From 83509fc6186c2fb6c8dc2738de8145424220865c6069425ec926fc673a9c681e Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 4 Oct 2015 21:55:30 +0000 Subject: [PATCH] Accepting request 336413 from home:TheIndifferent:branches:M17N Updating to 2.6.1, refreshing the patches. OBS-URL: https://build.opensuse.org/request/show/336413 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=109 --- Dont-use-hmtx-table-for-LSB.patch | 25 ------- bugzilla-308961-cmex-workaround.patch | 8 +-- don-t-mark-libpng-as-required-library.patch | 72 +++++++++------------ freetype-2.6.1.tar.bz2 | 3 + freetype-2.6.tar.bz2 | 3 - freetype-doc-2.6.1.tar.bz2 | 3 + freetype-doc-2.6.tar.bz2 | 3 - freetype2-bitmap-foundry.patch | 8 +-- freetype2-subpixel.patch | 8 +-- freetype2.changes | 59 +++++++++++++++++ freetype2.spec | 8 +-- ft2demos-2.6.1.tar.bz2 | 3 + ft2demos-2.6.tar.bz2 | 3 - ft2demos.changes | 5 ++ ft2demos.spec | 6 +- 15 files changed, 123 insertions(+), 94 deletions(-) delete mode 100644 Dont-use-hmtx-table-for-LSB.patch create mode 100644 freetype-2.6.1.tar.bz2 delete mode 100644 freetype-2.6.tar.bz2 create mode 100644 freetype-doc-2.6.1.tar.bz2 delete mode 100644 freetype-doc-2.6.tar.bz2 create mode 100644 ft2demos-2.6.1.tar.bz2 delete mode 100644 ft2demos-2.6.tar.bz2 diff --git a/Dont-use-hmtx-table-for-LSB.patch b/Dont-use-hmtx-table-for-LSB.patch deleted file mode 100644 index 4989a82..0000000 --- a/Dont-use-hmtx-table-for-LSB.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 26 Jul 2015 21:08:34 +0200 -Subject: [PATCH] [cff] Don't use `hmtx' table for LSB (#45520). - -* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance -width only. Bug introduced 2015-04-10. - -diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c -index 43054f8..a075ddc 100644 ---- a/src/cff/cffgload.c -+++ b/src/cff/cffgload.c -@@ -3064,9 +3064,7 @@ - metrics->width = cbox.xMax - cbox.xMin; - metrics->height = cbox.yMax - cbox.yMin; - -- if ( !face->horizontal.number_Of_HMetrics ) -- metrics->horiBearingX = cbox.xMin; -- -+ metrics->horiBearingX = cbox.xMin; - metrics->horiBearingY = cbox.yMax; - - if ( has_vertical_info ) --- -2.4.3 diff --git a/bugzilla-308961-cmex-workaround.patch b/bugzilla-308961-cmex-workaround.patch index a4b2075..8d9e4fe 100644 --- a/bugzilla-308961-cmex-workaround.patch +++ b/bugzilla-308961-cmex-workaround.patch @@ -2,11 +2,11 @@ src/base/ftobjs.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: freetype-2.5.4/src/base/ftobjs.c +Index: freetype-2.6.1/src/base/ftobjs.c =================================================================== ---- freetype-2.5.4.orig/src/base/ftobjs.c -+++ freetype-2.5.4/src/base/ftobjs.c -@@ -2254,6 +2254,11 @@ +--- freetype-2.6.1.orig/src/base/ftobjs.c ++++ freetype-2.6.1/src/base/ftobjs.c +@@ -2267,6 +2267,11 @@ if ( FT_IS_SCALABLE( face ) ) { diff --git a/don-t-mark-libpng-as-required-library.patch b/don-t-mark-libpng-as-required-library.patch index d40650e..11760ec 100644 --- a/don-t-mark-libpng-as-required-library.patch +++ b/don-t-mark-libpng-as-required-library.patch @@ -1,16 +1,8 @@ -From cef195062aa7f509a60b8765661ba4babd85b79c Mon Sep 17 00:00:00 2001 -From: Hrvoje Senjan -Date: Sun, 9 Mar 2014 20:09:12 +0100 -Subject: [PATCH 1/1] Don't mark libpng as required library - -It is private in .pc anyway ---- - -diff --git a/builds/unix/configure b/builds/unix/configure -index 4ae00dd..c3101e2 100755 ---- a/builds/unix/configure -+++ b/builds/unix/configure -@@ -13691,7 +13691,6 @@ esac +Index: freetype-2.6.1/builds/unix/configure +=================================================================== +--- freetype-2.6.1.orig/builds/unix/configure ++++ freetype-2.6.1/builds/unix/configure +@@ -14096,7 +14096,6 @@ esac # entries in Requires.private are separated by commas; REQUIRES_PRIVATE="$zlib_reqpriv, \ $bzip2_reqpriv, \ @@ -18,27 +10,27 @@ index 4ae00dd..c3101e2 100755 $harfbuzz_reqpriv" # beautify REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ -@@ -13705,7 +13704,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT +@@ -14110,7 +14109,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT - LIBS_PRIVATE="$zlib_libpriv \ - $bzip2_libpriv \ -- $libpng_libpriv \ - $harfbuzz_libpriv \ + LIBS_PRIVATE="$zlib_libspriv \ + $bzip2_libspriv \ +- $libpng_libspriv \ + $harfbuzz_libspriv \ $ft2_extra_libs" # beautify -@@ -13717,7 +13715,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ - LIBSSTATIC_CONFIG="-lfreetype \ - $zlib_libstaticconf \ - $bzip2_libstaticconf \ -- $libpng_libstaticconf \ - $harfbuzz_libstaticconf \ +@@ -14122,7 +14120,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + LIBSSTATIC_CONFIG="-lfreetype \ + $zlib_libsstaticconf \ + $bzip2_libsstaticconf \ +- $libpng_libsstaticconf \ + $harfbuzz_libsstaticconf \ $ft2_extra_libs" # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later -diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw -index dd7e576..bac2645 100644 ---- a/builds/unix/configure.raw -+++ b/builds/unix/configure.raw -@@ -914,7 +914,6 @@ esac +Index: freetype-2.6.1/builds/unix/configure.raw +=================================================================== +--- freetype-2.6.1.orig/builds/unix/configure.raw ++++ freetype-2.6.1/builds/unix/configure.raw +@@ -918,7 +918,6 @@ esac # entries in Requires.private are separated by commas; REQUIRES_PRIVATE="$zlib_reqpriv, \ $bzip2_reqpriv, \ @@ -46,19 +38,19 @@ index dd7e576..bac2645 100644 $harfbuzz_reqpriv" # beautify REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ -@@ -928,7 +927,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT +@@ -932,7 +931,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT - LIBS_PRIVATE="$zlib_libpriv \ - $bzip2_libpriv \ -- $libpng_libpriv \ - $harfbuzz_libpriv \ + LIBS_PRIVATE="$zlib_libspriv \ + $bzip2_libspriv \ +- $libpng_libspriv \ + $harfbuzz_libspriv \ $ft2_extra_libs" # beautify -@@ -940,7 +938,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ - LIBSSTATIC_CONFIG="-lfreetype \ - $zlib_libstaticconf \ - $bzip2_libstaticconf \ -- $libpng_libstaticconf \ - $harfbuzz_libstaticconf \ +@@ -944,7 +942,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + LIBSSTATIC_CONFIG="-lfreetype \ + $zlib_libsstaticconf \ + $bzip2_libsstaticconf \ +- $libpng_libsstaticconf \ + $harfbuzz_libsstaticconf \ $ft2_extra_libs" # remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later diff --git a/freetype-2.6.1.tar.bz2 b/freetype-2.6.1.tar.bz2 new file mode 100644 index 0000000..a1f5ddf --- /dev/null +++ b/freetype-2.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 +size 1744692 diff --git a/freetype-2.6.tar.bz2 b/freetype-2.6.tar.bz2 deleted file mode 100644 index 41935d8..0000000 --- a/freetype-2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e -size 1726219 diff --git a/freetype-doc-2.6.1.tar.bz2 b/freetype-doc-2.6.1.tar.bz2 new file mode 100644 index 0000000..eaaab76 --- /dev/null +++ b/freetype-doc-2.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69b1102c9f4e7d75ad2701618f7e5c084d819264755ecbf11893e3cc6de0e0f5 +size 477313 diff --git a/freetype-doc-2.6.tar.bz2 b/freetype-doc-2.6.tar.bz2 deleted file mode 100644 index 669aa30..0000000 --- a/freetype-doc-2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4868ec0b2b6890a1db296b00ce302ebf311b93b08aabd7ffca902e9c16b3e470 -size 477177 diff --git a/freetype2-bitmap-foundry.patch b/freetype2-bitmap-foundry.patch index a468642..ddfb6c6 100644 --- a/freetype2-bitmap-foundry.patch +++ b/freetype2-bitmap-foundry.patch @@ -2,11 +2,11 @@ src/pcf/pcfread.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) -Index: freetype-2.5.4/src/pcf/pcfread.c +Index: freetype-2.6.1/src/pcf/pcfread.c =================================================================== ---- freetype-2.5.4.orig/src/pcf/pcfread.c -+++ freetype-2.5.4/src/pcf/pcfread.c -@@ -1210,8 +1210,34 @@ THE SOFTWARE. +--- freetype-2.6.1.orig/src/pcf/pcfread.c ++++ freetype-2.6.1/src/pcf/pcfread.c +@@ -1246,8 +1246,34 @@ THE SOFTWARE. prop = pcf_find_property( face, "FAMILY_NAME" ); if ( prop && prop->isString ) { diff --git a/freetype2-subpixel.patch b/freetype2-subpixel.patch index 03ba700..c2adffe 100644 --- a/freetype2-subpixel.patch +++ b/freetype2-subpixel.patch @@ -1,7 +1,7 @@ -Index: freetype-2.5.4/include/config/ftoption.h +Index: freetype-2.6.1/include/freetype/config/ftoption.h =================================================================== ---- freetype-2.5.4.orig/include/config/ftoption.h -+++ freetype-2.5.4/include/config/ftoption.h +--- freetype-2.6.1.orig/include/freetype/config/ftoption.h ++++ freetype-2.6.1/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. */ @@ -11,7 +11,7 @@ Index: freetype-2.5.4/include/config/ftoption.h /*************************************************************************/ -@@ -604,7 +604,7 @@ FT_BEGIN_HEADER +@@ -602,7 +602,7 @@ FT_BEGIN_HEADER /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ /* defined. */ /* */ diff --git a/freetype2.changes b/freetype2.changes index e1848fb..8a04b2d 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Sun Oct 4 22:19:32 UTC 2015 - baiduzhyi.devel@gmail.com + +- Update to version 2.6.1 + * IMPORTANT BUG FIXES + - It turned out that for CFFs only the advance widths should be + taken from the `htmx' table, not the side bearings. This bug, + introduced in version 2.6.0, makes it necessary to upgrade if + you are using CFFs; otherwise, you get cropped glyphs with GUI + interfaces like GTK or Qt. + - Accessing Type 42 fonts returned incorrect results if the glyph + order of the embedded TrueType font differs from the glyph order + of the Type 42 charstrings table. + * IMPORTANT CHANGES + - The header file layout has been changed (again), moving all + header files except `ft2build.h' into a subdirectory tree. + Doing so reduces the possibility of header file name clashes + (e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h') on case + insensitive file systems like Mac OS X or Windows. + Applications that use (a) the `freetype-config' script or + FreeType's `freetype2.pc' file for pkg-config to get the include + directory for the compiler, and (b) the documented way for + header inclusion like + #include + #include FT_FREETYPE_H + ... + don't need any change to the source code. + - Simple access to named instances in GX variation fonts is now + available (in addition to the previous method via FreeType's MM + interface). In the `FT_Face' structure, bits 16-30 of the + `face_index' field hold the current named instance index for the + given face index, and bits 16-30 of `style_flags' contain the + number of instances for the given face index. `FT_Open_Face' + and friends also understand the extended bits of the face index + parameter. + You need to enable TT_CONFIG_OPTION_GX_VAR_SUPPORT for this new + feature. Otherwise, bits 16-30 of the two fields are zero (or + are ignored). + - Lao script support has been added to the auto-hinter. + * MISCELLANEOUS + - The auto-hinter's Arabic script support has been enhanced. + - Superscript-like and subscript-like glyphs as used by various + phonetic alphabets like the IPA are now better supported by the + auto-hinter. + - The TrueType bytecode interpreter now runs slightly faster. + - Improved support for builds with cmake. + - The function `FT_CeilFix' now always rounds towards plus + infinity. + - The function `FT_FloorFix' now always rounds towards minus + infinity. + - A new load flag `FT_LOAD_COMPUTE_METRICS' has been added; it + makes FreeType ignore pre-computed metrics, as needed by font + validating or font editing programs. Right now, only the + TrueType module supports it to ignore data from the `hdmx' + table. + - Another round of bug fixes to better handle broken fonts, found + by Kostya Serebryany . +- Dropping upstreamed patch Dont-use-hmtx-table-for-LSB.patch. + ------------------------------------------------------------------- Fri Sep 11 04:11:52 UTC 2015 - zaitor@opensuse.org diff --git a/freetype2.spec b/freetype2.spec index 95aa5fc..548d233 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -1,7 +1,7 @@ # # spec file for package freetype2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ # -%define doc_version 2.6 +%define doc_version 2.6.1 Name: freetype2 -Version: 2.6 +Version: 2.6.1 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -29,7 +29,6 @@ Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{ve Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2 Source3: baselibs.conf Patch1: freetype2-bitmap-foundry.patch -Patch2: Dont-use-hmtx-table-for-LSB.patch Patch200: freetype2-subpixel.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch202: don-t-mark-libpng-as-required-library.patch @@ -85,7 +84,6 @@ It also contains a small tutorial for using that library. %define enable_subpixel_rendering 0 %setup -q -n freetype-%{version} -a 1 %patch1 -p1 -%patch2 -p1 %patch308961 -p 1 %patch202 -p1 %if %{enable_subpixel_rendering} diff --git a/ft2demos-2.6.1.tar.bz2 b/ft2demos-2.6.1.tar.bz2 new file mode 100644 index 0000000..14ecd9f --- /dev/null +++ b/ft2demos-2.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:369d27ae65ba04c2e3e74cf948ebcc5aa51abd47cd2e1d7d5cad0bc1f82da2aa +size 190308 diff --git a/ft2demos-2.6.tar.bz2 b/ft2demos-2.6.tar.bz2 deleted file mode 100644 index 6d67fdb..0000000 --- a/ft2demos-2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8f4bc2a2e76e0dbe61838e452c5a7daf1d4bd9dfa44691940bf308f776d32b6 -size 190240 diff --git a/ft2demos.changes b/ft2demos.changes index 135639e..1a8db31 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 4 22:24:26 UTC 2015 - baiduzhyi.devel@gmail.com + +- Update to version 2.6.1. + ------------------------------------------------------------------- Thu Jun 11 08:56:22 UTC 2015 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index 2408abe..2ebf72d 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -1,7 +1,7 @@ # # spec file for package ft2demos # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define freetype_version 2.6 +%define freetype_version 2.6.1 Name: ft2demos -Version: 2.6 +Version: 2.6.1 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+