* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/, gnome-extra/libgsf/files/
@ 2024-01-16 3:19 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-01-16 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 9ec403a539c52f06f5111a62ace41e2604662e76
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:11:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:14:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec403a5
gnome-extra/libgsf: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/917549
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 20 ++++++++++++++++++++
| 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
--git a/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch b/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch
new file mode 100644
index 000000000000..cfbd82c6e634
--- /dev/null
+++ b/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/917549
+https://gitlab.gnome.org/GNOME/libgsf/-/commit/b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22
+
+From b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
+Date: Fri, 24 Nov 2023 19:47:35 +0100
+Subject: [PATCH] xml: Fix build with libxml2 2.12
+
+--- a/gsf/gsf-libxml.h
++++ b/gsf/gsf-libxml.h
+@@ -23,6 +23,7 @@
+ #define GSF_LIBXML_H
+
+ #include <gsf/gsf-fwd.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+
+ G_BEGIN_DECLS
+--
+GitLab
--git a/gnome-extra/libgsf/libgsf-1.14.51.ebuild b/gnome-extra/libgsf/libgsf-1.14.51.ebuild
index 9b8b4ef0e360..3abb894f8ff0 100644
--- a/gnome-extra/libgsf/libgsf-1.14.51.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.51.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=8
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
+ "${FILESDIR}"/1.14.51-libxml2-2.12.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/, gnome-extra/libgsf/files/
@ 2024-04-13 10:37 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2024-04-13 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 42fc4a9ab7a9840aa55b8ce5b966a2667a432755
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 10:22:52 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 10:22:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fc4a9a
gnome-extra/libgsf: drop 1.14.50-r1, 1.14.51
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 2 -
.../libgsf/files/1.14.50-configure-clang16.patch | 23 -----------
.../libgsf/files/1.14.51-libxml2-2.12.patch | 20 ---------
| 48 ----------------------
| 48 ----------------------
5 files changed, 141 deletions(-)
--git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 988640d82841..35f23a38a722 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,3 +1 @@
-DIST libgsf-1.14.50.tar.xz 702424 BLAKE2B dc6e3fa313cc99981cf521b4613ef135ea6836554be0cc557e49d77bd3259e1bf2150af1b7a41071f4b865c28a9b6153b6ef6e89d4868e4203ce7dc7da433c71 SHA512 e4a405d01440654bfe5059536524d494e5b66859235648bcf6031a74b59967504b50750f471bbe1607c4a5ef11cac98aa2ca9ebb31151cf5a19ffa340d421adb
-DIST libgsf-1.14.51.tar.xz 707488 BLAKE2B 08012d4df8e9256579069518a54198b9aa8c21c3d0c4297eb4ff829af666287cc186d846eecb277609ffe5a89d02a36344cedc67f6ed00354d018a692a99f4fe SHA512 b7c02e10762c93909a1aacb86f30b266ed8b0eeefe73ede5acb8ac0c1094a1e4be2b7bd3a59ebfc03180f8f72f2cc602e80c871a1b8a28f3fccfdd403ad24da7
DIST libgsf-1.14.52.tar.xz 707580 BLAKE2B 01f03f8c289388ab63ff67786fa2eac745e4233475d01544d7149a52d1f6043145acbab2e3c28dbaadfa20e5197c6d7f2316385879cd148dd55fb37e16999888 SHA512 3a7af5eae2aa539181dd0ae0d0ce4110da4c430ed8a26cdd7f0ec84c9bcf86360cceabf81ec7c6b902f2fe8d7ea5e3c09fa911d6bab3162f0f531e6973137f4b
diff --git a/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch b/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch
deleted file mode 100644
index c28811401e82..000000000000
--- a/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/898818
-https://gitlab.gnome.org/GNOME/libgsf/-/merge_requests/13
-
-From 167d7f96c81683392933ddb8c427e5d7c8ce284d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 27 Apr 2023 20:34:34 +0200
-Subject: [PATCH] configure.ac: Avoid implicit int in libbz2 probe
-
-Otherwise, this probe will always fail with future compilers,
-which are likely not to support implict ints by default.
---- a/configure.ac
-+++ b/configure.ac
-@@ -427,7 +427,7 @@ if test "x$test_bz2" = xtrue ; then
- #undef VERSION
- #undef HAVE_STDLIB_H
- #include <bzlib.h>
-- main ()
-+ int main (void)
- {
- return BZ2_bzDecompressInit (NULL, 0, 0);
- }
---
-GitLab
diff --git a/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch b/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch
deleted file mode 100644
index cfbd82c6e634..000000000000
--- a/gnome-extra/libgsf/files/1.14.51-libxml2-2.12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/917549
-https://gitlab.gnome.org/GNOME/libgsf/-/commit/b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22
-
-From b6719aa4a8a0fc3acfd8e7ab339b3493f7251b22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
-Date: Fri, 24 Nov 2023 19:47:35 +0100
-Subject: [PATCH] xml: Fix build with libxml2 2.12
-
---- a/gsf/gsf-libxml.h
-+++ b/gsf/gsf-libxml.h
-@@ -23,6 +23,7 @@
- #define GSF_LIBXML_H
-
- #include <gsf/gsf-fwd.h>
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
-
- G_BEGIN_DECLS
---
-GitLab
diff --git a/gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild
deleted file mode 100644
index f7edd9c1c383..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME2_EAUTORECONF=yes
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="bzip2 gtk +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.4.16:2
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- gtk? (
- x11-libs/gdk-pixbuf:2
- virtual/imagemagick-tools
- )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
- >=dev-build/gtk-doc-am-1.12
- dev-libs/gobject-introspection-common
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
- test? ( dev-perl/XML-Parser )
-"
-
-PATCHES=(
- "${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
- "${FILESDIR}"/1.14.50-configure-clang16.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with bzip2 bz2) \
- $(use_enable introspection) \
- $(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.51.ebuild b/gnome-extra/libgsf/libgsf-1.14.51.ebuild
deleted file mode 100644
index 2ad18eae56df..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.51.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME2_EAUTORECONF=yes
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
-
-LICENSE="LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="bzip2 gtk +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.4.16:2
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- gtk? (
- x11-libs/gdk-pixbuf:2
- virtual/imagemagick-tools
- )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
- >=dev-build/gtk-doc-am-1.12
- dev-libs/gobject-introspection-common
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
- test? ( dev-perl/XML-Parser )
-"
-
-PATCHES=(
- "${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
- "${FILESDIR}"/1.14.51-libxml2-2.12.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with bzip2 bz2) \
- $(use_enable introspection) \
- $(use_with gtk gdk-pixbuf)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-13 10:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-16 3:19 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/, gnome-extra/libgsf/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-13 10:37 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox