Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25702

Modified Files:
      Tag: pangocairo-branch
        gamin.info gamin.patch 
Log Message:
fix flag ordering


Index: gamin.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/gamin.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- gamin.patch 16 Jun 2008 06:56:23 -0000      1.1.2.2
+++ gamin.patch 24 Jun 2008 23:16:32 -0000      1.1.2.3
@@ -37,6 +37,28 @@
      if (fd < 0) {
          gam_error(DEBUG_INFO, "Failed to create unix socket\n");
          return (-1);
+diff -uNr gamin-0.1.9/python/Makefile.in gamin-0.1.9-patched/python/Makefile.in
+--- gamin-0.1.9/python/Makefile.in     2007-07-27 10:36:40.000000000 -0400
++++ gamin-0.1.9-patched/python/Makefile.in     2008-06-24 18:57:26.000000000 
-0400
+@@ -232,15 +232,15 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ SUBDIRS = tests
+ INCLUDES = \
+-      -I$(PYTHON_INCLUDES)    \
+       -I$(top_srcdir)/libgamin\
+-      -I$(top_srcdir)/lib
++      -I$(top_srcdir)/lib     \
++      -I$(PYTHON_INCLUDES)
+ 
+ EXTRA_DIST = \
+       gamin.c                 \
+       gamin.py
+ 
+-_gamin_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libgamin/.libs
++_gamin_la_LDFLAGS = -module -avoid-version
+ @[EMAIL PROTECTED] = \
+ @WITH_PYTHON_TRUE@    $(top_builddir)/libgamin/libgamin-1.la
+ 
 diff -uNr gamin-0.1.9/server/gam_channel.c 
gamin-0.1.9-patched/server/gam_channel.c
 --- gamin-0.1.9/server/gam_channel.c   2007-07-04 09:36:49.000000000 -0400
 +++ gamin-0.1.9-patched/server/gam_channel.c   2007-11-14 14:51:43.000000000 
-0500
@@ -92,3 +114,15 @@
  
  static gboolean gam_poll_basic_add_subscription(GamSubscription * sub);
  static gboolean gam_poll_basic_remove_subscription(GamSubscription * sub);
+diff -uNr gamin-0.1.9/tests/Makefile.in gamin-0.1.9-patched/tests/Makefile.in
+--- gamin-0.1.9/tests/Makefile.in      2007-07-27 10:36:40.000000000 -0400
++++ gamin-0.1.9-patched/tests/Makefile.in      2008-06-24 18:56:08.000000000 
-0400
+@@ -219,7 +219,7 @@
+ testgam_SOURCES = testing.c
+ testgam_LDFLAGS = 
+ testgam_DEPENDENCIES = $(DEPS)
+-testgam_LDADD = $(LDADDS) -L$(top_builddir)/libgamin -lgamin-1
++testgam_LDADD = $(LDADDS) $(top_builddir)/libgamin/libgamin-1.la
+ all: all-am
+ 
+ .SUFFIXES:

Index: gamin.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/Attic/gamin.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- gamin.info  16 Jun 2008 07:08:00 -0000      1.1.2.3
+++ gamin.info  24 Jun 2008 23:16:32 -0000      1.1.2.4
@@ -1,17 +1,21 @@
 Package: gamin
 Version: 0.1.9
-Revision: 2
+Revision: 3
 Description: File alteration monitor implementation
 License: LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-BuildDepends: glib2-dev (>= 2.14.0-1), libgettext3-dev, libiconv-dev
+BuildDepends: fink (>= 0.24.12-1), glib2-dev (>= 2.14.0-1), libgettext3-dev, 
libiconv-dev
 Depends: %N-shlibs (>= %v-%r), daemonic, glib2-shlibs (>= 2.14.0-1), 
libgettext3-shlibs, libiconv
 
 Source: http://www.gnome.org/~veillard/%n/sources/%n-%v.tar.gz
 Source-MD5: 2d3a6a70df090ed923238e381e6c2982
-Patch: %n.patch
-PatchScript: perl -pi -e 's,/etc/gamin,%p/etc/gamin,g' server/gam_conf.c
+PatchFile: %n.patch
+PatchFile-MD5: 5ecd997c358350d6dff9e6b6731fda3c
+PatchScript: <<
+       %{default_script}
+       perl -pi -e 's,/etc/gamin,%p/etc/gamin,g' server/gam_conf.c
+<<
 
 SetCPPFLAGS: -D_POSIX_C_SOURCE=1
 SetCFLAGS: -Os -g
@@ -66,5 +70,8 @@
        See: http://bugzilla.gnome.org/show_bug.cgi?id=323979
        Fix docfile after last 'make' to avoid triggering rebuilding
        of doc files due to changed timestamp.
+
+       Remove useless -L flags, put local -I ahead of global.
+       See: http://bugzilla.gnome.org/show_bug.cgi?id=540061
 <<
 Homepage: http://www.gnome.org/~veillard/gamin/


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to