Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15766
Modified Files:
gnome-session.info gnome-session.patch
Log Message:
new version
Index: gnome-session.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-session.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnome-session.patch 17 Feb 2009 21:45:33 -0000 1.5
+++ gnome-session.patch 14 Jun 2009 05:58:19 -0000 1.6
@@ -1,13 +1,14 @@
-diff -Nurd gnome-session-2.24.3/capplet/Makefile.in
gnome-session-2.24.3-new/capplet/Makefile.in
---- gnome-session-2.24.3/capplet/Makefile.in 2009-01-12 18:37:57.000000000
-0500
-+++ gnome-session-2.24.3-new/capplet/Makefile.in 2009-02-17
16:11:47.000000000 -0500
-@@ -254,11 +254,11 @@
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/capplet/Makefile.in
gnome-session-2.26.1/capplet/Makefile.in
+--- gnome-session-2.26.1.orig/capplet/Makefile.in 2009-04-14
11:35:43.000000000 -0400
++++ gnome-session-2.26.1/capplet/Makefile.in 2009-06-13 13:31:59.000000000
-0400
+@@ -273,12 +273,12 @@
top_srcdir = @top_srcdir@
NULL =
INCLUDES = \
+ -I$(top_srcdir)/egg \
+ -I$(top_srcdir)/gnome-session \
$(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
$(SESSION_PROPERTIES_CFLAGS) \
$(GCONF_CFLAGS) \
- -I$(top_srcdir)/egg \
@@ -15,44 +16,72 @@
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(pkgdatadir)"\" \
$(NULL)
-diff -Nurd gnome-session-2.24.3/compat/Makefile.in
gnome-session-2.24.3-new/compat/Makefile.in
---- gnome-session-2.24.3/compat/Makefile.in 2009-01-12 18:37:57.000000000
-0500
-+++ gnome-session-2.24.3-new/compat/Makefile.in 2009-02-17
16:11:47.000000000 -0500
-@@ -285,12 +285,12 @@
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/compat/Makefile.in
gnome-session-2.26.1/compat/Makefile.in
+--- gnome-session-2.26.1.orig/compat/Makefile.in 2009-04-14
11:35:43.000000000 -0400
++++ gnome-session-2.26.1/compat/Makefile.in 2009-06-13 13:31:49.000000000
-0400
+@@ -291,11 +291,11 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = \
+ -I$(top_srcdir)/egg \
$(WARN_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(COMPAT_CFLAGS) \
$(GCONF_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS) \
- $(GTK_CFLAGS) \
- -I$(top_srcdir)/egg \
-DAT_SPI_REGISTRYD_DIR=\""$(AT_SPI_REGISTRYD_DIR)"\" \
-DDEFAULT_SESSION_DIR=\""$(default_sessiondir)"\" \
- -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" \
-diff -Nurd gnome-session-2.24.3/gnome-session/Makefile.in
gnome-session-2.24.3-new/gnome-session/Makefile.in
---- gnome-session-2.24.3/gnome-session/Makefile.in 2009-01-12
18:37:58.000000000 -0500
-+++ gnome-session-2.24.3-new/gnome-session/Makefile.in 2009-02-17
16:11:47.000000000 -0500
-@@ -280,13 +280,13 @@
+ -DSYSCONFDIR=\""$(sysconfdir)"\"
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/egg/Makefile.in
gnome-session-2.26.1/egg/Makefile.in
+--- gnome-session-2.26.1.orig/egg/Makefile.in 2009-04-14 11:35:44.000000000
-0400
++++ gnome-session-2.26.1/egg/Makefile.in 2009-06-13 14:16:22.000000000
-0400
+@@ -292,8 +292,8 @@
+ -DG_LOG_DOMAIN=\""EggSMClient"\" \
+ $(platform_defines) \
+ $(EGG_SMCLIENT_CFLAGS) \
+- $(SM_LIBS) \
+- $(ICE_LIBS) \
++ $(SM_CFLAGS) \
++ $(ICE_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS)
+
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/gnome-session/Makefile.in
gnome-session-2.26.1/gnome-session/Makefile.in
+--- gnome-session-2.26.1.orig/gnome-session/Makefile.in 2009-04-14
11:35:44.000000000 -0400
++++ gnome-session-2.26.1/gnome-session/Makefile.in 2009-06-13
21:28:36.000000000 -0400
+@@ -302,6 +302,7 @@
NULL =
noinst_LTLIBRARIES = libgsmutil.la
INCLUDES = \
+ -I$(top_srcdir)/egg \
$(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(SM_CFLAGS) \
+@@ -309,11 +310,11 @@
$(GNOME_SESSION_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
$(GCONF_CFLAGS) \
- $(GTK_CFLAGS) \
$(POLKIT_GNOME_CFLAGS) \
- -I$(top_srcdir)/egg \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-DDATA_DIR=\""$(datadir)/gnome-session"\" \
-DDBUS_LAUNCH=\"dbus-launch\" \
-diff -Nurd gnome-session-2.24.3/gnome-session/gdm-signal-handler.c
gnome-session-2.24.3-new/gnome-session/gdm-signal-handler.c
---- gnome-session-2.24.3/gnome-session/gdm-signal-handler.c 2009-01-05
20:41:53.000000000 -0500
-+++ gnome-session-2.24.3-new/gnome-session/gdm-signal-handler.c
2009-02-17 16:11:47.000000000 -0500
+ -DLIBEXECDIR=\"$(libexecdir)\" \
++ -DPREFIX=\"$(prefix)\" \
+ -DGLADEDIR=\""$(pkgdatadir)"\" \
+ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
+@@ -393,7 +394,7 @@
+ $(NULL)
+
+ libgsmutil_la_LIBADD = \
+- $(GNOME_SESSION_LIBS)
++ $(GNOME_SESSION_LIBS) -lXext
+
+ libgsmutil_la_SOURCES = \
+ gsm-util.c \
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/gnome-session/gdm-signal-handler.c
gnome-session-2.26.1/gnome-session/gdm-signal-handler.c
+--- gnome-session-2.26.1.orig/gnome-session/gdm-signal-handler.c
2009-04-14 11:31:45.000000000 -0400
++++ gnome-session-2.26.1/gnome-session/gdm-signal-handler.c 2009-06-13
23:57:38.000000000 -0400
@@ -27,7 +27,6 @@
#include <unistd.h>
#include <string.h>
@@ -84,10 +113,59 @@
}
-diff -Nurd gnome-session-2.24.3/gnome-session/main.c
gnome-session-2.24.3-new/gnome-session/main.c
---- gnome-session-2.24.3/gnome-session/main.c 2009-01-05 20:41:53.000000000
-0500
-+++ gnome-session-2.24.3-new/gnome-session/main.c 2009-02-17
16:15:25.000000000 -0500
-@@ -453,6 +453,7 @@
+@@ -197,8 +181,8 @@
+ }
+ } else if (pid == 0) {
+ /* Child process */
+- execl (LIBEXECDIR "/gdm-crash-logger",
+- LIBEXECDIR "/gdm-crash-logger", NULL);
++ execl (PREFIX "/lib/gdm/gdm-crash-logger",
++ PREFIX "/lib/gdm/gdm-crash-logger", NULL);
+ }
+
+ return success;
+@@ -215,7 +199,7 @@
+ * we get much better information out of it. Otherwise
+ * fall back to execinfo.
+ */
+- if (g_stat (LIBEXECDIR "/gdm-crash-logger", &s) == 0) {
++ if (g_stat (PREFIX "/lib/gdm/gdm-crash-logger", &s) == 0) {
+ fallback = crashlogger_get_backtrace () ? FALSE : TRUE;
+ }
+
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/gnome-session/gdm.c
gnome-session-2.26.1/gnome-session/gdm.c
+--- gnome-session-2.26.1.orig/gnome-session/gdm.c 2009-04-14
11:31:45.000000000 -0400
++++ gnome-session-2.26.1/gnome-session/gdm.c 2009-06-14 00:55:12.000000000
-0400
+@@ -254,10 +254,12 @@
+
+ g_assert (data->fd <= 0);
+
+- if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) {
+- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
++ if (g_file_test (PREFIX GDM_PROTOCOL_SOCKET_PATH,
G_FILE_TEST_EXISTS)) {
++ strcpy (addr.sun_path, PREFIX GDM_PROTOCOL_SOCKET_PATH);
+ } else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS)) {
+ strcpy (addr.sun_path, "/tmp/.gdm_socket");
++ } else if (g_file_test (GDM_PROTOCOL_SOCKET_PATH,
G_FILE_TEST_EXISTS)) {
++ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
+ } else {
+ return FALSE;
+ }
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/gnome-session/gs-idle-monitor.c
gnome-session-2.26.1/gnome-session/gs-idle-monitor.c
+--- gnome-session-2.26.1.orig/gnome-session/gs-idle-monitor.c 2009-04-14
11:31:45.000000000 -0400
++++ gnome-session-2.26.1/gnome-session/gs-idle-monitor.c 2009-06-13
14:39:20.000000000 -0400
+@@ -27,6 +27,7 @@
+
+ #include <X11/Xlib.h>
+ #include <X11/extensions/sync.h>
++#include <X11/keysym.h>
+
+ #ifdef HAVE_XTEST
+ #include <X11/extensions/XTest.h>
+diff -Nurd -x'*~' gnome-session-2.26.1.orig/gnome-session/main.c
gnome-session-2.26.1/gnome-session/main.c
+--- gnome-session-2.26.1.orig/gnome-session/main.c 2009-04-14
11:31:45.000000000 -0400
++++ gnome-session-2.26.1/gnome-session/main.c 2009-06-13 13:37:18.000000000
-0400
+@@ -385,6 +385,7 @@
char **argv,
GError **error)
{
@@ -95,7 +173,7 @@
char **new_argv;
int i;
-@@ -483,6 +484,7 @@
+@@ -415,6 +416,7 @@
g_strerror (errno));
return FALSE;
}
Index: gnome-session.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-session.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gnome-session.info 17 Feb 2009 21:45:33 -0000 1.19
+++ gnome-session.info 14 Jun 2009 05:58:19 -0000 1.20
@@ -1,84 +1,60 @@
Package: gnome-session
-Version: 2.24.3
-Revision: 3
+Version: 2.26.1
+Revision: 1
Depends: <<
- at-spi (>= 1.24.0-1),
- atk1-shlibs (>= 1.24.0-1),
- audiofile-shlibs (>= 0.2.5-1),
+ at-spi (>= 1.26.0-1),
+ atk1-shlibs (>= 1.26.0-1),
cairo-shlibs (>= 1.8-1),
- control-center (>= 2.24.0-1),
+ control-center (>= 2.26.0-1),
dbus (>= 1.2.12-1),
- esound-shlibs (>= 0.2.38-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- gconf2 (>= 2.24.0-1),
- gconf2-shlibs (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ gconf2 (>= 2.26.0-1),
+ gconf2-shlibs (>= 2.26.0-1),
+ glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
gnome-base,
- gnome-icon-theme (>= 2.24.0-1),
- gnome-keyring-shlibs (>= 0.8.1-1),
- gnome-vfs2-unified (>= 1:2.24.0-1),
- gtk+2 (>= 2.14.0-1),
- libart2-shlibs (>= 2.3.16-1),
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2 (>= 2.24.0-1),
- libbonoboui2 (>= 2.24.0-1),
+ gnome-icon-theme (>= 2.26.0-1),
+ gtk+2 (>= 2.16.0-1),
+ gtk+2-shlibs (>= 2.16.0-1),
libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.3-1),
- libgnome2 (>= 2.24.0-1),
- libgnomecanvas2 (>= 2.20.1.1-1),
- libgnomeui2-shlibs (>= 2.24.0-1),
+ libglade2-shlibs (>= 2.6.4-1),
libiconv,
libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2 (>= 2.14.16-1),
- pango1-xft2-ft219 (>= 1.22.0-4),
- pixman-shlibs (>= 0.12.0-1),
+ orbit2 (>= 2.14.17-1),
+ pango1-xft2-ft219 (>= 1.24.0-1),
+ pixman-shlibs (>= 0.14.0-1),
popt-shlibs,
startup-notification-shlibs (>= 0.8-1),
x11
<<
BuildDepends: <<
- atk1 (>= 1.24.0-1),
- audiofile (>= 0.2.5-1),
- avahi-dev,
+ atk1 (>= 1.26.0-1),
cairo (>= 1.8-1),
- control-center2-dev (>= 2.24.0-1),
+ control-center2-dev (>= 2.26.0-1),
dbus-dev (>= 1.2.12-1),
- esound (>= 0.2.38-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
- gconf2-dev (>= 2.24.0-1),
+ freetype219 (>= 2.3.8-2),
+ gconf2-dev (>= 2.26.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.20.0-1),
glitz,
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2-dev (>= 2.14.0-1),
+ gtk+2-dev (>= 2.16.0-1),
intltool40,
- libart2 (>= 2.3.16-1),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.0-1),
- libbonoboui2-dev (>= 2.24.0-1),
libgettext3-dev,
- libglade2 (>= 2.6.3-1),
- libgnome2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-2),
- libgnomeui2-dev (>= 2.24.0-1),
+ libglade2 (>= 2.6.4-1),
libiconv-dev,
libjpeg,
libpng3,
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ orbit2-dev (>= 2.14.17-1),
+ pango1-xft2-ft219-dev (>= 1.24.0-1),
+ pixman (>= 0.14.0-1),
pkgconfig (>= 0.23),
popt,
startup-notification-dev (>= 0.8-1),
@@ -87,18 +63,19 @@
<<
Conflicts: gnome-core (<< 2.0.0)
Replaces: gdm (<< 2.22.0-1)
-Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
-Source-MD5: 5daf3307ec791953436484696b263093
+Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
+Source-MD5: aa280939a3e07209081095e8e10fe619
PatchFile: %n.patch
-PatchFile-MD5: d27d9c1fa1b2e48c1395ce4cf5eb89db
+PatchFile-MD5: 3baf5a461e001834de00e0b5642ccd04
PatchScript: <<
%{default_script}
perl -pi -e 's,(POLKIT_GNOME_REQUIRED=).*,${1}99999.FORCE.NONDETECT,'
configure
<<
-ConfigureParams: --mandir=%p/share/man --disable-docbook-docs
--disable-schemas-install --disable-dependency-tracking --disable-static
--enable-more-warnings
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-i=/usr/X11R6/include --x-l=/usr/X11R6/lib
+ConfigureParams: --mandir=%p/share/man --disable-docbook-docs
--disable-schemas-install --disable-dependency-tracking --disable-static
--enable-more-warnings
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--x-i=/usr/X11R6/include --x-l=/usr/X11R6/lib SM_CFLAGS=" " SM_LIBS=-lSM
ICE_CFLAGS=" " ICE_LIBS=-lICE XTEST_CFLAGS=" " XTEST_LIBS=-lXtst
XRENDER_CFLAGS=" " XRENDER_LIBS=-lXrender
--with-at-spi-registryd-directory=%p/lib/at-spi
SetCFLAGS: -Os
InstallScript: make -j1 install DESTDIR=%d
PostInstScript: <<
+ . %p/bin/init.sh
if [ configure = "$1" ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/gnome-session.schemas >/dev/null
@@ -106,6 +83,7 @@
gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
<<
PostRmScript: <<
+ . %p/bin/init.sh
gtk-update-icon-cache -f -t %p/share/icons/hicolor || :
<<
ConfFiles: %p/etc/gconf/schemas/gnome-session.schemas
@@ -128,10 +106,33 @@
TODO: fix .desktop location. See:
http://bugzilla.gnome.org/show_bug.cgi?id=569005
+
+ Fix -I ordering (place local before global).
+
+ Fix compiler flags in egg/Makefile.in. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=585667
+
+ Fix path to gdm-crash-logger. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=585703
+
+ Fix path to openbox's gdm_socket dir (part of various x11 wm
+ not gdm it appears). Some wm's use fink's var, others (and
+ non-fink ones) don't, so check both places.
+
+ Uses at-spi-registryd command, not lib-linking to at-spi
<<
DescPort: <<
OS X doesn't have execinfo.h and backtrace() until 10.5, so
just print default msg instead so we are portable to 10.4.
+
+ Lots of override/hardcoding of x11 flags for .pc that don't
+ exist on older apple x11.
+
+ Need X11/keysym.h to define the x11 keysyms. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=585672
+
+ Need direct link to libXext for XSync symbols. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=583618
<<
Description: Login session management
DescDetail: <<
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
