dbusmenu: => 16.04.0, fix -Werror bug

5 files changed, 135 insertions, 4 deletions

diff --git a/x11-libs/dbusmenu/DEPENDS b/x11-libs/dbusmenu/DEPENDS
index fe1dfed8cc..b06de945dc 100755
--- a/x11-libs/dbusmenu/DEPENDS
+++ b/x11-libs/dbusmenu/DEPENDS
@@ -1,4 +1,7 @@
-depends dbus &&
+depends dbus      &&
+depends json-glib &&
+depends intltool  &&
+
 optional_depends gtk-doc '--enable-gtk-doc' \
                          '--disable-gtk-doc --disable-gtk-doc-html' \
                          'for documentation' &&
diff --git a/x11-libs/dbusmenu/DETAILS b/x11-libs/dbusmenu/DETAILS
index 6cf89b0755..1e48f2e01a 100755
--- a/x11-libs/dbusmenu/DETAILS
+++ b/x11-libs/dbusmenu/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dbusmenu
-         VERSION=0.5.99
+         VERSION=16.04.0
           SOURCE="lib${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://launchpad.net/${SPELL}/0.6/${VERSION}/+download/${SOURCE}
-     SOURCE_HASH=sha512:10c9a7b6c7cd3a73cdba47f96f0e96cd9c790cac92b730140efdce2dc524ba8e7bd2fba2e422fe84bb97ced62d254117b67847418dfb098d1a542f53603297e1
+   SOURCE_URL[0]=http://launchpad.net/${SPELL}/${VERSION%.*}/${VERSION}/+download/${SOURCE}
+     SOURCE_HASH=sha256:b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lib${SPELL}-${VERSION}"
         WEB_SITE="https://launchpad.net/dbusmenu"
       LICENSE[0]=GPL/LGPL
diff --git a/x11-libs/dbusmenu/HISTORY b/x11-libs/dbusmenu/HISTORY
index 95f1133c39..4ba620bc5e 100644
--- a/x11-libs/dbusmenu/HISTORY
+++ b/x11-libs/dbusmenu/HISTORY
@@ -1,3 +1,8 @@
+2022-11-26 Conner Clere <connerclere@gmail.com>
+	* DETAILS: version 16.04.0
+	* DEPENDS: add json-glib and intltool deps
+	* PRE_BUILD, patches/libdbusmenu-16.04.0-werror.patch: fix '-Werror' bug
+
 2012-04-08 Florian Franzmann <bwlf@bandrate.org>
 	* DETAILS: version 0.5.99
 
