summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Julian Ospald <hasufell@posteo.de> 2016-10-25 15:56:50 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-11-03 16:04:22 +0100
commit591eefb6b4374268917d1c5a190d6416f9fd11ac (patch)
treeccc84285936dd697ffaf4d6faa87e01762f3aafd
parentbd95d220ee5c6b51b1e44648379033edbf8c10c7 (diff)
downloadoffice-591eefb6b4374268917d1c5a190d6416f9fd11ac.tar.gz
office-591eefb6b4374268917d1c5a190d6416f9fd11ac.tar.xz
app-office/abiword: minor build time fix
Change-Id: If8886aff58b5340b90bfec1310fa22f599337571 Reviewed-on: https://galileo.mailstation.de/gerrit/7452 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/app-office/abiword/abiword-3.0.1.exheres-04
-rw-r--r--packages/app-office/abiword/files/0001-BUILD-fix-pkg-config-invocation.patch26
2 files changed, 30 insertions, 0 deletions
diff --git a/packages/app-office/abiword/abiword-3.0.1.exheres-0 b/packages/app-office/abiword/abiword-3.0.1.exheres-0
index 457c62d..5ba4560 100644
--- a/packages/app-office/abiword/abiword-3.0.1.exheres-0
+++ b/packages/app-office/abiword/abiword-3.0.1.exheres-0
@@ -57,6 +57,10 @@ DEPENDENCIES="
# dev-libs/gnutls
# )
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/0001-BUILD-fix-pkg-config-invocation.patch
+)
+
# TODO: Collab
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-plugins="t602 docbook clarisworks wml kword hancom openwriter pdf loadbindings mswrite garble pdb applix opendocument sdw xslfo svg gimp bmp freetranslation iscii s5 babelfish opml eml wikipedia gdict passepartout google presentation urldict hrtext mif openxml goffice latex command wmf"
diff --git a/packages/app-office/abiword/files/0001-BUILD-fix-pkg-config-invocation.patch b/packages/app-office/abiword/files/0001-BUILD-fix-pkg-config-invocation.patch
new file mode 100644
index 0000000..72bc324
--- /dev/null
+++ b/packages/app-office/abiword/files/0001-BUILD-fix-pkg-config-invocation.patch
@@ -0,0 +1,26 @@
+From 148142b841a23fb82ca4e085a71d9f804b3a24cc Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Tue, 25 Oct 2016 15:44:20 +0200
+Subject: [PATCH] BUILD: fix pkg-config invocation
+Upstream: no
+
+---
+ plugin-configure.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugin-configure.m4 b/plugin-configure.m4
+index 54998fb..22b1569 100644
+--- a/plugin-configure.m4
++++ b/plugin-configure.m4
+@@ -121,7 +121,7 @@ AC_SUBST([PDF_LIBS])
+ goffice_req=
+ for ver in 0.10 ; do
+ if test "x$goffice_req" = x; then
+- if pkg-config --exists libgoffice-$ver; then
++ if ${PKG_CONFIG} --exists libgoffice-$ver; then
+ goffice_req=libgoffice-$ver
+ fi
+ fi
+--
+2.10.1
+