[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/files/, gnome-extra/libgsf/

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/files/, gnome-extra/libgsf/

[Matt Turner]

commit:     b3c63137dbc1ebc195515b18ab2a22f7a10067dd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 02:08:40 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 17 02:09:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c63137

gnome-extra/libgsf: Skip valgrind tests

Closes: https://bugs.gentoo.org/840353
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../libgsf/files/1.14.49-skip-valgrind-tests.patch | 27 ++++++++++++++++++++++
 gnome-extra/libgsf/libgsf-1.14.49.ebuild           |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch b/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch
new file mode 100644
index 000000000000..81993e34ebd7
--- /dev/null
+++ b/gnome-extra/libgsf/files/1.14.49-skip-valgrind-tests.patch
@@ -0,0 +1,27 @@
+diff --git a/tests/t8000-valgrind-zip.pl b/tests/t8000-valgrind-zip.pl
+index ad7597c..8c96b85 100755
+--- a/tests/t8000-valgrind-zip.pl
++++ b/tests/t8000-valgrind-zip.pl
+@@ -5,6 +5,8 @@ use strict;
+ use lib ($0 =~ m|^(.*/)| ? $1 : ".");
+ use LibGsfTest;
+ 
++exit 77; # Skip test, bug #840353
++
+ my $archive = "test.zip";
+ &LibGsfTest::junkfile ($archive);
+ 
+diff --git a/tests/t8020-valgrind-ole.pl b/tests/t8020-valgrind-ole.pl
+index d6df5d7..b8200e9 100755
+--- a/tests/t8020-valgrind-ole.pl
++++ b/tests/t8020-valgrind-ole.pl
+@@ -5,6 +5,8 @@ use strict;
+ use lib ($0 =~ m|^(.*/)| ? $1 : ".");
+ use LibGsfTest;
+ 
++exit 77; # Skip test, bug #840353
++
+ my $archive = "test.ole";
+ &LibGsfTest::junkfile ($archive);
+ 
+-- 

diff --git a/gnome-extra/libgsf/libgsf-1.14.49.ebuild b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
index 795fb272712c..cc9401e319aa 100644
--- a/gnome-extra/libgsf/libgsf-1.14.49.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-perl/XML-Parser )
 "
 
+PATCHES=(
+	"${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgsf/files/, gnome-extra/libgsf/

[Sam James]

commit:     77b3718f4d06bb41371886ad25b19bdd848b45df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 05:54:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 06:04:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77b3718f

gnome-extra/libgsf: fix configure w/ clang 16

Closes: https://bugs.gentoo.org/898818
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libgsf/files/1.14.50-configure-clang16.patch   | 23 +++++++++++
 gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild        | 48 ++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch b/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch
new file mode 100644
index 000000000000..c28811401e82
--- /dev/null
+++ b/gnome-extra/libgsf/files/1.14.50-configure-clang16.patch
@@ -0,0 +1,23 @@
+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/libgsf-1.14.50-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild
new file mode 100644
index 000000000000..1520f5d07364
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.50-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 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 ~sparc-solaris ~x64-solaris ~x86-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-util/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)
+}