Thu Oct 16 18:17:30 2008 UTC ()
update to 2.24.0
This switches to the gnome-2.24 release branch.


(drochner)
diff -r1.102 -r1.103 pkgsrc/x11/gnome-session/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/gnome-session/PLIST
diff -r1.40 -r1.41 pkgsrc/x11/gnome-session/distinfo
diff -r1.10 -r1.11 pkgsrc/x11/gnome-session/patches/patch-aa
diff -r1.5 -r0 pkgsrc/x11/gnome-session/patches/patch-ab
diff -r1.11 -r1.12 pkgsrc/x11/gnome-session/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/x11/gnome-session/patches/patch-ad
diff -r0 -r1.6 pkgsrc/x11/gnome-session/patches/patch-ae
diff -r0 -r1.1 pkgsrc/x11/gnome-session/patches/patch-af
cvs diff -r1.102 -r1.103 pkgsrc/x11/gnome-session/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/Makefile 2008/09/06 20:54:34 1.102
+++ pkgsrc/x11/gnome-session/Makefile 2008/10/16 18:17:30 1.103
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.102 2008/09/06 20:54:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.103 2008/10/16 18:17:30 drochner Exp $
2# 2#
3 3
4DISTNAME= gnome-session-2.22.3 4DISTNAME= gnome-session-2.24.0
5PKGREVISION= 1 
6CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.22/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.24/}
8SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/} 7SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.gnome.org/ 12HOMEPAGE= http://www.gnome.org/
14COMMENT= GNOME2 session management utilities 13COMMENT= GNOME2 session management utilities
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18CONFLICTS+= gnome-core<1.4.2nb4 17CONFLICTS+= gnome-core<1.4.2nb4
19 18
20EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 19EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
cvs diff -r1.21 -r1.22 pkgsrc/x11/gnome-session/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/PLIST 2008/04/25 04:02:23 1.21
+++ pkgsrc/x11/gnome-session/PLIST 2008/10/16 18:17:30 1.22
@@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
1@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $ 1@comment $NetBSD: PLIST,v 1.22 2008/10/16 18:17:30 drochner Exp $
2bin/gnome-session 2bin/gnome-session
3bin/gnome-session-properties 3bin/gnome-session-properties
4bin/gnome-session-remove 
5bin/gnome-session-save 4bin/gnome-session-save
6bin/gnome-wm 5bin/gnome-wm
 6lib/gnome-session/helpers/at-spi-registryd-wrapper
 7lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
 8lib/gnome-session/helpers/gnome-session-splash
 9lib/gnome-session/helpers/gnome-settings-daemon-helper
7man/man1/gnome-session-save.1 10man/man1/gnome-session-save.1
8man/man1/gnome-session.1 11man/man1/gnome-session.1
9man/man1/gnome-wm.1 12man/man1/gnome-wm.1
10man/man1/session-properties.1 13man/man1/session-properties.1
11man/man5/default.session.5 14man/man5/default.session.5
12share/applications/session-properties.desktop 15share/applications/session-properties.desktop
13share/gconf/schemas/gnome-session.schemas 16share/gconf/schemas/gnome-session.schemas
14share/gnome/default.session 17share/gnome-session/gsm-inhibit-dialog.glade
 18share/gnome-session/session-properties.glade
 19share/gnome/autostart/at-spi-registryd-wrapper.desktop
 20share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
 21share/gnome/autostart/gnome-session-splash.desktop
 22share/gnome/autostart/gnome-settings-daemon-helper.desktop
