Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052
Modified Files:
freetype2-hinting.info freetype2.info freetype2.patch
Added Files:
freetype219-hinting.info freetype219.info freetype219.patch
Removed Files:
freetype2-hinting.patch
Log Message:
New peaceful coexistence between freetype versions 2.1.4 and 2.1.9
(fingers crossed)
Index: freetype2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/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:06 -0000 1.3
+++ freetype2.patch 28 Feb 2005 14:49:53 -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/unstable/main/finkinfo/graphics/freetype2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freetype2.info 28 Jan 2005 14:54:56 -0000 1.4
+++ freetype2.info 28 Feb 2005 14:49:53 -0000 1.5
@@ -1,12 +1,12 @@
Package: freetype2
-Version: 2.1.3
-Revision: 23
-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: <<
@@ -34,7 +34,7 @@
<<
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)
@@ -42,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
@@ -54,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
@@ -80,3 +79,4 @@
License: OSI-Approved
Homepage: http://www.freetype.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
+
--- freetype2-hinting.patch DELETED ---
--- NEW FILE: freetype219-hinting.info ---
Package: freetype219-hinting
Version: 2.1.9
Revision: 1
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype219
Replaces: freetype219
Provides: freetype219
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
Source-MD5: ec1b903e4be5f073caa72458ea58c29c
Patch: freetype219.patch
PatchScript: perl -i -pe 's/.*(#define.*BYTECODE_INTERPRETER).*/\1/'
include/freetype/config/ftoption.h
CompileScript: <<
make setup CFG="--prefix=%p/lib/freetype219"
perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/'
builds/unix/libtool
make
<<
InstallScript: <<
#!/bin/sh -e
make install prefix=%i/lib/freetype219
perl -pi -e 's,(dep.*%p/lib),$1/freetype219/lib,g'
%i/lib/freetype219/lib/libfreetype.la
rm -rf %i/lib/freetype219/share
install -d -m 755 %i/share/doc/%N
cp -pR docs/* %i/share/doc/%N/
<<
SplitOff: <<
Package: %N-shlibs
Replaces: freetype219-shlibs, freetype2 (<< 2.0.8-2)
Conflicts: freetype219-shlibs
Provides: freetype219-shlibs
Files: lib/freetype219/lib/libfreetype.6*dylib
Shlibs: %p/lib/freetype219/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.1.9-1)
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, shared libs
<<
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, headers
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.
<<
DescUsage: <<
Packages that need freetype2 versions 2.1.8 or 2.1.9,
should builddepend on freetype219 and depend on freetype219-shlibs
and make sure that configure finds the freetype-config script in
%p/lib/freetype219/bin. The headers and libraries needed at build
time are in %p/lib/freetype219/{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]>
--- NEW FILE: freetype219.patch ---
diff -uNr freetype-2.1.9/builds/unix/detect.mk
freetype-2.1.9-new/builds/unix/detect.mk
--- freetype-2.1.9/builds/unix/detect.mk Tue Apr 13 04:35:05 2004
+++ freetype-2.1.9-new/builds/unix/detect.mk Thu Feb 24 17:02:56 2005
@@ -20,7 +20,8 @@
#
is_unix := $(strip $(wildcard /sbin/init) \
$(wildcard /usr/sbin/init) \
- $(wildcard /hurd/auth))
+ $(wildcard /hurd/auth) \
+ $(wildcard /sbin/launchd))
ifneq ($(is_unix),)
PLATFORM := unix
diff -uNr freetype-2.1.9/src/base/ftapi.c freetype-2.1.9-new/src/base/ftapi.c
--- freetype-2.1.9/src/base/ftapi.c Sat Mar 30 08:16:33 2002
+++ freetype-2.1.9-new/src/base/ftapi.c Thu Feb 24 16:57:09 2005
@@ -118,4 +118,18 @@
}
+ FT_BASE_DEF( FT_Short )
+ FT_Get_Short( FT_Stream stream )
+ {
+ return FT_GET_SHORT();
+ }
+
+
+ FT_BASE_DEF( FT_Long )
+ FT_Get_Long( FT_Stream stream )
+ {
+ return FT_GET_LONG();
+ }
+
+
/* END */
diff -uNr freetype-2.1.9/src/base/ftbase.c freetype-2.1.9-new/src/base/ftbase.c
--- freetype-2.1.9/src/base/ftbase.c Wed Feb 25 07:58:54 2004
+++ freetype-2.1.9-new/src/base/ftbase.c Thu Feb 24 16:57:09 2005
@@ -29,6 +29,7 @@
#include "ftgloadr.c"
#include "ftobjs.c"
#include "ftnames.c"
+#include "ftapi.c"
#include "ftrfork.c"
#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
diff -uNr freetype-2.1.9/src/base/ftobjs.c freetype-2.1.9-new/src/base/ftobjs.c
--- freetype-2.1.9/src/base/ftobjs.c Mon Jun 21 17:16:56 2004
+++ freetype-2.1.9-new/src/base/ftobjs.c Thu Feb 24 17:01:59 2005
@@ -947,7 +947,7 @@
/* there's a Mac-specific extended implementation of FT_New_Face() */
/* in src/base/ftmac.c */
-#ifndef FT_MACINTOSH
+/* #ifndef FT_MACINTOSH */
/* documentation is in freetype.h */
@@ -970,7 +970,7 @@
return FT_Open_Face( library, &args, face_index, aface );
}
-#endif /* !FT_MACINTOSH */
+/* #endif */ /* !FT_MACINTOSH */
/* documentation is in freetype.h */
diff -uNr freetype-2.1.9/src/truetype/ttinterp.c
freetype-2.1.9-new/src/truetype/ttinterp.c
--- freetype-2.1.9/src/truetype/ttinterp.c Fri Mar 5 04:26:22 2004
+++ freetype-2.1.9-new/src/truetype/ttinterp.c Thu Feb 24 16:57:19 2005
@@ -2474,7 +2474,7 @@
W = Vx * Vx + Vy * Vy;
/* Now, we want that Sqrt( W ) = 0x4000 */
- /* Or 0x1000000 <= W < 0x1004000 */
+ /* Or 0x10000000 <= W < 0x10004000 */
if ( Vx < 0 )
{
@@ -2492,7 +2492,7 @@
else
S2 = FALSE;
- while ( W < 0x1000000L )
+ while ( W < 0x10000000L )
{
/* We need to increase W by a minimal amount */
if ( Vx < Vy )
@@ -2503,7 +2503,7 @@
W = Vx * Vx + Vy * Vy;
}
- while ( W >= 0x1004000L )
+ while ( W >= 0x10004000L )
{
/* We need to decrease W by a minimal amount */
if ( Vx < Vy )
--- freetype-2.1.9/include/freetype/freetype.h Sat Jun 19 16:50:08 2004
+++ freetype-2.1.9-new/include/freetype/freetype.h Thu Feb 24 17:06:43 2005
@@ -17,11 +17,7 @@
#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error " #include <ft2build.h>"
-#error " #include FT_FREETYPE_H"
+#include <ft2build.h>
#endif
--- NEW FILE: freetype219.info ---
Package: freetype219
Version: 2.1.9
Revision: 1
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype219-hinting
Replaces: freetype219-hinting
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
Source-MD5: ec1b903e4be5f073caa72458ea58c29c
Patch: %n.patch
CompileScript: <<
make setup CFG="--prefix=%p/lib/%N"
perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/'
builds/unix/libtool
make
<<
InstallScript: <<
#!/bin/sh -e
make install prefix=%i/lib/%N
perl -pi -e 's,(dep.*%p/lib),$1/%N/lib,g' %i/lib/%N/lib/libfreetype.la
rm -rf %i/lib/%N/share
install -d -m 755 %i/share/doc/%N
cp -pR docs/* %i/share/doc/%N/
<<
SplitOff: <<
Package: %N-shlibs
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 10.0.0 %n (>= 2.1.9-1)
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, shared libs
<<
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, headers
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.
<<
DescUsage: <<
Packages that need freetype2 versions 2.1.8 or 2.1.9,
should builddepend on freetype219 and depend on freetype219-shlibs
and make sure that configure finds the freetype-config script in
%p/lib/freetype219/bin. The headers and libraries needed at build
time are in %p/lib/freetype219/{include,lib}.
<<
DescPort: <<
Previous versions by Christoph Pfisterer
<<
License: OSI-Approved
Homepage: http://www.freetype.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Index: freetype2-hinting.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/freetype2-hinting.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freetype2-hinting.info 28 Jan 2005 14:54:56 -0000 1.6
+++ freetype2-hinting.info 28 Feb 2005 14:49:53 -0000 1.7
@@ -1,15 +1,18 @@
Package: freetype2-hinting
-Version: 2.1.3
-Revision: 23
-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
@@ -44,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
@@ -57,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]>
+
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
