abiword: update to 3.0.5

Remove unnecessary configure flags and make champlain a build option.
Bring in patch that allows tests to run.
This commit is contained in:
Mat Boehlke 2021-09-17 20:44:05 -05:00 committed by John Zimmermann
parent e9a690ebf6
commit 775f5f6349
2 changed files with 40 additions and 8 deletions

View File

@ -0,0 +1,33 @@
From d49d714d8f4cff50681e7e3705ac05dccb785ed3 Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 17 Mar 2017 04:02:47 +0000
Subject: [PATCH] Fix make check: disable valgrind. Disable widget test
git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35408 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
---
src/wp/test/unix/all_test_unix.h | 2 +-
src/wp/test/unix/testwrap.sh.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/wp/test/unix/all_test_unix.h b/src/wp/test/unix/all_test_unix.h
index d1fbe7f7f9..1ce045bfa8 100644
--- a/src/wp/test/unix/all_test_unix.h
+++ b/src/wp/test/unix/all_test_unix.h
@@ -19,5 +19,5 @@
-#include "src/af/xap/gtk/t/xap_UnixWidget.t.cpp"
+//#include "src/af/xap/gtk/t/xap_UnixWidget.t.cpp"
diff --git a/src/wp/test/unix/testwrap.sh.in b/src/wp/test/unix/testwrap.sh.in
index 3b27f2b69a..edbf0962cf 100755
--- a/src/wp/test/unix/testwrap.sh.in
+++ b/src/wp/test/unix/testwrap.sh.in
@@ -5,5 +5,5 @@ export G_DEBUG
G_SLICE=always-malloc
export G_SLICE
-exec libtool --mode=execute @VALGRIND@ --leak-check=full --log-file=tf-vgdump ./AbiWord-test
+exec libtool --mode=execute ./AbiWord-test

View File

@ -1,14 +1,13 @@
# Template file for 'abiword'
pkgname=abiword
version=3.0.4
revision=2
version=3.0.5
revision=1
build_style=gnu-configure
configure_args="--enable-plugins --enable-clipart --enable-templates
--with-gtk3 $(vopt_enable goffice)"
configure_args="--enable-plugins --enable-clipart --enable-templates"
hostmakedepends="automake libtool flex pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel fribidi-devel libgsf-devel
enchant2-devel librsvg-devel wv-devel boost-devel libxslt-devel
libwmf-devel libchamplain-devel redland-devel libical-devel
libwmf-devel $(vopt_if champlain libchamplain-devel) redland-devel libical-devel
libgcrypt-devel harfbuzz-devel $(vopt_if goffice goffice-devel)
gtk+3-devel"
depends="hicolor-icon-theme desktop-file-utils"
@ -17,10 +16,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.abisource.com/"
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
checksum=e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
checksum=1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4
build_options="goffice"
build_options_default="goffice"
build_options="goffice champlain"
build_options_default="goffice champlain"
CXXFLAGS="-std=c++11"