Date: 15 Jun 2002 17:51:37 -0400 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: sroberts@dsl.pipex.com Cc: FreeBSD User Questions List <freebsd-questions@FreeBSD.org>, Glenn Johnson <gjohnson@srrc.ars.usda.gov>, dougb@FreeBSD.org Subject: Re: No screensaver applet in gnomecontrolcenter after upgrade to xscreensaver-4.05 Message-ID: <1024177898.81450.2.camel@shumai.marcuscom.com> In-Reply-To: <1024142916.21106.4.camel@Demon.Strobe.org> References: <1024142916.21106.4.camel@Demon.Strobe.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sat, 2002-06-15 at 08:08, Stacey Roberts wrote:
> Hello,
> I finally managed to get xscreensaver installed on this system.
> However after restarting X (no particular reason, just wanted to), I
> figured I'd configure the screensaver, but when I start
> gnomecontrolcenter, I can see screensaver in the panel on the left (no
> image).
>
> Clicking on screensaver doesn't cause the right panel to display the
> screensaver configuration options.
>
> Is there a reason / fix for this?
Attached are patches to correct this problem. These have been tested by
myself, and a few other users, and the screensaver capplet icon is
successfully installed in GNOME Control Center.
Doug, I have included you with the hopes these can be committed. They
are fairly unique to the FreeBSD port, so I didn't bother getting Jamie
involved. I have followed your format of using a non-inplace regex in
the Makefile as well. Thanks.
Joe
>
> Stacey
> --
> Stacey Roberts B.Sc. (HONS) Computer Science
> Network Systems Engineer
[-- Attachment #2 --]
diff -ruN xscreensaver.orig/Makefile xscreensaver/Makefile
--- x11/xscreensaver.orig/Makefile Sat Jun 15 17:46:31 2002
+++ x11/xscreensaver/Makefile Sat Jun 15 17:43:11 2002
@@ -91,6 +91,11 @@
@ ${SED} -e 's/malloc.h/stdlib.h/g' ${WRKSRC}/hacks/glx/${file}.Dist > \
${WRKSRC}/hacks/glx/${file}
.endfor
+ @ ${CP} ${WRKSRC}/driver/screensaver-properties.desktop.in \
+ ${WRKSRC}/driver/screensaver-properties.desktop.in.orig
+ @ ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+ ${WRKSRC}/driver/screensaver-properties.desktop.in.orig > \
+ ${WRKSRC}/driver/screensaver-properties.desktop.in
post-install:
@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
diff -ruN xscreensaver.orig/files/patch-ab xscreensaver/files/patch-ab
--- x11/xscreensaver.orig/files/patch-ab Sat Jun 15 17:46:30 2002
+++ x11/xscreensaver/files/patch-ab Sat Jun 15 15:28:08 2002
@@ -1,6 +1,49 @@
---- configure.orig Fri May 31 20:43:47 2002
-+++ configure Wed Jun 5 00:58:27 2002
-@@ -17452,13 +17452,13 @@
+--- configure.orig Tue Jun 11 05:09:04 2002
++++ configure Sat Jun 15 15:27:38 2002
+@@ -12929,7 +12929,7 @@
+ else
+ GNOME_DATADIR=`$gtk_config --prefix`
+ fi
+- GNOME_DATADIR="$GNOME_DATADIR/share"
++ GNOME_DATADIR="$GNOME_DATADIR/share/gnome"
+ fi
+
+ # .desktop files go in different places in Gnome 1.x and Gnome 2.x...
+@@ -14240,18 +14240,18 @@
+ GL_LIBS=""
+
+
+- # Some versions of MesaGL are compiled to require -lpthread.
+- # So if the Mesa headers exist, and -lpthread exists, then always
+- # link -lpthread after the Mesa libs (be they named -lGL or -lMesaGL.)
++ # Some versions of MesaGL are compiled to require "-pthread".
++ # So if the Mesa headers exist, and "-pthread" exists, then always
++ # link "-pthread" after the Mesa libs (be they named -lGL or -lMesaGL.)
+ #
+ if test "$ac_have_mesa_gl" = yes; then
+- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for pthread_create in "-pthread"" >&5
++echo $ECHO_N "checking for pthread_create in "-pthread"... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS=""-pthread" $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+@@ -14301,7 +14301,7 @@
+ 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"
++ GL_LIBS=""-pthread""
+ fi
+
+ fi
+@@ -17491,13 +17491,13 @@
# Now that we know whether we have Gnome, we can decide where the XML
# config files get installed.
#
diff -ruN xscreensaver.orig/files/patch-driver_screensaver-properties.desktop.in xscreensaver/files/patch-driver_screensaver-properties.desktop.in
--- x11/xscreensaver.orig/files/patch-driver_screensaver-properties.desktop.in Wed Dec 31 19:00:00 1969
+++ x11/xscreensaver/files/patch-driver_screensaver-properties.desktop.in Sat Jun 15 17:39:48 2002
@@ -0,0 +1,11 @@
+--- driver/screensaver-properties.desktop.in.orig Tue May 28 20:42:12 2002
++++ driver/screensaver-properties.desktop.in Sat Jun 15 17:39:29 2002
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Exec=xscreensaver-demo --crapplet
+ TryExec=xscreensaver-demo
+-Icon=xscreensaver.xpm
++Icon=%%PREFIX%%/share/gnome/xscreensaver/xscreensaver.xpm
+ Terminal=0
+ _Name=Screensaver
+ _Comment=Configure the settings of the screensaver.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1024177898.81450.2.camel>