Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv17382/main/finkinfo/gnome

Modified Files:
      Tag: pangocairo-branch
        gdm.info gdm.patch gedit-plugins.info 
Log Message:
more build fixes

Index: gedit-plugins.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/Attic/gedit-plugins.info,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- gedit-plugins.info  21 Sep 2007 00:24:35 -0000      1.1.2.20
+++ gedit-plugins.info  26 Sep 2007 00:12:39 -0000      1.1.2.21
@@ -1,5 +1,5 @@
 Package: gedit-plugins
-Version: 2.19.0
+Version: 2.19.90
 Revision: 1
 Depends: <<
        atk1-shlibs (>= 1.20.0-1),
@@ -16,7 +16,8 @@
        gnome-python2-desktop-py25 (>= 2.19.2-1),
        gnome-vfs2-unified (>= 1:2.20.0-1),
        gtk+2 (>= 2.12.0-1),
-       gtksourceview2-shlibs (>= 2.0.0-1),
+       gtksourceview2-shlibs,
+       gucharmap (>= 1.10-1),
        iso-codes,
        libart2-shlibs (>= 2.3.16-1),
        libbonobo2 (>= 2.20.0-1),
@@ -60,7 +61,8 @@
        gnome-python2-desktop-py25-dev (>= 2.19.2-1),
        gnome-vfs2-unified-dev (>= 1:2.20.0-1),
        gtk+2-dev (>= 2.12.0-1),
-       gtksourceview2-dev (>= 2.0.0-1),
+       gtksourceview2-dev,
+       gucharmap6-dev,
        intltool (>= 0.36.0-1),
        iso-codes,
        libart2 (>= 2.3.16-1),
@@ -91,6 +93,7 @@
 <<
 Source: mirror:gnome:sources/%n/2.19/%n-%v.tar.bz2
 Source-MD5: 0ab5f65726d0776e81af5c0ee22ef2e4
+PatchScript: perl -pi -e 's,gedit-2.16,gedit-2.20,g; 
s,gtksourceview-1.0,gtksourceview-2.0,g' configure
 SetLIBS: -L%p/lib
 ConfigureParams: --with-plugins=all --disable-scrollkeeper 
--disable-schemas-install --mandir=%p/share/man --disable-dependency-tracking 
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 PYTHON=%p/bin/python2.5
 InstallScript: <<

Index: gdm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gdm.info,v
retrieving revision 1.4.2.40
retrieving revision 1.4.2.41
diff -u -d -r1.4.2.40 -r1.4.2.41
--- gdm.info    21 Sep 2007 00:24:35 -0000      1.4.2.40
+++ gdm.info    26 Sep 2007 00:12:39 -0000      1.4.2.41
@@ -77,10 +77,8 @@
 Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
 Source-MD5: cf374113a1f837b0df916572625b5078
 Patch: %n.patch
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
 ConfigureParams: --disable-scrollkeeper --mandir=%p/share/man 
--libexecdir=%p/lib/%n --disable-dependency-tracking 
--enable-compile-warnings=maximum 
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
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install DESTDIR=%d
 PostInstScript: <<
        if [ configure = "$1" ]; then
                scrollkeeper-update -q
@@ -91,7 +89,7 @@
                scrollkeeper-update -q
        fi
 <<
-DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po 
vicious-extensions/ChangeLog:ChangeLog.vicious 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

Index: gdm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gdm.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gdm.patch   10 Mar 2007 19:34:51 -0000      1.1.2.1
+++ gdm.patch   26 Sep 2007 00:12:39 -0000      1.1.2.2
@@ -1,31 +1,26 @@
-diff -uNr gdm-2.17.8/daemon/xdmcp.c gdm-2.17.8-new/daemon/xdmcp.c
---- gdm-2.17.8/daemon/xdmcp.c  2007-02-26 03:59:35.000000000 -0500
-+++ gdm-2.17.8-new/daemon/xdmcp.c      2007-03-10 14:32:01.000000000 -0500
-@@ -2658,6 +2658,14 @@
-     }
- }
+diff -uNr gdm-2.20.0/daemon/gdm-xdmcp-manager.c 
gdm-2.20.0-new/daemon/gdm-xdmcp-manager.c
+--- gdm-2.20.0/daemon/gdm-xdmcp-manager.c      2007-09-17 10:45:50.000000000 
-0400
++++ gdm-2.20.0-new/daemon/gdm-xdmcp-manager.c  2007-09-25 15:07:01.000000000 
-0400
+@@ -366,7 +366,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 -uNr gdm-2.20.0/daemon/slave.c gdm-2.20.0-new/daemon/slave.c
+--- gdm-2.20.0/daemon/slave.c  2007-09-17 10:45:50.000000000 -0400
++++ gdm-2.20.0-new/daemon/slave.c      2007-09-25 15:04:26.000000000 -0400
+@@ -4407,8 +4407,10 @@
  
-+#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);
+                       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;
 +#endif
  
- static gboolean
- gdm_xdmcp_host_allow (
-@@ -2670,12 +2678,6 @@
- {
- #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);
+                       pututxline (u);
  
-     GdmHostent *client_he;
-     char *client;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to