diff --git a/x11-libs/dbusmenu/PRE_BUILD b/x11-libs/dbusmenu/PRE_BUILD
new file mode 100755
index 0000000000..e762f65067
--- /dev/null
+++ b/x11-libs/dbusmenu/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+apply_patch_dir patches
diff --git a/x11-libs/dbusmenu/patches/libdbusmenu-16.04.0-werror.patch b/x11-libs/dbusmenu/patches/libdbusmenu-16.04.0-werror.patch
new file mode 100644
index 0000000000..eeb7bfaa2a
--- /dev/null
+++ b/x11-libs/dbusmenu/patches/libdbusmenu-16.04.0-werror.patch
@@ -0,0 +1,120 @@
+diff --color -urp libdbusmenu-16.04.0.orig/libdbusmenu-glib/Makefile.am libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am
+--- libdbusmenu-16.04.0.orig/libdbusmenu-glib/Makefile.am	2016-02-27 12:58:43.000000000 -0600
++++ libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am	2022-11-26 09:09:29.156611178 -0600
+@@ -66,7 +66,7 @@ libdbusmenu_glib_la_LDFLAGS = \
+ libdbusmenu_glib_la_CFLAGS = \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
+ 
+ libdbusmenu_glib_la_LIBADD = \
+diff --color -urp libdbusmenu-16.04.0.orig/libdbusmenu-glib/Makefile.in libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.in
+--- libdbusmenu-16.04.0.orig/libdbusmenu-glib/Makefile.in	2016-02-27 13:00:13.000000000 -0600
++++ libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.in	2022-11-26 09:09:40.889687102 -0600
+@@ -498,7 +498,7 @@ libdbusmenu_glib_la_LDFLAGS = \
+ libdbusmenu_glib_la_CFLAGS = \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
+ 
+ libdbusmenu_glib_la_LIBADD = \
+diff --color -urp libdbusmenu-16.04.0.orig/libdbusmenu-gtk/Makefile.am libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am
+--- libdbusmenu-16.04.0.orig/libdbusmenu-gtk/Makefile.am	2016-02-27 12:58:43.000000000 -0600
++++ libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am	2022-11-26 09:08:09.300088399 -0600
+@@ -66,7 +66,7 @@ libdbusmenu_gtk_la_CFLAGS = \
+ 	$(DBUSMENUGTK_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-I$(top_srcdir) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
+ 
+ libdbusmenu_gtk_la_LIBADD = \
+diff --color -urp libdbusmenu-16.04.0.orig/libdbusmenu-gtk/Makefile.in libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.in
+--- libdbusmenu-16.04.0.orig/libdbusmenu-gtk/Makefile.in	2016-02-27 13:00:14.000000000 -0600
++++ libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.in	2022-11-26 09:08:21.151166683 -0600
+@@ -507,7 +507,7 @@ libdbusmenu_gtk_la_CFLAGS = \
+ 	$(DBUSMENUGTK_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-I$(top_srcdir) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
+ 
+ libdbusmenu_gtk_la_LIBADD = \
+diff --color -urp libdbusmenu-16.04.0.orig/tests/Makefile.am libdbusmenu-16.04.0/tests/Makefile.am
+--- libdbusmenu-16.04.0.orig/tests/Makefile.am	2016-02-27 12:58:43.000000000 -0600
++++ libdbusmenu-16.04.0/tests/Makefile.am	2022-11-26 09:09:01.010428150 -0600
+@@ -103,7 +103,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=
+ ############################################
+ 
+ DBUSMENU_GLIB_TEST_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	-DG_DISABLE_DEPRECATED \
+ 	-I$(top_srcdir) \
+ 	$(DBUSMENUTESTS_CFLAGS) \
+diff --color -urp libdbusmenu-16.04.0.orig/tests/Makefile.in libdbusmenu-16.04.0/tests/Makefile.in
+--- libdbusmenu-16.04.0.orig/tests/Makefile.in	2016-02-27 13:00:14.000000000 -0600
++++ libdbusmenu-16.04.0/tests/Makefile.in	2022-11-26 09:09:10.014486843 -0600
+@@ -979,7 +979,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=
+ # Shared vars for the dbusmenu-glib tests
+ ############################################
+ DBUSMENU_GLIB_TEST_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	-DG_DISABLE_DEPRECATED \
+ 	-I$(top_srcdir) \
+ 	$(DBUSMENUTESTS_CFLAGS) \
+diff --color -urp libdbusmenu-16.04.0.orig/tools/Makefile.am libdbusmenu-16.04.0/tools/Makefile.am
+--- libdbusmenu-16.04.0.orig/tools/Makefile.am	2016-02-27 12:58:43.000000000 -0600
++++ libdbusmenu-16.04.0/tools/Makefile.am	2022-11-26 09:06:39.844488726 -0600
+@@ -16,7 +16,7 @@ dbusmenu_dumper_CFLAGS = \
+ 	-I $(srcdir)/.. \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+ 	$(DBUSMENUDUMPER_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
+ dbusmenu_dumper_LDADD = \
+ 	../libdbusmenu-glib/libdbusmenu-glib.la \
+diff --color -urp libdbusmenu-16.04.0.orig/tools/Makefile.in libdbusmenu-16.04.0/tools/Makefile.in
+--- libdbusmenu-16.04.0.orig/tools/Makefile.in	2016-02-27 13:00:14.000000000 -0600
++++ libdbusmenu-16.04.0/tools/Makefile.in	2022-11-26 09:06:56.877604179 -0600
+@@ -454,7 +454,7 @@ dbusmenu_dumper_CFLAGS = \
+ 	-I $(srcdir)/.. \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+ 	$(DBUSMENUDUMPER_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
+ dbusmenu_dumper_LDADD = \
+ 	../libdbusmenu-glib/libdbusmenu-glib.la \
+diff --color -urp libdbusmenu-16.04.0.orig/tools/testapp/Makefile.am libdbusmenu-16.04.0/tools/testapp/Makefile.am
+--- libdbusmenu-16.04.0.orig/tools/testapp/Makefile.am	2016-02-27 12:58:43.000000000 -0600
++++ libdbusmenu-16.04.0/tools/testapp/Makefile.am	2022-11-26 09:07:10.653697102 -0600
+@@ -12,7 +12,7 @@ dbusmenu_testapp_CFLAGS = \
+ 	-I $(srcdir)/../.. \
+ 	$(DBUSMENUTESTS_CFLAGS) \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
+ dbusmenu_testapp_LDADD = \
+ 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
+diff --color -urp libdbusmenu-16.04.0.orig/tools/testapp/Makefile.in libdbusmenu-16.04.0/tools/testapp/Makefile.in
+--- libdbusmenu-16.04.0.orig/tools/testapp/Makefile.in	2016-02-27 13:00:14.000000000 -0600
++++ libdbusmenu-16.04.0/tools/testapp/Makefile.in	2022-11-26 09:07:21.954773031 -0600
+@@ -377,7 +377,7 @@ dbusmenu_testapp_CFLAGS = \
+ 	-I $(srcdir)/../.. \
+ 	$(DBUSMENUTESTS_CFLAGS) \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
+ dbusmenu_testapp_LDADD = \
+ 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \