Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20517
Modified Files:
gimp2.info
Log Message:
New revision of gimp2.
- The configure script checked for versions of some packages that
were newer than what was listed in Depends.
- The check for glib 2.19+ was disabled, but we have it now.
- It doesn't compile with gcc 4.0 on x86_64 because of
http://www.openradar.me/radar?id=18407. Require gcc4.2 to fix this.
Reported by Jean-François Mertens.
Index: gimp2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gimp2.info,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gimp2.info 17 Nov 2009 06:57:37 -0000 1.30
+++ gimp2.info 22 Nov 2009 23:24:46 -0000 1.31
@@ -3,7 +3,7 @@
Type: -svg (boolean)
Version: 2.6.6
-Revision: 4
+Revision: 5
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
@@ -17,8 +17,8 @@
BuildDepends: <<
fink (>= 0.24.12-1),
pkgconfig (>= 0.23), xft2-dev, glitz, cairo (>= 1.8-1), libpng3, libjpeg,
libtiff,
- glib2-dev (>= 2.18.0-1), giflib, aalib (>= 1.4rc5-2), libgettext3-dev,
gettext-bin, gettext-tools-0.17,
- libiconv-dev, gtk-doc (>= 1.11-6), x11-dev, libexif12, gtk+2-dev (>=
2.14.0-1), libart2, libmng2,
+ glib2-dev (>= 2.20.5-1), giflib, aalib (>= 1.4rc5-2), libgettext3-dev,
gettext-bin, gettext-tools-0.17,
+ libiconv-dev, gtk-doc (>= 1.11-6), x11-dev, libexif12, gtk+2-dev (>=
2.16.6-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.8-2),
libxslt (>= 1.1.22-1), libncurses5,
@@ -30,13 +30,15 @@
(%type_raw[-svg] = -svg) librsvg2 (>= 2.22.3-1),
(%type_raw[-svg] = -svg) libgsf1.114-dev (>= 1.14.11-1),
libxml2 (>= 2.6.30-1),
- (%type_raw[-svg] = -svg) libcroco3 (>= 0.6.2-1)
+ (%type_raw[-svg] = -svg) libcroco3 (>= 0.6.2-1),
+ gcc4.2
<<
Source-MD5: 23d880dd09cd62c936ed04666a53f8e4
DocFiles: COPYING AUTHORS LICENSE NEWS* README*
SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib
SetCFLAGS: -O2
+SetCC: gcc-4.2
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 --build=%m-apple-darwin`uname -r|cut -f1
-d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.`
PatchFile: %{ni}.patch
@@ -45,7 +47,7 @@
#!/bin/sh -ev
%{default_script}
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|' -e
's|mac_twain_ok=yes|mac_twain_ok=no|' configure
+ sed -i.bak -e 's|mac_twain_ok=yes|mac_twain_ok=no|' configure
<<
CompileScript: <<
@@ -181,8 +183,6 @@
The "gimp2-default" package contains the "gimp" binary.
<<
DescPackaging: <<
-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)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
