Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b3175649464750a7177e236e2189c5b85f4c3e8
commit 8b3175649464750a7177e236e2189c5b85f4c3e8 Author: Baste <[email protected]> Date: Mon Jun 12 10:23:23 2017 +0200 fontconfig-2.12.3-1-x86_64 - Fix build diff --git a/source/lib/fontconfig/FrugalBuild b/source/lib/fontconfig/FrugalBuild index 436049e..04ad4ac 100644 --- a/source/lib/fontconfig/FrugalBuild +++ b/source/lib/fontconfig/FrugalBuild @@ -9,15 +9,18 @@ pkgrel=1 pkgdesc="A library for configuring and customizing font access" url="http://fontconfig.org/"; depends=('freetype2>=2.7.1-2' 'expat>=2.2.0-2' 'bzip2>=1.0.6-14') +makedepends=('gperf') rodepends=('frugalware') groups=('lib' 'misc-fonts') archs=("x86_64") up2date="lynx -dump http://fontconfig.org/release|Flasttar" options=('force') source=($url/release/$pkgname-$pkgver.tar.gz \ - 25-no-bitmap.conf) + 25-no-bitmap.conf \ + gperf.patch) sha1sums=('3ec4c0edb3b1165adbe63bc521f1d001b88b2b4a' \ - '72ed9989eb96475b0c077dda2e47188583d63420') + '72ed9989eb96475b0c077dda2e47188583d63420' \ + '406a3bc0302b7c28f5b4be025c93325b2757cc60') ## NOTE: !!! DO _NOT_ BUMP , CHANGE or whatever else without permission from m8r or vmiklos !!! ## Fconfopts=" --with-add-fonts=/usr/share/fonts/X11" diff --git a/source/lib/fontconfig/gperf.patch b/source/lib/fontconfig/gperf.patch new file mode 100644 index 0000000..3dba0bb --- /dev/null +++ b/source/lib/fontconfig/gperf.patch @@ -0,0 +1,45 @@ +From 28139816d62b8444ca61a000a87c71e59fef104d Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <[email protected]> +Date: Mon, 5 Jun 2017 21:00:36 +0900 +Subject: Fix the build failure when srcdir != builddir and have gperf 3.1 or + later installed + + +diff --git a/src/Makefile.am b/src/Makefile.am +index bbbfeda..bd5ac1f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -104,7 +104,11 @@ noinst_PROGRAMS = fcarch + ../fc-lang/fclang.h: + cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h + +-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h ++fcobjshash.gperf: Makefile stamp-fcobjshash.gperf ++ -@$(RM) stamp-fcobjshash.gperf ++ @$(MAKE) stamp-fcobjshash.gperf ++ @touch -r stamp-fcobjshash.gperf $@ ++stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h + $(AM_V_GEN) $(CPP) -I$(top_srcdir) $< | \ + $(SED) 's/^ *//;s/ *, */,/' | \ + $(GREP) '^[^#]' | \ +@@ -113,7 +117,7 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h + /CUT_OUT_END/ { no_write=0; next; }; \ + { if (!no_write) print; next; }; \ + ' - > [email protected] && \ +- mv -f [email protected] $@ || ( $(RM) [email protected] && false ) ++ mv -f [email protected] fcobjshash.gperf && touch $@ || ( $(RM) [email protected] && false ) + + fcobjshash.h: Makefile fcobjshash.gperf + $(AM_V_GEN) $(GPERF) -m 100 fcobjshash.gperf > [email protected] && \ +@@ -198,7 +202,7 @@ stamp-fcstdint: $(top_builddir)/config.status + @touch $@ + + CLEANFILES = $(ALIAS_FILES) fontconfig.def +-DISTCLEANFILES = stamp-fcstdint fcstdint.h ++DISTCLEANFILES = stamp-fcstdint fcstdint.h stamp-fcobjshash.gperf + + fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES) + echo Generating $@ +-- +cgit v0.10.2 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
