Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10403
Modified Files:
libgnomedb.info libgnomedb.patch
Log Message:
gnome2.28 cleanup
Index: libgnomedb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/libgnomedb.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgnomedb.info 2 Jul 2009 05:13:46 -0000 1.4
+++ libgnomedb.info 24 May 2010 23:53:27 -0000 1.5
@@ -1,103 +1,104 @@
Package: libgnomedb
Version: 3.1.2
-Revision: 10
+Revision: 11
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- audiofile,
- avahi-dev,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ dpkg-base-files,
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools,
- glade3-dev (>= 3.6.7-1),
- glib2-dev (>= 2.20.0-1),
+ glade3-dev (>= 3.6.7-5),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.24.1-1),
goocanvas (>= 0.14-1),
- gtk+2-dev (>= 2.16.0-1),
+ gtk+2-dev (>= 2.18.0-1),
gtk-doc (>= 1.8-1),
- gtksourceview-dev (>= 1.8.5-2),
+ gtksourceview-dev (>= 1.8.5-4),
intltool40,
libart2,
- libavahi-glib1-dev,
libgcrypt (>= 1.4.3-2),
- libgda4-dev (>= 3.1.5-5),
- libgettext3-dev,
- libglade2 (>= 2.6.4-1),
- libgnome2-dev (>= 2.26.0-1),
- libgnomecanvas2-dev (>= 2.26.0-1),
- libgnomeprint2.2-dev (>= 2.18.6-2),
+ libgda4-dev (>= 3.1.5-7),
+ libgettext8-dev,
+ libglade2 (>= 2.6.4-7),
+ libgnomecanvas2-dev (>= 2.26.0-2),
+ libgnomeprint2.2-dev (>= 2.18.6-6),
libgpg-error,
libiconv-dev,
- libpng3,
libxml2 (>= 2.6.30-1),
- libxslt (>= 1.1.22-1),
- orbit2-dev (>= 2.14.17-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- readline5,
- sqlite3-dev,
- x11-dev,
- xft2-dev
+ x11-dev
+<<
+Depends: <<
+ %N4-shlibs (>= %v-%r),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2 (>= 2.28.0-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtksourceview-shlibs (>= 1.8.5-4),
+ libart2-shlibs,
+ libgda4-shlibs (>= 3.1.5-7),
+ libgettext8-shlibs,
+ libglade2-shlibs (>= 2.6.4-7),
+ libgnomecanvas2-shlibs (>= 2.26.0-2),
+ libgnomeprint2.2-shlibs (>= 2.18.6-6),
+ libxml2-shlibs (>= 2.6.30-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ rarian-compat
<<
-Depends: %N4-shlibs (>= %v-%r), gconf2 (>= 2.26.0-1), rarian-compat
Source: mirror:gnome:sources/%n/3.1/%n-%v.tar.bz2
Source-MD5: 9896bd66451c3f1e2bdd1cd79d524348
PatchFile: %n.patch
-PatchFile-MD5: 9b440b816ffef0bdb505341a8137b1f3
+PatchFile-MD5: c78a1aecb4d2dd8591a32716c636e32e
PatchScript: <<
%{default_script}
perl -pi -e 's/-scrollkeeper-update/#$&/' doc/Makefile.in
perl -pi -e 's,/local/G18/share/gtk-doc/html,%p/share/gtk-doc/html,g'
doc/C/html/*.html
<<
-ConfigureParams: --mandir='${prefix}/share/man' --disable-gtk-doc
--libexecdir='${prefix}/bin' --disable-schemas-install
--disable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir='${prefix}/share/man' --disable-gtk-doc
--libexecdir='${prefix}/bin' --disable-schemas-install
--enable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
+CompileScript: <<
+ ./configure %c
+ make NO_UNDEFINED=-no-undefined
+ fink-package-precedence --prohibit-bdep %n4-dev .
+<<
InstallScript: make -j1 install DESTDIR="%d"
SplitOff: <<
Package: %N4-shlibs
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
- dbus-shlibs (>= 1.2.1-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2-shlibs (>= 2.26.0-1),
- glade3-shlibs (>= 3.6.7-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gnome-vfs2-unified-shlibs (>= 1:2.24.1-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glade3-shlibs (>= 3.6.7-5),
+ glib2-shlibs (>= 2.22.0-1),
goocanvas-shlibs (>= 0.14-1),
- gtk+2-shlibs (>= 2.16.0-1),
- gtksourceview-shlibs (>= 1.8.5-2),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtksourceview-shlibs (>= 1.8.5-4),
libart2-shlibs,
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
libgcrypt-shlibs (>= 1.4.3-2),
- libgda4-shlibs (>= 3.1.5-5),
- libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.3-1),
- libgnomecanvas2-shlibs (>= 2.26.0-1),
- libgnomeprint2.2-shlibs (>= 2.18.6-2),
+ libgda4-shlibs (>= 3.1.5-7),
+ libgettext8-shlibs,
+ libglade2-shlibs (>= 2.6.4-7),
+ libgnomecanvas2-shlibs (>= 2.26.0-2),
+ libgnomeprint2.2-shlibs (>= 2.18.6-6),
libgpg-error-shlibs,
- libiconv,
iso-codes,
- libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
- sqlite3-shlibs,
- x11
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
Files: <<
lib/libgnomedb-3.0.4*.dylib
@@ -158,6 +159,8 @@
Import ltmain.sh dependent-lib dependency handlers from libtool2
(prevents linking against installed lib instead of build-dir one)
+
+ Recent glib doesn't publish -lintl, so pass it directly.
<<
DescPackaging: <<
share/gtk-doc moved %N -> %N4-dev as of 3.1.2-3
Index: libgnomedb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/libgnomedb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgnomedb.patch 2 Jul 2009 05:13:46 -0000 1.4
+++ libgnomedb.patch 24 May 2010 23:53:27 -0000 1.5
@@ -1,4 +1,4 @@
-diff -Nurd libgnomedb-3.1.2.orig/configure libgnomedb-3.1.2/configure
+re diff -Nurd libgnomedb-3.1.2.orig/configure libgnomedb-3.1.2/configure
--- libgnomedb-3.1.2.orig/configure 2007-10-24 15:44:07.000000000 -0400
+++ libgnomedb-3.1.2/configure 2008-03-06 14:51:57.000000000 -0500
@@ -23288,7 +23288,7 @@
@@ -81,6 +81,30 @@
$(graphlib)
gladegnomedbdir = @GLADE3_MODULES_DIR@
+diff -Nurd -x'*~' libgnomedb-3.1.2.orig/libgnomedb/Makefile.in
libgnomedb-3.1.2/libgnomedb/Makefile.in
+--- libgnomedb-3.1.2.orig/libgnomedb/Makefile.in 2007-10-24
16:22:18.000000000 -0400
++++ libgnomedb-3.1.2/libgnomedb/Makefile.in 2010-05-24 18:25:14.000000000
-0400
+@@ -488,7 +488,7 @@
+ $(gnomedb_sources)
+
+ libgnomedb_3_0_la_LDFLAGS = -version-info
$(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+-libgnomedb_3_0_la_LIBADD = data-entries/libgnomedb_handlers-3.0.la
binreloc/libgnomedb_binreloc-3.0.la $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS)
$(LIBGLADE_LIBS) $(GCONF_LIBS)
++libgnomedb_3_0_la_LIBADD = data-entries/libgnomedb_handlers-3.0.la
binreloc/libgnomedb_binreloc-3.0.la $(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS)
$(LIBGLADE_LIBS) $(GCONF_LIBS) $(INTLLIBS)
+ gnomedbincludedir =
$(includedir)/libgnomedb-$(GNOMEDB_ABI_MAJOR_VERSION).$(GNOMEDB_ABI_MINOR_VERSION)/libgnomedb
+ gnomedbinclude_HEADERS = $(gnomedb_public_headers)
$(libgnomedb_built_headers)
+ CLEANFILES = $(libgnomedb_built_headers) $(libgnomedb_built_cfiles) \
+diff -Nurd -x'*~' libgnomedb-3.1.2.orig/libgnomedb-extra/Makefile.in
libgnomedb-3.1.2/libgnomedb-extra/Makefile.in
+--- libgnomedb-3.1.2.orig/libgnomedb-extra/Makefile.in 2007-10-24
16:22:18.000000000 -0400
++++ libgnomedb-3.1.2/libgnomedb-extra/Makefile.in 2010-05-24
19:24:31.000000000 -0400
+@@ -404,7 +404,7 @@
+ sel-tables.c
+
+ libgnomedb_extra_3_0_la_LDFLAGS = -version-info
$(GNOMEDB_CURRENT):$(GNOMEDB_REVISION):$(GNOMEDB_AGE) $(NO_UNDEFINED)
+-libgnomedb_extra_3_0_la_LIBADD = ../libgnomedb/libgnomedb-3.0.la
$(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGNOMECANVAS_LIBS)
++libgnomedb_extra_3_0_la_LIBADD = ../libgnomedb/libgnomedb-3.0.la
$(LIBGNOMEDB_LIBS) $(GTKSOURCEVIEW_LIBS) $(LIBGNOMECANVAS_LIBS) $(INTLLIBS)
+ CLEANFILES = $(libgnomedb_extra_built_headers)
$(libgnomedb_extra_built_cfiles) \
+ extra_marshal.c extra_marshal.h \
+ gnome-db-extra-enum-types.h \
diff -Nurd -x'*~' libgnomedb-3.1.2.orig/ltmain.sh libgnomedb-3.1.2/ltmain.sh
--- libgnomedb-3.1.2.orig/ltmain.sh 2007-08-14 13:43:36.000000000 -0400
+++ libgnomedb-3.1.2/ltmain.sh 2009-07-02 00:36:17.000000000 -0400
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
