Date: 15 Jun 2002 23:04:26 +0100 From: Stacey Roberts <sroberts@dsl.pipex.com> To: Joe Marcus Clarke <marcus@FreeBSD.org> 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: <1024178667.47848.4.camel@Demon.Strobe.org> In-Reply-To: <1024177898.81450.2.camel@shumai.marcuscom.com> References: <1024142916.21106.4.camel@Demon.Strobe.org> <1024177898.81450.2.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-wiAgx8Zmu2SWB7mEpm7R
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Thanks Joe,
I'll apply and provide some feedback as and when it's done.
Stacey
On Sat, 2002-06-15 at 22:51, Joe Marcus Clarke wrote:
> 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).
> >=20
> > Clicking on screensaver doesn't cause the right panel to display the
> > screensaver configuration options.
> >=20
> > Is there a reason / fix for this?
>=20
> 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.
>=20
> 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.
>=20
> Joe
>=20
> >=20
> > Stacey
> > --=20
> > Stacey Roberts B.Sc. (HONS) Computer Science
> > Network Systems Engineer
>=20
>=20
> ----
>=20
> 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
> =20
> 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=3D`$gtk_config --prefix`
> + fi
> +- GNOME_DATADIR=3D"$GNOME_DATADIR/share"
> ++ GNOME_DATADIR=3D"$GNOME_DATADIR/share/gnome"
> + fi
> +=20
> + # .desktop files go in different places in Gnome 1.x and Gnome 2.x...
> +@@ -14240,18 +14240,18 @@
> + GL_LIBS=3D""
> +=20
> +=20
> +- # 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 -lMesaG=
L.)
> ++ # 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 -lMesa=
GL.)
> + #
> + if test "$ac_have_mesa_gl" =3D 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}" =3D set; then
> + echo $ECHO_N "(cached) $ECHO_C" >&6
> + else
> + ac_check_lib_save_LIBS=3D$LIBS
> +-LIBS=3D"-lpthread $LIBS"
> ++LIBS=3D""-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 =3D yes; then
> +- GL_LIBS=3D"-lpthread"
> ++ GL_LIBS=3D""-pthread""
> + fi
> +=20
> + 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.des=
ktop.in xscreensaver/files/patch-driver_screensaver-properties.desktop.in
> --- x11/xscreensaver.orig/files/patch-driver_screensaver-properties.deskt=
op.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 20=
02
> ++++ driver/screensaver-properties.desktop.in Sat Jun 15 17:39:29 2002
> +@@ -1,7 +1,7 @@
> + [Desktop Entry]
> + Exec=3Dxscreensaver-demo --crapplet
> + TryExec=3Dxscreensaver-demo
> +-Icon=3Dxscreensaver.xpm
> ++Icon=3D%%PREFIX%%/share/gnome/xscreensaver/xscreensaver.xpm
> + Terminal=3D0
> + _Name=3DScreensaver
> + _Comment=3DConfigure the settings of the screensaver.
--=20
Stacey Roberts B.Sc. (HONS) Computer Science
Network Systems Engineer
--=-wiAgx8Zmu2SWB7mEpm7R
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Thanks Joe,
I'll apply and provide some feedback as and when it's done.
Stacey
On Sat, 2002-06-15 at 22:51, Joe Marcus Clarke wrote:
> 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).
> >=20
> > Clicking on screensaver doesn't cause the right panel to display the
> > screensaver configuration options.
> >=20
> > Is there a reason / fix for this?
>=20
> 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.
>=20
> 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.
>=20
> Joe
>=20
> >=20
> > Stacey
> > --=20
> > Stacey Roberts B.Sc. (HONS) Computer Science
> > Network Systems Engineer
>=20
>=20
> ----
>=20
> 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
> =20
> 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=3D`$gtk_config --prefix`
> + fi
> +- GNOME_DATADIR=3D"$GNOME_DATADIR/share"
> ++ GNOME_DATADIR=3D"$GNOME_DATADIR/share/gnome"
> + fi
> +=20
> + # .desktop files go in different places in Gnome 1.x and Gnome 2.x...
> +@@ -14240,18 +14240,18 @@
> + GL_LIBS=3D""
> +=20
> +=20
> +- # 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 -lMesaG=
L.)
> ++ # 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 -lMesa=
GL.)
> + #
> + if test "$ac_have_mesa_gl" =3D 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}" =3D set; then
> + echo $ECHO_N "(cached) $ECHO_C" >&6
> + else
> + ac_check_lib_save_LIBS=3D$LIBS
> +-LIBS=3D"-lpthread $LIBS"
> ++LIBS=3D""-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 =3D yes; then
> +- GL_LIBS=3D"-lpthread"
> ++ GL_LIBS=3D""-pthread""
> + fi
> +=20
> + 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.des=
ktop.in xscreensaver/files/patch-driver_screensaver-properties.desktop.in
> --- x11/xscreensaver.orig/files/patch-driver_screensaver-properties.deskt=
op.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 20=
02
> ++++ driver/screensaver-properties.desktop.in Sat Jun 15 17:39:29 2002
> +@@ -1,7 +1,7 @@
> + [Desktop Entry]
> + Exec=3Dxscreensaver-demo --crapplet
> + TryExec=3Dxscreensaver-demo
> +-Icon=3Dxscreensaver.xpm
> ++Icon=3D%%PREFIX%%/share/gnome/xscreensaver/xscreensaver.xpm
> + Terminal=3D0
> + _Name=3DScreensaver
> + _Comment=3DConfigure the settings of the screensaver.
- --=20
Stacey Roberts B.Sc. (HONS) Computer Science
Network Systems Engineer
-----BEGIN PGP SIGNATURE-----
Version: PGP 6.5.8
iQA/AwUBPQu55/dn4A8qiCO5EQKVowCgnh7ym44bFXNhAY8yKndLtqLBAA4An1PY
18oi9GvLhGmWBR6UY8QyXwC2
=lf8O
-----END PGP SIGNATURE-----
--=-wiAgx8Zmu2SWB7mEpm7R--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1024178667.47848.4.camel>