OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-May-2006 10:27:57
Branch: HEAD Handle: 2006051409275600
Modified files:
openpkg-src/freetype freetype.patch freetype.spec
Log:
upgrading package: freetype 2.1.10 -> 2.2.1
Summary:
Revision Changes Path
1.7 +33 -73 openpkg-src/freetype/freetype.patch
1.58 +3 -3 openpkg-src/freetype/freetype.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 freetype.patch
--- openpkg-src/freetype/freetype.patch 15 Dec 2005 10:00:12 -0000
1.6
+++ openpkg-src/freetype/freetype.patch 14 May 2006 08:27:56 -0000
1.7
@@ -1,6 +1,6 @@
Index: builds/unix/freetype-config.in
--- builds/unix/freetype-config.in.orig 2005-06-04 23:58:48 +0200
-+++ builds/unix/freetype-config.in 2005-07-25 19:50:08 +0200
++++ builds/unix/freetype-config.in 2006-05-14 09:58:42 +0200
@@ -128,7 +128,7 @@
fi
@@ -11,87 +11,77 @@
echo $cflags -I$includedir
else
Index: builds/unix/freetype2.in
---- builds/unix/freetype2.in.orig 2003-06-01 23:30:03 +0200
-+++ builds/unix/freetype2.in 2005-07-25 19:50:08 +0200
+--- builds/unix/freetype2.in.orig 2005-08-26 07:49:21 +0200
++++ builds/unix/freetype2.in 2006-05-14 10:21:15 +0200
@@ -8,4 +8,4 @@
Version: @ft_version@
Requires:
Libs: -L${libdir} -lfreetype @LIBZ@
--Cflags: -I${includedir}/freetype2
+-Cflags: -I${includedir}/freetype2 -I${includedir}
+Cflags: -I${includedir}
Index: builds/unix/install.mk
---- builds/unix/install.mk.orig 2004-12-06 09:42:41 +0100
-+++ builds/unix/install.mk 2005-07-25 19:51:06 +0200
-@@ -26,33 +26,33 @@
+--- builds/unix/install.mk.orig 2006-04-01 07:16:40 +0200
++++ builds/unix/install.mk 2006-05-14 10:22:05 +0200
+@@ -30,30 +30,30 @@
install: $(PROJECT_LIBRARY)
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
- $(DESTDIR)$(libdir)/pkgconfig
\
-- $(DESTDIR)$(includedir)/freetype2/freetype/config
\
--
$(DESTDIR)$(includedir)/freetype2/freetype/internal \
-- $(DESTDIR)$(includedir)/freetype2/freetype/cache
\
-+ $(DESTDIR)$(includedir)/freetype/config \
-+ $(DESTDIR)$(includedir)/freetype/internal \
-+ $(DESTDIR)$(includedir)/freetype/cache \
- $(DESTDIR)$(bindir)
\
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(DESTDIR)$(libdir)/pkgconfig \
+- $(DESTDIR)$(includedir)/freetype2/freetype/config \
+- $(DESTDIR)$(includedir)/freetype2/freetype/cache \
++ $(DESTDIR)$(includedir)/freetype/config \
++ $(DESTDIR)$(includedir)/freetype/cache \
+ $(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal
- $(LIBTOOL) --mode=install $(INSTALL) \
+ $(LIBTOOL) --mode=install $(INSTALL) \
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) \
- $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
+ $$P $(DESTDIR)$(includedir)/freetype ; \
done
- -for P in $(BASE_H) ; do \
- $(INSTALL_DATA) \
-- $$P $(DESTDIR)$(includedir)/freetype2/freetype/internal ; \
-+ $$P $(DESTDIR)$(includedir)/freetype/internal ; \
- done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
+ $$P $(DESTDIR)$(includedir)/freetype/config ; \
done
- -for P in $(CACHE_H) ; do \
- $(INSTALL_DATA) \
-- $$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
-+ $$P $(DESTDIR)$(includedir)/freetype/cache ; \
- done
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/cache/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/cache
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/internal/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/internal
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
$(DESTDIR)$(includedir)/ft2build.h
- $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
+ $(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
- $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
+ $(DESTDIR)$(includedir)/freetype/config/ftconfig.h
+ $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
+- $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
++ $(DESTDIR)$(includedir)/freetype/config/ftmodule.h
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
$(DESTDIR)$(bindir)/freetype-config
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
-@@ -63,15 +63,15 @@
+@@ -64,11 +64,10 @@
uninstall:
-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
-- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
-- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/cache/*
-+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/cache
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/config/*
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/config
-+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/internal/*
-+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/internal
+ -$(DELETE) $(DESTDIR)$(includedir)/freetype/*
+ -$(DELDIR) $(DESTDIR)$(includedir)/freetype
-+ -$(DELDIR) $(DESTDIR)$(includedir)
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
Index: include/freetype/freetype.h
---- include/freetype/freetype.h.orig 2005-06-06 08:18:32 +0200
-+++ include/freetype/freetype.h 2005-07-25 19:50:08 +0200
+--- include/freetype/freetype.h.orig 2006-05-12 15:52:24 +0200
++++ include/freetype/freetype.h 2006-05-14 10:22:27 +0200
@@ -16,15 +16,6 @@
/***************************************************************************/
@@ -105,36 +95,6 @@
-#endif
-
-
- #ifndef __FREETYPE_H__
- #define __FREETYPE_H__
-
-Index: src/base/ftsynth.c
---- src/base/ftsynth.c.orig Tue Dec 13 00:44:56 2005
-+++ src/base/ftsynth.c Tue Dec 13 00:45:05 2005
-@@ -123,7 +123,6 @@
- if ( !error )
- {
- slot->advance.x += xstr;
-- slot->advance.y += ystr;
-
- slot->metrics.width += xstr;
- slot->metrics.height += ystr;
-Index: src/sfnt/sfdriver.c.orig
---- src/sfnt/sfdriver.c.orig Wed Aug 3 18:46:34 2005
-+++ src/sfnt/sfdriver.c Wed Aug 3 18:47:24 2005
-@@ -367,8 +367,13 @@
- /* see `ttsbit.h' and `sfnt.h' */
- tt_face_set_sbit_strike,
- tt_face_load_sbit_strikes,
-- 0 /* tt_find_sbit_image */,
-- 0 /* tt_load_sbit_metrics */,
-+#ifdef FT_OPTIMIZE_MEMORY
-+ 0,
-+ 0,
-+#else
-+ tt_find_sbit_image,
-+ tt_load_sbit_metrics,
-+#endif
- tt_face_load_sbit_image,
- tt_face_free_sbit_strikes,
-
+
/*************************************************************************/
+ /*
*/
+ /* The `raster' component duplicates some of the declarations in
*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 freetype.spec
--- openpkg-src/freetype/freetype.spec 1 Jan 2006 13:13:41 -0000
1.57
+++ openpkg-src/freetype/freetype.spec 14 May 2006 08:27:56 -0000
1.58
@@ -32,11 +32,11 @@
Class: BASE
Group: Graphics
License: GPL
-Version: 2.1.10
-Release: 20051215
+Version: 2.2.1
+Release: 20060514
# list of sources
-Source0:
http://savannah.nongnu.org/download/freetype/freetype-%{version}.tar.gz
+Source0:
http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.gz
Patch0: freetype.patch
# build information
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
