pool/freetype2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 645021 from M17N

Browse Source 
- Remove old ppc64 parts in spec file
- Refresh patches:
  + bugzilla-308961-cmex-workaround.patch
  + don-t-mark-libpng-as-required-library.patch
  + enable-long-family-names-by-default.patch
- Enable subpixel rendering with infinality config:
  + enable-subpixel-rendering.patch
  + enable-infinality-subpixel-hinting.patch

OBS-URL: https://build.opensuse.org/request/show/645021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=84
This commit is contained in:
Dominique Leuenberger 2018-11-08 08:40:20 +00:00 committed by Git OBS Bridge
commit 00e42d3819
8 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bugzilla-308961-cmex-workaround.patch
View File

@ -2,10 +2,10 @@
src/base/ftobjs.c | 5 +++++
1 file changed, 5 insertions(+)
Index: freetype-2.9/src/base/ftobjs.c
Index: freetype-2.9.1/src/base/ftobjs.c
===================================================================
--- freetype-2.9.orig/src/base/ftobjs.c
+++ freetype-2.9/src/base/ftobjs.c
--- freetype-2.9.1.orig/src/base/ftobjs.c
+++ freetype-2.9.1/src/base/ftobjs.c
@@ -2540,6 +2540,11 @@
if ( FT_IS_SCALABLE( face ) )

24
don-t-mark-libpng-as-required-library.patch
View File

@ -1,8 +1,8 @@
Index: freetype-2.9/builds/unix/configure
Index: freetype-2.9.1/builds/unix/configure
===================================================================
--- freetype-2.9.orig/builds/unix/configure
+++ freetype-2.9/builds/unix/configure
@@ -14487,7 +14487,6 @@ esac
--- freetype-2.9.1.orig/builds/unix/configure
+++ freetype-2.9.1/builds/unix/configure
@@ -14704,7 +14704,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -10,7 +10,7 @@ Index: freetype-2.9/builds/unix/configure
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -14501,7 +14500,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -14718,7 +14717,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
@ -18,7 +18,7 @@ Index: freetype-2.9/builds/unix/configure
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -14513,7 +14511,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@@ -14730,7 +14728,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \
@ -26,11 +26,11 @@ Index: freetype-2.9/builds/unix/configure
$harfbuzz_libsstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
Index: freetype-2.9/builds/unix/configure.raw
Index: freetype-2.9.1/builds/unix/configure.raw
===================================================================
--- freetype-2.9.orig/builds/unix/configure.raw
+++ freetype-2.9/builds/unix/configure.raw
@@ -938,7 +938,6 @@ esac
--- freetype-2.9.1.orig/builds/unix/configure.raw
+++ freetype-2.9.1/builds/unix/configure.raw
@@ -960,7 +960,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -38,7 +38,7 @@ Index: freetype-2.9/builds/unix/configure.raw
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -952,7 +951,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -974,7 +973,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
@ -46,7 +46,7 @@ Index: freetype-2.9/builds/unix/configure.raw
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -964,7 +962,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@@ -986,7 +984,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \

15
enable-infinality-subpixel-hinting.patch Normal file
View File

@ -0,0 +1,15 @@
Index: freetype-2.9.1/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.9.1.orig/include/freetype/config/ftoption.h
+++ freetype-2.9.1/include/freetype/config/ftoption.h
@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
/* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
/* */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
/*************************************************************************/

8
enable-long-family-names-by-default.patch
View File

@ -1,6 +1,8 @@
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -856,7 +856,7 @@ FT_BEGIN_HEADER
Index: freetype-2.9.1/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.9.1.orig/include/freetype/config/ftoption.h
+++ freetype-2.9.1/include/freetype/config/ftoption.h
@@ -849,7 +849,7 @@ FT_BEGIN_HEADER
/* If this option is activated, it can be controlled with the */
/* `no-long-family-names' property of the pcf driver module. */
/* */

13
enable-subpixel-rendering.patch Normal file
View File

@ -0,0 +1,13 @@
Index: freetype-2.9.1/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.9.1.orig/include/freetype/config/ftoption.h
+++ freetype-2.9.1/include/freetype/config/ftoption.h
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* rendering technology that produces excellent output without LCD */
/* filtering. */
/* */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
/*************************************************************************/

12
freetype2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Oct 27 11:54:18 UTC 2018 - Ismail Dönmez <idonmez@suse.com>
- Remove old ppc64 parts in spec file
- Refresh patches:
+ bugzilla-308961-cmex-workaround.patch
+ don-t-mark-libpng-as-required-library.patch
+ enable-long-family-names-by-default.patch
- Enable subpixel rendering with infinality config:
+ enable-subpixel-rendering.patch
+ enable-infinality-subpixel-hinting.patch
-------------------------------------------------------------------
Mon May 14 10:06:56 UTC 2018 - idonmez@suse.com

20
freetype2.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -23,7 +23,7 @@ Release: 0
Summary: A TrueType Font Library
License: SUSE-Freetype OR GPL-2.0-or-later
Group: System/Libraries
Url: https://www.freetype.org
URL: https://www.freetype.org
Source0: https://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: https://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2
Source2: %{name}.sh
@ -32,15 +32,13 @@ Patch0: bugzilla-308961-cmex-workaround.patch
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
Patch1: don-t-mark-libpng-as-required-library.patch
Patch2: enable-long-family-names-by-default.patch
Patch3: enable-subpixel-rendering.patch
Patch4: enable-infinality-subpixel-hinting.patch
BuildRequires: gawk
BuildRequires: libbz2-devel
BuildRequires: libpng-devel
BuildRequires: pkgconfig
BuildRequires: zlib-devel
# bug437293
%ifarch ppc64
Obsoletes: freetype2-64bit
%endif
%description
This library features TrueType fonts for open source projects. This
@ -79,10 +77,6 @@ Requires: zlib-devel
Provides: freetype-devel
# Static library provides:
Provides: libfreetype6-devel-static
# bug437293
%ifarch ppc64
Obsoletes: freetype2-devel-64bit
%endif
%description devel
This package contains all necessary include files, libraries and
@ -94,9 +88,7 @@ It also contains a small tutorial for using that library.
%prep
%setup -q -n freetype-%{version} -a 1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%autopatch -p1
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
@ -134,7 +126,7 @@ rm %{buildroot}%{_libdir}/libfreetype.la
%{_includedir}/*
%{_libdir}/libfreetype.so
%{_libdir}/pkgconfig/freetype2.pc
%{_mandir}/man1/freetype-config.1%{ext_man}
%{_mandir}/man1/freetype-config.1%{?ext_man}
%{_datadir}/aclocal
%changelog

2
ft2demos.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#