From c0a0132a587bfa7dab87e8caa2313d6b811e1360ab75430ee5d0cfce26bea742 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Mar 2018 09:45:37 +0000 Subject: [PATCH 1/3] Accepting request 581252 from home:13ilya:branches:M17N - Refresh spec-file via spec-cleaner. - Add shell script freetype2.sh in separate package freetype2-profile-tti35 for set TrurType interpreter version 35. OBS-URL: https://build.opensuse.org/request/show/581252 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=138 --- freetype2.changes | 7 +++++++ freetype2.sh | 1 + freetype2.spec | 31 ++++++++++++++++++++----------- 3 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 freetype2.sh diff --git a/freetype2.changes b/freetype2.changes index adeb0c7..ad70944 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 28 20:58:36 UTC 2018 - ilya@ilya.pp.ua + +- Refresh spec-file via spec-cleaner. +- Add shell script freetype2.sh in separate package + freetype2-profile-tti35 for set TrurType interpreter version 35. + ------------------------------------------------------------------- Fri Feb 9 11:11:36 UTC 2018 - fstrba@suse.com diff --git a/freetype2.sh b/freetype2.sh new file mode 100644 index 0000000..92d5d33 --- /dev/null +++ b/freetype2.sh @@ -0,0 +1 @@ +export FREETYPE_PROPERTIES="truetype:interpreter-version=35" diff --git a/freetype2.spec b/freetype2.spec index c096288..759a87b 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -12,21 +12,20 @@ # 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 # - -# %define doc_version 2.9 Name: freetype2 Version: 2.9 Release: 0 Summary: A TrueType Font Library -License: SUSE-Freetype or GPL-2.0+ +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 Source3: baselibs.conf Patch0: bugzilla-308961-cmex-workaround.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc @@ -39,9 +38,8 @@ Patch5: enable-long-family-names-by-default.patch BuildRequires: gawk BuildRequires: libbz2-devel BuildRequires: libpng-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: freetype2-64bit @@ -61,6 +59,16 @@ Provides: freetype2 = %{version} This library features TrueType fonts for open source projects. This version also contains an autohinter for producing improved output. +%package profile-tti35 +Summary: Set TrueType interpreter to version 35 +Group: System/Shells +Requires: bash +Requires: freetype2 +BuildArch: noarch + +%description profile-tti35 +System environment for set TrueType interpreter to version 35. + %package devel Summary: Development environment for the freetype2 TrueType font library Group: Development/Libraries/C and C++ @@ -102,23 +110,24 @@ export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)" make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install +install -Dm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh # remove documentation that does not belong in an rpm rm docs/INSTALL* %post -n libfreetype6 -p /sbin/ldconfig - %postun -n libfreetype6 -p /sbin/ldconfig %files -n libfreetype6 -%defattr(-,root,root) %{_libdir}/libfreetype.so.* %doc ChangeLog README %doc docs/{CHANGES,CUSTOMIZE,DEBUG,MAKEPP,PROBLEMS,TODO,*.txt} +%files profile-tti35 +%config %{_sysconfdir}/profile.d/%{name}.sh + %files devel -%defattr(-,root,root) %doc docs/reference/* %{_includedir}/* %if 0%{?suse_version} >= 1140 From 2d01fefc6657716ec251ae9e80ead744b1c87c96a15150bf785ccd26f0c182fe Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Mar 2018 11:11:38 +0000 Subject: [PATCH 2/3] Accepting request 583281 from home:13ilya:branches:M17N - Refresh spec-file via spec-cleaner. - Add shell script freetype2.sh in separate package freetype2-profile-tti35 for set TrurType interpreter version 35 (boo#1084085). OBS-URL: https://build.opensuse.org/request/show/583281 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=139 --- freetype2.changes | 6 +++--- freetype2.spec | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/freetype2.changes b/freetype2.changes index ad70944..8294860 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- -Wed Feb 28 20:58:36 UTC 2018 - ilya@ilya.pp.ua +Tue Mar 6 10:47:29 UTC 2018 - ilya@ilya.pp.ua - Refresh spec-file via spec-cleaner. -- Add shell script freetype2.sh in separate package - freetype2-profile-tti35 for set TrurType interpreter version 35. +- Add shell script freetype2.sh in separate package freetype2-profile-tti35 + for set TrurType interpreter version 35 (boo#1084085). ------------------------------------------------------------------- Fri Feb 9 11:11:36 UTC 2018 - fstrba@suse.com diff --git a/freetype2.spec b/freetype2.spec index 759a87b..691e41d 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -68,6 +68,10 @@ BuildArch: noarch %description profile-tti35 System environment for set TrueType interpreter to version 35. +In release 2.6.4, a new hinting mode for TrueType fonts was added, +which enabled by default to activate sub-pixel hinting for TrueType. +This broke the work of full hinting. This optional package with a bash profile +that will switch the TrueType Interpreter to the old version 35. %package devel Summary: Development environment for the freetype2 TrueType font library From e22dc750391941389689aee4ff1e7e4a699c4d6fef884c804d6d8c22147264f1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Mar 2018 11:13:03 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=140 --- freetype2.changes | 5 +++-- freetype2.spec | 5 +++-- ft2demos.spec | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/freetype2.changes b/freetype2.changes index 8294860..cec0cc0 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -2,8 +2,9 @@ Tue Mar 6 10:47:29 UTC 2018 - ilya@ilya.pp.ua - Refresh spec-file via spec-cleaner. -- Add shell script freetype2.sh in separate package freetype2-profile-tti35 - for set TrurType interpreter version 35 (boo#1084085). +- Add shell script freetype2.sh in separate package + freetype2-profile-tti35 in order to be able to set TrueType + interpreter version 35 (boo#1084085). ------------------------------------------------------------------- Fri Feb 9 11:11:36 UTC 2018 - fstrba@suse.com diff --git a/freetype2.spec b/freetype2.spec index 691e41d..c7b494d 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define doc_version 2.9 Name: freetype2 Version: 2.9 @@ -22,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 diff --git a/ft2demos.spec b/ft2demos.spec index bf0498d..978fab5 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -21,7 +21,7 @@ Name: ft2demos Version: 2.9 Release: 0 Summary: Freetype2 Utilities and Demo Programs -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Publishing/Other Url: https://www.freetype.org Source0: https://savannah.nongnu.org/download/freetype/freetype-%{freetype_version}.tar.bz2