Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6223
Modified Files:
conglomerate.info conglomerate.patch
Log Message:
GNOME2.28 cleanup
Index: conglomerate.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/conglomerate.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conglomerate.info 23 Apr 2010 14:34:01 -0000 1.8
+++ conglomerate.info 25 May 2010 08:51:09 -0000 1.9
@@ -1,96 +1,88 @@
Package: conglomerate
Version: 0.9.1
-Revision: 1007
+Revision: 1008
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 49ad67492e947d6c15e5b875d8360890
GCC: 4.0
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- audiofile-shlibs,
- esound-shlibs (>= 0.2.38-1),
- gconf2-shlibs (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gnome-keyring-shlibs (>= 0.8.1-1),
- gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
- gtk+2-shlibs (>= 2.12.0-1),
- gtksourceview-shlibs (>= 1.8.5-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dpkg-base-files,
+ 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),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.2-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtksourceview-shlibs (>= 1.8.5-3),
libart2-shlibs (>= 2.3.16-1),
- libbonobo2-shlibs (>= 2.20.0-1),
- libbonoboui2-shlibs (>= 2.20.0-1),
- libgettext3-shlibs (>= 0.14.5-1),
- libglade2-shlibs (>= 2.6.2-1),
- libgnome2-shlibs (>= 2.20.0-1),
- libgnomecanvas2-shlibs (>= 2.20.0-1),
- libgnomeprint2.2-shlibs (>= 2.18.2-1),
- libgnomeprintui2.2-shlibs,
- libgnomeui2-shlibs (>= 2.20.0-1),
+ libbonobo2-shlibs (>= 2.24.2-1),
+ libbonoboui2-shlibs (>= 2.24.2-1),
+ libgettext8-shlibs,
+ libglade2-shlibs (>= 2.6.4-7),
+ libgnome2-shlibs (>= 2.28.0-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-3),
+ libgnomeprint2.2-shlibs (>= 2.18.6-5),
+ libgnomeprintui2.2-shlibs (>= 2.18.4-5),
+ libgnomeui2-shlibs (>= 2.24.2-3),
libiconv,
- libjpeg-shlibs,
libxml2-shlibs (>= 2.6.30-1),
libxslt-shlibs (>= 1.1.22-1),
opensp4 (>= 1.5.1-1002),
- orbit2-shlibs (>= 2.14.9-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ orbit2-shlibs (>= 2.14.17-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
popt-shlibs,
rarian-compat,
shared-mime-info,
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- avahi-dev,
- audiofile,
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
- esound (>= 0.2.38-1),
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gconf2 (>= 2.20.0-1),
- gconf2-dev (>= 2.20.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin (>= 0.14.5-1),
gettext-tools (>= 0.14.5-2),
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2 (>= 2.14.3-1),
- gtk+2-dev (>= 2.12.0-1),
- gtk-doc (>= 1.8-1),
- gtksourceview-dev (>= 1.8.5-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.2-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtk-doc (>= 1.13-5),
+ gtksourceview-dev (>= 1.8.5-3),
intltool40,
libart2 (>= 2.3.16-2),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
- libgettext3-dev (>= 0.14.5-1),
- libglade2 (>= 2.6.2-1),
- libgnome2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeprintui2.2-dev,
- libgnomeui2-dev (>= 2.20.0-1),
+ libbonobo2-dev (>= 2.24.2-1),
+ libbonoboui2-dev (>= 2.24.2-1),
+ libgettext8-dev,
+ libglade2 (>= 2.6.4-7),
+ libgnome2-dev (>= 2.28.0-1),
+ libgnomecanvas2-dev (>= 2.26.0-3),
+ libgnomeprint2.2-dev (>= 2.18.6-5),
+ libgnomeprintui2.2-dev (>= 2.18.4-5),
+ libgnomeui2-dev (>= 2.24.2-3),
libiconv-dev,
- libjpeg (>= 6b-16),
- libpng3,
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
+ pkgconfig (>= 0.23),
popt,
- x11-dev,
- xft2-dev
+ x11-dev
<<
PatchFile: %n.patch
-PatchFile-MD5: 5138b5f78a966f2c75e4bf114d9c12d0
-ConfigureParams: --disable-enchant --enable-gtk-doc --enable-printing
--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: 7569384921598cfa8609198ecd6acfba
+SetCPPFLAGS: -MD
+ConfigureParams: --disable-enchant --enable-gtk-doc --enable-printing
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
echo "*** The below warnings are HARMLESS ***"
./configure %c
make
+ fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: <<
install -d -m 0755 %i/share/man/man1
@@ -101,7 +93,7 @@
if [ configure = "$1" ]; then
scrollkeeper-update -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/conglomerate.schemas
+ gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/conglomerate.schemas >/dev/null
fi
<<
PostRmScript: <<
@@ -150,6 +142,8 @@
ported on Fink, replace it with osx from opensp4.
Patching Makefile.in in doc to get the devhelp files and some
images.
+
+ Recent glib doesn't publish -lintl, so pass it directly.
<<
Homepage: http://www.conglomerate.org
License: GPL
Index: conglomerate.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/conglomerate.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conglomerate.patch 7 Jun 2007 02:52:07 -0000 1.3
+++ conglomerate.patch 25 May 2010 08:51:09 -0000 1.4
@@ -27,7 +27,15 @@
diff -Nurd conglomerate-0.9.1-orig/doc/reference/Makefile.in
conglomerate-0.9.1/doc/reference/Makefile.in
--- conglomerate-0.9.1-orig/doc/reference/Makefile.in 2005-06-21
06:20:42.000000000 +0200
+++ conglomerate-0.9.1/doc/reference/Makefile.in 2006-04-10
13:53:17.000000000 +0200
-@@ -389,8 +389,8 @@
+@@ -184,6 +184,7 @@
+ GTKDOC_CFLAGS = $(CONGLOMERATE_CFLAGS) -I$(top_srcdir)/src
-I$(top_srcdir)/src/recent-files
+ GTKDOC_LIBS = $(CONGLOMERATE_LIBS) \
+ $(GTKSOURCEVIEW_LIBS) $(ENCHANT_LIBS) $(PRINTING_LIBS) \
++ $(INTLLIBS) \
+ $(filter-out ../../src/main.o,$(wildcard ../../src/*.o)) \
+ $(top_builddir)/src/recent-files/libeggrecent.la
+
+@@ -389,8 +390,8 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
@@ -57,3 +65,11 @@
$(NULL)
+@@ -471,6 +471,7 @@
+ $(LIBFO_LIBS) \
+ $(SEWFOX_LIBS) \
+ $(GTKSOURCEVIEW_LIBS) \
++ $(INTLLIBS) \
+ $(NULL)
+
+
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
