Accepting request 178609 from M17N

- Library and tools must be compiled with large file 
  support in 32 bit archs just like the rest of system.

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

- 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

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

OBS-URL: https://build.opensuse.org/request/show/178609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=54
This commit is contained in:
Stephan Kulow 2013-06-18 13:11:56 +00:00 committed by Git OBS Bridge
commit a3efe31fe2
13 changed files with 78 additions and 68 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
size 1546087

3
freetype-2.4.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381
size 1597205

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e80082d8594300d2cc1f1c315179006012fa4ded7acb4b6a1f7b43b5b19dcb51
size 106643

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae5c1674aae330d94714a1c23562eabcb4a96399764c10e6c3ac8a19b8054238
size 106734

View File

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

View File

@ -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 <<EOF
Usage: freetype-config [OPTION]...
@@ -138,14 +137,10 @@ if test "$echo_cflags" = "yes" ; then
echo $cflags
fi
fi
if test "$echo_libs" = "yes" ; then
- rpath=
- if test "$enable_shared" = "yes" ; then
- eval "rpath=\"$hardcode_libdir_flag_spec\""
- fi
libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
echo -L${SYSROOT}$libdir $libs
else
echo $libs

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
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
- 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.
-------------------------------------------------------------------
Fri Jan 11 17:12:01 UTC 2013 - jw@suse.com

View File

@ -25,7 +25,7 @@ BuildRequires: zlib-devel
Obsoletes: freetype2-64bit
%endif
#
Version: 2.4.11
Version: 2.4.12
Release: 0
Summary: A TrueType Font Library
License: SUSE-Freetype or GPL-2.0+
@ -34,8 +34,8 @@ Url: http://www.freetype.org
Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
Source3: baselibs.conf
Patch1: freetype-new-cff-engine.patch
Patch3: freetype2-bitmap-foundry.patch
Patch10: freetype2-no_rpath.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch200: freetype2-subpixel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -78,15 +78,15 @@ It also contains a small tutorial for using that library.
%prep
%define enable_subpixel_rendering 0
%setup -q -n freetype-%{version} -a 1
%patch3 -p 1 -b .bitmap-foundry
%patch10
%patch1 -p1
%patch3 -p1
%patch308961 -p 1
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%patch200 -p1
%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}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075
size 164608

3
ft2demos-2.4.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aee81b9b8c8476d8da89e8eda4550b4b55ec4ab274a1692c4a9eff7b3baabf3a
size 170312

View File

@ -1,13 +0,0 @@
Index: ft2demos-2.4.3/Makefile
===================================================================
--- ft2demos-2.4.3.orig/Makefile 2009-10-07 09:57:21.000000000 +0200
+++ ft2demos-2.4.3/Makefile 2010-10-29 16:24:24.770446520 +0200
@@ -482,7 +482,7 @@ else
$(LINK)
$(BIN_DIR_2)/testname$E: $(OBJ_DIR_2)/testname.$(SO) $(FTLIB)
- $(LINK)
+ $(LINK_COMMON)
$(BIN_DIR_2)/ftview$E: $(OBJ_DIR_2)/ftview.$(SO) $(FTLIB) \

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
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
- 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.
-------------------------------------------------------------------
Fri Jan 11 17:12:14 UTC 2013 - jw@suse.com

View File

@ -17,7 +17,7 @@
Name: ft2demos
Version: 2.4.11
Version: 2.4.12
Release: 0
Summary: Freetype2 Utilities and Demo Programs
License: GPL-2.0+
@ -27,9 +27,9 @@ 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
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch50: ft2demos-build-testname.patch
Patch200: freetype2-subpixel.patch
BuildRequires: xorg-x11-devel
Conflicts: dtc
Supplements: fonts-config
Source1000: bnc628213_test.otf
Source1004: bnc629447_sigsegv31.ttf
@ -45,14 +45,12 @@ Freetype2 utilities and demo programs.
%define enable_subpixel_rendering 0%{?opensuse_bs}
%setup -q -n freetype-%{freetype_version} -b 1
%patch308961 -p 1
pushd ../ft2demos-%{version}
%patch50 -p 1
popd
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%build
export CFLAGS="%optflags -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%configure --without-bzip2
make %{?_smp_mflags}
pushd ..