3 files changed, 86 insertions, 2 deletions
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-r1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild
index 96b2c49bd9a0..11f52b57e993 100644
--- a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="LXAppearance plugin for configuring OpenBox"
 HOMEPAGE="https://lxde.org/"
@@ -21,7 +23,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/harfbuzz:=
-	x11-libs/cairo
+	x11-libs/cairo[X]
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/libICE
@@ -37,6 +39,16 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-undefined.patch # 779484
+	"${FILESDIR}"/${P}-cairo-xlib.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-static \