From e9fca56afc13fc5b9c47772e6335daaeef0a93436167ea43e980d334774c2717 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 29 Jul 2009 15:22:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=14 --- bnc441638-bc-enabling-fix-from-cvs.patch | 22 ---------------------- freetype-2.3.7.tar.bz2 | 3 --- freetype-2.3.9.tar.bz2 | 3 +++ freetype-doc-2.3.7.tar.bz2 | 3 --- freetype-doc-2.3.9.tar.bz2 | 3 +++ freetype2.changes | 13 +++++++++++++ freetype2.spec | 12 +++++------- ft2demos-2.3.7.tar.bz2 | 3 --- ft2demos-2.3.9.tar.bz2 | 3 +++ ft2demos.changes | 13 +++++++++++++ ft2demos.spec | 10 +++++----- uninitialized-variable.patch | 12 ------------ 12 files changed, 45 insertions(+), 55 deletions(-) delete mode 100644 bnc441638-bc-enabling-fix-from-cvs.patch delete mode 100644 freetype-2.3.7.tar.bz2 create mode 100644 freetype-2.3.9.tar.bz2 delete mode 100644 freetype-doc-2.3.7.tar.bz2 create mode 100644 freetype-doc-2.3.9.tar.bz2 delete mode 100644 ft2demos-2.3.7.tar.bz2 create mode 100644 ft2demos-2.3.9.tar.bz2 delete mode 100644 uninitialized-variable.patch diff --git a/bnc441638-bc-enabling-fix-from-cvs.patch b/bnc441638-bc-enabling-fix-from-cvs.patch deleted file mode 100644 index f42d404..0000000 --- a/bnc441638-bc-enabling-fix-from-cvs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru freetype-2.3.7.orig//devel/ftoption.h freetype-2.3.7/devel/ftoption.h ---- freetype-2.3.7.orig//devel/ftoption.h 2008-02-16 06:53:26.000000000 +0100 -+++ freetype-2.3.7/devel/ftoption.h 2008-11-05 17:24:46.000000000 +0100 -@@ -659,6 +659,7 @@ - */ - #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER - #define TT_USE_BYTECODE_INTERPRETER -+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING - #elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING - #define TT_USE_BYTECODE_INTERPRETER - #endif -diff -ru freetype-2.3.7.orig//include/freetype/config/ftoption.h freetype-2.3.7/include/freetype/config/ftoption.h ---- freetype-2.3.7.orig//include/freetype/config/ftoption.h 2008-02-16 06:53:25.000000000 +0100 -+++ freetype-2.3.7/include/freetype/config/ftoption.h 2008-11-05 17:24:09.000000000 +0100 -@@ -658,6 +658,7 @@ - */ - #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER - #define TT_USE_BYTECODE_INTERPRETER -+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING - #elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING - #define TT_USE_BYTECODE_INTERPRETER - #endif diff --git a/freetype-2.3.7.tar.bz2 b/freetype-2.3.7.tar.bz2 deleted file mode 100644 index 1474101..0000000 --- a/freetype-2.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ecf879eb69fc323669981f02aebff1e3045de415303e86ee67f2080cb3ee888 -size 1310542 diff --git a/freetype-2.3.9.tar.bz2 b/freetype-2.3.9.tar.bz2 new file mode 100644 index 0000000..0715d3e --- /dev/null +++ b/freetype-2.3.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6 +size 1363190 diff --git a/freetype-doc-2.3.7.tar.bz2 b/freetype-doc-2.3.7.tar.bz2 deleted file mode 100644 index 09f5810..0000000 --- a/freetype-doc-2.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d57e0b35ecc37828b6326580cb944fa1408b97d16dbbd26d344c48e47222d20 -size 98646 diff --git a/freetype-doc-2.3.9.tar.bz2 b/freetype-doc-2.3.9.tar.bz2 new file mode 100644 index 0000000..d6bb0ba --- /dev/null +++ b/freetype-doc-2.3.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a06ba5e13c0087cddd1bf0aa7f3622e65389afe3f3beebcd6c76d42b01f8497 +size 102532 diff --git a/freetype2.changes b/freetype2.changes index 4040ad9..56a3c21 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 27 15:01:04 CEST 2009 - tiwai@suse.de + +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=653641 +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=667610 +- fix builds with older distros + ------------------------------------------------------------------- Tue Jul 7 10:28:53 CEST 2009 - meissner@novell.com diff --git a/freetype2.spec b/freetype2.spec index 6d269bd..c1e407c 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -1,5 +1,5 @@ # -# spec file for package freetype2 (Version 2.3.7) +# spec file for package freetype2 (Version 2.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ AutoReqProv: on Obsoletes: freetype2-64bit %endif # -Version: 2.3.7 -Release: 27 +Version: 2.3.9 +Release: 1 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -45,9 +45,7 @@ Patch4: ft2-stream-compat.diff Patch5: revert-fix-bytecode.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch Patch9: fix-build.patch -Patch10: uninitialized-variable.patch Patch308961: bugzilla-308961-cmex-workaround.patch -Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch Patch11: bnc485889-overflow1.patch Patch12: bnc485889-overflow2.patch Patch13: bnc485889-overflow3.patch @@ -111,9 +109,7 @@ Authors: #%patch5 -p 1 #%patch8 -p 1 %patch9 -p 1 -%patch10 -p 1 %patch308961 -p 1 -%patch441638 -p 1 %patch11 -p 1 %patch12 -p 1 %patch13 -p 1 @@ -132,7 +128,9 @@ find . -name ".cvsignore" | xargs rm -f cp /usr/share/automake*/config.{guess,sub} builds/unix %build +%if %suse_version > 1110 sh ./autogen.sh +%endif export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing " ln -s /usr/bin/libtool ./builds/unix/libtool make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib" diff --git a/ft2demos-2.3.7.tar.bz2 b/ft2demos-2.3.7.tar.bz2 deleted file mode 100644 index 606d2bc..0000000 --- a/ft2demos-2.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:944f0d24df4706c8a077c5d184a42822aaa0a2fbb8b67abe7c0d6920317cd499 -size 158328 diff --git a/ft2demos-2.3.9.tar.bz2 b/ft2demos-2.3.9.tar.bz2 new file mode 100644 index 0000000..7851a31 --- /dev/null +++ b/ft2demos-2.3.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c82dcbdb6581c1b5ab01c166fde238d86c55e457c0bd533f2166b7038639b734 +size 159111 diff --git a/ft2demos.changes b/ft2demos.changes index 8985827..fefe2e6 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 27 15:05:32 CEST 2009 - tiwai@suse.de + +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=653641 +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=667610 +- fix builds with older distros + ------------------------------------------------------------------- Thu Apr 16 17:55:50 CEST 2009 - nadvornik@suse.cz diff --git a/ft2demos.spec b/ft2demos.spec index 9e0b121..4483ad3 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -1,5 +1,5 @@ # -# spec file for package ft2demos (Version 2.3.7) +# spec file for package ft2demos (Version 2.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ AutoReqProv: on %if %suse_version > 1000 Supplements: fonts-config %endif -Version: 2.3.7 -Release: 34 +Version: 2.3.9 +Release: 1 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -47,7 +47,6 @@ Patch5: revert-fix-bytecode.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch -Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch Patch11: bnc485889-overflow1.patch Patch12: bnc485889-overflow2.patch Patch13: bnc485889-overflow3.patch @@ -87,7 +86,6 @@ Authors: #%patch8 -p 1 %patch9 -p 1 %patch308961 -p 1 -%patch441638 -p 1 %patch11 -p 1 %patch12 -p 1 %patch13 -p 1 @@ -112,7 +110,9 @@ find . -name ".cvsignore" | xargs rm -f cp /usr/share/automake*/config.{guess,sub} builds/unix %build +%if %suse_version > 1110 sh ./autogen.sh +%endif export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing " ln -s /usr/bin/libtool ./builds/unix/libtool make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib" diff --git a/uninitialized-variable.patch b/uninitialized-variable.patch deleted file mode 100644 index b9dee0e..0000000 --- a/uninitialized-variable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru freetype-2.3.7.orig//src/base/ftobjs.c freetype-2.3.7/src/base/ftobjs.c ---- freetype-2.3.7.orig//src/base/ftobjs.c 2008-06-10 06:57:53.000000000 +0200 -+++ freetype-2.3.7/src/base/ftobjs.c 2008-08-18 16:16:38.000000000 +0200 -@@ -1713,7 +1713,7 @@ - FT_Error error; - FT_Driver driver; - FT_Memory memory; -- FT_Stream stream; -+ FT_Stream stream = NULL; - FT_Face face = 0; - FT_ListNode node = 0; - FT_Bool external_stream;