commit: 37370dd2b82721da4aedeeaaabafb10c12e89eac Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 18 00:50:29 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 18 01:19:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37370dd2
dev-ruby/ruby-glib2: fix build w/ glib-2.76 Closes: https://bugs.gentoo.org/900921 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/ruby-glib2-3.5.1-glib-2.76.patch | 23 ++++++++++++++++++++ dev-ruby/ruby-glib2/ruby-glib2-3.5.1-r1.ebuild | 25 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/dev-ruby/ruby-glib2/files/ruby-glib2-3.5.1-glib-2.76.patch b/dev-ruby/ruby-glib2/files/ruby-glib2-3.5.1-glib-2.76.patch new file mode 100644 index 000000000000..b575530551c8 --- /dev/null +++ b/dev-ruby/ruby-glib2/files/ruby-glib2-3.5.1-glib-2.76.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/900921 +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270087 +https://cgit.freebsd.org/ports/commit/?id=9a23b33ce95593af78f9b973c1fba4fa8835cc25 + +--- a/ext/glib2/rbglib_bookmarkfile.c ++++ b/ext/glib2/rbglib_bookmarkfile.c +@@ -35,6 +35,7 @@ bookmarkfile_copy(const GBookmarkFile* file) + return (GBookmarkFile*)file; + } + ++#if !GLIB_CHECK_VERSION(2, 76, 0) + static GType + g_bookmark_file_get_type(void) + { +@@ -48,6 +49,7 @@ g_bookmark_file_get_type(void) + /************************************************/ + + #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type()) ++#endif + + #define RG_TARGET_NAMESPACE cBookmarkFile + #define _SELF(self) ((GBookmarkFile*)(RVAL2BOXED(self, G_TYPE_BOOKMARK_FILE))) + diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.5.1-r1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.5.1-r1.ebuild new file mode 100644 index 000000000000..1789b42c0dae --- /dev/null +++ b/dev-ruby/ruby-glib2/ruby-glib2-3.5.1-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby27 ruby30 ruby31 ruby32" + +inherit ruby-ng-gnome2 + +DESCRIPTION="Ruby Glib2 bindings" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="" +RDEPEND+=" >=dev-libs/glib-2" +DEPEND+=" >=dev-libs/glib-2" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5.1-glib-2.76.patch +) + +all_ruby_prepare() { + ruby-ng-gnome2_all_ruby_prepare + + # Skip spawn tests since our sandbox also provides items in the + # environment and this makes the test fragile. + rm -v test/test-spawn.rb || die +}
