From c2930bb91abdab5a74f5f188321fc00d9feff321 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Sun, 28 Nov 2021 01:16:59 +0100 Subject: x11-themes/gtk-engines-murrine: fix implicit-function QA warnings Signed-off-by: Marek Szuba --- .../files/0.98.2-implicit-functions.patch | 29 ++++++++++++ .../gtk-engines-murrine-0.98.2-r2.ebuild | 49 -------------------- .../gtk-engines-murrine-0.98.2-r3.ebuild | 53 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 49 deletions(-) create mode 100644 x11-themes/gtk-engines-murrine/files/0.98.2-implicit-functions.patch delete mode 100644 x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r2.ebuild create mode 100644 x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild (limited to 'x11-themes') diff --git a/x11-themes/gtk-engines-murrine/files/0.98.2-implicit-functions.patch b/x11-themes/gtk-engines-murrine/files/0.98.2-implicit-functions.patch new file mode 100644 index 000000000000..cb0db5b67c1d --- /dev/null +++ b/x11-themes/gtk-engines-murrine/files/0.98.2-implicit-functions.patch @@ -0,0 +1,29 @@ +--- a/src/murrine_rc_style.h ++++ b/src/murrine_rc_style.h +@@ -154,5 +154,6 @@ + }; + + GType murrine_rc_style_get_type (void); ++void murrine_rc_style_register_types (GTypeModule *); + + #endif /* MURRINE_RC_STYLE_H */ +--- a/src/murrine_style.h ++++ b/src/murrine_style.h +@@ -102,5 +102,6 @@ + }; + + GType murrine_style_get_type (void); ++void murrine_style_register_types (GTypeModule *); + + #endif /* MURRINE_STYLE_H */ +--- a/src/support.h 2012-01-17 18:46:01.000000000 +0100 ++++ b/src/support.h 2021-11-28 01:08:50.868702336 +0100 +@@ -148,5 +148,8 @@ + G_GNUC_INTERNAL void murrine_get_notebook_tab_position (GtkWidget *widget, + gboolean *start, + gboolean *end); ++G_GNUC_INTERNAL gboolean murrine_object_is_a (const GObject *object, ++ const gchar *type_name); ++G_GNUC_INTERNAL gboolean murrine_widget_is_ltr (GtkWidget *widget); + + #endif /* SUPPORT_H */ diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r2.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r2.ebuild deleted file mode 100644 index dd124f302e19..000000000000 --- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GNOME_ORG_MODULE="murrine" - -inherit gnome.org multilib-minimal - -DESCRIPTION="Murrine GTK+2 Cairo Engine" -HOMEPAGE="https://tracker.debian.org/pkg/gtk2-engines-murrine" - -LICENSE="LGPL-2.1 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="+themes animation-rtl" - -RDEPEND=">=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]" -PDEPEND="themes? ( x11-themes/murrine-themes )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/intltool-0.37.1 - sys-devel/gettext - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS TODO ) - -src_prepare() { - default - # Linking fix, in next release (commit 6e8eb244). Sed to avoid eautoreconf. - sed -e 's:\($(GTK_LIBS) $(pixman_LIBS)\)$:\1 -lm:' \ - -i Makefile.* || die "sed failed" -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf --enable-animation \ - --enable-rgba \ - $(use_enable animation-rtl animationrtl) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild new file mode 100644 index 000000000000..1c5274f04bf3 --- /dev/null +++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GNOME_ORG_MODULE="murrine" + +inherit gnome.org multilib-minimal + +DESCRIPTION="Murrine GTK+2 Cairo Engine" +HOMEPAGE="https://tracker.debian.org/pkg/gtk2-engines-murrine" + +LICENSE="LGPL-2.1 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="+themes animation-rtl" + +RDEPEND=">=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] + >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]" +PDEPEND="themes? ( x11-themes/murrine-themes )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.37.1 + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/0.98.2-implicit-functions.patch +) + +DOCS=( AUTHORS ChangeLog NEWS TODO ) + +src_prepare() { + default + # Linking fix, in next release (commit 6e8eb244). Sed to avoid eautoreconf. + sed -e 's:\($(GTK_LIBS) $(pixman_LIBS)\)$:\1 -lm:' \ + -i Makefile.* || die "sed failed" +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf --enable-animation \ + --enable-rgba \ + $(use_enable animation-rtl animationrtl) +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad