gentoo auto-resync : 12:07:2022 - 07:32:03

7 files changed, 137 insertions, 1 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 9de8cfe99876..dc816114e04a 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxappearance-obconf/Manifest b/lxde-base/lxappearance-obconf/Manifest
index a6f8fbd4aec0..abdc2150c9ed 100644
--- a/lxde-base/lxappearance-obconf/Manifest
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -1,3 +1,6 @@
+AUX lxappearance-obconf-0.2.3-cairo-xlib.patch 1286 BLAKE2B 18d8725ac71ac8c8d9d75cf6aea4a6c4dae8ff61c9aad5578e7e8d30b2bdee8a76b4a0d20274203b23dc5552c52ed3f5557bd2a91660e4180d9d77994dbce2a5 SHA512 e1ae84731078038efe60f785796ae119c08d1bc88d8373b470595cf2197e1c5058de4895651afb1e09a81bb65d6572d3ebbd49d40f67c9e1a0dff721b99cd89d
+AUX lxappearance-obconf-0.2.3-no-undefined.patch 844 BLAKE2B 5982eae382fb97cc4c2be0faf21990ec8ce21539937ab89b6a5ff70c7da1b9ff176fa7a5f54bd74b8eafdc778f7ce38fe4b8cdf67c25c6c39630a8eea1fe8eb0 SHA512 23fa8a4f02fbecbe40485a86bfb1959679298973245226cdb9ed7096945d2642060cbf88615d88f498ba1e118b434c1123b7ac01af5a9fcaaa73278ba3f1b942
 DIST lxappearance-obconf-0.2.3.tar.xz 290204 BLAKE2B 3f222419e147232eb805e8b86a29993fefbf80008cc3cd98d048a0b3b2799fb3672571f87666917136ad17c1b4b6bd649194599d684bb14a574ae40d0d127d99 SHA512 cec56238b2b8ea86ab310fdf3d9d43ef665aac7762018a296803ef7caccb6a5a7854c4b17e0028152b379a373602ede30edb02811a9a370ba369b62bb3caee09
 EBUILD lxappearance-obconf-0.2.3-r1.ebuild 887 BLAKE2B 818c958fc8cb491d06313fc488400f82f1c094eae7d3522c3b362f96a0664685012a63c714ebf75f3565414dd622938cd1b0f83be09efe46d980c1b17a8645f5 SHA512 7ca0b73f5d11b71de1fb3035b80af55771773f2d0304e247e6ed98834efc99c2bbf1be07371cf3ae872f50958ed9a4ca1001d6631778800f15bda403b4c93314
