fix dependencies and add a patch for building in a clean chroot

3 files changed, 85 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c024795586b..6884d280e7f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Aug 26 17:48:17 UTC 2018
 pkgbase = abiword-git
 	pkgdesc = Fully-featured word processor from official gnome gitlab mirror
 	pkgver = 20472.09026668e
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.abisource.com
 	arch = i686
 	arch = x86_64
@@ -12,14 +14,12 @@ pkgbase = abiword-git
 	makedepends = gobject-introspection
 	makedepends = python2
 	makedepends = libwpd
-	depends = fribidi
 	depends = wv
 	depends = goffice
 	depends = redland
 	depends = libical
 	depends = loudmouth
 	depends = enchant
-	depends = lasem
 	depends = libwpg
 	depends = libwmf
 	depends = link-grammar
@@ -39,10 +39,12 @@ pkgbase = abiword-git
 	source = enchant-2.1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword
 	source = aiksaurus-plugin.m4::https://git.archlinux.org/svntogit/packages.git/plain/trunk/aiksaurus-plugin.m4?h=packages/abiword
 	source = command-plugin.m4::https://git.archlinux.org/svntogit/packages.git/plain/trunk/command-plugin.m4?h=packages/abiword
+	source = in_chroot.patch
 	sha256sums = SKIP
 	sha256sums = 444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2
 	sha256sums = 5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1
 	sha256sums = 2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be
+	sha256sums = 379908e0a2d9fd58fe7529283378079c79da6a519d99dc59a2e774f2f045a8e4
 
 pkgname = abiword-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 36fb16f3d3c7..4434279f4530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgname=abiword-git
 pkgver=20472.09026668e
-pkgrel=1
+pkgrel=2
 pkgdesc="Fully-featured word processor from official gnome gitlab mirror"
 arch=('i686' 'x86_64')
 url="http://www.abisource.com"
 license=('GPL')
-depends=('fribidi' 'wv' 'goffice' 'redland' 'libical' 'loudmouth' 
-	 'enchant' 'lasem' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus'
-	 'libots' 'libchamplain' 'psiconv' 'telepathy-glib' 'libwps')
+depends=('wv' 'goffice' 'redland' 'libical' 'loudmouth' 'enchant' 'libwpg'
+	 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libots'
+	 'libchamplain' 'psiconv' 'telepathy-glib' 'libwps')
 makedepends=('git' 'asio' 'boost' 'gobject-introspection' 'python2' 'libwpd')
 provides=('abiword' 'abiword-plugins')
 conflicts=('abiword' 'abiword-plugins')
@@ -20,11 +20,12 @@ options=('!makeflags')
 source=("abiword-git::git+https://gitlab.gnome.org/World/AbiWord.git"
 	'enchant-2.1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword'
 	'aiksaurus-plugin.m4::https://git.archlinux.org/svntogit/packages.git/plain/trunk/aiksaurus-plugin.m4?h=packages/abiword' 
-	'command-plugin.m4::https://git.archlinux.org/svntogit/packages.git/plain/trunk/command-plugin.m4?h=packages/abiword')
+	'command-plugin.m4::https://git.archlinux.org/svntogit/packages.git/plain/trunk/command-plugin.m4?h=packages/abiword' in_chroot.patch)
 sha256sums=('SKIP'
             '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2'
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
-            '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be')
+            '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
+            '379908e0a2d9fd58fe7529283378079c79da6a519d99dc59a2e774f2f045a8e4')
 
 pkgver() {
   cd ${pkgname}
@@ -40,7 +41,7 @@ prepare() {
   # Generate m4 file for configure
   find plugins -name plugin.m4 | xargs cat > plugin-list.m4
   patch -Np1 < "$srcdir"/enchant-2.1.patch || true
-  sed -i '/AC_INIT/ a m4_pattern_allow([AC_MSG_ERROR])' configure.ac
+  patch -Np0 < "$srcdir"/in_chroot.patch || true
 }
 
 build() {
diff --git a/in_chroot.patch b/in_chroot.patch
new file mode 100644
index 000000000000..519ad32f3dd3
--- /dev/null
+++ b/in_chroot.patch
@@ -0,0 +1,72 @@
+--- configure.ac	2018-08-17 13:18:28.010088365 +0200
++++ configure.ac.new	2018-08-17 18:14:06.049959957 +0200
+@@ -6,6 +6,7 @@
+ m4_define([abi_version], [abi_version_major.abi_version_minor.abi_version_micro])
+ 
+ AC_INIT([abiword],[abi_version],[http://www.abisource.com/])
++m4_pattern_allow([AC_MSG_ERROR])
+ AC_CANONICAL_HOST
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+@@ -561,61 +562,6 @@
+ fi
+ AC_SUBST(ABIWORD_ICONDIR, "$abi_cv_icondir")
+ 
+-dnl ***********************************************************************
+-dnl GCC/Clang sanitizer support
+-dnl ***********************************************************************
+-AC_ARG_WITH([sanitizer],
+-            [AS_HELP_STRING([--with-sanitizer=@<:@address/undefined/no@:>@],
+-                            [Use specific GCC/Clang analyzer])],
+-            [with_sanitizer=$withval],
+-            [with_sanitizer=no])
+-AS_IF([test "x$with_sanitizer" != "xno"],[
+-	AX_CHECK_COMPILE_FLAG([-fsanitize=$withval],
+-	                      [CFLAGS="$CFLAGS -fsanitize=$withval"
+-			       CXXFLAGS="$CXXFLAGS -fsanitize=$withval"],
+-	                      [AC_MSG_ERROR([-fsanitize=$withval is not supported])])
+-        AX_APPEND_COMPILE_FLAGS([-fno-omit-frame-pointer])
+-        AC_LANG_PUSH(C++)
+-        AX_APPEND_COMPILE_FLAGS([-fno-omit-frame-pointer])
+-        AC_LANG_POP
+-])
+-
+-dnl ***************************************************************
+-dnl Excessive warnings
+-dnl ***************************************************************
+-AC_LANG_PUSH(C++)
+-AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option], [
+-	ax_compiler_flags_test="-Werror=unknown-warning-option"
+-], [
+-	ax_compiler_flags_test=""
+-])
+-dnl XXX enable these
+-dnl -Wformat-nonliteral
+-AX_APPEND_COMPILE_FLAGS([ \
+-   -Wcast-align \
+-   -Wchar-subscripts \
+-   -Wconst-qual \
+-   -Wextra \
+-   -Wformat \
+-   -Wformat-security \
+-   -Wformat-overflow=2 \
+-   -Wheader-guard \
+-   -Wimplicit-fallthrough=3 \
+-   -Wlogical-not-parentheses \
+-   -Wmisleading-indentation \
+-   -Wmissing-noreturn \
+-   -Wno-overloaded-virtual \
+-   -Wpointer-arith \
+-   -Wpointer-bool-conversion \
+-   -Wredundant-decls \
+-   -Wshadow \
+-   -Wsign-compare \
+-   -Wunreachable-code \
+-   -Wunused \
+-   -Wwrite-strings \
+-], [], [$ax_compiler_flags_test])
+-AC_LANG_POP
+-
+ #
+ # Dependency tests
+ #