15share/icons/hicolor/16x16/apps/session-properties.png 23share/icons/hicolor/16x16/apps/session-properties.png
16share/icons/hicolor/22x22/apps/session-properties.png 24share/icons/hicolor/22x22/apps/session-properties.png
17share/icons/hicolor/24x24/apps/session-properties.png 25share/icons/hicolor/24x24/apps/session-properties.png
18share/icons/hicolor/32x32/apps/session-properties.png 26share/icons/hicolor/32x32/apps/session-properties.png
19share/icons/hicolor/scalable/apps/session-properties.svg 27share/icons/hicolor/scalable/apps/session-properties.svg
20share/locale/af/LC_MESSAGES/gnome-session-2.0.mo 28share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
21share/locale/am/LC_MESSAGES/gnome-session-2.0.mo 29share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
22share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo 30share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
23share/locale/az/LC_MESSAGES/gnome-session-2.0.mo 31share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
24share/locale/be/LC_MESSAGES/gnome-session-2.0.mo 32share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
25share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo 33share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
26share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo 34share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
27share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo 35share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
@@ -78,41 +86,44 @@ share/locale/oc/LC_MESSAGES/gnome-sessio @@ -78,41 +86,44 @@ share/locale/oc/LC_MESSAGES/gnome-sessio
78share/locale/or/LC_MESSAGES/gnome-session-2.0.mo 86share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
79share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo 87share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
80share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo 88share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
81share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo 89share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
82share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo 90share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
83share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo 91share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
84share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo 92share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
85share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo 93share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
86share/locale/si/LC_MESSAGES/gnome-session-2.0.mo 94share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
87share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo 95share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
88share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo 96share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
89share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo 97share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
90share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo 98share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
91share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo 99share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
92share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo 100share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
93share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo 101share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
94share/locale/te/LC_MESSAGES/gnome-session-2.0.mo 102share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
95share/locale/th/LC_MESSAGES/gnome-session-2.0.mo 103share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
96share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo 104share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
97share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo 105share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
98share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo 106share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
99share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo 107share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
100share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo 108share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
101share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo 109share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
102share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo 110share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
103share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo 111share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
104share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo 112share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
105share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo 113share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
106share/pixmaps/splash/gnome-splash-orig.png 114share/pixmaps/splash/gnome-splash-orig.png
107share/pixmaps/splash/gnome-splash.png 115share/pixmaps/splash/gnome-splash.png
108@dirrm share/pixmaps/splash 116@dirrm share/pixmaps/splash
109@comment in xdg-dirs: @dirrm share/pixmaps 117@comment in xdg-dirs: @dirrm share/pixmaps
110@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps 118@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
111@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps 119@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
112@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps 120@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
113@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps 121@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
114@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps 122@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
115@comment in hicolor-icon-theme: @dirrm share/icons/hicolor 123@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
116@comment in gnome2-dirs: @dirrm share/gnome 124@dirrm share/gnome/autostart
 125@dirrm share/gnome-session
117@comment in GConf: @dirrm share/gconf/schemas 126@comment in GConf: @dirrm share/gconf/schemas
118@comment in xdg-dirs: @dirrm share/applications 127@comment in xdg-dirs: @dirrm share/applications
 128@dirrm lib/gnome-session/helpers
 129@dirrm lib/gnome-session
cvs diff -r1.40 -r1.41 pkgsrc/x11/gnome-session/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/distinfo 2008/07/15 10:43:38 1.40
+++ pkgsrc/x11/gnome-session/distinfo 2008/10/16 18:17:30 1.41
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.40 2008/07/15 10:43:38 drochner Exp $ 1$NetBSD: distinfo,v 1.41 2008/10/16 18:17:30 drochner Exp $
2 2
3SHA1 (gnome-session-2.22.3.tar.bz2) = 817e007009e6e43cd2f1980e6d90546e7117cc9d 3SHA1 (gnome-session-2.24.0.tar.bz2) = 5a4b329db62ae3518029982ae86fb1b138500c3e
4RMD160 (gnome-session-2.22.3.tar.bz2) = a35065aa665ada5081f3fe19abc70950f8588e34 4RMD160 (gnome-session-2.24.0.tar.bz2) = e0430e566ba61a2fe4a1390f0cfb5cf32eec437b
5Size (gnome-session-2.22.3.tar.bz2) = 773853 bytes 5Size (gnome-session-2.24.0.tar.bz2) = 797656 bytes
6SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d 6SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
7RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96 7RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
8Size (gnome-splash-2.16.0.png) = 36601 bytes 8Size (gnome-splash-2.16.0.png) = 36601 bytes
9SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec 9SHA1 (patch-aa) = 9a385124467efd98a71a41ec8e123c6e51316d40
10SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75 10SHA1 (patch-ac) = f3a74bd3942269f44fab2d52262c2fedb3fd2848
11SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95 11SHA1 (patch-ad) = fe18ad5dbb6851b81bf23a4dcb2eec2d32981730
12SHA1 (patch-ad) = c737a11ec9ab7c74e498644f81377ffb3c65ee94 12SHA1 (patch-ae) = 31759f8ee3f4415c43feb9ce5e93cba549de06a3
 13SHA1 (patch-af) = b307190d2c0f8cc2e5aef8fec00868eaf5ddf8b9
cvs diff -r1.10 -r1.11 pkgsrc/x11/gnome-session/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/patches/Attic/patch-aa 2008/04/15 18:06:15 1.10
+++ pkgsrc/x11/gnome-session/patches/Attic/patch-aa 2008/10/16 18:17:30 1.11
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.10 2008/04/15 18:06:15 drochner Exp $ 1$NetBSD: patch-aa,v 1.11 2008/10/16 18:17:30 drochner Exp $
2 2
3--- gnome-session/Makefile.in.orig 2008-03-10 22:01:44.000000000 +0100 3--- gnome-session/Makefile.in.orig 2008-09-22 23:30:18.000000000 +0200
4+++ gnome-session/Makefile.in 4+++ gnome-session/Makefile.in
5@@ -301,7 +301,7 @@ INCLUDES = \ 5@@ -312,7 +312,7 @@ INCLUDES = \
6 -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" \ 6 -DLIBEXECDIR=\"$(libexecdir)\" \
7 -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" \ 7 -DGLADEDIR=\""$(pkgdatadir)"\" \
8 -DRSH_COMMAND=\""$(RSH_COMMAND)\"" \ 8 -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
9- -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" \ 9- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
10+ -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\"" \ 10+ -DGCONFTOOL_CMD=\"$(REAL_GCONFTOOL)\"
11 -DDEFAULTDIR="\"$(defaultdir)\"" \ 11
12 -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ 12 test_inhibit_SOURCES = \
13 -DTIME_UTILITY="\"$(TIME_UTILITY)\"" \ 13 test-inhibit.c \
File Deleted: pkgsrc/x11/gnome-session/patches/Attic/patch-ab
cvs diff -r1.11 -r1.12 pkgsrc/x11/gnome-session/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/patches/Attic/patch-ac 2008/04/25 04:02:23 1.11
+++ pkgsrc/x11/gnome-session/patches/Attic/patch-ac 2008/10/16 18:17:30 1.12
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $ 1$NetBSD: patch-ac,v 1.12 2008/10/16 18:17:30 drochner Exp $
2 2
3--- data/Makefile.in.orig 2008-04-10 10:34:02.000000000 -0400 3--- data/Makefile.in.orig 2008-09-22 23:30:16.000000000 +0200
4+++ data/Makefile.in 4+++ data/Makefile.in
5@@ -628,8 +628,8 @@ info: info-recursive 5@@ -683,8 +683,8 @@ info: info-recursive
6 info-am: 6 info-am:
7  7
8 install-data-am: install-data-local install-defaultDATA \ 8 install-data-am: install-data-local install-gladeDATA \
9- install-pixmapDATA install-schemasDATA install-settingsDATA \ 9- install-pixmapDATA install-schemasDATA install-settingsDATA \
10- install-xsessionDATA 10- install-xsessionDATA
11+ install-pixmapDATA install-schemasDATA install-settingsDATA 11+ install-pixmapDATA install-schemasDATA install-settingsDATA
12+# install-xsessionDATA 12+# install-xsessionDATA
13  13
14 install-dvi: install-dvi-recursive 14 install-dvi: install-dvi-recursive
15  15
cvs diff -r1.6 -r1.7 pkgsrc/x11/gnome-session/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/patches/Attic/patch-ad 2008/05/12 12:58:03 1.6
+++ pkgsrc/x11/gnome-session/patches/Attic/patch-ad 2008/10/16 18:17:30 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.6 2008/05/12 12:58:03 jmcneill Exp $ 1$NetBSD: patch-ad,v 1.7 2008/10/16 18:17:30 drochner Exp $
2 2
3--- gnome-session/gnome-wm.orig 2008-04-10 10:32:20.000000000 -0400 3--- data/gnome-wm.orig 2008-09-22 23:21:08.000000000 +0200
4+++ gnome-session/gnome-wm 2008-05-12 08:50:00.000000000 -0400 4+++ data/gnome-wm
5@@ -119,15 +119,21 @@ 5@@ -131,15 +131,21 @@ fi
6 case `basename $WINDOW_MANAGER` in 6 case `basename $WINDOW_MANAGER` in
7 compiz) 7 compiz)
8 export LIBGL_ALWAYS_INDIRECT=1 8 export LIBGL_ALWAYS_INDIRECT=1
9+ export INTEL_BATCH=1 9+ export INTEL_BATCH=1
10 gtk-window-decorator & 10 gtk-window-decorator &
11- OPT3=glib 11- OPT3=glib
12- OPT4=gconf 12- OPT4=gconf
13+ if which ccsm >/dev/null; then 13+ if which ccsm >/dev/null; then
14+ OPT3=ccp 14+ OPT3=ccp
15+ else 15+ else
16+ OPT3=glib 16+ OPT3=glib
17+ OPT4=decoration 17+ OPT4=decoration
18+ OPT5=gconf 18+ OPT5=gconf
File Added: pkgsrc/x11/gnome-session/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.6 2008/10/16 18:17:30 drochner Exp $

--- gnome-session/gsm-autostart-app.c.orig	2008-10-15 19:38:53.000000000 +0200
+++ gnome-session/gsm-autostart-app.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
+#include <signal.h>
 
 #include <glib.h>
 #include <gio/gio.h>
File Added: pkgsrc/x11/gnome-session/patches/Attic/patch-af
$NetBSD: patch-af,v 1.1 2008/10/16 18:17:30 drochner Exp $

--- gnome-session/gdm-signal-handler.c.orig	2008-10-15 19:43:48.000000000 +0200
+++ gnome-session/gdm-signal-handler.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <signal.h>
-#include <execinfo.h>
 #include <syslog.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -160,6 +159,7 @@ signal_io_watch (GIOChannel       *ioc,
 static void
 fallback_get_backtrace (void)
 {
+#if 0
         void *  frames[64];
         size_t  size;
         char ** strings;
@@ -176,6 +176,7 @@ fallback_get_backtrace (void)
         } else {
                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
         }
+#endif
 }