+EBUILD lxappearance-obconf-0.2.3-r2.ebuild 1048 BLAKE2B 594bbad04f6ba5c0366f7f8f7f6d99d62a61966a5f8a9c6eea25e95a753f627b3c7105736f1e936948cb4830789f3cd12b261ac16de206ede8873dfaa9648505 SHA512 60176bc3f5fc88ff222b48037d0ecab102487f221a2d56074252dacdb2417eb9c72ef3e37f3356a1ce387b3e4ef1b16f32c98718630d214cbb6719e72099f258
 MISC metadata.xml 247 BLAKE2B 3b37ff1877cfc7fcc0e16b26e64daf919cea425d6f26460e2c4f8d732e2c729de13bdff9c518ed7878f5bffac3a0312e1a72131b1c61d3ab6b8c013c35208f4f SHA512 8e4697c27ada4b1f484c98d641b66fe364cb2ebc7d85960e056c31ff659a4460f44442ba26fe0c89becc1a4e02631e171fafb597875350faec022b172f8901e4
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
new file mode 100644
index 000000000000..7098f98ca50f
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-cairo-xlib.patch
@@ -0,0 +1,47 @@
+From: orbea <orbea@riseup.net>
+Date: Mon, 11 Jul 2022 17:38:52 -0700
+Subject: [PATCH] build: Add missing cairo-xlib dependency
+
+src/preview.c:146:15: warning: implicit declaration of function ‘cairo_xlib_surface_create’; did you mean ‘cairo_image_surface_create’? [-Wimplicit-function-declaration]
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,6 +16,7 @@ module_LTLIBRARIES = src/obconf.la
+ moduledir = $(libdir)/lxappearance/plugins
+ 
+ src_obconf_la_CPPFLAGS = \
++	$(CAIRO_CFLAGS) \
+ 	$(OPENBOX_CFLAGS) \
+ 	$(GTK_CFLAGS) \
+ 	$(LXAPPEARANCE_CFLAGS) \
+@@ -30,6 +31,7 @@ src_obconf_la_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"Obconf\"
+ 
+ src_obconf_la_LIBADD = \
++	$(CAIRO_LIBS) \
+ 	$(OPENBOX_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(LXAPPEARANCE_LIBS) \
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,6 +89,10 @@ PKG_CHECK_MODULES(OPENBOX, [obrender-3.5 >= 3.5 obt-3.5 >= 3.5])
+ AC_SUBST(OPENBOX_CFLAGS)
+ AC_SUBST(OPENBOX_LIBS)
+ 
++PKG_CHECK_MODULES(CAIRO, [cairo-xlib])
++AC_SUBST(CAIRO_CFLAGS)
++AC_SUBST(CAIRO_LIBS)
++
+ 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 <string.h>
+ 
++#include <cairo/cairo-xlib.h>
+ #include <obrender/theme.h>
+ 
+ #if GTK_CHECK_VERSION(3, 0, 0)
diff --git a/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-no-undefined.patch b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-no-undefined.patch
new file mode 100644
index 000000000000..4e94157ac7a0
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/files/lxappearance-obconf-0.2.3-no-undefined.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/779484
+
+From: orbea <orbea@riseup.net>
+Date: Mon, 11 Jul 2022 17:23:36 -0700
+Subject: [PATCH] build: Remove -no-undefined
+
+This depends on lxappearance_changed which is only available in the
+lxappearence binary and will be undefined at build time. Additionally
+GNU libtool silently ignores -no-undefined allowing the build to work
+while slibtool will respect it as expected.
+
+The easiest way to solve this is to just remove -no-undefined since it
+is not respected anyways.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,7 @@ AC_SUBST(LXAPPEARANCE_LIBDIR)
+ AC_SUBST(LXAPPEARANCE_DATADIR)
+ 
+ LXAPPEARANCE_MODULE="-avoid-version \
+-    -no-undefined "'-export-symbols-regex "^[[^_]].*"'
++    "'-export-symbols-regex "^[[^_]].*"'
+ AC_SUBST(LXAPPEARANCE_MODULE)
+ 
+ if test x"$enable_more_warnings" = x"yes"; then
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..11f52b57e993
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="LXAppearance plugin for configuring OpenBox"
+HOMEPAGE="https://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	>=lxde-base/lxappearance-0.6.3-r2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	x11-libs/cairo[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/pango
+	x11-wm/openbox
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-undefined.patch # 779484
+	"${FILESDIR}"/${P}-cairo-xlib.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
index 325eb3c128ab..10bd62aa0d68 100644
--- a/lxde-base/lxappearance/Manifest
+++ b/lxde-base/lxappearance/Manifest
@@ -1,3 +1,3 @@
 DIST lxappearance-0.6.3.tar.xz 165656 BLAKE2B d76d3d9b270e18e46cad44d204d1d5e4faf20bd6c292bf8dd17c2d570fa0276f183489c39f115c189b525643dbd03d0a1b1681f7fa0f61171bc822d8250ef513 SHA512 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c
-EBUILD lxappearance-0.6.3-r2.ebuild 652 BLAKE2B 6cfabe6bfa142be13ec43bdcd54301a1e0dec91414255c303c9cb5d460e83496cd54d8467ec5dc07eea9531aa3543bda629ef9af808aaa7544f005f4b32b969c SHA512 7dd397e559cb5229d0b842db8ea726cd2a0e57512f9fdcbd86a72e7a3da18bbce3ac6de7c4a1bcbd93267999a4c1f3836efdd2877fa0cb6d3fd409e978717b93
+EBUILD lxappearance-0.6.3-r3.ebuild 652 BLAKE2B 6cfabe6bfa142be13ec43bdcd54301a1e0dec91414255c303c9cb5d460e83496cd54d8467ec5dc07eea9531aa3543bda629ef9af808aaa7544f005f4b32b969c SHA512 7dd397e559cb5229d0b842db8ea726cd2a0e57512f9fdcbd86a72e7a3da18bbce3ac6de7c4a1bcbd93267999a4c1f3836efdd2877fa0cb6d3fd409e978717b93
 MISC metadata.xml 247 BLAKE2B 3b37ff1877cfc7fcc0e16b26e64daf919cea425d6f26460e2c4f8d732e2c729de13bdff9c518ed7878f5bffac3a0312e1a72131b1c61d3ab6b8c013c35208f4f SHA512 8e4697c27ada4b1f484c98d641b66fe364cb2ebc7d85960e056c31ff659a4460f44442ba26fe0c89becc1a4e02631e171fafb597875350faec022b172f8901e4
diff --git a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild
index bdd7fc588a95..bdd7fc588a95 100644
--- a/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
+++ b/lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild