From 19cb1b5b622b58028ea72d6e62463921eb025245cc28a3b377dfbbebcdef5b1d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 11 Dec 2013 07:34:37 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/freetype2 revision 58.0 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=66b170f151964a1b0f49aefc05d6f0a4 --- freetype-2.5.0.1.tar.bz2 | 3 ++ freetype-2.5.2.tar.bz2 | 3 -- freetype-doc-2.5.0.tar.bz2 | 3 ++ freetype-doc-2.5.2.tar.bz2 | 3 -- freetype2-subpixel.patch | 6 ++-- freetype2.changes | 73 -------------------------------------- freetype2.spec | 6 ++-- ft2demos-2.5.0.tar.bz2 | 3 ++ ft2demos-2.5.2.tar.bz2 | 3 -- ft2demos.changes | 73 -------------------------------------- ft2demos.spec | 9 ++--- overflow.patch | 17 --------- 12 files changed, 16 insertions(+), 186 deletions(-) create mode 100644 freetype-2.5.0.1.tar.bz2 delete mode 100644 freetype-2.5.2.tar.bz2 create mode 100644 freetype-doc-2.5.0.tar.bz2 delete mode 100644 freetype-doc-2.5.2.tar.bz2 create mode 100644 ft2demos-2.5.0.tar.bz2 delete mode 100644 ft2demos-2.5.2.tar.bz2 delete mode 100644 overflow.patch diff --git a/freetype-2.5.0.1.tar.bz2 b/freetype-2.5.0.1.tar.bz2 new file mode 100644 index 0000000..a13d30a --- /dev/null +++ b/freetype-2.5.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5 +size 1607037 diff --git a/freetype-2.5.2.tar.bz2 b/freetype-2.5.2.tar.bz2 deleted file mode 100644 index 5c71f59..0000000 --- a/freetype-2.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def -size 1676373 diff --git a/freetype-doc-2.5.0.tar.bz2 b/freetype-doc-2.5.0.tar.bz2 new file mode 100644 index 0000000..bef5c26 --- /dev/null +++ b/freetype-doc-2.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c1af657e8845830278abd019c49288e6b0f94409a6d4506c73a29f0fc062a4d +size 106728 diff --git a/freetype-doc-2.5.2.tar.bz2 b/freetype-doc-2.5.2.tar.bz2 deleted file mode 100644 index d7e3a8f..0000000 --- a/freetype-doc-2.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47915cdb956a4984e90de81181925386eac1a20a23df1932770de1e6790989ba -size 109440 diff --git a/freetype2-subpixel.patch b/freetype2-subpixel.patch index c829946..49bdd65 100644 --- a/freetype2-subpixel.patch +++ b/freetype2-subpixel.patch @@ -1,7 +1,7 @@ -Index: freetype-2.4.11/include/config/ftoption.h +Index: freetype-2.4.11/include/freetype/config/ftoption.h =================================================================== ---- freetype-2.4.11.orig/include/config/ftoption.h -+++ freetype-2.4.11/include/config/ftoption.h +--- 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. */ diff --git a/freetype2.changes b/freetype2.changes index 1c247dd..a41ad19 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,76 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 10 03:04:59 UTC 2013 - hrvoje.senjan@gmail.com - -- Update to version 2.5.2 - * Fixed bug that made FreeType crash on some popular (but not - fully conformant) fonts like `ahronbd.ttf' - * Another round of improvements to correct positioning and hinting - of composite glyphs in TrueType fonts - * Fixed bug introduced in version 2.5.1: handling embedded - bitmap strikes of TrueType fonts, caused garbage display - under some circumstances - * Fixed `ftgrid' demo program compilation in non-development - builds -- Droped fix-compile-in-non-debug.patch, included in this release - -------------------------------------------------------------------- -Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com - -- Update to version 2.5.1 - * For some WinFNT files, the last glyph wasn't displayed but - incorrectly marked as invalid. - * The vertical size of glyphs was incorrectly set after a call to - `FT_GlyphSlot_Embolden', resulting in clipped glyphs. - * Many fields of the `PCLT' table in SFNT based fonts (if accessed - with `FT_Get_Sfnt_Table') were computed incorrectly. - * In TrueType fonts, hinting of composite glyphs could sometimes - deliver incorrect positions of components or even distorted - shapes. - * WOFF font format support has been added. - * The auto-hinter now supports Hebrew. Greek and Cyrillic support - has been improved. - * Support for the forthcoming `OS/2' SFNT table version 5, as can - be found e.g. in the `Sitka' font family for Windows 8.1. - * The header file layout has been changed. After installation, - all files are now located in `/include/freetype2'. - Applications that use (a) `freetype-config' or FreeType's - `pkg-config' file to get the include directory for the compiler, - and (b) the documented way for header inclusion like - #include or #include FT_FREETYPE_H - don't need any change to the source code. - * The stem darkening feature of the new CFF engine can now be - fine-tuned with the new `darkening-parameters' property. - * `ftgrid' has been updated to toggle various engines with the `H' - key, similar to `ftview' and `ftdiff'. - * The functionality of `ttdebug' has been greatly enhanced. - . It now displays twilight, storage, and control value data; key - * Better support of ARMv7 and x86_64 processors. - * Apple's `sbix' color bitmap format is now supported. - * Improved auto-hinter rendering for many TrueType fonts, - especially in the range 20-40ppem. - * A new face flag `FT_FACE_FLAG_COLOR' has been added (to be - accessed with the macro `FT_HAS_COLOR'). - * `FT_Gzip_Uncompress' (modeled after zlib's `uncompress' - function) has been added; this is a by-product of the newly - added WOFF support. - * Support for a build with `cmake' has been contributed by John - Cary . - * Support for x64 builds with Visual C++ has been contributed by - Kenneth Miller - * Manual pages for most demo programs have been added. - * The GETINFO bytecode instruction for TrueType fonts was buggy if - used to retrieve subpixel hinting information. It was necessary - to set selector bit 6 to get results for selector bits 7-10, - which is wrong. - * Improved computation of emulated vertical metrics for TrueType - fonts. - * Fixed horizontal start-up position of vertical phantom points in - TrueType bytecode. -- Rebase freetype2-subpixel.patch to current release -- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos -- Added overflow.patch for resolving post-build-check detected error: - I: Statement is overflowing a buffer - ------------------------------------------------------------------- Wed Jul 3 08:31:13 UTC 2013 - idonmez@suse.com diff --git a/freetype2.spec b/freetype2.spec index 12efce9..8f4576e 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -26,8 +26,8 @@ BuildRequires: zlib-devel Obsoletes: freetype2-64bit %endif # -%define doc_version 2.5.2 -Version: 2.5.2 +%define doc_version 2.5.0 +Version: 2.5.0.1 Release: 0 Summary: A TrueType Font Library License: SUSE-Freetype or GPL-2.0+ @@ -39,8 +39,6 @@ Source3: baselibs.conf Patch1: freetype2-bitmap-foundry.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch201: overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/ft2demos-2.5.0.tar.bz2 b/ft2demos-2.5.0.tar.bz2 new file mode 100644 index 0000000..6a2eed0 --- /dev/null +++ b/ft2demos-2.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:490c3487561119c60b874ae2df5c27fedce320f8ab38b2832d4baf5a28120f34 +size 172671 diff --git a/ft2demos-2.5.2.tar.bz2 b/ft2demos-2.5.2.tar.bz2 deleted file mode 100644 index 2ff71c8..0000000 --- a/ft2demos-2.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3cdf60186caeb68cafc98b6b32c54ae9467a7a844865db161510a17a2d14471 -size 185966 diff --git a/ft2demos.changes b/ft2demos.changes index 22d2b24..cd431f3 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,76 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 10 03:04:59 UTC 2013 - hrvoje.senjan@gmail.com - -- Update to version 2.5.2 - * Fixed bug that made FreeType crash on some popular (but not - fully conformant) fonts like `ahronbd.ttf' - * Another round of improvements to correct positioning and hinting - of composite glyphs in TrueType fonts - * Fixed bug introduced in version 2.5.1: handling embedded - bitmap strikes of TrueType fonts, caused garbage display - under some circumstances - * Fixed `ftgrid' demo program compilation in non-development - builds -- Droped fix-compile-in-non-debug.patch, included in this release - -------------------------------------------------------------------- -Wed Nov 27 19:31:42 UTC 2013 - hrvoje.senjan@gmail.com - -- Update to version 2.5.1 - * For some WinFNT files, the last glyph wasn't displayed but - incorrectly marked as invalid. - * The vertical size of glyphs was incorrectly set after a call to - `FT_GlyphSlot_Embolden', resulting in clipped glyphs. - * Many fields of the `PCLT' table in SFNT based fonts (if accessed - with `FT_Get_Sfnt_Table') were computed incorrectly. - * In TrueType fonts, hinting of composite glyphs could sometimes - deliver incorrect positions of components or even distorted - shapes. - * WOFF font format support has been added. - * The auto-hinter now supports Hebrew. Greek and Cyrillic support - has been improved. - * Support for the forthcoming `OS/2' SFNT table version 5, as can - be found e.g. in the `Sitka' font family for Windows 8.1. - * The header file layout has been changed. After installation, - all files are now located in `/include/freetype2'. - Applications that use (a) `freetype-config' or FreeType's - `pkg-config' file to get the include directory for the compiler, - and (b) the documented way for header inclusion like - #include or #include FT_FREETYPE_H - don't need any change to the source code. - * The stem darkening feature of the new CFF engine can now be - fine-tuned with the new `darkening-parameters' property. - * `ftgrid' has been updated to toggle various engines with the `H' - key, similar to `ftview' and `ftdiff'. - * The functionality of `ttdebug' has been greatly enhanced. - . It now displays twilight, storage, and control value data; key - * Better support of ARMv7 and x86_64 processors. - * Apple's `sbix' color bitmap format is now supported. - * Improved auto-hinter rendering for many TrueType fonts, - especially in the range 20-40ppem. - * A new face flag `FT_FACE_FLAG_COLOR' has been added (to be - accessed with the macro `FT_HAS_COLOR'). - * `FT_Gzip_Uncompress' (modeled after zlib's `uncompress' - function) has been added; this is a by-product of the newly - added WOFF support. - * Support for a build with `cmake' has been contributed by John - Cary . - * Support for x64 builds with Visual C++ has been contributed by - Kenneth Miller - * Manual pages for most demo programs have been added. - * The GETINFO bytecode instruction for TrueType fonts was buggy if - used to retrieve subpixel hinting information. It was necessary - to set selector bit 6 to get results for selector bits 7-10, - which is wrong. - * Improved computation of emulated vertical metrics for TrueType - fonts. - * Fixed horizontal start-up position of vertical phantom points in - TrueType bytecode. -- Rebase freetype2-subpixel.patch to current release -- Added fix-compile-in-non-debug.patch, fixes release build of ftdemos -- Added overflow.patch for resolving post-build-check detected error: - I: Statement is overflowing a buffer - ------------------------------------------------------------------- Wed Jul 3 08:33:20 UTC 2013 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index c9f6de9..ef5d40c 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -17,19 +17,17 @@ Name: ft2demos -Version: 2.5.2 +Version: 2.5.0 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0+ Group: Productivity/Publishing/Other -%define freetype_version 2.5.2 +%define freetype_version 2.5.0.1 Url: http://www.freetype.org Source0: http://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2 Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2 Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -# PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer -Patch201: overflow.patch BuildRequires: libpng-devel BuildRequires: xorg-x11-devel Conflicts: dtc @@ -51,9 +49,6 @@ Freetype2 utilities and demo programs. %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif -pushd ../ft2demos-%{version} -%patch201 -p1 -popd %build export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" diff --git a/overflow.patch b/overflow.patch deleted file mode 100644 index f8eb972..0000000 --- a/overflow.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur ft2demos-2.5.1/src/ttdebug.c ft2demos-2.5.1.new/src/ttdebug.c ---- ft2demos-2.5.1/src/ttdebug.c 2013-11-05 12:31:57.452397772 +0100 -+++ ft2demos-2.5.1.new/src/ttdebug.c 2013-12-08 23:40:31.756506259 +0100 -@@ -1905,11 +1905,11 @@ - - FT_Library_Version( library, &major, &minor, &patch ); - -- offset = snprintf( version_string, 64 + 1, -+ offset = snprintf( version_string, sizeof(version_string), - "ttdebug (FreeType) %d.%d", - major, minor ); - if ( patch ) -- offset = snprintf( version_string + offset, 64 + 1 - offset, -+ offset = snprintf( version_string + offset, sizeof(version_string) - offset, - ".%d", - patch ); - }