Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv11758/graphics

Modified Files:
        freetype219.info freetype219.patch 
Log Message:
new freetype219; cascade its dep (higher c_v) into fontconfig2 so that our x11 
overlays are self-consistent


Index: freetype219.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- freetype219.info    23 Apr 2011 18:39:45 -0000      1.39
+++ freetype219.info    27 Aug 2011 13:53:52 -0000      1.40
@@ -1,32 +1,38 @@
 Package: freetype219
-Version: 2.4.4
-Revision: 2
-BuildDepends: fink (>= 0.24.12-1)
+Version: 2.4.6
+Revision: 1
+BuildDepends: <<
+       bzip2-dev,
+       fink (>= 0.24.12-1),
+       fink-package-precedence
+<<
 Depends: %N-shlibs (= %v-%r)
 BuildConflicts: make (<= 3.79.1-3)
 Conflicts: freetype219-hinting
 Replaces: freetype219-hinting, %N-default
 BuildDependsOnly: True
 Source: http://download.savannah.gnu.org/releases/freetype/freetype-%v.tar.bz2
-Source-MD5: b3e2b6e2f1c3e0dffa1fd2a0f848b671
-#Source2: mirror:debian:pool/main/f/freetype/freetype_%v-1.diff.gz
-Source2: mirror:debian:pool/main/f/freetype/freetype_2.4.4-1.diff.gz
-Source2-MD5: 0beb8386f9eba23dbbc00ae6c0d02f89
+Source-MD5: 5e6510613f612809d2d7862592b92ab7
+Source2: mirror:debian:pool/main/f/freetype/freetype_2.4.6-2.diff.gz
+Source2-MD5: 3c738acba25b3de4635b8da8d39a71ad
 PatchFile: %n.patch
-PatchFile-MD5: fe4d9c9a991e77575d861d9a4ec69d0a
+PatchFile-MD5: c3d5ad584bfe073398cae6f3d6a49f7c
 PatchScript: <<
  %{default_script}
- gzip -dc ../freetype_2.4.4-1.diff.gz | patch -p1
+ gzip -dc ../freetype_2.4.6-2.diff.gz | patch -p1
  patch -p0 < debian/patches-freetype/freetype-2.1.7-backwards.compat.patch
  patch -p1 < debian/patches-freetype/enable-gxvalid-otvalid.patch
  patch -p1 < debian/patches-freetype/enable-subpixel-rendering.patch
+ patch -p1 < debian/patches-freetype/0001-Fix-Savannah-bug-33992.patch
 <<
 NoSetCPPFLAGS: true
+SetCPPFLAGS: -MD
 CompileScript: <<
 #!/bin/sh -ev
        export CPATH=%p/include
        ./configure --prefix=%p/lib/%N --with-old-mac-fonts --disable-static
        make
+       fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=%n .
 <<
 InstallScript: <<
 #!/bin/sh -ev
@@ -62,11 +68,14 @@
 
 SplitOff: <<
        Package: %N-shlibs
-       Depends: dpkg-base-files
+       Depends: <<
+               bzip2-shlibs,
+               dpkg-base-files
+       <<
        Replaces:  freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2)
        Conflicts: freetype219-hinting-shlibs
        Files: lib/%N/lib/libfreetype.6*dylib
-       Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 13.0.0 %n (>= 2.4.4-1)
+       Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 14.0.0 %n (>= 2.4.6-2)
        DocFiles: ChangeLog* README docs/LICENSE.TXT
        Description: TrueType font rendering library, shared libs
 <<

Index: freetype219.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- freetype219.patch   23 Apr 2011 15:07:49 -0000      1.14
+++ freetype219.patch   27 Aug 2011 13:53:52 -0000      1.15
@@ -1,27 +1,27 @@
-diff -Nurd -x'*~' freetype-2.4.4.orig/builds/unix/freetype-config.in 
freetype-2.4.4/builds/unix/freetype-config.in
---- freetype-2.4.4.orig/builds/unix/freetype-config.in 2009-12-21 
18:23:42.000000000 -0500
-+++ freetype-2.4.4/builds/unix/freetype-config.in      2011-04-23 
10:59:37.000000000 -0400
+diff -Nurd -x'*~' freetype-2.4.6.orig/builds/unix/freetype-config.in 
freetype-2.4.6/builds/unix/freetype-config.in
+--- freetype-2.4.6.orig/builds/unix/freetype-config.in 2011-01-05 
13:25:28.000000000 -0500
++++ freetype-2.4.6/builds/unix/freetype-config.in      2011-08-27 
09:18:53.000000000 -0400
 @@ -144,7 +144,7 @@
    if test "$enable_shared" = "yes" ; then
      eval "rpath=\"$hardcode_libdir_flag_spec\""
    fi
--  libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
+-  libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
 +  libs="-lfreetype"
    if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != 
"/usr/lib64"; then
      echo -L${SYSROOT}$libdir $libs
    else
-diff -Nurd -x'*~' freetype-2.4.4.orig/builds/unix/freetype2.in 
freetype-2.4.4/builds/unix/freetype2.in
---- freetype-2.4.4.orig/builds/unix/freetype2.in       2009-07-03 
09:28:24.000000000 -0400
-+++ freetype-2.4.4/builds/unix/freetype2.in    2011-04-23 10:58:18.000000000 
-0400
+diff -Nurd -x'*~' freetype-2.4.6.orig/builds/unix/freetype2.in 
freetype-2.4.6/builds/unix/freetype2.in
+--- freetype-2.4.6.orig/builds/unix/freetype2.in       2011-01-05 
13:25:28.000000000 -0500
++++ freetype-2.4.6/builds/unix/freetype2.in    2011-08-27 09:18:53.000000000 
-0400
 @@ -8,5 +8,4 @@
  Version: @ft_version@
  Requires:
  Libs: -L${libdir} -lfreetype
--Libs.private: @LIBZ@ @FT2_EXTRA_LIBS@
+-Libs.private: @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@
  Cflags: -I${includedir}/freetype2 -I${includedir}
-diff -Nurd -x'*~' freetype-2.4.4.orig/include/freetype/t1tables.h 
freetype-2.4.4/include/freetype/t1tables.h
---- freetype-2.4.4.orig/include/freetype/t1tables.h    2009-07-03 
09:28:24.000000000 -0400
-+++ freetype-2.4.4/include/freetype/t1tables.h 2011-04-23 10:55:23.000000000 
-0400
+diff -Nurd -x'*~' freetype-2.4.6.orig/include/freetype/t1tables.h 
freetype-2.4.6/include/freetype/t1tables.h
+--- freetype-2.4.6.orig/include/freetype/t1tables.h    2009-07-03 
09:28:24.000000000 -0400
++++ freetype-2.4.6/include/freetype/t1tables.h 2011-08-27 09:18:53.000000000 
-0400
 @@ -78,6 +78,15 @@
      FT_Short    underline_position;
      FT_UShort   underline_thickness;


------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management 
Up to 160% more powerful than alternatives and 25% more efficient. 
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to