From c55bb03ee9a399d8f1e5a046a49ca9da4aee1a969fbad3936fe50de7226d39fa Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 11 May 2013 04:02:57 +0000 Subject: [PATCH 1/3] Accepting request 174996 from home:namtrac:branches:M17N - Update to version 2.4.12 * A new CFF rendering engine from Adobe * The macro FT_CONFIG_OPTION_OLD_INTERNALS is no longer set by default. - freetype-new-cff-engine.patch: Enable the new CFF engine by default. - Drop freetype2-no_rpath.patch, not needed. - Update to version 2.4.12 * Using the `H' key, it is now possible to select the CFF engine in both ftview and ftdiff. * The new command line option '-H' for `ftbench' selects the Adobe CFF engine. * It is now possible to directly select the LCD rendering mode with the keys 'A'-'F' in 'ftview'. The key mapping for cycling through LCD modes has been changed from 'K' and 'L' to 'k' and 'l', and toggling custom LCD filtering is no longer mapped to key 'F' but to key 'L'. * In `ftdiff', key 'x' toggles between layout modes: Either use the advance width (this is new and now the default) or the bounding box information to determine line breaks. * For all demo tools, the new command line option `-v' shows the version. * For the demo tools with a GUI, the new command line options '-w' and '-h' select the width and the height of the output window, respectively. - Drop ft2demos-build-testname.patch, not needed. OBS-URL: https://build.opensuse.org/request/show/174996 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=74 --- freetype-2.4.11.tar.bz2 | 3 --- freetype-2.4.12.tar.bz2 | 3 +++ freetype-doc-2.4.11.tar.bz2 | 3 --- freetype-doc-2.4.12.tar.bz2 | 3 +++ freetype-new-cff-engine.patch | 13 +++++++++++++ freetype2-no_rpath.patch | 35 ----------------------------------- freetype2.changes | 10 ++++++++++ freetype2.spec | 10 +++++----- ft2demos-2.4.11.tar.bz2 | 3 --- ft2demos-2.4.12.tar.bz2 | 3 +++ ft2demos-build-testname.patch | 13 ------------- ft2demos.changes | 23 +++++++++++++++++++++++ ft2demos.spec | 6 +----- 13 files changed, 61 insertions(+), 67 deletions(-) delete mode 100644 freetype-2.4.11.tar.bz2 create mode 100644 freetype-2.4.12.tar.bz2 delete mode 100644 freetype-doc-2.4.11.tar.bz2 create mode 100644 freetype-doc-2.4.12.tar.bz2 create mode 100644 freetype-new-cff-engine.patch delete mode 100644 freetype2-no_rpath.patch delete mode 100644 ft2demos-2.4.11.tar.bz2 create mode 100644 ft2demos-2.4.12.tar.bz2 delete mode 100644 ft2demos-build-testname.patch diff --git a/freetype-2.4.11.tar.bz2 b/freetype-2.4.11.tar.bz2 deleted file mode 100644 index 03091af..0000000 --- a/freetype-2.4.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f -size 1546087 diff --git a/freetype-2.4.12.tar.bz2 b/freetype-2.4.12.tar.bz2 new file mode 100644 index 0000000..a0fb4fd --- /dev/null +++ b/freetype-2.4.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381 +size 1597205 diff --git a/freetype-doc-2.4.11.tar.bz2 b/freetype-doc-2.4.11.tar.bz2 deleted file mode 100644 index a7eee42..0000000 --- a/freetype-doc-2.4.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e80082d8594300d2cc1f1c315179006012fa4ded7acb4b6a1f7b43b5b19dcb51 -size 106643 diff --git a/freetype-doc-2.4.12.tar.bz2 b/freetype-doc-2.4.12.tar.bz2 new file mode 100644 index 0000000..7fe500a --- /dev/null +++ b/freetype-doc-2.4.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae5c1674aae330d94714a1c23562eabcb4a96399764c10e6c3ac8a19b8054238 +size 106734 diff --git a/freetype-new-cff-engine.patch b/freetype-new-cff-engine.patch new file mode 100644 index 0000000..568803c --- /dev/null +++ b/freetype-new-cff-engine.patch @@ -0,0 +1,13 @@ +Index: freetype-2.4.12/src/cff/cffobjs.c +=================================================================== +--- freetype-2.4.12.orig/src/cff/cffobjs.c ++++ freetype-2.4.12/src/cff/cffobjs.c +@@ -1056,7 +1056,7 @@ + + + /* set default property values */ +- driver->hinting_engine = FT_CFF_HINTING_FREETYPE; ++ driver->hinting_engine = FT_CFF_HINTING_ADOBE; + driver->no_stem_darkening = FALSE; + + return FT_Err_Ok; diff --git a/freetype2-no_rpath.patch b/freetype2-no_rpath.patch deleted file mode 100644 index 869aeef..0000000 --- a/freetype2-no_rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - builds/unix/freetype-config.in | 5 ----- - 1 file changed, 5 deletions(-) - -Index: builds/unix/freetype-config.in -=================================================================== ---- builds/unix/freetype-config.in.orig -+++ builds/unix/freetype-config.in -@@ -14,11 +14,10 @@ exec_prefix=@exec_prefix@ - exec_prefix_set=no - includedir=@includedir@ - libdir=@libdir@ - enable_shared=@build_libtool_libs@ - wl=@wl@ --hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' - - usage() - { - cat < Date: Sun, 9 Jun 2013 13:45:08 +0000 Subject: [PATCH 2/3] Accepting request 178244 from home:elvigia:branches:M17N - Library and tools must be compiled with large file support in 32 bit archs just like the rest of system. OBS-URL: https://build.opensuse.org/request/show/178244 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=75 --- freetype2.changes | 6 ++++++ freetype2.spec | 2 +- ft2demos.spec | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/freetype2.changes b/freetype2.changes index ccf9965..c3832e9 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 9 03:58:33 UTC 2013 - crrodriguez@opensuse.org + +- Library and tools must be compiled with large file + support in 32 bit archs just like the rest of system. + ------------------------------------------------------------------- Fri May 10 18:05:44 UTC 2013 - idonmez@suse.com diff --git a/freetype2.spec b/freetype2.spec index 81baaa8..0861845 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -86,7 +86,7 @@ It also contains a small tutorial for using that library. %endif %build -export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE" +export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" %configure --without-bzip2 \ --disable-static make %{?_smp_mflags} diff --git a/ft2demos.spec b/ft2demos.spec index aa9f845..e625243 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -49,6 +49,7 @@ Freetype2 utilities and demo programs. %endif %build +export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" %configure --without-bzip2 make %{?_smp_mflags} pushd .. From ce8bdd223367f437ad684e2f21f0247fce5b50ae50be9d4283e21803ccc0d5ef Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Jun 2013 08:54:46 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=76 --- ft2demos.changes | 8 ++++++++ ft2demos.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/ft2demos.changes b/ft2demos.changes index 6219f8e..f7c3ae3 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 12 08:46:35 UTC 2013 - werner@suse.com + +- Add conflict to package dtc for /usr/bin/ftdump as the two tools + are different, + dtc: ftdump -- Flat Tree dumping utility + ft2demos: ftdump -- Simple font dumper + ------------------------------------------------------------------- Fri May 10 18:09:21 UTC 2013 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index e625243..090b600 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -29,6 +29,7 @@ Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version} Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch BuildRequires: xorg-x11-devel +Conflicts: dtc Supplements: fonts-config Source1000: bnc628213_test.otf Source1004: bnc629447_sigsegv31.ttf