From c8f07a9a78b9ab5cc080e6c3985ec4d42c6ae472dd39d4d558c677af16234f3c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 17 Apr 2022 07:06:03 +0000 Subject: [PATCH 1/3] Accepting request 970259 from home:dirkmueller:Factory - update to 2.14.0: * Fix endianness on generating MD5 cache name * Fix a typo in the description of FcWeightFromOpenTypeDouble * fc-validate: returns an error code when missing some glyphs * Fallback uuid-based name to read a cache if no MD5-based cache * fc-cache: Show font directories to generate cache with -v * Replace UUID file mechanism with per-directory 'map' attribute [v2] * memleak fixes - drop fontconfig-do-not-remove-UUID-file.patch (obsolete) OBS-URL: https://build.opensuse.org/request/show/970259 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=164 --- fontconfig-2.13.1.tar.bz2 | 3 - fontconfig-2.14.0.tar.xz | 3 + fontconfig-do-not-remove-UUID-file.patch | 82 ------------------------ fontconfig.changes | 13 ++++ fontconfig.spec | 13 ++-- skip-network-test.patch | 13 ++++ 6 files changed, 35 insertions(+), 92 deletions(-) delete mode 100644 fontconfig-2.13.1.tar.bz2 create mode 100644 fontconfig-2.14.0.tar.xz delete mode 100644 fontconfig-do-not-remove-UUID-file.patch create mode 100644 skip-network-test.patch diff --git a/fontconfig-2.13.1.tar.bz2 b/fontconfig-2.13.1.tar.bz2 deleted file mode 100644 index 99dc816..0000000 --- a/fontconfig-2.13.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 -size 1723639 diff --git a/fontconfig-2.14.0.tar.xz b/fontconfig-2.14.0.tar.xz new file mode 100644 index 0000000..2f04338 --- /dev/null +++ b/fontconfig-2.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac +size 1431056 diff --git a/fontconfig-do-not-remove-UUID-file.patch b/fontconfig-do-not-remove-UUID-file.patch deleted file mode 100644 index 8d35853..0000000 --- a/fontconfig-do-not-remove-UUID-file.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/8 -From 5f12f564f8748deaa603adb7a4b8f616b6390ad4 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Wed, 17 Oct 2018 21:15:47 -0700 -Subject: [PATCH] Do not remove UUID file when a scanned directory is empty - -Because FcDirCacheDeleteUUID does not reset the modification time on -the directory, and because FcDirCacheRead unconditionally creates the -UUID file each time it is run, any empty directory in the cache will -get its timestamp changed each time the cache for that directory is -read. - -Instead, just leave the UUID file around as it is harmless. - -The alternative would be to only create the UUID file after the cache -has been created and the directory has been discovered to be -non-empty, but that would delay the creation of the UUID file. - -Signed-off-by: Keith Packard ---- - src/fcdir.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/fcdir.c b/src/fcdir.c -index 93f220c..bfcdf95 100644 ---- a/src/fcdir.c -+++ b/src/fcdir.c -@@ -421,13 +421,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) - /* Not using existing cache file, construct new cache */ - if (!cache) - cache = FcDirCacheScan (dir, config); -- if (cache) -- { -- FcFontSet *fs = FcCacheSet (cache); -- -- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0)) -- FcDirCacheDeleteUUID (dir, config); -- } - - return cache; - } --- -2.18.1 - -diff --git a/test/run-test.sh b/test/run-test.sh -index e76e39bd8c384f8354600d8c7b073a57f3012482..ed41456998ba599568e2ab0bf3cc990e9abcc525 100644 ---- a/test/run-test.sh -+++ b/test/run-test.sh -@@ -239,19 +239,19 @@ fi - - rm -rf $MyPWD/sysroot - --dotest "deleting .uuid file on empty dir" --prep --cp $FONT1 $FONT2 $FONTDIR --$FCCACHE $FONTDIR --sleep 1 --rm -f $FONTDIR/*pcf --$FCCACHE $FONTDIR --rmdir $FONTDIR > /dev/null 2>&1 --if [ $? != 0 ]; then -- echo "*** Test failed: $TEST" -- echo "$FONTDIR isn't empty" -- ls -al $FONTDIR -- exit 1 --fi -+# dotest "deleting .uuid file on empty dir" -+# prep -+# cp $FONT1 $FONT2 $FONTDIR -+# $FCCACHE $FONTDIR -+# sleep 1 -+# rm -f $FONTDIR/*pcf -+# $FCCACHE $FONTDIR -+# rmdir $FONTDIR > /dev/null 2>&1 -+# if [ $? != 0 ]; then -+# echo "*** Test failed: $TEST" -+# echo "$FONTDIR isn't empty" -+# ls -al $FONTDIR -+# exit 1 -+# fi - - rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out diff --git a/fontconfig.changes b/fontconfig.changes index 0159196..77e7ba4 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Apr 15 00:44:37 UTC 2022 - Dirk Müller + +- update to 2.14.0: + * Fix endianness on generating MD5 cache name + * Fix a typo in the description of FcWeightFromOpenTypeDouble + * fc-validate: returns an error code when missing some glyphs + * Fallback uuid-based name to read a cache if no MD5-based cache + * fc-cache: Show font directories to generate cache with -v + * Replace UUID file mechanism with per-directory 'map' attribute [v2] + * memleak fixes +- drop fontconfig-do-not-remove-UUID-file.patch (obsolete) + ------------------------------------------------------------------- Thu Jan 27 16:14:14 UTC 2022 - pgajdos@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index d04a16e..79c4d2d 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -18,23 +18,23 @@ Name: fontconfig %define lname libfontconfig1 -Version: 2.13.1 +Version: 2.14.0 Release: 0 Summary: Library for Font Configuration License: MIT Group: System/Libraries -URL: http://fontconfig.org/ -Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2 +URL: https://www.freedesktop.org/wiki/Software/fontconfig/ +Source0: https://www.freedesktop.org/software/fontconfig/release/fontconfig-%{version}.tar.xz Source4: baselibs.conf Source5: local.conf -# PATCH-FIX-UPSTREAM fontconfig-do-not-remove-UUID-file.patch boo#1124816 badshah400@gmail.com -- Removing .uuid files caused frequent rescanning of all system fonts causing intermittent CPU usage surges, for example, when browsing using firefox; patch taken from upstream commit -Patch0: fontconfig-do-not-remove-UUID-file.patch +Patch1: skip-network-test.patch BuildRequires: automake >= 1.11 BuildRequires: gperf BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(uuid) Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config < 003.02 @@ -91,8 +91,7 @@ HTML documentation and manual pages for developers using the fontconfig library. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # use suse-specific doc path: find -name \*.1 -o -name \*.sgml -exec sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g' {} + diff --git a/skip-network-test.patch b/skip-network-test.patch new file mode 100644 index 0000000..45e2423 --- /dev/null +++ b/skip-network-test.patch @@ -0,0 +1,13 @@ +Index: fontconfig-2.14.0/test/Makefile.am +=================================================================== +--- fontconfig-2.14.0.orig/test/Makefile.am ++++ fontconfig-2.14.0/test/Makefile.am +@@ -69,8 +69,6 @@ test_pthread_LDADD = $(top_builddir)/src + # to meaningfully test anything, and we are not installed yet. + #TESTS += test-pthread + +-check_PROGRAMS += test-crbug1004254 +-test_crbug1004254_LDADD = $(top_builddir)/src/libfontconfig.la + # Disabling this for the same reason as above but trying to run in run-test.sh. + #TESTS += test-crbug1004254 + endif From 2ccc96af0da484b486ab53e2b283d0abf2597b405014d2ecf6ab20287b51a0b5 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 28 Apr 2022 11:29:26 +0000 Subject: [PATCH 2/3] Accepting request 973673 from home:simotek:branches:M17N - Seems we now need python3 for building OBS-URL: https://build.opensuse.org/request/show/973673 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=165 --- fontconfig.changes | 5 +++++ fontconfig.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/fontconfig.changes b/fontconfig.changes index 77e7ba4..6de1b76 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 28 11:05:51 UTC 2022 - Simon Lees + +- Seems we now need python3 for building + ------------------------------------------------------------------- Fri Apr 15 00:44:37 UTC 2022 - Dirk Müller diff --git a/fontconfig.spec b/fontconfig.spec index 79c4d2d..56e6d9f 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -36,6 +36,7 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(uuid) +BuildRequires: python3-base Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config < 003.02 Provides: IPA-fonts-config = 003.02 From a469a655a3aca74712efb5cf35cb9c8ca31be3a2ac06ee81b73c7e4f3c49a7af Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 28 Apr 2022 13:52:37 +0000 Subject: [PATCH 3/3] Accepting request 973727 from home:simotek:branches:M17N Seems skip-network-test.patch was missed from the changelog OBS-URL: https://build.opensuse.org/request/show/973727 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=166 --- fontconfig.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/fontconfig.changes b/fontconfig.changes index 6de1b76..83e406c 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -15,6 +15,7 @@ Fri Apr 15 00:44:37 UTC 2022 - Dirk Müller * Replace UUID file mechanism with per-directory 'map' attribute [v2] * memleak fixes - drop fontconfig-do-not-remove-UUID-file.patch (obsolete) +- add skip-network-test.patch ------------------------------------------------------------------- Thu Jan 27 16:14:14 UTC 2022 - pgajdos@suse.com