gentoo auto-resync : 29:09:2022 - 03:21:54

4 files changed, 43 insertions, 23 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c0bee8cb46a2..4dd95aedeb98 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index a79a6314bda6..a8e9752fc512 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,4 @@
+AUX obconf-2.0.4_p20150213-clang16.patch 392 BLAKE2B 1644fc6adf6f60e352ab879e97f1cc1fc1b2183484f0d68bb9155ebe745460464d8a7d14b720da6973e7a7204d31a9a7b136ad9275edbd36d30b80d6201ac4fb SHA512 7eb9018437508ea26ac1ebf9967a080ac95c5abf07ddd49368ca5fab494ffd9c7c165f361d06ee300ec9e934908bba7d12970d68d314b618fed98ac98d360af2
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
-EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B b8c9fd85a019c53ffee70bd7f871da3737d063d0cc538ac0b08f1dcf248769a5055e91c0fe374245082e3546db3931fb7a5e749d8a7ba6bd2b86d55e6e5c8c39 SHA512 b5a8209b8d2c0775afd116469d0bc8ab79c5e2d9c28d48def08527d14d0491a68c49c80ea9994fac76a3c23346072d9fe3b2f512f313acd7f965d71c07365e92
+EBUILD obconf-2.0.4_p20150213-r1.ebuild 970 BLAKE2B f78c78a1086ada6e3ed265ae248174a8e55be5dc41604ae483183725ab2755505c86938b4f6f3bcf54b3540e6ab1020ccec6ceac5869f7a83f6d7d6b00f99fed SHA512 ad492d09111a95daf5023e184a01b388ecd871175c08ff18ec648563f9099e57ccc18348cd19ee7594491d4f06c7775809015c561a4e695b07589b2e79492703
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch b/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch
new file mode 100644
index 000000000000..4775005da274
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/870538
+--- a/src/appearance.c
++++ b/src/appearance.c
+@@ -19,2 +19,3 @@
+ 
++#include <ctype.h>
+ #include "main.h"
+--- a/src/desktops.h
++++ b/src/desktops.h
+@@ -26,2 +26,3 @@
+ void desktops_setup_names(GtkWidget *w);
++void desktops_setup_tab(void);
+ 
+--- a/src/main.c
++++ b/src/main.c
+@@ -26,2 +26,3 @@
+ #include "mouse.h"
++#include "moveresize.h"
+ #include "desktops.h"
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213-r1.ebuild
index b7462187832e..18c3479ac255 100644
--- a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-COMMIT=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39
-inherit autotools xdg-utils
+inherit autotools xdg
+
+HASH_OBCONF=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39
 
 DESCRIPTION="Tool for configuring the Openbox window manager"
 HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-SRC_URI="http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT:0:7}"
+SRC_URI="http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=${HASH_OBCONF};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_OBCONF::7}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,32 +18,31 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-lin
 IUSE="nls"
 
 RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
 	x11-libs/startup-notification
-	>=x11-wm/openbox-3.5.2
-"
-DEPEND="${RDEPEND}"
+	x11-wm/openbox:3"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_enable nls)
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}