From 138f5d5769f87ce6b8ff248f8d7f741eb98071a3b67a7959137f617f02e05bf5 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 5 Jun 2017 11:40:56 +0000 Subject: [PATCH 1/2] - Update to 2.12.3: Don't call perror() if no changes happens in errno Fix FcCacheOffsetsValid() Fix the build issue with gperf 3.1 Fix the build issue on GNU/Hurd Update a bit for the changes in FreeType 2.7.1 Add the description of FC_LANG envvar to the doc Bug 101202 - fontconfig FTBFS if docbook-utils is installed Correct cache version info in doc/fontconfig-user.sgml Avoid conflicts with integer width macros from TS 18661-1:2014 Fix PostScript font alias name Update aliases for URW June 2016 - removed unneeded: - fontconfig-glibc-2.25.patch - make-check.patch OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=141 --- fontconfig-2.12.1.tar.bz2 | 3 -- fontconfig-2.12.3.tar.bz2 | 3 ++ fontconfig-doc-2.12.1.tar.bz2 | 3 -- fontconfig-doc-2.12.3.tar.bz2 | 3 ++ fontconfig-glibc-2.25.patch | 72 ----------------------------------- fontconfig.changes | 19 +++++++++ fontconfig.spec | 14 +++---- make-check.patch | 18 --------- 8 files changed, 32 insertions(+), 103 deletions(-) delete mode 100644 fontconfig-2.12.1.tar.bz2 create mode 100644 fontconfig-2.12.3.tar.bz2 delete mode 100644 fontconfig-doc-2.12.1.tar.bz2 create mode 100644 fontconfig-doc-2.12.3.tar.bz2 delete mode 100644 fontconfig-glibc-2.25.patch delete mode 100644 make-check.patch diff --git a/fontconfig-2.12.1.tar.bz2 b/fontconfig-2.12.1.tar.bz2 deleted file mode 100644 index 757cc9e..0000000 --- a/fontconfig-2.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 -size 1608901 diff --git a/fontconfig-2.12.3.tar.bz2 b/fontconfig-2.12.3.tar.bz2 new file mode 100644 index 0000000..bafe56d --- /dev/null +++ b/fontconfig-2.12.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd +size 1600509 diff --git a/fontconfig-doc-2.12.1.tar.bz2 b/fontconfig-doc-2.12.1.tar.bz2 deleted file mode 100644 index 47e54ba..0000000 --- a/fontconfig-doc-2.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9abfe5080f3e8ea46b1e68810be4986f966794fb14512ccf14d45943ee77e533 -size 102967 diff --git a/fontconfig-doc-2.12.3.tar.bz2 b/fontconfig-doc-2.12.3.tar.bz2 new file mode 100644 index 0000000..37a7d93 --- /dev/null +++ b/fontconfig-doc-2.12.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81c8d9f1ebd6536eabef34942441903191db6fb8c947c567b14f2eef40b33715 +size 100510 diff --git a/fontconfig-glibc-2.25.patch b/fontconfig-glibc-2.25.patch deleted file mode 100644 index b15ed5c..0000000 --- a/fontconfig-glibc-2.25.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 11 Dec 2016 14:32:00 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj ---- -Upstream-Status: Merged into master (1ab5258f7c2abfafcd63a760ca08bf93591912da) - - fontconfig/fontconfig.h | 3 ++- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 5 insertions(+), 4 deletions(-) - -Index: fontconfig-2.12.1/fontconfig/fontconfig.h -=================================================================== ---- fontconfig-2.12.1.orig/fontconfig/fontconfig.h -+++ fontconfig-2.12.1/fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -Index: fontconfig-2.12.1/src/fcobjs.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjs.h -+++ fontconfig-2.12.1/src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) -Index: fontconfig-2.12.1/src/fcobjshash.gperf -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.gperf -+++ fontconfig-2.12.1/src/fcobjshash.gperf -@@ -44,7 +44,7 @@ int id; - "rgba",FC_RGBA_OBJECT - "scale",FC_SCALE_OBJECT - "minspace",FC_MINSPACE_OBJECT --"charwidth",FC_CHAR_WIDTH_OBJECT -+"charwidth",FC_CHARWIDTH_OBJECT - "charheight",FC_CHAR_HEIGHT_OBJECT - "matrix",FC_MATRIX_OBJECT - "charset",FC_CHARSET_OBJECT -Index: fontconfig-2.12.1/src/fcobjshash.h -=================================================================== ---- fontconfig-2.12.1.orig/src/fcobjshash.h -+++ fontconfig-2.12.1/src/fcobjshash.h -@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, - {-1}, - #line 47 "fcobjshash.gperf" -- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, - #line 48 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, - #line 55 "fcobjshash.gperf" diff --git a/fontconfig.changes b/fontconfig.changes index d9be970..e39b6c7 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jun 5 11:33:07 UTC 2017 - pgajdos@suse.com + +- Update to 2.12.3: + Don't call perror() if no changes happens in errno + Fix FcCacheOffsetsValid() + Fix the build issue with gperf 3.1 + Fix the build issue on GNU/Hurd + Update a bit for the changes in FreeType 2.7.1 + Add the description of FC_LANG envvar to the doc + Bug 101202 - fontconfig FTBFS if docbook-utils is installed + Correct cache version info in doc/fontconfig-user.sgml + Avoid conflicts with integer width macros from TS 18661-1:2014 + Fix PostScript font alias name + Update aliases for URW June 2016 +- removed unneeded: + - fontconfig-glibc-2.25.patch + - make-check.patch + ------------------------------------------------------------------- Sun Feb 26 01:44:16 UTC 2017 - qantas94heavy@gmail.com diff --git a/fontconfig.spec b/fontconfig.spec index d150a97..cfe66ac 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -18,7 +18,7 @@ %define build_docs 0 Name: fontconfig -Version: 2.12.1 +Version: 2.12.3 Release: 0 Summary: Library for Font Configuration License: MIT @@ -29,13 +29,10 @@ Source4: baselibs.conf Source5: local.conf # suse specific because freetype2-bitmap-foundry.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 -Patch0: make-check.patch Patch1: fontconfig-locale_c.utf8.patch -# PATCH-FIX-UPSTREAM fontconfig-glibc-2.25.patch -- fixes build with glibc 2.25 -# http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130213.html -Patch2: fontconfig-glibc-2.25.patch BuildRequires: automake >= 1.11 BuildRequires: freetype2-devel +BuildRequires: gperf BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -109,9 +106,7 @@ accepts font patterns and returns the nearest matching font. %if %{build_docs} < 1 tar -xvf %{SOURCE1} %endif -%patch0 -p1 %patch1 -p1 -%patch2 -p1 # use suse-specific doc path: find -name \*.1 -o -name \*.sgml | xargs sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g' @@ -122,6 +117,11 @@ find . -name Makefile.am -exec sed -i "s/\(TESTS_ENVIRONMENT=.*\) sh/\1/" {} \; chmod u+x test/run-test.sh chmod u+x doc/check-missing-doc # ----- +# build 2.12.3 (2.12.1 worked fine); not needed as soon +# as following bug is resolved: +# https://bugs.freedesktop.org/show_bug.cgi?id=101280 +rm src/fcobjshash.h +# --- autoreconf -fiv %configure --with-pic --with-arch=%{_host_cpu} \ --disable-static \ diff --git a/make-check.patch b/make-check.patch deleted file mode 100644 index 18b1eed..0000000 --- a/make-check.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru fontconfig-2.3.93.20060131.orig/test/out.expected fontconfig-2.3.93.20060131/test/out.expected ---- fontconfig-2.3.93.20060131.orig/test/out.expected 2003-03-01 06:54:42.000000000 +0100 -+++ fontconfig-2.3.93.20060131/test/out.expected 2006-01-31 11:50:40.000000000 +0100 -@@ -1,8 +1,8 @@ --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 - = --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 - = --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 From 3f75c9296ef788762f66465ebcf4116129fb9b9e68a49738c3b342dc5a4eb233 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 5 Jun 2017 11:49:02 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=142 --- fontconfig.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fontconfig.spec b/fontconfig.spec index cfe66ac..834a6c5 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -32,7 +32,13 @@ Source5: local.conf Patch1: fontconfig-locale_c.utf8.patch BuildRequires: automake >= 1.11 BuildRequires: freetype2-devel +# ----- +# (see removal of src/fcobjshash.h in %build) +# build 2.12.3 (2.12.1 worked fine); not needed as soon +# as following bug is resolved: +# https://bugs.freedesktop.org/show_bug.cgi?id=101280 BuildRequires: gperf +# --- BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: pkgconfig