diff options
Diffstat (limited to 'user/abiword')
| -rw-r--r-- | user/abiword/APKBUILD | 16 | ||||
| -rw-r--r-- | user/abiword/fix-bad-cast.patch | 12 | ||||
| -rw-r--r-- | user/abiword/fix-black-drawing-regression.patch | 54 | ||||
| -rw-r--r-- | user/abiword/libxml2-2.12.patch | 29 |
4 files changed, 51 insertions, 60 deletions
diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD index 76ae5ea08..7da87b633 100644 --- a/user/abiword/APKBUILD +++ b/user/abiword/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abiword -pkgver=3.0.2 -pkgrel=0 +pkgver=3.0.5 +pkgrel=1 pkgdesc="A fully-featured word processor" url="https://www.abisource.com" arch="all" options="!check" # Test suite requires valgrind, etc license="GPL-2.0+" +depends="" makedepends="bzip2-dev enchant-dev fribidi-dev goffice-dev gtk+3.0-dev libgsf-dev libjpeg-turbo-dev librsvg-dev libxslt-dev pcre-dev popt-dev wv-dev" @@ -21,8 +22,10 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ latex loadbindings mht mif mswrite openwriter openxml opml paint \ passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \ xslfo" -source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz - fix-black-drawing-regression.patch +# https certificate is expired; integrity provided by checksum +source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz + fix-bad-cast.patch + libxml2-2.12.patch " build() { @@ -40,5 +43,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 abiword-3.0.2.tar.gz -cae9a08047cd97d11acea25a2f0b0ca4e8e4556b462eb476507fa178a7412221839febfeb36bebf491bb94d53525c4584d86230f96c403a7ceb2dec4223be8fe fix-black-drawing-regression.patch" +sha512sums="a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 abiword-3.0.5.tar.gz +89edeed246f937e4f198068ed9861e155662d346fb1534d2ed676cbd782de22a691d2b045989942bd715cbfc3750cf9d7615065816b970695597361ae4a9d55e fix-bad-cast.patch +0f98383e160782ccc2160e1bd9f5ba5ca02463dc14c2caeb987f225c06b4484a3618a068ff35806b6e3b6b2748e90a558c71ffb8d44c669f302fdcaebca836d4 libxml2-2.12.patch" diff --git a/user/abiword/fix-bad-cast.patch b/user/abiword/fix-bad-cast.patch new file mode 100644 index 000000000..fdecb21c5 --- /dev/null +++ b/user/abiword/fix-bad-cast.patch @@ -0,0 +1,12 @@ +diff -ur a/src/af/xap/xp/xap_Dialog.cpp b/src/af/xap/xp/xap_Dialog.cpp +--- a/src/af/xap/xp/xap_Dialog.cpp 2022-02-01 17:49:27.650000000 +0000 ++++ b/src/af/xap/xp/xap_Dialog.cpp 2022-02-01 17:52:14.000000000 +0000 +@@ -267,7 +267,7 @@ + // This function constructs and returns the window name of a modeless dialog by + // concatenating the active frame with the dialog name + +- *pWindowName = (char) NULL; ++ *pWindowName = 0; // https://gitlab.gnome.org/World/AbiWord/-/commit/857cd86def49fe8557cfe123830c4d5a61eee732.patch + UT_UTF8String wn = UT_UTF8String(pDialogName); + + XAP_Frame* pFrame = getActiveFrame(); diff --git a/user/abiword/fix-black-drawing-regression.patch b/user/abiword/fix-black-drawing-regression.patch deleted file mode 100644 index dbce8c696..000000000 --- a/user/abiword/fix-black-drawing-regression.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere <hub@figuiere.net> -Date: Thu, 8 Dec 2016 02:03:10 +0000 -Subject: [PATCH] Bug 13815 - draw event should return TRUE - -This fix the black drawing regression with Gtk3.22 - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 ---- - src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- - src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..10f8e00 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else --gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) -+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); -@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..a0ff57f 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else -- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); -+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif - static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); - static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/user/abiword/libxml2-2.12.patch b/user/abiword/libxml2-2.12.patch new file mode 100644 index 000000000..2c3642248 --- /dev/null +++ b/user/abiword/libxml2-2.12.patch @@ -0,0 +1,29 @@ +From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Mon, 11 Dec 2023 01:55:53 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. +Let’s add the correct include. +--- + src/af/util/xp/ut_stringbuf.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/af/util/xp/ut_stringbuf.cpp b/src/af/util/xp/ut_stringbuf.cpp +index f1e8d9078..88488ad67 100644 +--- a/src/af/util/xp/ut_stringbuf.cpp ++++ b/src/af/util/xp/ut_stringbuf.cpp +@@ -26,6 +26,7 @@ + #include <algorithm> + + #include <libxml/uri.h> ++#include <libxml/xmlmemory.h> + + #include <glib.h> + +-- +GitLab + |