Date: Sat, 27 Mar 2004 02:36:36 +0900
From: Alexander Nedotsukov <bland@FreeBSD.org>
To: Jeremy Messenger <mezz7@cox.net>
Cc: freebsd-gnome@FreeBSD.org
Subject: Re: Time to put ${PTHREAD_LIBS} in the x11/xscreensaver-gnome?
Message-ID: <40646A24.9000702@FreeBSD.org>
In-Reply-To: <opr5epdtjo8ckrg5@smtp.central.cox.net>
References: <opr5epdtjo8ckrg5@smtp.central.cox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------020401030104080302050500
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
I would like you guys do one more thing for me.
Reinstall port without your ${PTHREAD_LIBS} patch.
Edit /usr/X11R6/share/xscreensaver/xscreensaver-demo.glade2 and do
@@ -2,7 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">;
<glade-interface>
-<requires lib="gnome"/>
<widget class="GtkWindow" id="xscreensaver_demo">
<property name="title" translatable="yes">XScreenSaver</property>
Save.
Start xscreensaver-demo.
If crash gone please test full patch I attached.
Thanks,
Alexander.
--------------020401030104080302050500
Content-Type: text/plain;
name="xscreensaver-gnome.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="xscreensaver-gnome.patch"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xscreensaver-gnome/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 26 Mar 2004 01:42:38 -0000 1.25
+++ Makefile 26 Mar 2004 17:25:38 -0000
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver-gnome
PORTVERSION= 4.15
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
Index: files/patch-ab
===================================================================
RCS file: /home/pcvs/ports/x11/xscreensaver-gnome/files/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- files/patch-ab 9 Nov 2003 04:03:40 -0000 1.4
+++ files/patch-ab 26 Mar 2004 17:25:38 -0000
@@ -1,6 +1,6 @@
---- configure.orig Sat Nov 8 22:45:13 2003
-+++ configure Sat Nov 8 22:45:58 2003
-@@ -2572,7 +2572,7 @@
+--- configure.orig Thu Mar 25 22:53:53 2004
++++ configure Thu Mar 25 22:57:09 2004
+@@ -2574,7 +2574,7 @@
if test -n "$GCC"; then
echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5
echo "${ECHO_T}Turning on gcc compiler warnings." >&6
@@ -9,7 +9,17 @@
OBJCC="$OBJCC -Wall"
# supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
# and then perhaps we can do without -pedantic?
-@@ -18603,13 +18603,13 @@
+@@ -15346,9 +15346,6 @@
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+-if test $ac_cv_lib_pthread_pthread_create = yes; then
+- GL_LIBS="-lpthread"
+-fi
+
+ fi
+
+@@ -19014,13 +19011,13 @@
# Now that we know whether we have Gnome, we can decide where the XML
# config files get installed.
#
Index: files/patch-driver::xscreensaver-demo.glade2
===================================================================
RCS file: files/patch-driver::xscreensaver-demo.glade2
diff -N files/patch-driver::xscreensaver-demo.glade2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-driver::xscreensaver-demo.glade2 26 Mar 2004 17:25:38 -0000
@@ -0,0 +1,10 @@
+--- driver/xscreensaver-demo.glade2.orig Sat Mar 27 02:04:45 2004
++++ driver/xscreensaver-demo.glade2 Sat Mar 27 02:05:15 2004
+@@ -2,7 +2,6 @@
+ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">;
+
+ <glade-interface>
+-<requires lib="gnome"/>
+
+ <widget class="GtkWindow" id="xscreensaver_demo">
+ <property name="title" translatable="yes">XScreenSaver</property>
--------------020401030104080302050500--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?40646A24.9000702>