From ae30ae3c370239801793d8eeeb7d95e8fb7c8c2c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 6 Oct 2025 13:07:19 +0200 Subject: [PATCH] abiword, bump to 3.0.7, bump boost requirement (#13032) Drop gcc2 version for 32bit --- app-office/abiword/abiword-2.4.recipe | 67 ------------------- ...word-3.0.5.recipe => abiword-3.0.7.recipe} | 24 ++++--- ...-3.0.5.patchset => abiword-3.0.7.patchset} | 26 +++---- 3 files changed, 27 insertions(+), 90 deletions(-) delete mode 100644 app-office/abiword/abiword-2.4.recipe rename app-office/abiword/{abiword-3.0.5.recipe => abiword-3.0.7.recipe} (87%) rename app-office/abiword/patches/{abiword-3.0.5.patchset => abiword-3.0.7.patchset} (91%) diff --git a/app-office/abiword/abiword-2.4.recipe b/app-office/abiword/abiword-2.4.recipe deleted file mode 100644 index 49afbc417..000000000 --- a/app-office/abiword/abiword-2.4.recipe +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY="A free word processing program similar to Microsoft® Word" -DESCRIPTION="AbiWord is a free word processing program similar to Microsoft® \ -Word. It is suitable for a wide variety of word processing tasks. - -AbiWord allows you to collaborate with multiple people on one document at the \ -same time. It is tightly integrated with the AbiCollab.net web service, which \ -lets you store documents online, allows easy document sharing with your \ -friends, and performs format conversions on the fly." -HOMEPAGE="https://www.abisource.com/" -COPYRIGHT="1998-2014 the AbiSource community" -LICENSE="GNU GPL v2" -REVISION="4" -srcGitRev="217fbb622ee64efc181cd67d2742d6a60a086e2d" -SOURCE_URI="https://github.com/HaikuArchives/AbiWord/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="7ec2ddca905c8ccb923315d952d04e90a4c124d50dc42dddbd1957a8ee6e915e" -SOURCE_DIR="AbiWord-$srcGitRev" - -ARCHITECTURES="!all x86_gcc2" - -PROVIDES=" - abiword = $portVersion - app:AbiWord - " -REQUIRES=" - haiku - lib:libexpat - lib:libfribidi - lib:libiconv - lib:libpng16 - lib:libpopt - lib:libpsiconv - lib:libxml2 - lib:libz - " - -BUILD_REQUIRES=" - haiku_devel - devel:libexpat - devel:libfribidi - devel:libiconv - devel:libpng16 - devel:libpopt - devel:libpsiconv - devel:libxml2 - devel:libz - " -BUILD_PREREQUIRES=" - cmd:cmp - cmd:gcc - cmd:ld - cmd:make - " - -BUILD() -{ - chmod +x abi/configure wv/configure - cd abi/src - # AbiWord doesn't build with multiple jobs specified - make -} - -INSTALL() -{ - mkdir $appsDir - cp abi/src/*/bin/* $appsDir - addAppDeskbarSymlink $appsDir/AbiWord -} diff --git a/app-office/abiword/abiword-3.0.5.recipe b/app-office/abiword/abiword-3.0.7.recipe similarity index 87% rename from app-office/abiword/abiword-3.0.5.recipe rename to app-office/abiword/abiword-3.0.7.recipe index c25798569..a7e4edd5d 100644 --- a/app-office/abiword/abiword-3.0.5.recipe +++ b/app-office/abiword/abiword-3.0.7.recipe @@ -7,12 +7,12 @@ same time. It is tightly integrated with the AbiCollab.net web service, which \ lets you store documents online, allows easy document sharing with your \ friends, and performs format conversions on the fly." HOMEPAGE="https://www.abisource.com/" -COPYRIGHT="1998-2021 the AbiSource community" +COPYRIGHT="1998-2025 the AbiSource community" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://www.abisource.com/downloads/abiword/$portVersion/source/abiword-$portVersion.tar.gz" -CHECKSUM_SHA256="1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4" -SOURCE_DIR="abiword-$portVersion" +REVISION="1" +SOURCE_URI="https://gitlab.gnome.org/World/AbiWord/-/archive/release-$portVersion/AbiWord-release-$portVersion.tar.bz2" +CHECKSUM_SHA256="19099c5cc6022efba50cebf0f081a21afdb5358256b4ea9b51c735968132f362" +SOURCE_DIR="AbiWord-release-$portVersion" PATCHES="abiword-$portVersion.patchset" ADDITIONAL_FILES="abiword.rdef.in" @@ -52,7 +52,8 @@ REQUIRES=" lib:libpangocairo_1.0$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:librsvg_2$secondaryArchSuffix - lib:libx11$secondaryArchSuffix + lib:libwv_1.2$secondaryArchSuffix + lib:libX11$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -61,7 +62,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel gsettings_desktop_schemas$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix >= 1.70.0 + devel:libboost_system$secondaryArchSuffix >= 1.88.0 devel:libenchant_2$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix @@ -84,18 +85,19 @@ BUILD_REQUIRES=" devel:libwpd_0.10$secondaryArchSuffix devel:libwpg_0.3$secondaryArchSuffix devel:libwmf$secondaryArchSuffix - devel:libwv$secondaryArchSuffix + devel:libwv_1.2$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoconf - cmd:automake + autoconf_archive + cmd:autoreconf cmd:awk cmd:cmp cmd:find cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix @@ -103,6 +105,8 @@ BUILD_PREREQUIRES=" BUILD() { + ./autogen-common.sh + autoreconf -fi export LIBS="-lglib-2.0 -lgmodule-2.0" runConfigure ./configure --with-icondir=$dataDir/icons make $jobArgs diff --git a/app-office/abiword/patches/abiword-3.0.5.patchset b/app-office/abiword/patches/abiword-3.0.7.patchset similarity index 91% rename from app-office/abiword/patches/abiword-3.0.5.patchset rename to app-office/abiword/patches/abiword-3.0.7.patchset index d7bd77b56..361e33ad8 100644 --- a/app-office/abiword/patches/abiword-3.0.5.patchset +++ b/app-office/abiword/patches/abiword-3.0.7.patchset @@ -1,14 +1,14 @@ -From aaf43fa8ca17fb2a44dab2a8f5f5224e7e2c902f Mon Sep 17 00:00:00 2001 +From 05f2cbf50f8b4d35537c9a9b39eee379f7f73c4b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 30 Oct 2022 19:25:47 +1000 Subject: enchant2 support -diff --git a/configure b/configure -index 00b716c..e0bca69 100755 ---- a/configure -+++ b/configure -@@ -4213,7 +4213,7 @@ xp_pkgs=" +diff --git a/configure.ac b/configure.ac +index c65adcc..fc1066a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ xp_pkgs=" " # optional deps @@ -49,10 +49,10 @@ index ed97c1f..165de98 100644 void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen) -- -2.37.3 +2.50.1 -From 7e03d4c1dad941f1e872aa6d8e7948c4260e4c94 Mon Sep 17 00:00:00 2001 +From 07f4abb3fdfca3e350c6bf90176ad063b30877fc Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 30 Oct 2022 19:07:33 +1000 Subject: Dirty hack for XDG variables @@ -78,10 +78,10 @@ index f19c841..07d03b9 100644 } -- -2.37.3 +2.50.1 -From 486245f74b7684650dca7faaf7a1a8652a002a02 Mon Sep 17 00:00:00 2001 +From 81cd1c9eac5e8f79749c54cdb11cd9dbfc406aff Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 30 Oct 2022 19:26:24 +1000 Subject: glib2 segfault fix @@ -105,10 +105,10 @@ index 63c21b1..4c2e615 100644 char *raw_uri = gnome_vfs_unescape_string (uri, G_DIR_SEPARATOR_S); char *basename = raw_uri ? g_path_get_basename (raw_uri) : NULL; -- -2.37.3 +2.50.1 -From 32227f11065c56f334bbf8a5b013ac3a484cfd96 Mon Sep 17 00:00:00 2001 +From 5b358a5a531db7dfa7710f9696651a78d226748e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 19 Nov 2022 12:37:25 +1000 Subject: Lose precision fix from gentoo @@ -148,5 +148,5 @@ index dd210a8..3e92bf0 100644 XAP_Frame* pFrame = getActiveFrame(); -- -2.37.3 +2.50.1