Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv14283
Modified Files:
freetype219.info freetype219.patch
Log Message:
kill static and associated cruft
Index: freetype219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- freetype219.info 23 Mar 2011 16:53:12 -0000 1.37
+++ freetype219.info 23 Apr 2011 15:07:49 -0000 1.38
@@ -1,6 +1,6 @@
Package: freetype219
Version: 2.4.4
-Revision: 1
+Revision: 2
BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r)
BuildConflicts: make (<= 3.79.1-3)
@@ -13,7 +13,7 @@
Source2: mirror:debian:pool/main/f/freetype/freetype_2.4.4-1.diff.gz
Source2-MD5: 0beb8386f9eba23dbbc00ae6c0d02f89
PatchFile: %n.patch
-PatchFile-MD5: e5b96957d2f21f0dc55e0ed1db4f2b9c
+PatchFile-MD5: fe4d9c9a991e77575d861d9a4ec69d0a
PatchScript: <<
%{default_script}
gzip -dc ../freetype_2.4.4-1.diff.gz | patch -p1
@@ -25,7 +25,7 @@
CompileScript: <<
#!/bin/sh -ev
export CPATH=%p/include
- ./configure --prefix=%p/lib/%N --with-old-mac-fonts
+ ./configure --prefix=%p/lib/%N --with-old-mac-fonts --disable-static
make
<<
InstallScript: <<
@@ -117,6 +117,10 @@
# ltmain.sh to append ".0.1" to -compatibility_version so when
# upstream fixes -version-info triplet x+1.y.z will be higher.
# See: https://savannah.nongnu.org/bugs/?28483
+
+ No longer supply static (as of 2.4.4-2), therefore no longer
+ need to propagate linking against libs that are not in public
+ ABI.
<<
License: OSI-Approved
Homepage: http://www.freetype.org/
Index: freetype219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- freetype219.patch 23 Mar 2011 16:53:12 -0000 1.13
+++ freetype219.patch 23 Apr 2011 15:07:49 -0000 1.14
@@ -1,6 +1,27 @@
-diff -Nurd -x'*~' freetype-2.3.11.orig/include/freetype/t1tables.h
freetype-2.3.11/include/freetype/t1tables.h
---- freetype-2.3.11.orig/include/freetype/t1tables.h 2009-07-03
09:28:24.000000000 -0400
-+++ freetype-2.3.11/include/freetype/t1tables.h 2010-01-20
03:11:13.000000000 -0500
+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
+@@ -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"
+ 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
+@@ -8,5 +8,4 @@
+ Version: @ft_version@
+ Requires:
+ Libs: -L${libdir} -lfreetype
+-Libs.private: @LIBZ@ @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
@@ -78,6 +78,15 @@
FT_Short underline_position;
FT_UShort underline_thickness;
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
