Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6659
Modified Files:
gdm.info gdm.patch gnome-session.info
Log Message:
new gdm version
Index: gdm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gdm.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gdm.info 26 Sep 2008 22:57:16 -0000 1.8
+++ gdm.info 21 Jan 2009 06:23:31 -0000 1.9
@@ -1,96 +1,122 @@
Package: gdm
-Version: 2.20.5
+Version: 2.24.1
Revision: 1
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
+ atk1-shlibs (>= 1.24.0-1),
audiofile-shlibs (>= 0.2.5-1),
- cairo-shlibs (>= 1.6-1),
- dbus-shlibs (>= 1.0-1),
+ cairo-shlibs (>= 1.8-1),
+ dbus-shlibs (>= 1.2.1-1),
esound-shlibs (>= 0.2.38-1),
expat1-shlibs,
- file-roller (>= 2.20.0-1),
- gconf2 (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
+ gconf2 (>= 2.24.0-1),
+ glib2-shlibs (>= 2.18.0-1),
glitz-shlibs,
gnome-keyring (>= 0.8.1-1),
- gnome-vfs2-unified (>= 1:2.20.0-1),
- gtk+2 (>= 2.12.0-1),
+ gnome-panel-shlibs (>= 2.24.0-1),
+ gnome-vfs2-unified (>= 1:2.24.0-1),
+ gtk+2-shlibs (>= 2.14.0-1),
+ iso-codes (>= 1.0-3),
libart2-shlibs (>= 2.3.16-1),
- libcroco3-shlibs,
+ libavahi-client3-shlibs,
+ libavahi-common3-shlibs,
+ libavahi-glib1-shlibs,
+ libbonobo2-shlibs (>= 2.24.0-1),
+ libbonoboui2-shlibs (>= 2.24.0-1),
libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.2-1),
- libgnome2 (>= 2.20.0-1),
- libgnomeui2 (>= 2.20.0-1),
- libgnomecanvas2 (>= 2.20.0-1),
- libgsf1.114-shlibs (>= 1.14.5-1),
+ libglade2-shlibs (>= 2.6.3-1),
+ libgnome2 (>= 2.24.0-1),
+ libgnomeui2-shlibs (>= 2.24.0-1),
+ libgnomecanvas2 (>= 2.20.1.1-2),
libiconv,
- libjpeg-shlibs,
- librsvg2-shlibs (>= 2.18.0-1),
+ libpng3-shlibs,
+ libxklavier12-shlibs (>= 3.7-1),
libxml2-shlibs (>= 2.6.30-1),
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219 (>= 1.18.4-4),
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
passwd (>= 20051118-1),
+ pixman-shlibs (>= 0.12.0-1),
+ popt-shlibs,
rarian-compat,
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
+ atk1 (>= 1.24.0-1),
audiofile,
avahi-dev,
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
+ cairo (>= 1.8-1),
+ dbus-dev (>= 1.2.1-1),
esound (>= 0.2.38-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gail18-dev,
- gconf2-dev (>= 2.20.0-1),
+ freetype219 (>= 2.3.7-7),
+ gconf2-dev (>= 2.24.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
glitz,
- gnome-doc-utils (>= 0.12.0-1),
+ gnome-doc-utils (>= 0.14.0-1),
gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2-dev (>= 2.12.0-1),
+ gnome-panel-dev (>= 2.24.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.0-1),
+ gtk+2-dev (>= 2.14.0-1),
gtk-doc,
- intltool (>= 0.36.0-1),
+ intltool40,
libart2 (>= 2.3.16-1),
libavahi-glib1-dev,
- libcroco3,
+ libbonobo2-dev (>= 2.24.0-1),
+ libbonoboui2-dev (>= 2.24.0-1),
libgettext3-dev,
- libglade2 (>= 2.6.2-1),
- libgnome2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgsf1.114-dev (>= 1.14.5-1),
+ libglade2 (>= 2.6.3-1),
+ libgnome2-dev (>= 2.24.0-1),
+ libgnomeui2-dev (>= 2.24.0-1),
+ libgnomecanvas2-dev (>= 2.20.1.1-2),
libiconv-dev,
- libjpeg,
libpng3,
- librsvg2 (>= 2.18.0-1),
+ libxklavier12 (>= 3.7-1),
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ orbit2-dev (>= 2.14.16-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23),
popt,
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
-Source-MD5: 151d90901abc2088a0825ee1dd8da7f6
+Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
+Source-MD5: 31139d7a79096463b127b4790058b056
PatchFile: %n.patch
-PatchFile-MD5: d96d010cef903ee496ad439103d50020
-ConfigureParams: --disable-scrollkeeper --mandir=%p/share/man
--libexecdir=%p/lib/%n --disable-dependency-tracking
--enable-compile-warnings=maximum --with-log-dir=%p/var/log/gdm
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+PatchFile-MD5: 5101816bb7623733f19a1691be77c9ce
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,security/(.*?\.h),pam/\1,g' configure
+ perl -pi -e
's/(POLICYKIT_REQUIRED_VERSION\s*=).*/${1}99999.FORCE.NONDETECT/' configure
+<<
+ConfigureParams: <<
+ --mandir=%p/share/man --libexecdir=%p/lib/%n \
+ --with-log-dir=%p/var/log/gdm --with-pid-file=%p/var/run/gdm.pid \
+ --disable-dependency-tracking --disable-static --enable-more-warnings \
+ --disable-scrollkeeper \
+ --disable-polkit \
+ PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+<<
CompileScript: <<
if [ $UID -ne 0 ]; then echo "%n cannot be built with
--build-as-nobody"; exit 1; fi
%{default_script}
<<
+InfoTest: <<
+ TestDepends: check
+ TestScript: make check || exit 2
+<<
InstallScript: make -j1 install DESTDIR=%d
+ConfFiles: %p/etc/gconf/schemas/gdm-simple-greeter.schemas
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update -q
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
fi
<<
PostRmScript: <<
@@ -98,14 +124,37 @@
scrollkeeper-update -q
fi
<<
-DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README* TODO
+DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README TODO
DescPort: <<
- The "hosts_ctl in -lwrap" test is misleading...the test is broken
- but the result doesn't matter because libwrap is static only and was
- already found in the preceeding test.
-
May need to fix some _environ usage for darwin. See:
http://bugzilla.gnome.org/show_bug.cgi?id=322085
+
+ Make sure utmp.ut_exit is protected by autoconf test. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=568487
+
+ execinfo.h isn't always available. Avail on OS X >= 10.5 but
+ not bothering to test (i.e., always patched out) because it's
+ not important enough to gdm to need to autoreconf. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=568491
+
+ pam header detection is a disaster: convert to darwin's pam/
+ not others' security/ pathnames, and fix other problems. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=568515
+
+ We don't have an AI_NUMERICSERV flag in getaddrinfo()
+
+ Avoid nested extern decl in gdm-xdmcp-display-factory.c. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=568516
+
+ Don't have fgetpwent() but just using normal /etc/passwd, so
+ patch gdm-user-manager.c to getpwent() instead.
+<<
+DescPackaging: <<
+ Disable PolicyKit for consistent build results if fink gets polkit pkg
+
+ Back out feature that requires newer fontconfig (2.5) than we
+ have (2.4.1). See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=547826
<<
Description: GNOME desktop manager
License: GPL
Index: gnome-session.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-session.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gnome-session.info 20 Jan 2009 06:41:10 -0000 1.16
+++ gnome-session.info 21 Jan 2009 06:23:31 -0000 1.17
@@ -1,6 +1,6 @@
Package: gnome-session
Version: 2.24.3
-Revision: 1
+Revision: 2
Depends: <<
at-spi (>= 1.24.0-1),
atk1-shlibs (>= 1.24.0-1),
@@ -87,6 +87,7 @@
xft2-dev
<<
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
PatchFile: %n.patch
@@ -123,6 +124,8 @@
DescPackaging: <<
Fink doesn't have polkit right now, force nondetection for
consistent results if/when fink gets it.
+
+ share/xsession/gnome.desktop moved to gdm in GNOME2.22
<<
DescPort: <<
OS X doesn't have execinfo.h and backtrace() until 10.5, so
Index: gdm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gdm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gdm.patch 15 Jul 2008 01:40:55 -0000 1.2
+++ gdm.patch 21 Jan 2009 06:23:31 -0000 1.3
@@ -1,26 +1,222 @@
-diff -Nurd -x'*~' gdm-2.20.3.orig/daemon/gdm-xdmcp-manager.c
gdm-2.20.3/daemon/gdm-xdmcp-manager.c
---- gdm-2.20.3.orig/daemon/gdm-xdmcp-manager.c 2008-01-07 14:39:37.000000000
-0500
-+++ gdm-2.20.3/daemon/gdm-xdmcp-manager.c 2008-01-09 17:33:11.000000000
-0500
-@@ -367,7 +367,7 @@
- if (ai->ai_flags & AI_NUMERICHOST) {
- g_string_append (str, "numhost ");
- }
-- if (ai->ai_flags & AI_NUMERICSERV) {
-+ if (ai->ai_flags & NI_NUMERICSERV) {
- g_string_append (str, "numserv ");
- }
- if (ai->ai_flags & AI_V4MAPPED) {
-diff -Nurd -x'*~' gdm-2.20.3.orig/daemon/slave.c gdm-2.20.3/daemon/slave.c
---- gdm-2.20.3.orig/daemon/slave.c 2008-01-07 14:39:38.000000000 -0500
-+++ gdm-2.20.3/daemon/slave.c 2008-01-09 17:33:11.000000000 -0500
-@@ -4407,8 +4407,10 @@
+diff -Nurd -x'*~' gdm-2.24.1.orig/common/gdm-signal-handler.c
gdm-2.24.1/common/gdm-signal-handler.c
+--- gdm-2.24.1.orig/common/gdm-signal-handler.c 2008-11-18
17:38:43.000000000 -0500
++++ gdm-2.24.1/common/gdm-signal-handler.c 2009-01-20 16:53:43.000000000
-0500
+@@ -27,7 +27,9 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#if HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +162,7 @@
+ static void
+ fallback_get_backtrace (void)
+ {
++#ifdef HAVE_EXECINFO_H
+ void * frames[64];
+ size_t size;
+ char ** strings;
+@@ -173,9 +176,10 @@
+ }
+ free (strings);
+ syslog (LOG_CRIT, "******************* END
**********************************");
+- } else {
+- g_warning ("GDM crashed, but symbols couldn't be retrieved.");
++ return;
+ }
++#endif
++ g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+ }
- u->ut_type = DEAD_PROCESS;
- u->ut_tv.tv_sec = record.ut_tv.tv_sec;
-+#ifndef __APPLE__
- u->ut_exit.e_termination = 0;
- u->ut_exit.e_exit = 0;
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/configure gdm-2.24.1/configure
+--- gdm-2.24.1.orig/configure 2008-11-18 18:06:46.000000000 -0500
++++ gdm-2.24.1/configure 2009-01-20 22:21:52.000000000 -0500
+@@ -23441,7 +23441,7 @@
+ GNOME_PANEL_REQUIRED_VERSION=2.0.0
+ LIBXKLAVIER_REQUIRED_VERSION=3.5
+ #FONTCONFIG_REQUIRED_VERSION=2.6.0
+-FONTCONFIG_REQUIRED_VERSION=2.5.0
++FONTCONFIG_REQUIRED_VERSION=2.4.0
+
+
+
+@@ -31654,6 +31654,7 @@
+ fi
+
+
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ { $as_echo "$as_me:$LINENO: checking for const pam_message" >&5
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-record.c
gdm-2.24.1/daemon/gdm-session-record.c
+--- gdm-2.24.1.orig/daemon/gdm-session-record.c 2008-11-18
17:38:44.000000000 -0500
++++ gdm-2.24.1/daemon/gdm-session-record.c 2009-01-20 16:29:30.000000000
-0500
+@@ -322,8 +322,10 @@
+ #elif defined(HAVE_UT_UT_TIME)
+ u->ut_time = session_record.ut_time;
+ #endif
++#ifdef HAVE_UT_UT_EXIT_E_TERMINATION
+ u->ut_exit.e_termination = 0;
+ u->ut_exit.e_exit = 0;
+#endif
- pututxline (u);
+ pututxline (u);
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-worker.c
gdm-2.24.1/daemon/gdm-session-worker.c
+--- gdm-2.24.1.orig/daemon/gdm-session-worker.c 2008-11-18
17:38:44.000000000 -0500
++++ gdm-2.24.1/daemon/gdm-session-worker.c 2009-01-20 22:14:05.000000000
-0500
+@@ -32,7 +32,7 @@
+ #include <grp.h>
+ #include <pwd.h>
+
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-xdmcp-display-factory.c
gdm-2.24.1/daemon/gdm-xdmcp-display-factory.c
+--- gdm-2.24.1.orig/daemon/gdm-xdmcp-display-factory.c 2008-11-18
17:38:44.000000000 -0500
++++ gdm-2.24.1/daemon/gdm-xdmcp-display-factory.c 2009-01-20
22:48:05.000000000 -0500
+@@ -368,9 +368,6 @@
+ if (ai->ai_flags & AI_NUMERICHOST) {
+ g_string_append (str, "numhost ");
+ }
+- if (ai->ai_flags & AI_NUMERICSERV) {
+- g_string_append (str, "numserv ");
+- }
+ if (ai->ai_flags & AI_V4MAPPED) {
+ g_string_append (str, "v4mapped ");
+ }
+@@ -600,20 +597,22 @@
+ return TRUE;
+ }
+
++#ifdef HAVE_TCPWRAPPERS
++
++/*
++ * Avoids a warning, my tcpd.h file doesn't include this prototype, even
++ * though the library does include the function and the manpage mentions it
++ */
++extern int hosts_ctl (char *daemon,
++ char *client_name,
++ char *client_addr,
++ char *client_user);
++#endif
++
+ static gboolean
+ gdm_xdmcp_host_allow (GdmAddress *address)
+ {
+ #ifdef HAVE_TCPWRAPPERS
+-
+- /*
+- * Avoids a warning, my tcpd.h file doesn't include this prototype,
even
+- * though the library does include the function and the manpage
mentions it
+- */
+- extern int hosts_ctl (char *daemon,
+- char *client_name,
+- char *client_addr,
+- char *client_user);
+-
+ char *client;
+ char *host;
+ gboolean ret;
+diff -Nurd -x'*~'
gdm-2.24.1.orig/gui/simple-greeter/gdm-greeter-login-window.c
gdm-2.24.1/gui/simple-greeter/gdm-greeter-login-window.c
+--- gdm-2.24.1.orig/gui/simple-greeter/gdm-greeter-login-window.c
2008-11-18 17:49:12.000000000 -0500
++++ gdm-2.24.1/gui/simple-greeter/gdm-greeter-login-window.c 2009-01-20
22:14:20.000000000 -0500
+@@ -68,7 +68,7 @@
+ #include "gdm-user-chooser-widget.h"
+
+ #ifdef HAVE_PAM
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+ #define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE
+ #else
+ #define PW_ENTRY_SIZE GDM_MAX_PASS
+diff -Nurd -x'*~'
gdm-2.24.1.orig/gui/simple-greeter/gdm-language-chooser-widget.c
gdm-2.24.1/gui/simple-greeter/gdm-language-chooser-widget.c
+--- gdm-2.24.1.orig/gui/simple-greeter/gdm-language-chooser-widget.c
2008-11-18 17:38:43.000000000 -0500
++++ gdm-2.24.1/gui/simple-greeter/gdm-language-chooser-widget.c
2009-01-20 15:34:07.000000000 -0500
+@@ -133,7 +133,6 @@
+ static gboolean
+ language_has_font (const char *locale)
+ {
+- const FcCharSet *charset;
+ FcPattern *pattern;
+ FcObjectSet *object_set;
+ FcFontSet *font_set;
+@@ -147,29 +146,21 @@
+
+ gdm_parse_language_name (locale, &language_code, NULL, NULL, NULL);
+
+- charset = FcLangGetCharSet ((FcChar8 *) language_code);
+- if (!charset) {
+- /* fontconfig does not know about this language */
+- is_displayable = TRUE;
+- } else {
+- /* see if any fonts support rendering it */
+- pattern = FcPatternBuild (NULL, FC_LANG, FcTypeString,
language_code, NULL);
+-
+- if (pattern == NULL)
+- goto done;
++ pattern = FcPatternBuild (NULL, FC_LANG, FcTypeString, language_code,
NULL);
++ if (pattern == NULL)
++ goto done;
+
+- object_set = FcObjectSetCreate ();
++ object_set = FcObjectSetBuild (NULL, NULL);
+
+- if (object_set == NULL)
+- goto done;
++ if (object_set == NULL)
++ goto done;
+
+- font_set = FcFontList (NULL, pattern, object_set);
++ font_set = FcFontList (NULL, pattern, object_set);
+
+- if (font_set == NULL)
+- goto done;
++ if (font_set == NULL)
++ goto done;
+
+- is_displayable = (font_set->nfont > 0);
+- }
++ is_displayable = (font_set->nfont > 0);
+
+ done:
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/gui/simple-greeter/gdm-user-manager.c
gdm-2.24.1/gui/simple-greeter/gdm-user-manager.c
+--- gdm-2.24.1.orig/gui/simple-greeter/gdm-user-manager.c 2008-11-18
17:38:43.000000000 -0500
++++ gdm-2.24.1/gui/simple-greeter/gdm-user-manager.c 2009-01-20
23:28:46.000000000 -0500
+@@ -1280,11 +1280,7 @@
+ new_users = NULL;
+
+ errno = 0;
+- fp = fopen (PATH_PASSWD, "r");
+- if (fp == NULL) {
+- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror
(errno));
+- goto out;
+- }
++ setpwent();
+
+ g_hash_table_foreach (manager->priv->users,
listify_hash_values_hfunc, &old_users);
+ g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+@@ -1297,7 +1293,7 @@
+ }
+ }
+
+- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
+ GdmUser *user;
+ user = NULL;
+@@ -1360,7 +1356,6 @@
+ out:
+ /* Cleanup */
+
+- fclose (fp);
+
+ g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
+ g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
