From e488dfe685b3bc24b8393136c29291d2c8da20100c59e005303312a2e5c8135f Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 20 Dec 2012 16:06:24 +0000 Subject: [PATCH] Accepting request 146151 from home:namtrac:branches:M17N MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to version 2.4.11 * Some vulnerabilities in the BDF implementation have been fixed. * Support for OpenType collections (OTC) has been added. * Pure CFF fonts within an SFNT wrapper are now supported. * Minor rendering improvements to the auto-hinter. * `FT_GlyphSlot_Oblique' now uses a shear angle of 12°. - Modify freetype2-subpixel.patch for new subpixel hinting option. - Drop fix-build.patch: no longer needed - Update to version 2.4.11 * ftdiff now supports UTF-8 encoded input files for option `-f'. * Using keys `r' and `R', you can now adjust the stroker radius in ftview. OBS-URL: https://build.opensuse.org/request/show/146151 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=70 --- fix-build.patch | 31 ------------------------------- freetype-2.4.10.tar.bz2 | 3 --- freetype-2.4.11.tar.bz2 | 3 +++ freetype-doc-2.4.10.tar.bz2 | 3 --- freetype-doc-2.4.11.tar.bz2 | 3 +++ freetype2-subpixel.patch | 17 +++++++++++++---- freetype2.changes | 12 ++++++++++++ freetype2.spec | 4 +--- ft2demos-2.4.10.tar.bz2 | 3 --- ft2demos-2.4.11.tar.bz2 | 3 +++ ft2demos.changes | 8 ++++++++ ft2demos.spec | 4 +--- 12 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 fix-build.patch delete mode 100644 freetype-2.4.10.tar.bz2 create mode 100644 freetype-2.4.11.tar.bz2 delete mode 100644 freetype-doc-2.4.10.tar.bz2 create mode 100644 freetype-doc-2.4.11.tar.bz2 delete mode 100644 ft2demos-2.4.10.tar.bz2 create mode 100644 ft2demos-2.4.11.tar.bz2 diff --git a/fix-build.patch b/fix-build.patch deleted file mode 100644 index fa96541..0000000 --- a/fix-build.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- - autogen.sh | 2 +- - builds/unix/configure.raw | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: freetype-2.4.2/autogen.sh -=================================================================== ---- freetype-2.4.2.orig/autogen.sh -+++ freetype-2.4.2/autogen.sh -@@ -150,7 +150,7 @@ sed -e "s;@VERSION@;$freetype_major$free - < configure.raw > configure.ac - - run aclocal -I . --force --run $LIBTOOLIZE --force --copy --install -+run $LIBTOOLIZE --force --copy - run autoconf --force - - chmod +x mkinstalldirs -Index: freetype-2.4.2/builds/unix/configure.raw -=================================================================== ---- freetype-2.4.2.orig/builds/unix/configure.raw -+++ freetype-2.4.2/builds/unix/configure.raw -@@ -650,7 +650,7 @@ AC_SUBST([FT2_EXTRA_LIBS]) - AC_SUBST([SYSTEM_ZLIB]) - - --LT_INIT(win32-dll) -+#LT_INIT(win32-dll) - - AC_SUBST([hardcode_libdir_flag_spec]) - AC_SUBST([wl]) diff --git a/freetype-2.4.10.tar.bz2 b/freetype-2.4.10.tar.bz2 deleted file mode 100644 index 3212c79..0000000 --- a/freetype-2.4.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f -size 1508927 diff --git a/freetype-2.4.11.tar.bz2 b/freetype-2.4.11.tar.bz2 new file mode 100644 index 0000000..03091af --- /dev/null +++ b/freetype-2.4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f +size 1546087 diff --git a/freetype-doc-2.4.10.tar.bz2 b/freetype-doc-2.4.10.tar.bz2 deleted file mode 100644 index 44ebedb..0000000 --- a/freetype-doc-2.4.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8 -size 106697 diff --git a/freetype-doc-2.4.11.tar.bz2 b/freetype-doc-2.4.11.tar.bz2 new file mode 100644 index 0000000..a7eee42 --- /dev/null +++ b/freetype-doc-2.4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e80082d8594300d2cc1f1c315179006012fa4ded7acb4b6a1f7b43b5b19dcb51 +size 106643 diff --git a/freetype2-subpixel.patch b/freetype2-subpixel.patch index a72f21b..49bdd65 100644 --- a/freetype2-subpixel.patch +++ b/freetype2-subpixel.patch @@ -1,8 +1,8 @@ -Index: freetype-2.4.3/include/freetype/config/ftoption.h +Index: freetype-2.4.11/include/freetype/config/ftoption.h =================================================================== ---- freetype-2.4.3.orig/include/freetype/config/ftoption.h 2010-07-05 06:38:55.000000000 +0200 -+++ freetype-2.4.3/include/freetype/config/ftoption.h 2010-10-29 16:15:59.582654748 +0200 -@@ -93,7 +93,7 @@ FT_BEGIN_HEADER +--- freetype-2.4.11.orig/include/freetype/config/ftoption.h ++++ freetype-2.4.11/include/freetype/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ @@ -10,4 +10,13 @@ Index: freetype-2.4.3/include/freetype/config/ftoption.h +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + /*************************************************************************/ +@@ -577,7 +577,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + /*************************************************************************/ diff --git a/freetype2.changes b/freetype2.changes index 3754d5c..6d7470d 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Dec 20 13:56:36 UTC 2012 - idonmez@suse.com + +- Update to version 2.4.11 + * Some vulnerabilities in the BDF implementation have been fixed. + * Support for OpenType collections (OTC) has been added. + * Pure CFF fonts within an SFNT wrapper are now supported. + * Minor rendering improvements to the auto-hinter. + * `FT_GlyphSlot_Oblique' now uses a shear angle of 12°. +- Modify freetype2-subpixel.patch for new subpixel hinting option. +- Drop fix-build.patch: no longer needed + ------------------------------------------------------------------- Sun Jun 17 10:34:24 UTC 2012 - idonmez@suse.com diff --git a/freetype2.spec b/freetype2.spec index af8d6a2..d2dd83e 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -25,7 +25,7 @@ BuildRequires: zlib-devel Obsoletes: freetype2-64bit %endif # -Version: 2.4.10 +Version: 2.4.11 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -35,7 +35,6 @@ Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{ve Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2 Source3: baselibs.conf Patch3: freetype2-bitmap-foundry.patch -Patch9: fix-build.patch Patch10: freetype2-no_rpath.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch @@ -80,7 +79,6 @@ It also contains a small tutorial for using that library. %define enable_subpixel_rendering 0 %setup -q -n freetype-%{version} -a 1 %patch3 -p 1 -b .bitmap-foundry -%patch9 -p 1 %patch10 %patch308961 -p 1 %if %{enable_subpixel_rendering} diff --git a/ft2demos-2.4.10.tar.bz2 b/ft2demos-2.4.10.tar.bz2 deleted file mode 100644 index 9edd705..0000000 --- a/ft2demos-2.4.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fb7e97f35c0f59ecd967577a3e77fbcca10d84c00129a74e5da45bf3625cc45 -size 163949 diff --git a/ft2demos-2.4.11.tar.bz2 b/ft2demos-2.4.11.tar.bz2 new file mode 100644 index 0000000..67ea459 --- /dev/null +++ b/ft2demos-2.4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075 +size 164608 diff --git a/ft2demos.changes b/ft2demos.changes index 1234cfd..b75b4ea 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 20 13:57:51 UTC 2012 - idonmez@suse.com + +- Update to version 2.4.11 + * ftdiff now supports UTF-8 encoded input files for option `-f'. + * Using keys `r' and `R', you can now adjust the stroker radius in + ftview. + ------------------------------------------------------------------- Sun Jun 17 10:35:24 UTC 2012 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index 91ad40c..5a68837 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -17,7 +17,7 @@ Name: ft2demos -Version: 2.4.10 +Version: 2.4.11 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ @@ -26,7 +26,6 @@ Group: Productivity/Publishing/Other Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 -Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch50: ft2demos-build-testname.patch Patch200: freetype2-subpixel.patch @@ -45,7 +44,6 @@ Freetype2 utilities and demo programs. %prep %define enable_subpixel_rendering 0%{?opensuse_bs} %setup -q -n freetype-%{freetype_version} -b 1 -%patch9 -p 1 %patch308961 -p 1 pushd ../ft2demos-%{version} %patch50 -p 1