Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32005
Modified Files:
gimp2.info
Log Message:
More dep upgrades...scrap unused fallback only used for older glib than we have
Index: gimp2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gimp2.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gimp2.info 14 Apr 2009 13:40:12 -0000 1.22
+++ gimp2.info 15 Apr 2009 05:39:34 -0000 1.23
@@ -3,7 +3,7 @@
Type: -svg (boolean)
Version: 2.6.4
-Revision: 3
+Revision: 4
Source: mirror:gimp:v2.6/gimp-%v.tar.bz2
Depends: %N-shlibs (= %v-%r), dbus-shlibs (>= 1.2.1-1), libbabl0.0.0-shlibs,
libgegl0.0.0-shlibs
@@ -20,38 +20,23 @@
libiconv-dev, gtk-doc (>= 1.8-1), x11-dev, libexif12, gtk+2-dev (>=
2.14.0-1), libart2, libmng2,
expat1, fontconfig2-dev (>= 2.4.1-1), lcms, libwmf, pango1-xft2-ft219-dev (>=
1.22.4-1),
pixman (>= 0.12.0-1), atk1 (>= 1.24.0-1), intltool40, freetype219 (>=
2.3.7-7),
- dbus-dev (>= 1.2.1-1), gnome-vfs2-unified-dev (>= 1:2.24.0-1), libxslt (>=
1.1.22-1), libncurses5,
- bzip2-dev, libbabl0.0.0-dev, libcurl4 (>= 7.18.2-1), libgegl0.0.0-dev,
poppler4-glib, poppler4, webkit-1.0.1,
+ libxslt (>= 1.1.22-1), libncurses5,
+ bzip2-dev, libbabl0.0.0-dev, libcurl4 (>= 7.18.2-1), libgegl0.0.0-dev,
poppler4-glib, poppler4, libopenjpeg (>= 1.3-1),
+ webkit-1.0.1, system-openssl-dev, libssh2.1, dbus-dev (>= 1.2.1-1),
libxml2-bin, libxslt-bin, sqlite3-dev,
(%type_raw[-svg] = -svg) librsvg2 (>= 2.22.3-1),
- (%type_raw[-svg] = -svg) audiofile,
- (%type_raw[-svg] = -svg) avahi-dev,
- (%type_raw[-svg] = -svg) esound,
- (%type_raw[-svg] = -svg) gconf2-dev (>= 2.24.0-1),
- (%type_raw[-svg] = -svg) gnome-keyring-dev,
- (%type_raw[-svg] = -svg) libavahi-glib1-dev,
- (%type_raw[-svg] = -svg) libbonobo2-dev (>= 2.24.0-1),
- (%type_raw[-svg] = -svg) libbonoboui2-dev (>= 2.24.0-1),
- (%type_raw[-svg] = -svg) libgnome2-dev (>= 2.24.0-1),
- (%type_raw[-svg] = -svg) libgnomecanvas2-dev (>= 2.20.1.1-2),
- (%type_raw[-svg] = -svg) libgnomeui2-dev (>= 2.24.0-1),
(%type_raw[-svg] = -svg) libgsf1.114-dev (>= 1.14.11-1),
- (%type_raw[-svg] = -svg) libxml2 (>= 2.6.30-1),
- (%type_raw[-svg] = -svg) orbit2-dev (>= 2.14.16-1),
- (%type_raw[-svg] = -svg) libcroco3 (>= 0.6.2-1),
- (%type_raw[-svg] = -svg) popt
+ libxml2 (>= 2.6.30-1),
+ (%type_raw[-svg] = -svg) libcroco3 (>= 0.6.2-1)
<<
Source-MD5: 4e8185e40ab06559ce6dd5ef61b3e83b
DocFiles: COPYING AUTHORS LICENSE NEWS* README*
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
-ConfigureParams: --disable-python --disable-dependency-tracking --without-hal
--enable-gimp-remote --mandir=%p/share/man --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc
+SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib
+ConfigureParams: --disable-python --disable-dependency-tracking --without-hal
--enable-gimp-remote --mandir=%p/share/man --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--enable-gtk-doc --without-gnomevfs
PatchScript: <<
#!/bin/sh -ev
- if [ "%type_raw[-svg]" != "-svg" ]; then
- sed -i.bak -e 's;SVG = @SVG@;SVG = ;' plug-ins/common/Makefile.in
- fi
sed -i.bak -e 's|# (web-browser "firefox|(web-browser "open|' etc/gimprc
sed -i.bak -e 's|have_glib_2_19=yes|have_glib_2_19=no|' configure
for po in po*/*.po; do echo '' > $po; done
@@ -60,7 +45,11 @@
CompileScript: <<
#!/bin/sh -ev
export F77=no
- ./configure %c
+ if [ "%type_raw[-svg]" != "-svg" ]; then
+ ./configure %c --without-librsvg
+ else
+ ./configure %c
+ fi
make
<<
@@ -108,18 +97,18 @@
glitz-shlibs (>= 0.5.6-3),
gtk+2-shlibs (>= 2.14.7-2),
lcms-shlibs (>= 1.17-1),
- libcroco3-shlibs (>= 0.6.1-1002),
+ (%type_raw[-svg] = -svg) libcroco3-shlibs (>= 0.6.2-1),
libcurl4-shlibs (>= 7.19.3-1),
libexif12-shlibs (>= 0.6.16-1),
libgettext3-shlibs (>= 0.14.5-2),
- libgsf1.114-shlibs (>= 1.14.11-1),
+ (%type_raw[-svg] = -svg) libgsf1.114-shlibs (>= 1.14.11-1),
libiconv (>= 1.12-3),
libjpeg-shlibs (>= 6b-17),
libmng2-shlibs (>= 1.0.9-10),
libncurses5-shlibs (>= 5.4-20041023-1010),
libopenjpeg-shlibs (>= 1.3-1),
libpng3-shlibs (>= 1:1.2.33-1),
- librsvg2-shlibs (>= 2.22.3-1),
+ (%type_raw[-svg] = -svg) librsvg2-shlibs (>= 2.22.3-1),
libtiff-shlibs (>= 3.8.2-1002),
libwmf-shlibs (>= 0.2.8.2-9),
libxml2-shlibs (>= 2.6.32-1),
@@ -191,6 +180,9 @@
DescPackaging: <<
Localization files are not installed because they require a newer version of
gettext-tools.
The check for glib 2.19 is disabled until we have it.
+
+Fink's glib has gio/gvfs so use that and don't even bother checking
+for gnomevfs fallback (which entails gnome-keyring and libgnomeui too)
<<
License: GPL/LGPL
Homepage: http://www.gimp.org/
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
