Accepting request 146177 from M17N

- 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. (forwarded request 146151 from namtrac) OBS-URL: https://build.opensuse.org/request/show/146177 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=51
2012-12-21 13:35:39 +00:00 · 2012-12-21 13:35:39 +00:00 · 58c55cba38
commit 58c55cba38
parent 1d98fe9958 e488dfe685
12 changed files with 44 additions and 50 deletions
--- a/fix-build.patch
+++ b/fix-build.patch
@ -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])
--- a/freetype-2.4.10.tar.bz2
+++ b/freetype-2.4.10.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f
-size 1508927
--- a/freetype-2.4.11.tar.bz2
+++ b/freetype-2.4.11.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
+size 1546087
--- a/freetype-doc-2.4.10.tar.bz2
+++ b/freetype-doc-2.4.10.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b83b46fd02d00c256eea12bddf598454f95858dbeaa853b76dac5974f0321fd8
-size 106697
--- a/freetype-doc-2.4.11.tar.bz2
+++ 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
--- 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
+ 
+ 
   /*************************************************************************/
--- 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

--- 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}
--- a/ft2demos-2.4.10.tar.bz2
+++ b/ft2demos-2.4.10.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3fb7e97f35c0f59ecd967577a3e77fbcca10d84c00129a74e5da45bf3625cc45
-size 163949
--- a/ft2demos-2.4.11.tar.bz2
+++ b/ft2demos-2.4.11.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075
+size 164608
--- 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

--- 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