From 57cfe5ec1a36b47930dc4e6af824e98aadb15795 Mon Sep 17 00:00:00 2001
From: Edinaldo P. Silva
Date: Sun, 24 Jul 2016 21:22:15 -0500
Subject: libraries/libdbusmenu: Updated for version 16.04.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 libraries/libdbusmenu/README                   |  9 +++++----
 libraries/libdbusmenu/g_type_init.patch        | 26 --------------------------
 libraries/libdbusmenu/libdbusmenu.SlackBuild   |  9 +++------
 libraries/libdbusmenu/libdbusmenu.info         |  6 +++---
 libraries/libdbusmenu/reference-xinclude.patch | 22 ----------------------
 5 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 libraries/libdbusmenu/g_type_init.patch
 delete mode 100644 libraries/libdbusmenu/reference-xinclude.patch

(limited to 'libraries')

diff --git a/libraries/libdbusmenu/README b/libraries/libdbusmenu/README
index 0bb930475c..cad08910ee 100644
--- a/libraries/libdbusmenu/README
+++ b/libraries/libdbusmenu/README
@@ -1,7 +1,8 @@
 libdbusmenu (library for passing menus over DBus)
 
-libdbusmenu is a small little library that was created by pulling out some comon
-code out of indicator-applet.
+libdbusmenu is a small little library that was created by
+pulling some common code out of indicator-applet.
 
-It passes a menu structure across DBus so that a program can create a menu simply
-without worrying about how it is displayed on the other side of the bus.
+It passes a menu structure across DBus so that a program
+can create a menu simply without worrying about how it is
+displayed on the other side of the bus.
diff --git a/libraries/libdbusmenu/g_type_init.patch b/libraries/libdbusmenu/g_type_init.patch
deleted file mode 100644
index a050f169e4..0000000000
--- a/libraries/libdbusmenu/g_type_init.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/tools/dbusmenu-dumper.c
-+++ b/tools/dbusmenu-dumper.c
-@@ -388,7 +388,10 @@
- int
- main (int argc, char ** argv)
- {
-+#if GLIB_VERSION_CUR_STABLE < G_ENCODE_VERSION(2, 36)
-+	// g_type_init is deprecated after 2.36
- 	g_type_init();
-+#endif
- 	GError * error = NULL;
- 	GOptionContext * context;
- 
---- a/tools/testapp/main.c
-+++ b/tools/testapp/main.c
-@@ -135,7 +135,10 @@
- 
- int main (int argc, char ** argv)
- {
-+#if GLIB_VERSION_CUR_STABLE < G_ENCODE_VERSION(2, 36)
-+	// g_type_init is deprecated after 2.36
- 	g_type_init();
-+#endif
- 
- 	if (argc != 2) {
- 		g_warning(USAGE);
diff --git a/libraries/libdbusmenu/libdbusmenu.SlackBuild b/libraries/libdbusmenu/libdbusmenu.SlackBuild
index 03bdc11d85..536b73abc4 100644
--- a/libraries/libdbusmenu/libdbusmenu.SlackBuild
+++ b/libraries/libdbusmenu/libdbusmenu.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
-#
+
 # Slackware build script for libdbusmenu.
-#
+
 # Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libdbusmenu
-VERSION=${VERSION:-12.10.2}
+VERSION=${VERSION:-16.04.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,9 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/g_type_init.patch
-patch -p1 < $CWD/reference-xinclude.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libdbusmenu/libdbusmenu.info b/libraries/libdbusmenu/libdbusmenu.info
index 2946514cec..ec4a3be6f7 100644
--- a/libraries/libdbusmenu/libdbusmenu.info
+++ b/libraries/libdbusmenu/libdbusmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="libdbusmenu"
-VERSION="12.10.2"
+VERSION="16.04.0"
 HOMEPAGE="https://launchpad.net/libdbusmenu/"
-DOWNLOAD="https://launchpad.net/libdbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz"
-MD5SUM="e30fc986b447f62513d61225fa573a70"
+DOWNLOAD="https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz"
+MD5SUM="3c05d53053b3ea69384b5f93d7a4c7c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-glib"
diff --git a/libraries/libdbusmenu/reference-xinclude.patch b/libraries/libdbusmenu/reference-xinclude.patch
deleted file mode 100644
index a4e6ee3a0b..0000000000
--- a/libraries/libdbusmenu/reference-xinclude.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
-+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
-@@ -15,9 +15,6 @@
-     <xi:include href="xml/menuitem-proxy.xml"/>
-     <xi:include href="xml/menuitem.xml"/>
-     <xi:include href="xml/client.xml"/>
--    <xi:include href="xml/client-menuitem.xml"/>
--    <xi:include href="xml/dbusmenu-client.xml"/>
--    <xi:include href="xml/dbusmenu-server.xml"/>
-     <xi:include href="xml/types.xml"/>
- 
-   </chapter>
---- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
-+++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
-@@ -15,7 +15,6 @@
-     <xi:include href="xml/menuitem.xml"/>
-     <xi:include href="xml/client.xml"/>
-     <xi:include href="xml/parser.xml"/>
--    <xi:include href="xml/serializablemenuitem.xml"/>
- 
-   </chapter>
-   <chapter id="object-tree">
-- 
cgit v1.2.3