Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31939

Modified Files:
        gimp2.info 
Log Message:
Fix two Depends errors, along with a new kludge to force fontconfig to work the right 
way. Attempting to upgrade with 'fink update gimp2' rather than 'fink update-all' 
triggers dpkg bug 217862.

Index: gimp2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/gimp2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gimp2.info  4 Sep 2004 21:24:53 -0000       1.10
+++ gimp2.info  13 Sep 2004 05:43:59 -0000      1.11
@@ -2,7 +2,7 @@
 Package: gimp2%type_pkg[-svg]%type_pkg[-noprint]
 Type: -svg (boolean), -noprint (boolean)
 Version: 2.0.4
-Revision: 1
+Revision: 2
 Source: mirror:gimp:gimp/v2.0/gimp-%v.tar.bz2
 Source2: mirror:gimp:gimp/help/testing/gimp-help-2-0.4.tar.gz
 Depends: %N-shlibs (= %v-%r)
@@ -10,7 +10,7 @@
 Replaces: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
 Recommends: %N-default (= %v-%r)
 BuildDepends: <<
-libpng3, libjpeg, libtiff, glib2-dev, netpbm, giflib, imlib, aalib (>= 1.4rc5-2), 
gettext-dev, gettext-bin, libiconv-dev, gtk-doc, x11-dev,  (%type_raw[-noprint] = .) 
gimp-print-dev, pkgconfig, libexif-dev, gtk+2-dev, libart2, libmng2, expat, 
fontconfig2-dev, lcms, libwmf, pango1-xft2-dev, 
+libpng3, libjpeg, libtiff, glib2-dev, netpbm, giflib, imlib, aalib (>= 1.4rc5-2), 
gettext-dev, gettext-bin, libiconv-dev, gtk-doc, x11-dev,  (%type_raw[-noprint] = .) 
gimp-print-dev, libexif-dev, gtk+2-dev, libart2, libmng2, expat, fontconfig2-dev, 
lcms, libwmf, pango1-xft2-dev, 
  (%type_raw[-svg] = -svg) librsvg2,
  (%type_raw[-svg] = -svg) audiofile,
  (%type_raw[-svg] = -svg) gail17-dev,
@@ -25,12 +25,14 @@
  (%type_raw[-svg] = -svg) libgsf-dev,
  (%type_raw[-svg] = -svg) libxml2,
  (%type_raw[-svg] = -svg) orbit2-dev,
- (%type_raw[-svg] = -svg) libgtkhtml2
+ (%type_raw[-svg] = -svg) libgtkhtml2,
+ libxslt
 <<
 Source-MD5: 731198e0f46cca833243c43197681c66 
 Source2-MD5: 41adc4749ba78171135063436325ff23
-SetCC: gcc -I%p/lib/fontconfig2/include/
+SetCC: gcc -I%p/lib/fontconfig2/include/ -L%p/lib/fontconfig2/lib
 SetLIBS: -liconv -lintl -lexpat
+SetLDFLAGS: -Wl,-search_paths_first
 DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n
 ConfigureParams: --disable-dependency-tracking --enable-altivec --enable-mp 
--enable-gtk-doc --with-shm=posix --with-aa --with-sendmail=/usr/sbin/sendmail 
--mandir=%p/share/man
 
@@ -108,11 +110,11 @@
 
 SplitOff3: <<
  Package: %N-dev
- Depends: %N-shlibs (= %v-%r)
+ Depends: %N-shlibs (= %v-%r), pkgconfig
  Conflicts: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, gimp-dev 
(<= 2.0.0-5)
  Replaces: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, gimp-dev 
(<= 2.0.0-5)
  BuildDependsOnly: true
- Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib 
lib/libgimpcolor-2.0.dylib lib/libgimpmath-2.0.dylib lib/libgimpmodule-2.0.dylib 
lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib lib/libgimpwidgets-2.0.dylib 
lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0
+ Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib 
lib/libgimpcolor-2.0.dylib lib/libgimpmath-2.0.dylib lib/libgimpmodule-2.0.dylib 
lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib lib/libgimpwidgets-2.0.dylib 
lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0 
  DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n
 <<
 
@@ -138,9 +140,8 @@
 DescUsage: <<
 * rsvg2 disabled because it's too inconvenient to install, use -svg variant for it
 * gtkhtml disabled for same reason as rsvg2; Safari works well as a help browser
-* CC trickery to get around ld/libtool/fontconfig problems
-* if you did not install "Gimp-Print Printer Drivers" when installing OS X, you need 
-noprint
-* the -ghostscript splitoff contains the WMF and PostScript plugins; this is because 
our ghostscript package is unstable and I would like to be able to use GIMP without it
+* If you did not install "Gimp-Print Printer Drivers" when installing OS X, you need 
-noprint
+* The -ghostscript splitoff contains the WMF and PostScript plugins; this is because 
our ghostscript package is unstable and I would like to be able to use GIMP without it
 <<
 License: GPL/LGPL
 Homepage: http://www.gimp.org/



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM. 
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to