Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory 
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17092/stable/main/finkinfo/gnome

Modified Files:
        gedit.info gedit.patch 
Log Message:
sync buildfixes from unstable


Index: gedit.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gedit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gedit.patch 15 Nov 2009 08:20:29 -0000      1.4
+++ gedit.patch 28 Jan 2010 20:14:54 -0000      1.5
@@ -1,18 +1,30 @@
-diff -Nurd -x'*~' gedit-2.26.2.orig/configure gedit-2.26.2/configure
---- gedit-2.26.2.orig/configure        2009-05-16 15:45:05.000000000 -0400
-+++ gedit-2.26.2/configure     2009-06-11 01:47:04.000000000 -0400
-@@ -16301,7 +16301,7 @@
+diff -Nurd -x'*~' gedit-2.26.3.orig/configure gedit-2.26.3/configure
+--- gedit-2.26.3.orig/configure        2009-07-02 14:02:13.000000000 -0400
++++ gedit-2.26.3/configure     2010-01-28 00:11:16.000000000 -0500
+@@ -16268,7 +16268,7 @@
  fi
  else
        EGG_SMCLIENT_CFLAGS=
 -      EGG_SMCLIENT_LIBS=
-+      EGG_SMCLIENT_LIBS="-L/usr/X11R6/lib -lSM -lICE"
++      EGG_SMCLIENT_LIBS="-L/usr/X11R6/lib -lSM -lICE -lX11"
  fi
  
  
-diff -Nurd -x'*~' gedit-2.26.2.orig/gedit/gedit.c gedit-2.26.2/gedit/gedit.c
---- gedit-2.26.2.orig/gedit/gedit.c    2009-05-16 12:18:39.000000000 -0400
-+++ gedit-2.26.2/gedit/gedit.c 2009-06-11 01:51:36.000000000 -0400
+diff -Nurd -x'*~' gedit-2.26.3.orig/gedit/Makefile.in 
gedit-2.26.3/gedit/Makefile.in
+--- gedit-2.26.3.orig/gedit/Makefile.in        2009-07-02 14:02:14.000000000 
-0400
++++ gedit-2.26.3/gedit/Makefile.in     2010-01-28 00:10:31.000000000 -0500
+@@ -401,7 +401,7 @@
+ 
+ # GEDIT_LIBS must be the last to ensure correct order on some platforms
+ libgedit_la_LIBADD = dialogs/libdialogs.la smclient/libeggsmclient.la \
+-      $(GEDIT_LIBS)
++      $(GEDIT_LIBS) $(INTLLIBS)
+ BUILT_SOURCES = \
+       gedit-enum-types.c              \
+       gedit-enum-types.h              \
+diff -Nurd -x'*~' gedit-2.26.3.orig/gedit/gedit.c gedit-2.26.3/gedit/gedit.c
+--- gedit-2.26.3.orig/gedit/gedit.c    2009-07-02 13:54:58.000000000 -0400
++++ gedit-2.26.3/gedit/gedit.c 2010-01-27 23:41:39.000000000 -0500
 @@ -609,7 +609,7 @@
                                           icon_dir);
        g_free (icon_dir);

Index: gedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gedit.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gedit.info  19 Dec 2009 19:43:01 -0000      1.10
+++ gedit.info  28 Jan 2010 20:14:54 -0000      1.11
@@ -71,7 +71,7 @@
 Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
 Source-MD5: 0cdaad6b02af250c9c110010d0a708b2
 PatchFile: %n.patch
-PatchFile-MD5: 1b80aa80e1cee4b8efa161d703965b98
+PatchFile-MD5: 439ab5cca612f6db4e78e9d7aa00fd40
 PatchScript: <<
        %{default_script}
 #      perl -pi -e 's|#\!\s*/usr/bin/env\s+python.*|#\!%p/bin/python2.6|' 
`find . -name \*.py -o -name \*.in`
@@ -135,9 +135,12 @@
 <<
 DescPort: <<
        Hack libSM flag passing: just hardcode what sm.pc should be
+       (including libX11 that is used directly...must link directly)
        even though we're on OS X and may not have that file.
 
        Fix build for x11ish smclient on OS X by inverting
        PLATFORM_OSX in gedit/smclient/Makefile. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=567464
+
+       Recent glib doesn't publish -lintl, so pass it directly.
 <<


------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to