Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11473
Modified Files:
freetype2-hinting.info freetype2.info freetype2.patch
Removed Files:
freetype2-hinting.patch
Log Message:
Latest freetype2 to stable in order to satisfy dependency for root4.
Okay'ed by Alexander Strange, haven't heard anything from Jeff
Whitaker, hope it's okay.
Index: freetype2-hinting.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/freetype2-hinting.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freetype2-hinting.info 27 Jan 2005 07:56:55 -0000 1.5
+++ freetype2-hinting.info 26 May 2005 17:46:26 -0000 1.6
@@ -1,30 +1,40 @@
Package: freetype2-hinting
-Version: 2.1.3
-Revision: 22
-Depends: %N-shlibs (= %v-%r)
+Version: 2.1.4
+Revision: 11
+# Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2
Replaces: freetype2
Provides: freetype2
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.gz
-Source-MD5: 60d2e54385aead468c102e7250eab055
-Patch: %n.patch
-PatchScript: mv install install.sh
+Source-MD5: dd40b965b06d66749e53df9299633886
+Patch: freetype2.patch
+PatchScript: <<
+ perl -i -pe 's/.*(#define.*BYTECODE_INTERPRETER).*/\1/'
include/freetype/config/ftoption.h
+ mv install install.sh
+<<
CompileScript: <<
make setup CFG="--prefix=%p"
perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/'
builds/unix/libtool
make
<<
InstallScript: <<
+#!/bin/sh -e
+
make install prefix=%i
install -d -m 755 %i/lib/freetype2/lib
mv %i/bin %i/lib/freetype2
mv %i/lib/libfreetype.a %i/lib/freetype2/lib
mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
- mv %i/lib/libfreetype.la %i/lib/freetype2/lib
+ perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la >
%i/lib/freetype2/lib/libfreetype.la
+ rm -rf %i/lib/libfreetype.la
mv %i/include %i/lib/freetype2
rm -rf %i/share/aclocal
+ for file in %i/lib/libfreetype*.dylib; do
+ REALFILE=`echo "$file" | sed -e 's,^%d,,'`
+ ln -sf "$REALFILE" %i/lib/freetype2/lib/
+ done
<<
SplitOff: <<
Package: %N-shlibs
@@ -37,7 +47,7 @@
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
- Description: TrueType font rendering library, version 2, shared libs
+ Description: TrueType font rendering library, shared libs
<<
SplitOff2: <<
Package: %N-dev
@@ -50,29 +60,30 @@
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
- Description: TrueType font rendering library, version 2, headers
+ Description: TrueType font rendering library, headers
<<
DocFiles: <<
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
-Description: TrueType font rendering library, version 2 (dummy)
+Description: TrueType font rendering library, (dummy)
DescDetail: <<
FreeType 2 is a library that provides access to and rendering of a
wide range of font file formats, including TrueType, PostScript Type 1,
and several bitmap font formats.
-
-The freetype2 packages now exist only for compatibility with older Fink
-packages. Developers should use the freetype that is part of XFree86
-for new packages.
-
-For packages that need freetype2 version 2.1.3 or newer, there is now
-a freetype2-dev splitoff. For this to work, you need to make sure that
-configure finds the freetype-config script in %p/lib/freetype2/bin
+<<
+DescUsage: <<
+Packages that need freetype2 versions between 2.1.3 and 2.1.6,
+should builddepend on freetype2-dev and depend on freetype2-shlibs
+and make sure that configure finds the freetype-config script in
+%p/lib/freetype2/bin. The headers and libraries needed at build
+time are in %p/lib/freetype2/{include,lib}.
<<
DescPort: <<
Previous versions by Christoph Pfisterer
+ Uses the same patch file as the non-hinting package.
<<
License: Restrictive
Homepage: http://www.freetype.org/
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
+
Index: freetype2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/freetype2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freetype2.patch 1 Nov 2004 23:59:05 -0000 1.3
+++ freetype2.patch 26 May 2005 17:46:27 -0000 1.4
@@ -1,5 +1,19 @@
---- freetype-2.1.3/builds/unix/freetype-config.in~ Tue Dec 16 18:58:35 2003
-+++ freetype-2.1.3/builds/unix/freetype-config.in Tue Dec 16 19:00:47 2003
+diff -aur freetype-2.1.4_ori/builds/unix/detect.mk
freetype-2.1.4/builds/unix/detect.mk
+--- freetype-2.1.4_ori/builds/unix/detect.mk 2002-06-14 10:09:25.000000000
+0200
++++ freetype-2.1.4/builds/unix/detect.mk 2005-02-27 23:38:15.000000000
+0100
+@@ -18,7 +18,7 @@
+
+ # Note: this test is duplicated in "builds/toplevel.mk".
+ #
+- is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init)
$(wildcard /hurd/auth))
++ is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init)
$(wildcard /hurd/auth) $(wildcard /sbin/launchd))
+ ifneq ($(is_unix),)
+
+ PLATFORM := unix
+Only in freetype-2.1.4/builds/unix: detect.mk~
+diff -aur freetype-2.1.4_ori/builds/unix/freetype-config.in
freetype-2.1.4/builds/unix/freetype-config.in
+--- freetype-2.1.4_ori/builds/unix/freetype-config.in 2002-12-16
22:51:23.000000000 +0100
++++ freetype-2.1.4/builds/unix/freetype-config.in 2005-02-27
23:32:32.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
@@ -8,25 +22,11 @@
[EMAIL PROTECTED]@
usage()
-diff -Naur freetype-2.1.3.old/builds/unix/freetype-config.in
freetype-2.1.3.new/builds/unix/freetype-config.in
-diff -Naur freetype-2.1.3.old/builds/unix/ltmain.sh
freetype-2.1.3.new/builds/unix/ltmain.sh
---- freetype-2.1.3.old/builds/unix/ltmain.sh Tue Mar 5 10:09:59 2002
-+++ freetype-2.1.3.new/builds/unix/ltmain.sh Fri Mar 28 13:26:18 2003
-@@ -2894,6 +2894,11 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval cmds=\"$archive_cmds\"
- fi
- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
---- freetype-2.1.3/src/base/ftobjs.c.orig Mon Feb 17 07:10:01 2003
-+++ freetype-2.1.3/src/base/ftobjs.c Mon Feb 17 07:10:39 2003
-@@ -798,7 +798,7 @@
+Only in freetype-2.1.4/builds/unix: freetype-config.in~
+diff -aur freetype-2.1.4_ori/src/base/ftobjs.c freetype-2.1.4/src/base/ftobjs.c
+--- freetype-2.1.4_ori/src/base/ftobjs.c 2003-03-27 22:35:43.000000000
+0100
++++ freetype-2.1.4/src/base/ftobjs.c 2005-02-27 23:37:16.000000000 +0100
+@@ -926,7 +926,7 @@
/* there's a Mac-specific extended implementation of FT_New_Face() */
/* in src/base/ftmac.c */
@@ -35,23 +35,13 @@
/* documentation is in freetype.h */
-@@ -821,7 +821,7 @@
+@@ -949,7 +949,7 @@
return FT_Open_Face( library, &args, face_index, aface );
}
-#endif /* !FT_MACINTOSH */
-+/*#endif !FT_MACINTOSH */
++/*#endif !FT_MACINTOSH */
/* documentation is in freetype.h */
---- freetype-2.1.3/builds/unix/detect.mk.bak 2002-06-14 10:09:25.000000000
+0200
-+++ freetype-2.1.3/builds/unix/detect.mk 2004-11-02 00:41:47.000000000
+0100
-@@ -18,7 +18,7 @@
-
- # Note: this test is duplicated in "builds/toplevel.mk".
- #
-- is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init)
$(wildcard /hurd/auth))
-+ is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init)
$(wildcard /hurd/auth) $(wildcard /sbin/launchd))
- ifneq ($(is_unix),)
-
- PLATFORM := unix
+Only in freetype-2.1.4/src/base: ftobjs.c~
Index: freetype2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/freetype2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freetype2.info 27 Jan 2005 07:56:55 -0000 1.3
+++ freetype2.info 26 May 2005 17:46:27 -0000 1.4
@@ -1,12 +1,12 @@
Package: freetype2
-Version: 2.1.3
-Revision: 22
-Depends: %N-shlibs (= %v-%r)
+Version: 2.1.4
+Revision: 11
+# Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2-hinting
Replaces: freetype2-hinting
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.gz
-Source-MD5: 60d2e54385aead468c102e7250eab055
+Source-MD5: dd40b965b06d66749e53df9299633886
Patch: %n.patch
PatchScript: mv install install.sh
CompileScript: <<
@@ -15,19 +15,26 @@
make
<<
InstallScript: <<
+#!/bin/sh -e
+
make install prefix=%i
install -d -m 755 %i/lib/freetype2/lib
mv %i/bin %i/lib/freetype2
mv %i/lib/libfreetype.a %i/lib/freetype2/lib
mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
- mv %i/lib/libfreetype.la %i/lib/freetype2/lib
+ perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la >
%i/lib/freetype2/lib/libfreetype.la
+ rm -rf %i/lib/libfreetype.la
mv %i/include %i/lib/freetype2
rm -rf %i/share/aclocal
+ for file in %i/lib/libfreetype*.dylib; do
+ REALFILE=`echo "$file" | sed -e 's,^%d,,'`
+ ln -sf "$REALFILE" %i/lib/freetype2/lib/
+ done
<<
SplitOff: <<
Package: %N-shlibs
- Replaces: freetype2-hinting-shlibs, freetype2 (<< 2.0.8-2)
+ Replaces: freetype2-hinting-shlibs, freetype2 (<< 2.0.8-2)
Conflicts: freetype2-hinting-shlibs
Files: lib/libfreetype.6*dylib
Shlibs: %p/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.0.9-1)
@@ -35,7 +42,7 @@
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
- Description: TrueType font rendering library, version 2, shared libs
+ Description: TrueType font rendering library, shared libs
<<
SplitOff2: <<
Package: %N-dev
@@ -47,25 +54,24 @@
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
- Description: TrueType font rendering library, version 2, headers
+ Description: TrueType font rendering library, headers
<<
DocFiles: <<
README docs/* src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
-Description: TrueType font rendering library, version 2 (dummy)
+Description: TrueType font rendering library, (dummy)
DescDetail: <<
FreeType 2 is a library that provides access to and rendering of a
wide range of font file formats, including TrueType, PostScript Type 1,
and several bitmap font formats.
-
-The freetype2 package now exists only for compatibility with older Fink
-packages. Developers should use the freetype that is part of XFree86
-for new packages.
-
-For packages that need freetype2 version 2.1.3 or newer, there is now
-a freetype2-dev splitoff. For this to work, you need to make sure that
-configure finds the freetype-config script in %p/lib/freetype2/bin
+<<
+DescUsage: <<
+Packages that need freetype2 versions between 2.1.3 and 2.1.6,
+should builddepend on freetype2-dev and depend on freetype2-shlibs
+and make sure that configure finds the freetype-config script in
+%p/lib/freetype2/bin. The headers and libraries needed at build
+time are in %p/lib/freetype2/{include,lib}.
<<
DescPort: <<
Previous versions by Christoph Pfisterer
@@ -73,3 +79,4 @@
License: OSI-Approved
Homepage: http://www.freetype.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
+
--- freetype2-hinting.patch DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
