OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Apr-2004 09:15:23
Branch: HEAD Handle: 2004042208152300
Modified files:
openpkg-src/freetype freetype.patch freetype.spec
Log:
upgrading package: freetype 2.1.7 -> 2.1.8
Summary:
Revision Changes Path
1.4 +12 -33 openpkg-src/freetype/freetype.patch
1.43 +2 -2 openpkg-src/freetype/freetype.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 freetype.patch
--- openpkg-src/freetype/freetype.patch 18 Apr 2004 10:29:51 -0000 1.3
+++ openpkg-src/freetype/freetype.patch 22 Apr 2004 07:15:23 -0000 1.4
@@ -1,18 +1,18 @@
Index: builds/unix/freetype-config.in
---- builds/unix/freetype-config.in.orig 2003-04-24 07:45:59.000000000 +0200
-+++ builds/unix/freetype-config.in 2003-11-10 09:15:43.000000000 +0100
-@@ -79,7 +79,7 @@
+--- builds/unix/freetype-config.in.orig 2004-04-17 20:58:43.000000000 +0200
++++ builds/unix/freetype-config.in 2004-04-22 09:10:11.000000000 +0200
+@@ -105,7 +105,7 @@
fi
if test "$echo_cflags" = "yes" ; then
-- cflags="[EMAIL PROTECTED]@/freetype2"
-+ cflags="[EMAIL PROTECTED]@"
- if test "@includedir@" != "/usr/include" ; then
- echo $cflags [EMAIL PROTECTED]@
- else
+- cflags="-I$includedir/freetype2"
++ cflags="-I$includedir"
+ if test "$includedir" != "/usr/include" ; then
+ echo $cflags -I$includedir
+ else
Index: builds/unix/freetype2.in
--- builds/unix/freetype2.in.orig 2003-06-01 23:30:03.000000000 +0200
-+++ builds/unix/freetype2.in 2003-11-10 09:15:43.000000000 +0100
++++ builds/unix/freetype2.in 2004-04-22 09:04:34.000000000 +0200
@@ -8,4 +8,4 @@
Version: @ft_version@
Requires:
@@ -21,7 +21,7 @@
+Cflags: -I${includedir}
Index: builds/unix/install.mk
--- builds/unix/install.mk.orig 2003-11-09 09:37:13.000000000 +0100
-+++ builds/unix/install.mk 2003-11-10 09:16:36.000000000 +0100
++++ builds/unix/install.mk 2004-04-22 09:04:34.000000000 +0200
@@ -26,33 +26,33 @@
install: $(PROJECT_LIBRARY)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
@@ -90,8 +90,8 @@
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
Index: include/freetype/freetype.h
---- include/freetype/freetype.h.orig 2003-11-09 09:38:13.000000000 +0100
-+++ include/freetype/freetype.h 2003-11-10 09:15:43.000000000 +0100
+--- include/freetype/freetype.h.orig 2004-04-13 23:08:17.000000000 +0200
++++ include/freetype/freetype.h 2004-04-22 09:04:34.000000000 +0200
@@ -16,15 +16,6 @@
/***************************************************************************/
@@ -108,24 +108,3 @@
#ifndef __FREETYPE_H__
#define __FREETYPE_H__
-------------------------------------------------------------------------------
-
-Check for the "eexec" keyword in Type1 fonts.
-This fixes a potential hang when viewing certain PDF documents.
-See http://bugzilla.gnome.org/show_bug.cgi?id=129400 for details.
-
-Index: src/type1/t1load.c
---- src/type1/t1load.c 2003/12/12 15:38:39 1.88
-+++ src/type1/t1load.c 2003/12/22 11:35:36 1.89
-@@ -1527,6 +1527,11 @@
- parser->root.cursor = cur2;
- }
-
-+ /* look for `eexec' */
-+ else if ( *cur == 'e' && cur + 5 < limit &&
-+ ft_strncmp( (char*)cur, "eexec", 5 ) == 0 )
-+ break;
-+
- /* look for `closefile' which ends the eexec section */
- else if ( *cur == 'c' && cur + 9 < limit &&
- ft_strncmp( (char*)cur, "closefile", 9 ) == 0 )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 freetype.spec
--- openpkg-src/freetype/freetype.spec 18 Apr 2004 10:29:51 -0000 1.42
+++ openpkg-src/freetype/freetype.spec 22 Apr 2004 07:15:23 -0000 1.43
@@ -33,8 +33,8 @@
Class: BASE
Group: Graphics
License: GPL
-Version: 2.1.7
-Release: 20040418
+Version: 2.1.8
+Release: 20040422
# list of sources
Source0: ftp://ftp.freetype.org/freetype/freetype2/freetype-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
