Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26040
Modified Files:
bakery.info bakery.patch
Log Message:
cleanup for GNOME2.28
Index: bakery.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/bakery.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bakery.patch 15 Jul 2008 01:40:52 -0000 1.2
+++ bakery.patch 25 May 2010 21:20:18 -0000 1.3
@@ -1,12 +1,15 @@
diff -Nurd -x'*~' bakery-2.4.4.orig/bakery/Makefile.in
bakery-2.4.4/bakery/Makefile.in
--- bakery-2.4.4.orig/bakery/Makefile.in 2008-01-13 13:25:54.000000000
-0500
-+++ bakery-2.4.4/bakery/Makefile.in 2008-01-13 17:07:34.000000000 -0500
-@@ -284,7 +284,7 @@
++++ bakery-2.4.4/bakery/Makefile.in 2010-05-25 16:10:39.000000000 -0400
+@@ -282,9 +282,9 @@
+ Document/libbakery_document.la \
+ Utilities/libbakery_utilities.la \
View/libbakery_view.la \
- $(BAKERY_LIBS)
+- $(BAKERY_LIBS)
++ $(BAKERY_LIBS) $(INTLLIBS)
-libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release
$(GENERIC_RELEASE) -no-undefined
-+libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
$(no_undefined)
++libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-no-undefined
# Install the headers:
library_configdir = $(libdir)/bakery-2.4/include
Index: bakery.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/bakery.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bakery.info 23 Apr 2010 14:34:01 -0000 1.12
+++ bakery.info 25 May 2010 21:20:16 -0000 1.13
@@ -1,91 +1,86 @@
Package: bakery
Version: 2.4.4
-Revision: 2
+Revision: 3
GCC: 4.0
Depends: %N-2.4-shlibs (= %v-%r)
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- avahi-dev,
- cairo (>= 1.6-1),
- cairomm1,
- dbus-dev (>= 1.0-1),
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
+ cairomm1 (>= 1.8.4-1),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gconf2-dev (>= 2.20.0-1),
- gconfmm2.6 (>= 2.20.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ gconfmm2.6 (>= 2.28.0-1),
gettext-bin (>= 0.14.5-1),
gettext-tools (>= 0.14.5-1),
- glib2-dev (>= 2.14.0-1),
- glibmm2.4-dev (>= 2.13.9-1),
+ glib2-dev (>= 2.22.0-1),
+ glibmm2.4-dev (>= 2.22.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gnome-vfsmm2.6 (>= 2.20.0-1),
- gtk+2-dev (>= 2.12.0-1),
- gtkmm2.4-dev (>= 2.12.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.2-1),
+ gnome-vfsmm2.6 (>= 2.26.0-3),
+ gtk+2-dev (>= 2.18.0-1),
+ gtkmm2.4-gtk-dev (>= 2.18.0-1),
intltool40,
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libgettext3-dev (>= 0.14.5-1),
- libglade2 (>= 2.6.2-1),
- libglademm2.4 (>= 2.6.4-1),
+ libgettext8-dev,
+ libglade2 (>= 2.6.4-7),
+ libglademm2.4 (>= 2.6.7-2),
libiconv-dev (>= 1.10-6),
- libpng3,
libsigc++2 (>= 2.0.11-1003),
- libxml++2 (>= 2.20.0-1),
+ libxml++2 (>= 2.26.1-2),
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
- popt,
- x11-dev,
- xft2-dev
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pangomm1.4.1 (>= 2.26.0-1),
+ pixman (>= 0.16.0-1),
+ pkgconfig (>= 0.23),
+ x11-dev
<<
Conflicts: bakery2.6
Replaces: bakery2.6
Source: mirror:gnome:sources/bakery/2.4/bakery-%v.tar.bz2
Source-MD5: c80b4cf39dc8aa65bb9302b84f084b93
BuildDependsOnly: true
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
PatchFile: %n.patch
-PatchFile-MD5: b5ee0a5410273ca074f038869736a17b
-ConfigureParams: --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
+PatchFile-MD5: 6f603c76c3cdf8a25e8368e24508996c
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's/^(LIBS\s*=.*)/\1 \$(INTLLIBS)/' examples/*/Makefile.in
examples/*/*/Makefile.in
+<<
+ConfigureParams: --disable-static --enable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
PERL_PATH=/usr/bin/perl ./configure %c
make
+ fink-package-precedence --prohibit-bdep %n .
<<
SplitOff: <<
Package: %N-2.4-shlibs
Description: C++ shared libraries for bakery
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- gconf2-shlibs (>= 2.20.0-1),
- gconfmm2.6-shlibs (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- glibmm2.4-shlibs (>= 2.13.9-1),
- gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
- gnome-vfsmm2.6-shlibs (>= 2.20.0-1),
- gtk+2-shlibs (>= 2.12.0-1),
- gtkmm2.4-shlibs (>= 2.12.0-1),
- libbonobo2-shlibs (>= 2.20.0-1),
- libgettext3-shlibs (>= 0.14.5-1),
- libglade2-shlibs (>= 2.6.2-1),
- libglademm2.4-shlibs (>= 2.6.4-1),
- libiconv (>= 1.10-6),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ cairomm1-shlibs (>= 1.8.4-1),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ gconfmm2.6-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ glibmm2.4-shlibs (>= 2.22.0-1),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.2-1),
+ gnome-vfsmm2.6-shlibs (>= 2.26.0-3),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtkmm2.4-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
+ libglade2-shlibs (>= 2.6.4-7),
+ libglademm2.4-shlibs (>= 2.6.7-2),
libsigc++2-shlibs (>= 2.0.11-1003),
- libxml++2-shlibs (>= 2.20.0-1),
+ libxml++2-shlibs (>= 2.26.1-2),
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.9-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
- popt-shlibs,
- x11-shlibs
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ pangomm1.4.1-shlibs (>= 2.26.0-1)
<<
Files: lib/libbakery-2.4.*.dylib share/locale
Shlibs: %p/lib/libbakery-2.4.1.dylib 2.0.0 %n (>= 2.4.1-1)
@@ -99,8 +94,9 @@
Try to bring some sanity to the lib-versioning
- Fix passing of -no-undefined flag. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=509227
+ Recent glib doesn't publish -lintl, so pass it directly.
+# Needed by all the examples (but not the lib itself) perl-pie
+# them insead of a bloating up the .patch
<<
Description: C++ framework for creating gnome apps
License: LGPL
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
