diff options
| author | Schala | 2016-06-17 13:42:10 -0700 |
|---|---|---|
| committer | Schala | 2016-06-17 13:42:10 -0700 |
| commit | b134efb753718a5171d7950e1bfb254e82453b27 (patch) | |
| tree | f2ec6d0e9ec4f0c391e1283b4b4e30b1d502ed58 | |
| parent | 90b9dd6fb53f80819eb216cf24c67d85d2f6a548 (diff) | |
| download | aur-b134efb753718a5171d7950e1bfb254e82453b27.tar.gz | |
patches
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-fix-config-linking.all.patch | 14 | ||||
| -rw-r--r-- | 0007-pkgconfig.mingw.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
4 files changed, 56 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jun 17 20:31:24 UTC 2016 +# Fri Jun 17 20:41:50 UTC 2016 pkgbase = mingw-w64-fontconfig pkgdesc = A library for configuring and customizing font access (mingw-w64) pkgver = 2.12.0 - pkgrel = 1 + pkgrel = 2 url = http://www.fontconfig.org/release arch = any license = custom @@ -14,7 +14,11 @@ pkgbase = mingw-w64-fontconfig options = !strip options = !buildflags source = http://www.fontconfig.org/release/fontconfig-2.12.0.tar.bz2 + source = 0001-fix-config-linking.all.patch + source = 0007-pkgconfig.mingw.patch sha256sums = b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 + sha256sums = 1266d4bbd8270f013fee2401c890f0251babf50a175a69d681d3a6af5003c899 + sha256sums = af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b pkgname = mingw-w64-fontconfig diff --git a/0001-fix-config-linking.all.patch b/0001-fix-config-linking.all.patch new file mode 100644 index 000000000000..2a8551f7e1df --- /dev/null +++ b/0001-fix-config-linking.all.patch @@ -0,0 +1,14 @@ +--- fontconfig-2.10.92/conf.d/Makefile.am.orig 2013-04-13 06:32:27 +0400 ++++ fontconfig-2.10.92/conf.d/Makefile.am 2013-04-13 06:37:08 +0400 +@@ -83,9 +83,9 @@ + @(echo cd $(DESTDIR)$(configdir); \ + cd $(DESTDIR)$(configdir); \ + for i in $(CONF_LINKS); do \ +- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ ++ echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .; \ + $(RM) $$i; \ +- ln -s $(templatedir)/$$i .; \ ++ ln -s $(DESTDIR)$(templatedir)/$$i .; \ + done) + uninstall-local: + @(echo cd $(DESTDIR)$(configdir); \ diff --git a/0007-pkgconfig.mingw.patch b/0007-pkgconfig.mingw.patch new file mode 100644 index 000000000000..0895c2fc43c4 --- /dev/null +++ b/0007-pkgconfig.mingw.patch @@ -0,0 +1,22 @@ +--- fontconfig-2.11.93/m4/pkg.m4.orig 2015-03-09 02:54:03.000000000 +0000 ++++ fontconfig-2.11.93/m4/pkg.m4 2015-04-06 11:04:21.862416100 +0000 +@@ -111,8 +111,8 @@ + pkg_failed=no + AC_MSG_CHECKING([for $1]) + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags --dont-define-prefix], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs --dont-define-prefix], [$2]) + + m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS + and $1[]_LIBS to avoid the need to call pkg-config. +@@ -207,7 +207,7 @@ + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +-_PKG_CONFIG([$1], [variable="][$3]["], [$2]) ++_PKG_CONFIG([$1], [variable="][$3][" --dont-define-prefix], [$2]) + AS_VAR_COPY([$1], [pkg_cv_][$1]) + + AS_VAR_IF([$1], [""], [$5], [$4])dnl @@ -1,6 +1,6 @@ pkgname=mingw-w64-fontconfig pkgver=2.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access (mingw-w64)" arch=(any) url="http://www.fontconfig.org/release" @@ -8,11 +8,22 @@ license=("custom") makedepends=(mingw-w64-configure) depends=(mingw-w64-expat mingw-w64-freetype2) options=(staticlibs !strip !buildflags) -source=("http://www.fontconfig.org/release/fontconfig-$pkgver.tar.bz2") -sha256sums=('b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224') +source=("http://www.fontconfig.org/release/fontconfig-$pkgver.tar.bz2" +"0001-fix-config-linking.all.patch" +"0007-pkgconfig.mingw.patch") +sha256sums=('b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224' + '1266d4bbd8270f013fee2401c890f0251babf50a175a69d681d3a6af5003c899' + 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" +prepare() { + cd fontconfig-$pkgver + patch -p1 -i ${srcdir}/0001-fix-config-linking.all.patch + patch -p1 -i ${srcdir}/0007-pkgconfig.mingw.patch + autoreconf -fi +} + build() { cd fontconfig-$pkgver for _arch in ${_architectures}; do |