From owner-freebsd-gnome Thu Jul 18 7:46:55 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C83137B400; Thu, 18 Jul 2002 07:46:42 -0700 (PDT) Received: from rabbit.netstyle.com.ua (rabbit.netstyle.com.ua [193.193.194.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D61943E67; Thu, 18 Jul 2002 07:46:36 -0700 (PDT) (envelope-from sobomax@FreeBSD.org) Received: from vega.vega.com (root@[195.5.51.243]) by rabbit.netstyle.com.ua (8.12.5/8.12.5) with ESMTP id g6IEkNwN033377; Thu, 18 Jul 2002 17:46:28 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Received: from FreeBSD.org (big_brother.vega.com [192.168.1.1]) by vega.vega.com (8.12.5/8.11.3) with ESMTP id g6IEkTMk007623; Thu, 18 Jul 2002 17:46:29 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Message-ID: <3D36D4C9.8DA1A910@FreeBSD.org> Date: Thu, 18 Jul 2002 17:46:33 +0300 From: Maxim Sobolev Organization: Vega International Capital X-Mailer: Mozilla 4.79 [en] (Windows NT 5.0; U) X-Accept-Language: en,uk,ru MIME-Version: 1.0 To: dougb@FreeBSD.org Cc: gnome@FreeBSD.org Subject: Divorcing xscreensaver and xscreensaver-gnome Content-Type: multipart/mixed; boundary="------------BF7596F5CD7309783E70DC8D" Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This is a multi-part message in MIME format. --------------BF7596F5CD7309783E70DC8D Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Hi Doug, Please appreve attached patches for xscreensaver port. Those patches do the following: 1. Remove all optional GNOME support from x11/xscreensaver port and explicitly disable gnome components. Instead, task of building/installing GNOME component was moved into separate xcreensaver-gnome port, which will be maintained separately; 2. Prevent detection of gtk-2.0/libxml2 when one of the is installed. Unfortunately, there is no clean way to do it with configure args, so that I ended up patching configure script. We need those patches because if for some reason user has gtk-2.0 installed during compilation of xscreensaver, gtk-2.0 will be picked up and used instead of gtk-1.2. Since there is no dependency line on gtk-2.0 later the user might uninstall gtk-2.0 and find his xscreensaver installation hosed due to missed shared library. The same applies to gdk-pixbuf - currently port just extends PLIST with bin/webcollage-helper, but again no dependency on gdk-pixbuf is registered; 3. Convert xscreensaver to USE_GNOMENG; 4. Fix detection of libintl, which enables localisation of xscreensaver's GUI (the same patch was sent for your approval long time ago, but I never heard any reply). Please note that if I do not hear your reply within 5 days I'll go on and commit those changes on my own, because xscreensaver currently is one of the major stumbling blocks on the way of FreeBSD GNOME progress. Thanks! -Maxim --------------BF7596F5CD7309783E70DC8D Content-Type: text/plain; charset=koi8-r; name="xscreensaver.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xscreensaver.diff" ? xscreensaver/pkg-plist,v ? xscreensaver-gnome/distinfo Index: xscreensaver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/Makefile,v retrieving revision 1.58 diff -d -u -r1.58 Makefile --- xscreensaver/Makefile 14 Jun 2002 06:33:42 -0000 1.58 +++ xscreensaver/Makefile 18 Jul 2002 14:23:35 -0000 @@ -18,37 +18,28 @@ MAINTAINER?= DougB@FreeBSD.org -LIB_DEPENDS= gle.3:${PORTSDIR}/graphics/gle \ - xml.5:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= gle.3:${PORTSDIR}/graphics/gle USE_X_PREFIX= yes USE_XPM= yes USE_MESA= yes USE_GMAKE= yes -USE_GTK= yes -WANT_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= libxml gtk12 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ - --with-jpeg=${LOCALBASE} - -.include + --with-jpeg=${LOCALBASE} \ + --without-gnome --without-motif --without-pixbuf +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + X_CFLAGS="-I${LOCALBASE}/include/gnome-xml" .if defined(XS_WITH_ALL_FORTUNES) CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa" .endif -.if defined(HAVE_GNOME) && defined(WITH_GNOME) -USE_GNOME= yes -CONFIGURE_ARGS+= --with-gnome -.else -CONFIGURE_ARGS+= --without-gnome -.undef HAVE_GNOME -.endif - -CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml - MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \ blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \ bumps.1 cage.1 ccurve.1 circuit.1 compass.1 coral.1 critical.1 \ @@ -76,12 +67,6 @@ xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \ xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1 -pre-fetch: -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - @(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || \ - /usr/bin/true) -.endif - post-patch: @ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched @ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \ @@ -92,10 +77,4 @@ ${WRKSRC}/hacks/glx/${file} .endfor -post-install: - @(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \ - ${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \ - ${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \ - ${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi) - -.include +.include Index: xscreensaver/pkg-libwarning =================================================================== RCS file: xscreensaver/pkg-libwarning diff -N xscreensaver/pkg-libwarning --- xscreensaver/pkg-libwarning 14 Jun 2002 06:33:42 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -There is currently a conflict between configure for this port, -and pkgconfig. If your build fails, do the following: - -make clean -pkg_delete -f pkgconfig* -make install - -You may also want to upgrade your complete ports tree and -then re-install glib12 and gtk12 which will also fix the -pkg-config files for those two ports, and should offer a -more permanent solution. Index: xscreensaver/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/pkg-plist,v retrieving revision 1.34 diff -d -u -r1.34 pkg-plist --- xscreensaver/pkg-plist 11 Jun 2002 21:05:04 -0000 1.34 +++ xscreensaver/pkg-plist 18 Jul 2002 14:23:35 -0000 @@ -1,4 +1,3 @@ -%%GNOME:%%bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -153,16 +152,24 @@ bin/xscreensaver-hacks/xteevee bin/xscreensaver-hacks/zoom lib/X11/app-defaults/XScreenSaver -%%GNOME:%%share/gnome/apps/Settings/Desktop/screensaver-properties.desktop -%%GNOME:%%share/gnome/control-center/Desktop/screensaver-properties.desktop -%%GNOME:%%share/gnome/control-center/capplets/screensaver.desktop -%%GNOME:%%share/gnome/pixmaps/screensaver-cmndln.xpm -%%GNOME:%%share/gnome/pixmaps/screensaver-colorselector.xpm -%%GNOME:%%share/gnome/pixmaps/screensaver-diagnostic.xpm -%%GNOME:%%share/gnome/pixmaps/screensaver-locking.xpm -%%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm -%%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm -%%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm +share/locale/ca/LC_MESSAGES/xscreensaver.mo +share/locale/da/LC_MESSAGES/xscreensaver.mo +share/locale/de/LC_MESSAGES/xscreensaver.mo +share/locale/es/LC_MESSAGES/xscreensaver.mo +share/locale/et/LC_MESSAGES/xscreensaver.mo +share/locale/fi/LC_MESSAGES/xscreensaver.mo +share/locale/fr/LC_MESSAGES/xscreensaver.mo +share/locale/hu/LC_MESSAGES/xscreensaver.mo +share/locale/it/LC_MESSAGES/xscreensaver.mo +share/locale/ja/LC_MESSAGES/xscreensaver.mo +share/locale/ko/LC_MESSAGES/xscreensaver.mo +share/locale/no/LC_MESSAGES/xscreensaver.mo +share/locale/pl/LC_MESSAGES/xscreensaver.mo +share/locale/pt/LC_MESSAGES/xscreensaver.mo +share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo +share/locale/ru/LC_MESSAGES/xscreensaver.mo +share/locale/sv/LC_MESSAGES/xscreensaver.mo +share/locale/wa/LC_MESSAGES/xscreensaver.mo share/xscreensaver/xscreensaver.xpm share/xscreensaver/screensaver-cmndln.xpm share/xscreensaver/screensaver-colorselector.xpm Index: xscreensaver/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/files/patch-ab,v retrieving revision 1.14 diff -d -u -r1.14 patch-ab --- xscreensaver/files/patch-ab 5 Jun 2002 08:51:01 -0000 1.14 +++ xscreensaver/files/patch-ab 18 Jul 2002 14:23:35 -0000 @@ -1,6 +1,27 @@ ---- configure.orig Fri May 31 20:43:47 2002 -+++ configure Wed Jun 5 00:58:27 2002 -@@ -17452,13 +17452,13 @@ + +$FreeBSD$ + +--- configure.orig Tue Jun 11 12:09:04 2002 ++++ configure Thu Jul 18 15:09:54 2002 +@@ -12483,7 +12483,7 @@ + pkg_check_version gmodule-2.0 2.0.0 + pkg_check_version libxml-2.0 2.4.6 + pkg_check_version libglade-2.0 1.99.0 +- have_gtk="$ok" ++ have_gtk="no" + + if test "$have_gtk" = yes; then + have_gtk2=yes +@@ -13116,7 +13116,7 @@ + + # First check for XML 2.x. + # +- pkg_check_version libxml-2.0 2.4.6 ++ pkg_check_version libxml 1.0 + + # If that didn't work (we don't have XML 2.x) and we *don't* have + # Gtk 2.x, then check to see if we have XML 1.x +@@ -17491,13 +17491,13 @@ # Now that we know whether we have Gnome, we can decide where the XML # config files get installed. # Index: xscreensaver/files/patch-po::Makefile.in.in =================================================================== RCS file: xscreensaver/files/patch-po::Makefile.in.in diff -N xscreensaver/files/patch-po::Makefile.in.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver/files/patch-po::Makefile.in.in 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2002/06/06 19:53:47 1.1 ++++ po/Makefile.in.in 2002/06/06 19:54:28 +@@ -101,7 +101,7 @@ + exec_prefix = @exec_prefix@ + #datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver + datadir = @GNOME_DATADIR@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + #gnulocaledir = $(prefix)/share/locale -- not for xscreensaver + gnulocaledir = $(localedir) + #gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po Index: xscreensaver-gnome/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver-gnome/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- xscreensaver-gnome/Makefile 14 Feb 2002 00:02:18 -0000 1.1 +++ xscreensaver-gnome/Makefile 18 Jul 2002 14:23:35 -0000 @@ -5,12 +5,54 @@ # $FreeBSD: ports/x11/xscreensaver-gnome/Makefile,v 1.1 2002/02/14 00:02:18 ade Exp $ # +MAINDIR= ${.CURDIR}/../xscreensaver + +PORTNAME= xscreensaver-gnome +PORTVERSION!= ${MAKE} -V PORTVERSION -f ${MAINDIR}/${MAKEFILE} +PORTREVISION!= ${MAKE} -V PORTREVISION -f ${MAINDIR}/${MAKEFILE} +PORTEPOCH!= ${MAKE} -V PORTEPOCH -f ${MAINDIR}/${MAKEFILE} CATEGORIES= x11 gnome +DISTFILES= MAINTAINER= gnome@FreeBSD.org -MASTERDIR= ${.CURDIR}/../xscreensaver +FETCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11/xscreensaver:patch +BUILD_DEPENDS!= ${MAKE} -V BUILD_DEPENDS -f ${MAINDIR}/${MAKEFILE} +LIB_DEPENDS!= ${MAKE} -V LIB_DEPENDS -f ${MAINDIR}/${MAKEFILE} +RUN_DEPENDS!= ${MAKE} -V RUN_DEPENDS -f ${MAINDIR}/${MAKEFILE} -WITH_GNOME= yes +RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver -.include "${MASTERDIR}/Makefile" +USE_X_PREFIX= yes +USE_GMAKE= yes +USE_GNOMENG= yes +USE_GNOME= gnomehier gnomelibs libcapplet gdkpixbuf +GNU_CONFIGURE= yes +OLD_CONFIGURE_ARGS!= ${MAKE} -V CONFIGURE_ARGS -f ${MAINDIR}/${MAKEFILE} +CONFIGURE_ARGS= ${OLD_CONFIGURE_ARGS:N--without-gnome} --with-gnome +CONFIGURE_ENV!= ${MAKE} -V CONFIGURE_ENV -f ${MAINDIR}/${MAKEFILE} + +post-extract: + @${CP} -Rp ${WRKDIRPREFIX}${MAINDIR}/work/xscreensaver-${PORTVERSION} \ + ${WRKSRC} + @${RM} -f ${WRKSRC}/config.cache + +do-build: + @cd ${WRKSRC}/driver && ${GMAKE} clean xscreensaver-demo \ + screensaver-properties.desktop + +do-install: + @${INSTALL_DATA} ${WRKSRC}/utils/images/screensaver-*.xpm \ + ${PREFIX}/share/gnome/pixmaps + @${INSTALL_DATA} ${WRKSRC}/utils/images/logo-50.xpm \ + ${PREFIX}/share/gnome/pixmaps/xscreensaver.xpm + @${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo \ + ${PREFIX}/bin/xscreensaver-gnome + @${INSTALL_SCRIPT} ${WRKSRC}/driver/screensaver-properties-capplet \ + ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/driver/screensaver-properties.desktop \ + ${PREFIX}/share/gnome/apps/Settings/Desktop + @${INSTALL_DATA} ${WRKSRC}/driver/screensaver-properties.desktop \ + ${PREFIX}/share/gnome/control-center/Desktop + +.include Index: xscreensaver-gnome/pkg-comment =================================================================== RCS file: xscreensaver-gnome/pkg-comment diff -N xscreensaver-gnome/pkg-comment --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver-gnome/pkg-comment 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1 @@ +A component for integrating xscreensaver package into GNOME desktop Index: xscreensaver-gnome/pkg-descr =================================================================== RCS file: xscreensaver-gnome/pkg-descr diff -N xscreensaver-gnome/pkg-descr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver-gnome/pkg-descr 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1 @@ +A component for integrating xscreensaver package into GNOME desktop. Index: xscreensaver-gnome/pkg-plist =================================================================== RCS file: xscreensaver-gnome/pkg-plist diff -N xscreensaver-gnome/pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver-gnome/pkg-plist 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1,11 @@ +bin/screensaver-properties-capplet +bin/xscreensaver-gnome +share/gnome/apps/Settings/Desktop/screensaver-properties.desktop +share/gnome/control-center/Desktop/screensaver-properties.desktop +share/gnome/pixmaps/screensaver-cmndln.xpm +share/gnome/pixmaps/screensaver-colorselector.xpm +share/gnome/pixmaps/screensaver-diagnostic.xpm +share/gnome/pixmaps/screensaver-locking.xpm +share/gnome/pixmaps/screensaver-power.xpm +share/gnome/pixmaps/screensaver-snap.xpm +share/gnome/pixmaps/xscreensaver.xpm Index: xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet =================================================================== RCS file: xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet diff -N xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver-gnome/files/patch-driver::screensaver-properties-capplet 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- driver/screensaver-properties-capplet 2002/07/18 12:49:32 1.1 ++++ driver/screensaver-properties-capplet 2002/07/18 12:49:41 +@@ -16,4 +16,4 @@ + # xscreensaver-demo accepts the same arguments that Gnome's capplet does, + # except that "--capplet" must be the first argument. + +-exec xscreensaver-demo --crapplet "$@" ++exec xscreensaver-gnome --crapplet "$@" Index: xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in =================================================================== RCS file: xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in diff -N xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in 18 Jul 2002 14:23:35 -0000 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- driver/screensaver-properties.desktop.in 2002/07/18 12:49:32 1.1 ++++ driver/screensaver-properties.desktop.in 2002/07/18 12:49:51 +@@ -1,6 +1,6 @@ + [Desktop Entry] +-Exec=xscreensaver-demo --crapplet +-TryExec=xscreensaver-demo ++Exec=xscreensaver-gnome --crapplet ++TryExec=xscreensaver-gnome + Icon=xscreensaver.xpm + Terminal=0 + _Name=Screensaver --------------BF7596F5CD7309783E70DC8D-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message