From 48b7cc4daf05dd7e5d5dc550b4972d4550fbe356 Mon Sep 17 00:00:00 2001 From: orbea Date: Mon, 11 Jul 2022 19:28:05 -0700 Subject: lxde-base/lxappearance: Fix patch Fixes: https://github.com/gentoo/gentoo/commit/26734c3900e4e41aa7820b6f4afcf30bec26a441 Signed-off-by: orbea Closes: https://github.com/gentoo/gentoo/pull/26359 Signed-off-by: Sam James --- .../lxappearance-obconf-0.2.3-cairo-xlib.patch | 12 ++++++-- .../lxappearance/lxappearance-0.6.3-r2.ebuild | 33 ---------------------- .../lxappearance/lxappearance-0.6.3-r3.ebuild | 33 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 35 deletions(-) delete mode 100644 lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild create mode 100644 lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild (limited to 'lxde-base') diff --git a/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch index ae61c3b35f82..7098f98ca50f 100644 --- a/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch +++ b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch @@ -22,8 +22,6 @@ src/preview.c:146:15: warning: implicit declaration of function ‘cairo_xlib_su $(OPENBOX_LIBS) \ $(GTK_LIBS) \ $(LXAPPEARANCE_LIBS) \ -diff --git a/configure.ac b/configure.ac -index 9042f7f..84de1c7 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,10 @@ PKG_CHECK_MODULES(OPENBOX, [obrender-3.5 >= 3.5 obt-3.5 >= 3.5]) @@ -37,3 +35,13 @@ index 9042f7f..84de1c7 100644 if test "x$enable_gtk3" = "xyes" ; then CFLAGS="$CFLAGS -DENABLE_GTK3" gtk_modules="gtk+-3.0 >= 3.0.0" +--- a/src/preview.c ++++ b/src/preview.c +@@ -27,6 +27,7 @@ + + #include + ++#include + #include + + #if GTK_CHECK_VERSION(3, 0, 0) diff --git a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild deleted file mode 100644 index bdd7fc588a95..000000000000 --- a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="LXDE GTK+ theme switcher" -HOMEPAGE="https://wiki.lxde.org/en/LXAppearance" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - dbus? ( dev-libs/dbus-glib ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - econf \ - --enable-gtk3 \ - $(use_enable dbus) -} diff --git a/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild new file mode 100644 index 000000000000..bdd7fc588a95 --- /dev/null +++ b/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="LXDE GTK+ theme switcher" +HOMEPAGE="https://wiki.lxde.org/en/LXAppearance" +SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="dbus" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + dbus? ( dev-libs/dbus-glib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + econf \ + --enable-gtk3 \ + $(use_enable dbus) +} -- cgit v1.2.3-65-gdbad