From ec1d1394c75d231865b133bb6a10f4e76d78f40c Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 14 Feb 2003 21:08:38 +0000 Subject: Update to 2.2.0.2. Changes since 2.0.8: * Build fix (Thomas Vander Stichele) * Mark a couple of strings for translation (Yuriy Syrota) * Cool new splash screen (Jakub Steiner) * Up the slow client purge delay to 2 minutes (Mark) * Fix GsmProtocol initialisation problem (Mark) * Ensure child dialogs are kept above the parent (Satyajit) * Add startup notification flag to .desktop files (Dennis Cranston) * Unref the GConfCliet (Brian Cameron) * Add X-GNOME-BUGZILLA to the .desktop files (Fernando Herrera) * Fixup manpages (Christian Marillat, Mark, Alex Duggan) * Update application icons map (Evandro Fernandes Giovanini) * Fixup Xinerama aware logout iris code (Mark) * Allow splash screen to be configured (Rodney Dawes) * Use intltool to merge schmemas translations (Mark) * Use metacity for the window manager by default (Jacob) * Multiscreen support for logout iris and dialog (Mark) * Use "Order" instead of "Priority" in the capplet (Mark) * New translations. --- x11/gnome-session/Makefile | 13 +++++---- x11/gnome-session/PLIST | 36 ++++++++++------------- x11/gnome-session/distinfo | 10 +++---- x11/gnome-session/patches/patch-aa | 60 +++++++------------------------------- x11/gnome-session/patches/patch-ac | 22 +++++++------- 5 files changed, 49 insertions(+), 92 deletions(-) (limited to 'x11/gnome-session') diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 8cefbe3e7f0..3888a47be27 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,21 +1,21 @@ -# $NetBSD: Makefile,v 1.8 2003/02/05 22:22:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/02/14 21:08:38 jmmv Exp $ # -DISTNAME= gnome-session-2.0.8 -PKGREVISION= 2 +DISTNAME= gnome-session-2.2.0.2 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.0/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.2/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 session management utilities +DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs + GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_GMAKE= yes -USE_GNU_GETTEXT= yes USE_X11= yes USE_PERL5= build @@ -25,8 +25,11 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --program-transform-name=s,gnome,gnome2, CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} +GCONF2_SCHEMAS= gnome-session.schemas + .include "../../audio/esound/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/GConf2/schemas.mk" .include "../../devel/GConf2-ui/buildlink2.mk" .include "../../devel/libgnome/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST index 4888e4b0c97..a845b24da0e 100644 --- a/x11/gnome-session/PLIST +++ b/x11/gnome-session/PLIST @@ -1,25 +1,23 @@ -@comment $NetBSD: PLIST,v 1.2 2002/11/04 08:50:37 rh Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:08:38 jmmv Exp $ bin/gnome2-session bin/gnome2-session-properties bin/gnome2-session-save bin/gnome2-smproxy bin/gnome2-wm -etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml -etc/gconf/schemas/gnome-session.schemas +man/man1/gnome2-session-properties.1 +man/man1/gnome2-session-save.1 man/man1/gnome2-session.1 man/man1/gnome2-smproxy.1 man/man1/gnome2-wm.1 -man/man1/gnome2-save-session.1 -man/man1/gnome2-session-properties.1 -man/man5/gnome2-default.session.5 +man/man5/default.session.5 share/control-center-2.0/capplets/session-properties.desktop -share/gnome/gnome2-default.session -share/gnome/gnome2-default.wm +share/gconf/schemas/gnome-session.schemas +share/gnome/default.session +share/gnome/default.wm +${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-session-2.0.mo +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-session-2.0.mo @@ -44,6 +42,7 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-session-2.0.mo +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-session-2.0.mo @@ -56,6 +55,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gnome-session-2.0.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-session-2.0.mo @@ -65,14 +65,10 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo -share/pixmaps/splash/gnome2-splash.png -@unexec ${RMDIR} %D/share/pixmaps/splash 2>/dev/null || ${TRUE} +share/pixmaps/splash/gnome-splash.png +@dirrm share/pixmaps/splash @exec ${MKDIR} %D/share/omf/gnome-core @unexec ${RMDIR} %D/share/omf/gnome-core 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/omf 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/control-center-2.0/capplets 2>/dev/null || ${TRUE} -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session +@comment in gnome2-dirs: @dirrm share/gnome +@comment in GConf2: @dirrm share/gconf/schemas +@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index c90adef5962..4c0a378f56d 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2002/11/04 08:50:38 rh Exp $ +$NetBSD: distinfo,v 1.3 2003/02/14 21:08:39 jmmv Exp $ -SHA1 (gnome-session-2.0.8.tar.bz2) = 515fa031d7c03570512d6ceba0249a426d448c48 -Size (gnome-session-2.0.8.tar.bz2) = 797437 bytes -SHA1 (patch-aa) = 7bc230f07abb2df2fa506055833f52836c276ffb +SHA1 (gnome-session-2.2.0.2.tar.bz2) = 7a40ddad89135a5bcd26d54e71871d3531040229 +Size (gnome-session-2.2.0.2.tar.bz2) = 736370 bytes +SHA1 (patch-aa) = 74b3ecc90f529c070826de2de7c29652e5980967 SHA1 (patch-ab) = 6a7b9394c41442c4181f4efb33f7ea7c61ee6f6b -SHA1 (patch-ac) = 148f41bdbf56524c8751e55dac1415a3ebb53791 +SHA1 (patch-ac) = 2b467144bbf8f42a7a0796840c42ba8537aa8634 SHA1 (patch-ad) = 24901462a72294008ef4f219668323fc159eaea0 diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa index 37d7602cd32..14b68fb1d09 100644 --- a/x11/gnome-session/patches/patch-aa +++ b/x11/gnome-session/patches/patch-aa @@ -1,53 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/15 06:03:04 rh Exp $ +$NetBSD: patch-aa,v 1.2 2003/02/14 21:08:39 jmmv Exp $ ---- gnome-session/Makefile.in.orig Thu Sep 5 12:25:10 2002 +--- gnome-session/Makefile.in.orig 2003-02-04 00:00:04.000000000 +0100 +++ gnome-session/Makefile.in -@@ -413,6 +413,8 @@ install-man1: - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ inst=`echo $$inst | sed 's/save/gnome2-save/'`; \ -+ inst=`echo $$inst | sed 's/session-prop/gnome2-session-prop/'`; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done -@@ -447,7 +449,7 @@ install-man5: - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/gnome2-$$inst; \ - done - - uninstall-man5: -@@ -477,10 +479,10 @@ install-defaultDATA: $(default_DATA) - @list='$(default_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/$$p; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultdir)/gnome2-$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/$$p; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(defaultdir)/gnome2-$$p; \ - fi; fi; \ - done - -@@ -494,12 +496,13 @@ install-pixmapDATA: $(pixmap_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pixmapdir) - @list='$(pixmap_DATA)'; for p in $$list; do \ -+ inst=`echo $$p | sed '$(transform)'`; \ - if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$inst"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$inst; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst; \ - fi; fi; \ - done +@@ -658,7 +658,7 @@ default.wm: default.wm.in ../config.stat + # don't do this if we are building in eg. rpm + install-data-local: +- if test -z "$(DESTDIR)" ; then \ ++ if false; then \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-session/$$p ; \ + done \ diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac index 91e94e29fd2..d520f9ae1c1 100644 --- a/x11/gnome-session/patches/patch-ac +++ b/x11/gnome-session/patches/patch-ac @@ -1,15 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/09/15 06:03:04 rh Exp $ +$NetBSD: patch-ac,v 1.2 2003/02/14 21:08:39 jmmv Exp $ ---- gnome-session/splash-widget.c.orig Fri Jul 26 03:01:04 2002 +--- gnome-session/splash-widget.c.orig 2002-11-28 02:01:40.000000000 +0100 +++ gnome-session/splash-widget.c -@@ -336,6 +336,10 @@ read_background (SplashWidget *sw) - - if (!pb) - pb = gdk_pixbuf_new_from_file ( -+ GNOME_ICONDIR "/splash/gnome2-splash.png", NULL); -+ -+ if (!pb) -+ pb = gdk_pixbuf_new_from_file ( - GNOME_ICONDIR "/splash/gnome-splash.png", NULL); +@@ -313,7 +313,7 @@ read_background (SplashWidget *sw) + "/apps/gnome-session/options/splash_image", + NULL); + if (!filename) +- filename = g_strdup (GNOME_ICONDIR "/splash/gnome-splash.png"); ++ filename = g_strdup (GNOME_ICONDIR "/splash/gnome2-splash.png"); - sw->background = pb; + pb = gdk_pixbuf_new_from_file (filename, NULL); + g_free (filename); -- cgit v1.2.3