diff --git a/bugzilla-308961-cmex-workaround.patch b/bugzilla-308961-cmex-workaround.patch index 9b5df52..4bb4eb7 100644 --- a/bugzilla-308961-cmex-workaround.patch +++ b/bugzilla-308961-cmex-workaround.patch @@ -2,11 +2,11 @@ src/base/ftobjs.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: freetype-2.11.0/src/base/ftobjs.c +Index: freetype-2.12.0/src/base/ftobjs.c =================================================================== ---- freetype-2.11.0.orig/src/base/ftobjs.c -+++ freetype-2.11.0/src/base/ftobjs.c -@@ -2646,6 +2646,11 @@ +--- freetype-2.12.0.orig/src/base/ftobjs.c ++++ freetype-2.12.0/src/base/ftobjs.c +@@ -2732,6 +2732,11 @@ if ( FT_IS_SCALABLE( face ) ) { diff --git a/don-t-mark-libpng-as-required-library.patch b/don-t-mark-libpng-as-required-library.patch index 7ed6af5..ea2eb71 100644 --- a/don-t-mark-libpng-as-required-library.patch +++ b/don-t-mark-libpng-as-required-library.patch @@ -1,24 +1,16 @@ -Index: freetype-2.11.0/builds/unix/configure +Index: freetype-2.12.0/builds/unix/configure =================================================================== ---- freetype-2.11.0.orig/builds/unix/configure -+++ freetype-2.11.0/builds/unix/configure -@@ -15672,7 +15672,6 @@ fi +--- freetype-2.12.0.orig/builds/unix/configure ++++ freetype-2.12.0/builds/unix/configure +@@ -16214,7 +16214,6 @@ fi # entries in Requires.private are separated by commas - REQUIRES_PRIVATE="$zlib_reqpriv, \ - $bzip2_reqpriv, \ -- $libpng_reqpriv, \ - $harfbuzz_reqpriv, \ - $brotli_reqpriv" + PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ +- $libpng_reqpriv, \ + $harfbuzz_reqpriv, \ + $brotli_reqpriv" # beautify -@@ -15687,7 +15686,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT - - LIBS_PRIVATE="$zlib_libspriv \ - $bzip2_libspriv \ -- $libpng_libspriv \ - $harfbuzz_libspriv \ - $brotli_libspriv \ - $ft2_extra_libs" -@@ -15700,7 +15698,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ +@@ -16242,7 +16241,6 @@ PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libsstaticconf \ $bzip2_libsstaticconf \ @@ -26,27 +18,19 @@ Index: freetype-2.11.0/builds/unix/configure $harfbuzz_libsstaticconf \ $brotli_libsstaticconf \ $ft2_extra_libs" -Index: freetype-2.11.0/builds/unix/configure.raw +Index: freetype-2.12.0/builds/unix/configure.raw =================================================================== ---- freetype-2.11.0.orig/builds/unix/configure.raw -+++ freetype-2.11.0/builds/unix/configure.raw -@@ -1036,7 +1036,6 @@ fi +--- freetype-2.12.0.orig/builds/unix/configure.raw ++++ freetype-2.12.0/builds/unix/configure.raw +@@ -987,7 +987,6 @@ fi # entries in Requires.private are separated by commas - REQUIRES_PRIVATE="$zlib_reqpriv, \ - $bzip2_reqpriv, \ -- $libpng_reqpriv, \ - $harfbuzz_reqpriv, \ - $brotli_reqpriv" + PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ +- $libpng_reqpriv, \ + $harfbuzz_reqpriv, \ + $brotli_reqpriv" # beautify -@@ -1051,7 +1050,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT - - LIBS_PRIVATE="$zlib_libspriv \ - $bzip2_libspriv \ -- $libpng_libspriv \ - $harfbuzz_libspriv \ - $brotli_libspriv \ - $ft2_extra_libs" -@@ -1064,7 +1062,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ +@@ -1015,7 +1014,6 @@ PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libsstaticconf \ $bzip2_libsstaticconf \ diff --git a/freetype-2.11.1.tar.xz b/freetype-2.11.1.tar.xz deleted file mode 100644 index 4f5f3a6..0000000 --- a/freetype-2.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 -size 2270728 diff --git a/freetype-2.11.1.tar.xz.sig b/freetype-2.11.1.tar.xz.sig deleted file mode 100644 index 805f5eb..0000000 --- a/freetype-2.11.1.tar.xz.sig +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRY4MER459UCMXT7HbBpg6s5wf9pQUCYai+XgAKCRDBpg6s5wf9 -pVaXAJ9R5rw0VtOkZYA8snxKWwdqhZoSqgCbBfYfvxdZeT3tcFg0T0zcHKAS4w8= -=Qbcs ------END PGP SIGNATURE----- diff --git a/freetype-2.12.0.tar.xz b/freetype-2.12.0.tar.xz new file mode 100644 index 0000000..d9d38ca --- /dev/null +++ b/freetype-2.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033 +size 2340352 diff --git a/freetype-2.12.0.tar.xz.sig b/freetype-2.12.0.tar.xz.sig new file mode 100644 index 0000000..1b5c164 --- /dev/null +++ b/freetype-2.12.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE4wZ0cHhWQJ/xlIAQvmw6rGOtjj8FAmJF1o0ACgkQvmw6rGOt +jj8WnhAAljqY66SYda3abRlIcA3Y0TBdHry1jytE7J3seimzLYo3n0/dR+2I0SDH +iSBluaQVSylhf7B2drsVCpIBERBENajpz8gTb36U5ToV7BuoPyiCaxSI+v6J2pQV +cQo6qqJNFUlHtCKlcdNq2Ywb7sd5epVq1rQa4YQDZPsGBLVmV1mqWEpXGo6ZBrrj +m8I4GPe9hoZyuGy6O6euKcssj8Qd4+qKyuhhw6+yJYwvk+rH7SRwZRqYp9NNdug5 +sviu19i/FuXqBte1tX9z7KinSKU+52RZpM9HKDfIyCg5KiVfE541d+D5/nGXfHrs +KUZ2OoEznOMyHNBcNY/VZJ5NaY7Lr5ePvfDLgZT1QS9QqPH6S9TMFdGTaQkK1jQb +H+mbCbv9DLiZTwBpFq6deL8p6Xti+EF4pqfVrCwZIvWkS8yB5Z498WDbpB2BA9yG ++KF/kQPon0QaThxEqpMIFt0bguXz5/DvK0rTyCi+a/hTe7JLdU7N9DQVSZzfUpq4 +4Vjg3lnV8BGEttNGr6Nhd7weX3j5+q9mlRKGPaZvEfONwHr27f89cCRnNTsH/8Xk +0zy/1dz+SuRu3YjNRxzIi4t2d9O9jtHRIPsET3yM45uYNff/YfdQ2gny1rrn50/r +bFwh0lwnAtJxt+r3KPOIuMC8h0s+QGw2V2oJM+gLRdOMtG8VmEo= +=/eFy +-----END PGP SIGNATURE----- diff --git a/freetype-doc-2.11.1.tar.xz b/freetype-doc-2.11.1.tar.xz deleted file mode 100644 index c2bd562..0000000 --- a/freetype-doc-2.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:755e29908093c19138a38775784b0accf7e838ffa28a25b8722b3dfe651d80fa -size 2038348 diff --git a/freetype-doc-2.11.1.tar.xz.sig b/freetype-doc-2.11.1.tar.xz.sig deleted file mode 100644 index 10f7f8c..0000000 --- a/freetype-doc-2.11.1.tar.xz.sig +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRY4MER459UCMXT7HbBpg6s5wf9pQUCYai+XgAKCRDBpg6s5wf9 -pch/AJoDW8EEPtHPkz+lABAuFNipDvM5LwCghBgSwuM2UlYGWtF/ayrOkWfCZKk= -=/lYA ------END PGP SIGNATURE----- diff --git a/freetype-doc-2.12.0.tar.xz b/freetype-doc-2.12.0.tar.xz new file mode 100644 index 0000000..48bfc56 --- /dev/null +++ b/freetype-doc-2.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22cf273cba41da07b7414a82a3ae701df1239e29928f0b8c42d08c5ef98dc01d +size 2038684 diff --git a/freetype-doc-2.12.0.tar.xz.sig b/freetype-doc-2.12.0.tar.xz.sig new file mode 100644 index 0000000..fa0241f --- /dev/null +++ b/freetype-doc-2.12.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE4wZ0cHhWQJ/xlIAQvmw6rGOtjj8FAmJF1o4ACgkQvmw6rGOt +jj+gKxAAr0c/ksKgxROIcd0uOoHgzbsfeUco1LC3KHcdSSOhxnTQol5tdiSs/hlb +Nmvv6KTuQ3TtBwFuEUS7l9QQt3qC+LN58qbAYAK5UYYxICiQoW48bREtrHYqbdKS +DbtHka0Mlg2FFZdMeJP1E2Smwe1zIBZaZ0eWEMlv9fbn8egnpPRyqXKdNMoOLd3Z +mczoQ5uaM/fWEefbXkvJIY7tnwrrHraobOrrgjdVTFhuCL/HFRh4GqtAO2E/ENsn +RuZFka4op8VUb9sRRpjtJHrE4tWQ5f3uA1OWrPdtnGIdnXp5Np3cut9CgOQXVfcJ +NWvDfsscNKy4SjOl1sOv7IX1B5bxZ3jKgwxD/TRHEVuT8j7Q7dnZrF3QBCHKT3nl ++jYU4MuZGXHuqBKcglYHhoSnIdvmdjGPx8hFZqjTu0dAFMpEroFqaYpb2DCYRSK/ +nB8Gm/rrkcOvDeNNN0DU+heZv+0YzLu+2m/8B0POtcjNN6P6uDAUKohgN7uLi7Db +33fpxqruxLL6WnzsOaKX2q3ymADJw8XflAC0yZxxFOyZfg29JHZufl2BI5TYZzNR +IknVxyv3A7R1NbScxNhOTnSHJjMh6nLOQJQgUuvGU/oONFhJzK4j4grDu4A/XNqd +lP6U5wmQHxDGpDSbPXh2VG8BDeShwwdzWeb268V6mY6RPUPvwfY= +=1quz +-----END PGP SIGNATURE----- diff --git a/freetype2.changes b/freetype2.changes index dc4bc06..fca2325 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Apr 8 17:06:49 UTC 2022 - Dirk Müller + +- update to 2.12.0: + - FreeType now handles OT-SVG fonts, to be controlled with + `FT_CONFIG_OPTION_SVG` configuration macro. By default, it can + only load the 'SVG ' table of an OpenType font. However, by using + the `svg-hooks` property of the new 'ot-svg' module it is possible + to register an external SVG rendering engine. The FreeType demo + programs have been set up to use 'librsvg' as the rendering + library. + - The handling of fonts with an 'sbix' table has been improved. + - The internal 'zlib' code has been updated to be in sync with the + current 'zlib' version (1.2.11). + - The previously internal load flag `FT_LOAD_SBITS_ONLY` is now + public. + - Some minor improvements of the building systems, in particular + handling of the 'zlib' library (internal vs. external). + - Support for non-desktop Universal Windows Platform. + - Various other minor bug and documentation fixes. + - The `ftdump` demo program shows more information for Type1 fonts + if option `-n` is given. + - `ftgrid` can now display embedded bitmap strikes. + ------------------------------------------------------------------- Thu Dec 2 22:07:29 UTC 2021 - Dirk Müller diff --git a/freetype2.keyring b/freetype2.keyring index 4273b01..c96f660 100644 Binary files a/freetype2.keyring and b/freetype2.keyring differ diff --git a/freetype2.spec b/freetype2.spec index c15a8be..fd7774a 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -1,7 +1,7 @@ # # spec file for package freetype2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define doc_version 2.11.1 +%define doc_version 2.12.0 Name: freetype2 -Version: 2.11.1 +Version: 2.12.0 Release: 0 Summary: A TrueType Font Library License: GPL-2.0-or-later OR SUSE-Freetype diff --git a/ft2demos-2.11.1.tar.xz b/ft2demos-2.11.1.tar.xz deleted file mode 100644 index 7210be5..0000000 --- a/ft2demos-2.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c60620d49d0f16d95586eb868c01b129569409e6cfdcb87a78e0482a12604672 -size 257240 diff --git a/ft2demos-2.11.1.tar.xz.sig b/ft2demos-2.11.1.tar.xz.sig deleted file mode 100644 index 614eae1..0000000 --- a/ft2demos-2.11.1.tar.xz.sig +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRY4MER459UCMXT7HbBpg6s5wf9pQUCYai+XgAKCRDBpg6s5wf9 -paLVAJ91qArXhQaYiwC1HCljbs5H9Fo4PQCfWqqQKnaoWQj/h+JIUmbwE87nt6w= -=V+bb ------END PGP SIGNATURE----- diff --git a/ft2demos-2.12.0.tar.xz b/ft2demos-2.12.0.tar.xz new file mode 100644 index 0000000..f5e3219 --- /dev/null +++ b/ft2demos-2.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbc7ecaebc8c1658e4cc9e04e5978bba35375f664e87b857ca67451ab6b372d3 +size 263612 diff --git a/ft2demos-2.12.0.tar.xz.sig b/ft2demos-2.12.0.tar.xz.sig new file mode 100644 index 0000000..90205ca --- /dev/null +++ b/ft2demos-2.12.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE4wZ0cHhWQJ/xlIAQvmw6rGOtjj8FAmJF1o0ACgkQvmw6rGOt +jj+WFQ//erNao1rfR2pKTk6pEFiXHn0SuBXpMQRZ+jKRUoXcaUiPHFYqvTb0OBZg +ELKdWxDfCBhs0IwSa6rDaEWujWU3DEbRS52DoauDh9cnl16ZcIy6NiKRQ+g9Yv0J +AU/ErM66eReAnhK+cKSqWMmx2ZSRuRbDPH7M41b03MiBOCAuQT25Z7T3VZeCVcrc +ad8DsxKKI6LsAWeObeigirWAfLZ+hqweo0mkgo8sYLYjiGBfbtAII43p8Q0Xf2Zu +S2TlkK29thMtFH9XbArU7igi/z4f2u3VVlsi/mA+S1GlYs917jvo8gAX+OjouLTL +JSNOLYtOk+uFGajhzURxXHuU8p5/ouu+9AsH8Hp/r0BXKeGNPAQX6jUNOnI5sJxg +qVMSricRiayaUPNIyjT7cvyqg34xQbaOCtECUr/Z4vVCe1yHxvjWKYL//rl9o7VP +HeAIjfNxirbqCofJhfreW66xoBaXb8D8OChJkGfgepL4Msh0KBwXxHPGNE5k0Sli +ttLBJ02kK6rFISokGVpjAX+OkFaVBAOJ6tWg/jlfrQ+MrC5u5HHojQXps0e9w39y +kbtKJorkYY8TvTlnk3r2/H0UkJXwe+baIVgyDO/WazsnGssivnugQPQV178v10Mg +Lk4nLj/EVADgBxQT3uvDpw2cK/U/zoK6Y/r+WB9jZI07G6FP0V0= +=rpMT +-----END PGP SIGNATURE----- diff --git a/ft2demos.spec b/ft2demos.spec index e6d4926..8dffa4d 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -1,7 +1,7 @@ # # spec file for package ft2demos # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define freetype_version 2.11.1 +%define freetype_version 2.12.0 Name: ft2demos -Version: 2.11.1 +Version: 2.12.0 Release: 0 Summary: Freetype2 Utilities and Demo Programs License: GPL-2.0-or-later @@ -48,6 +48,7 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libbrotlidec) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(zlib) Requires: ftbench = %{version}-%{release}