Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22973/10.4-pangocairo/unstable/main/finkinfo/gnome
Modified Files: Tag: pangocairo-branch pango1-xft2-ft219.info pango1-xft2.info Log Message: dep & flag modernization; make the two pango1-xft2*-dev mutually exclusive (packages can't successfully link to both at once, so prevent attempts to do so and the resulting headers/libs mismatch messes) Index: pango1-xft2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pango1-xft2.info,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -d -r1.4.2.6 -r1.4.2.7 --- pango1-xft2.info 14 Mar 2007 04:57:57 -0000 1.4.2.6 +++ pango1-xft2.info 27 Apr 2007 14:05:47 -0000 1.4.2.7 @@ -39,7 +39,7 @@ << PostInstScript: << if [ configure = "$1" ]; then - update-pango-modules + %p/sbin/update-pango-modules fi << PostRmScript: << Index: pango1-xft2-ft219.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v retrieving revision 1.4.2.19 retrieving revision 1.4.2.20 diff -u -d -r1.4.2.19 -r1.4.2.20 --- pango1-xft2-ft219.info 24 Apr 2007 02:22:15 -0000 1.4.2.19 +++ pango1-xft2-ft219.info 27 Apr 2007 14:05:47 -0000 1.4.2.20 @@ -5,7 +5,10 @@ License: LGPL Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> -Depends: %N-shlibs (= %v-%r), fontconfig2-shlibs (>= 2.3.2-13) +Depends: << + %N-shlibs (= %v-%r), + fontconfig2-shlibs (>= 2.3.2-13) +<< BuildDepends: << cairo (>= 1.2.2-1001), expat1, @@ -13,7 +16,7 @@ fontconfig2-dev (>= 2.3.2-13), glib2-dev (>= 2.12.0-1), glitz, - gtk-doc (>= 0.8-1), + gtk-doc (>= 1.2-1), libgettext3-dev, libiconv-dev, libpng3 (>= 1.2.5-4), @@ -32,11 +35,11 @@ sed -e 's|query|ft219-query|' update-pango-modules > update-pango-ft219-modules << -SetCFLAGS: -Os -SetCPPFLAGS: -I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include -SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L%p/lib -lexpat -no-undefined -bind_at_load NoSetCPPFLAGS: true +SetCPPFLAGS: -I%p/lib/freetype219/include -I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include NoSetLDFLAGS: true +SetLDFLAGS: -no-undefined -L%p/lib/fontconfig2/lib -L%p/lib/freetype219/lib -L%p/lib -lexpat -no-undefined -bind_at_load +SetCFLAGS: -Os ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --enable-static --includedir=%p/lib/pango-ft219/include --libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc CompileScript: << #!/bin/bash -ev @@ -74,7 +77,7 @@ install -d -m 755 $SYSCONFDIR/pango install -c -m 644 xrender.pc %i/lib/pango-ft219/lib/pkgconfig/ << -DocFiles: AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS +DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS SplitOff: << Package: %N-shlibs Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9) @@ -83,11 +86,13 @@ expat1-shlibs, freetype219-shlibs (>= 2.3.1-1), glib2-shlibs (>= 2.12.0-1), + libgettext3-shlibs, + libiconv, libthai-shlibs (>= 0.1.7-1), x11-shlibs, xft2-shlibs << - DocFiles: COPYING ChangeLog HACKING INSTALL NEWS README THANKS + DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS Files: << lib/pango-ft219/lib/libpango-1.0.*.dylib lib/pango-ft219/lib/libpangocairo-1.0.*.dylib @@ -112,6 +117,7 @@ BuildDependsOnly: True Conflicts: pango1-xft2-dev Replaces: pango1-xft2-dev + DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS Files: << lib/pango-ft219/include lib/pango-ft219/lib @@ -160,4 +166,3 @@ check uses some C++ but it doesn't leak out into the installed package << - ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits