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

Modified Files:
        rep-gtk.info rep-gtk.patch 
Log Message:
This thing is gnome2ish per upstream docs and configure tests, so
overhaul deps and patch makefile to assure that this is how it is.
Remove GCC field for this pure-C package.


Index: rep-gtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/rep-gtk.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rep-gtk.info        18 Dec 2005 04:08:51 -0000      1.8
+++ rep-gtk.info        14 Jun 2007 06:21:06 -0000      1.9
@@ -1,17 +1,38 @@
 Package: rep-gtk
 Version: 0.18
-Revision: 13
-GCC: 3.3
+Revision: 14
 Source: mirror:sourceforge:rep-gtk/rep-gtk-%v.tar.gz
 Source-MD5: 220b0d728656472c068e40823f0a3b22
-Depends: librep (>= 0.16.2-10), gnome-libs-shlibs, gdk-pixbuf-shlibs, 
libglade2-shlibs, glib2-shlibs, gtk+2-shlibs
-BuildDepends: libiconv-dev, gdbm, libjpeg, libtiff, netpbm, audiofile, esound, 
glib, orbit-dev, readline (>= 4.3-15), giflib, imlib, gnome-libs-dev, 
librep-dev (>= 0.14-18), libxml, gtk+2, gdk-pixbuf, libglade2, gettext-dev, 
gettext-bin, gettext-tools, pkgconfig, glib2-dev (>= 2.6.0-1), pango1-xft2-dev 
(>= 1.8.0-1), atk1 (>= 1.9.0-1), gtk+2-dev (>= 2.5.0-1), libxml2 (>= 2.6.6-1)
+Depends: <<
+       atk1-shlibs (>= 1.12.4-1),
+       glib2-shlibs (>= 2.12.0-1),
+       gtk+2-shlibs,
+       libgettext3-shlibs,
+       libglade2-shlibs (>= 2.6.0-1),
+       libiconv,
+       librep (>= 0.17-3),
+       libxml2-shlibs (>= 2.6.6-1),
+       pango1-xft2-shlibs (>= 1.10.1-1),
+       x11
+<<
+BuildDepends: <<
+       atk1 (>= 1.12.4-1),
+       glib2-dev (>= 2.12.0-1),
+       gtk+2-dev,
+       libgettext3-dev,
+       libglade2 (>= 2.6.0-1),
+       libiconv-dev,
+       librep-dev (>= 0.17-3),
+       libxml2 (>= 2.6.6-1),
+       pango1-xft2-dev (>= 1.10.1-1),
+       pkgconfig (>= 0.21-1),
+       x11-dev
+<<
 UpdateConfigGuess: true
 Patch: %n.patch
-ConfigureParams: --libexecdir='${prefix}/lib'
-SetCPPFLAGS: -no-cpp-precomp
+ConfigureParams: --libexecdir='${prefix}/lib' --disable-dependency-tracking
 InstallScript: <<
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
 <<
 DocFiles: README* COPYING AUTHORS
 #
@@ -20,6 +41,11 @@
 This package allows librep programs to use Gtk+ and GNOME to display
 user interfaces.
 <<
+DescPackaging: <<
+  dmacks: Make sure -I. is first and -I%p/include is last, which
+  assures we get consistent use of expected-by-upstream libs. Don't
+  bother passing precompiler flags to linker.
+<<
 License: GPL
 Homepage: http://rep-gtk.sourceforge.net/
 Maintainer: Daryl Anderman <[EMAIL PROTECTED]>

Index: rep-gtk.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/rep-gtk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rep-gtk.patch       28 Jul 2004 11:45:42 -0000      1.1
+++ rep-gtk.patch       14 Jun 2007 06:21:06 -0000      1.2
@@ -1,3 +1,50 @@
+diff -Nurd -x'*~' rep-gtk-0.18.orig/Makefile.in rep-gtk-0.18/Makefile.in
+--- rep-gtk-0.18.orig/Makefile.in      2002-02-13 02:50:27.000000000 -0500
++++ rep-gtk-0.18/Makefile.in   2007-06-14 01:52:05.000000000 -0400
+@@ -32,11 +32,11 @@
+ include $(repexecdir)/rules.mk
+ 
+ [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+-override CPPFLAGS += -DHAVE_CONFIG_H -I.
+-override CFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @REP_CFLAGS@ @LIBGLADE_CFLAGS@ 
@GNOME_CFLAGS@ @GNOMEUI_CFLAGS@ @GNOME_CANVAS_CFLAGS@ @GDK_PIXBUF_CFLAGS@
++CPPFLAGS = -DHAVE_CONFIG_H -I.
++CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @REP_CFLAGS@ @LIBGLADE_CFLAGS@ 
@GNOME_CFLAGS@ @GNOMEUI_CFLAGS@ @GNOME_CANVAS_CFLAGS@ @GDK_PIXBUF_CFLAGS@
++CPPFLAGS += @CPPFLAGS@
+ [EMAIL PROTECTED]@ @LIBS@
+ [EMAIL PROTECTED]@ @LIBS@
+ [EMAIL PROTECTED]@ @LIBS@
+@@ -60,22 +60,22 @@
+ all : build_dirs $(OUT)
+ 
+ gtk-2/types.la : $(SGTK_OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_SGTK_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_SGTK_LIBS)
+ 
+ gtk-2/gtk.la : $(OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GTK_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GTK_LIBS)
+ 
+ gtk-2/libglade.la : $(LIBGLADE_OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) 
$(REP_LIBGLADE_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_LIBGLADE_LIBS)
+ 
+ gtk-2/gnome-lib.la : $(GNOMELIB_OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) 
$(REP_GNOMELIB_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GNOMELIB_LIBS)
+ 
+ gtk-2/gnome-ui.la : $(GNOMEUI_OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) 
$(REP_GNOMEUI_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GNOMEUI_LIBS)
+ 
+ gtk-2/gnome-canvas.la : $(GNOME_CANVAS_OBJS)
+-      $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) 
$(REP_GNOME_CANVAS_LIBS)
++      $(rep_DL_LD) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GNOME_CANVAS_LIBS)
+ 
+ %-glue.c : %.defs build-gtk.jlc
+       rep build-gtk.jlc -f build-gtk-batch $< $@
 diff -ruN rep-gtk-0.18/gtk-compat.c rep-gtk-0.18.patched/gtk-compat.c
 --- rep-gtk-0.18/gtk-compat.c  Fri Jul 12 00:19:22 2002
 +++ rep-gtk-0.18.patched/gtk-compat.c  Sat Jul 24 08:04:58 2004


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to