Date: Sat, 21 Sep 2002 19:46:17 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org Subject: [patch] unbreak x11/gnomecore for <4.6 Message-ID: <20020921094617.74ACD6A7124@k7.mavetju>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Edwin Groothuis
>Organization: -
>Confidential: no
>Synopsis: [patch] unbreak x11/gnomecore for <4.6
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 4.5-RELEASE i386
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386
>Description:
Since the upgrade to gnomecore-1.4.2, it won't compile anymore under
FreeBSD 4.5. Reason? it's using langinfo.h
>How-To-Repeat:
obvious
>Fix:
- When running <4.6, apply the attached patch
(4.5-panel::gnome-panel-screenshot.c)
- Apply this patch to Makefile
--- Makefile.old Sat Sep 21 19:05:57 2002
+++ Makefile Sat Sep 21 19:33:38 2002
@@ -37,8 +37,14 @@
session-properties-capplet.1
MAN5= default.session.5
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 460000
+EXTRA_PATCHES += ${FILESDIR}/4.5-panel::gnome-panel-screenshot.c
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
*** 4.5-panel::gnome-panel-screenshot.c:
--- panel/gnome-panel-screenshot.c.old Sat Sep 21 19:11:55 2002
+++ panel/gnome-panel-screenshot.c Sat Sep 21 19:04:23 2002
@@ -53,7 +53,7 @@
#include <libart_lgpl/art_rgb_affine.h>
#include <stdio.h>
-#include <langinfo.h>
+/*#include <langinfo.h> */
/* How far down the window tree will we search when looking for top-level
* windows? Some window managers doubly-reparent the client, so account
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020921094617.74ACD6A7124>