diff options
| -rw-r--r-- | libre/abiword/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/abiword/command-plugin.m4 | 47 |
2 files changed, 55 insertions, 1 deletions
diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index 86623786b..8793aead9 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -6,7 +6,7 @@ pkgname=abiword pkgver=3.0.1 -pkgrel=4.parabola1 +pkgrel=5.parabola1 arch=('i686' 'x86_64') pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support' license=('GPL') @@ -25,6 +25,7 @@ source=(http://abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver. abiword-3.0.0-link-grammar-5-second.patch link-grammar-panic.patch aiksaurus-plugin.m4 + command-plugin.m4 gnutls-3.4.0.patch liberation-fonts.patch) sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' @@ -33,6 +34,7 @@ sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' 'd2c80da81a339634a7a4ee4cef12f7ee968f2c2a8c2f75533b6713b71f0d61fd' '94d1e638f7b85123dc2282d2e59b982bde6ad0dbbe1b6b54351e610c5a0ea578' '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1' + '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be' 'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100' '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079') @@ -49,11 +51,15 @@ prepare() { # Fix build with new gnutls 3.4.x patch -Np0 -i ../gnutls-3.4.0.patch + # python2 fix + sed -i 's/python -c/python2 -c/' src/gi-overrides/Makefile.{am,in} + # Replace nonfree fonts support to liberation fonts patch -Np1 -i ../liberation-fonts.patch # Install missing m4 file install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4 + install -m644 ../command-plugin.m4 plugins/command/plugin.m4 # Generate m4 file for configure find plugins -name plugin.m4 | xargs cat > plugin-configure.m4 @@ -77,6 +83,7 @@ build() { passepartout pdb pdf presentation psion s5 sdw t602 urldict \ wikipedia wmf wml wordperfect wpg xslfo" \ --enable-introspection + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/libre/abiword/command-plugin.m4 b/libre/abiword/command-plugin.m4 new file mode 100644 index 000000000..dd010adf6 --- /dev/null +++ b/libre/abiword/command-plugin.m4 @@ -0,0 +1,47 @@ +command_deps="no" + +if test "$enable_command" != ""; then + if test "$TOOLKIT" != "gtk"; then + command_deps="no" + AC_MSG_WARN([command plugin: only supported on UNIX/gtk platforms]) + else + # stolen from the original plugin.m4 in abiword-plugins + AC_CHECK_HEADER(readline/readline.h,[ + AC_CHECK_HEADER(readline/history.h,[ + AC_CHECK_LIB(readline,readline,[ + command_deps="yes" + ],[ AC_CHECK_LIB(readline,rl_initialize,[ + command_deps="yes" + + ],,) + ],) + ]) + ]) + fi +fi + +if test "$enable_command" = "yes" || \ + test "$command_deps" = "yes"; then + +if test "$enable_command_builtin" = "yes"; then +AC_MSG_ERROR([command plugin: static linking not supported]) +fi + +AC_MSG_CHECKING([command plugin: for readline and friends]) +if test "$command_deps" != "yes"; then + AC_MSG_ERROR([no]) +else + AC_MSG_RESULT([yes]) + COMMAND_LIBS="-lreadline -lhistory $COMMAND_LIBS" +fi + +test "$enable_command" = "auto" && PLUGINS="$PLUGINS command" + +COMMAND_CFLAGS="$COMMAND_CFLAGS "'${PLUGIN_CFLAGS}' +COMMAND_LIBS="$COMMAND_LIBS "'${PLUGIN_LIBS}' + +fi + +AC_SUBST([COMMAND_CFLAGS]) +AC_SUBST([COMMAND_LIBS]) + |