summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-02 23:42:06 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-02 23:42:06 +0000
commitc8042d10e135808d5f2b48867bc291e00664b99b (patch)
tree7ff539056fa93b5d71b38241122ac9d6566cf672 /app-office
parent7c58ecff5764af03b4c65f4115d7b9474e3a5717 (diff)
gentoo auto-resync : 02:03:2024 - 23:42:06
Diffstat (limited to 'app-office')
-rw-r--r--app-office/Manifest.gzbin8429 -> 8427 bytes
-rw-r--r--app-office/abiword/Manifest3
-rw-r--r--app-office/abiword/abiword-3.0.5-r1.ebuild (renamed from app-office/abiword/abiword-3.0.5.ebuild)3
-rw-r--r--app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch25
4 files changed, 29 insertions, 2 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9351943bc234..34e816619d1d 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index a5b821327b42..04108006c772 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,5 +1,6 @@
+AUX abiword-3.0.5-libxml2-2.12.patch 727 BLAKE2B 1bb21c02d96705d31d4c511b8dfed75402c14ce181c51505eb27c945096ce307536666d12d60ccdaf7f432e06f16be12ffcc209372642d42f7fa374d559dc039 SHA512 8f1254fe166b7e20264dc56662d68a883e0ea216ade134961cf42417fbacac746c985c5705c2a5ddedd43404acddf8b567b9feb544c0991599e049eb69f2e278
AUX abiword-3.0.5-musl-lose-precision-fix.patch 1340 BLAKE2B 4e2f9d2d82d7ef2c00a425e2f354130771c9d441156b2a256dcdb89aac0ccf2646bd33d19e8d6199e63e97fd70c024f2f4b979851c8f02aa2a2acd3a510a04df SHA512 ff14374ecc01b1f51a638e34b695be9535456e1b9b184da817660286b763c7fd9147e633b01c295a5d2a61a66b8c86a7a6c12352f5de01896da0e0f862ad8db1
DIST abiword-3.0.4-patchset-r3.txz 14752 BLAKE2B 2faaaf333a38ea181b83819fd53fd97c5e98a0cbb0b2ad6e668254a88cb69e922fd3b70a181fc7edd789bc313d929915460a0524ff463166400d8e46d878c034 SHA512 e8d2508cf561b49581441b3b581dd663a966da67175f2a39d4a95a6035d8c8c7c3198ca99f253f8d6f3993a66be752265f612b6c59c7712592e464a1da0f240e
DIST abiword-3.0.5.tar.gz 11084159 BLAKE2B c34361c2ae1604ef1ec913781c98f3707f3c98c3fb5ed5328212b51081706fe5177fb8b5a3805431c0ee451f04d8d95fdc6e7dbc3fc38d9d5037b576e115ee54 SHA512 a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
-EBUILD abiword-3.0.5.ebuild 4455 BLAKE2B 7de1464f32e8f1067de823e05b786feaa3762a62f1fd032610056fc4b066ece9726459177aabefab675c29ed098ad632fd469519bac3190500a6f8c65181348d SHA512 5c4489cf6825062dc31da46d7910ad84b20321d8fd7989913bdeea7703ba148441d0077c23f2a27630693d6a6a378251f9559e0ebeee4f33889250ee77d28df9
+EBUILD abiword-3.0.5-r1.ebuild 4501 BLAKE2B 087c3e24321a50dd88e6b55d60fe78d39566b192f6afb45ab98b28fae66676c71521677f541baabcb4eec3cf33dbb7641fbbfc934a7fc4378d82b0ab6cba96d1 SHA512 a55e7bdd593773d0a8c62e98568b4a76e24d7fc471c51621b2395c25660a56dec1c924f1107e52b161c25e649b5bd5486859672eb744970eea5ffa4b29a578d1
MISC metadata.xml 1349 BLAKE2B 9fb8f6e4be91a6d056ae6389051f37d832ab3fdbef471ed730d22ec3ef24dd956a35e25f38e4c8d75facf0196664d4c3d093b701d498ae0851229fee1144347e SHA512 0be805faf1b5d87c9973c4b2ef21022cc1de970b57d2f72a4cb7a59f4a325bc66d649bd02cd4fbb0a376c849cfc77beeedc962a16b2fdead055d4f80708b2bdc
diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild
index ff7b3097fd9b..4e942cdb2686 100644
--- a/app-office/abiword/abiword-3.0.5.ebuild
+++ b/app-office/abiword/abiword-3.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -85,6 +85,7 @@ PATCHES=(
"${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch
"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
"${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch
+ "${FILESDIR}"/${PN}-3.0.5-libxml2-2.12.patch
)
src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch
new file mode 100644
index 000000000000..a8f82e2d844a
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch
@@ -0,0 +1,25 @@
+https://gitlab.gnome.org/World/AbiWord/-/commit/2a06be6a10a0718f8a3d8e00c317f5042c99a467
+https://bugs.gentoo.org/923394
+
+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.
+--- 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