libraries/libdbusmenu: Updated for version 16.04.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 111 insertions, 15 deletions

diff --git a/libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch b/libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch
new file mode 100644
index 0000000000..fbe7ca334c
--- /dev/null
+++ b/libraries/libdbusmenu/0001_no-deprecated-gnome-common-macros.patch
@@ -0,0 +1,12 @@
+Description: Drop deprecated gnome-common variables.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -9,6 +9,4 @@
+ 
+ gtkdocize || exit 1
+ 
+-USE_GNOME2_MACROS=1 \
+-USE_COMMON_DOC_BUILD=yes \
+ gnome-autogen.sh --enable-gtk-doc $@
diff --git a/libraries/libdbusmenu/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch b/libraries/libdbusmenu/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch
new file mode 100644
index 0000000000..4955c7c309
--- /dev/null
+++ b/libraries/libdbusmenu/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch
@@ -0,0 +1,78 @@
+From 761ae73c061f9be0ae8dcd97893e75d6e02fbf46 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Fri, 6 Oct 2017 11:13:09 +0200
+Subject: [PATCH] gtkdoc-check: Move over gtkdoc-check unit tests to the docs/
+ directory and use AM's unit testing API. (However, this seems to be broken
+ currently, so we disable those tests completely, for now (current solution
+ after hours of investigating).
+
+---
+ docs/libdbusmenu-glib/reference/Makefile.am |  1 +
+ docs/libdbusmenu-gtk/reference/Makefile.am  |  2 +-
+ tests/Makefile.am                           | 22 ----------------------
+ 3 files changed, 2 insertions(+), 23 deletions(-)
+
+diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
+index 9274c5c..924a795 100644
+--- a/docs/libdbusmenu-glib/reference/Makefile.am
++++ b/docs/libdbusmenu-glib/reference/Makefile.am
+@@ -93,4 +93,5 @@ if ENABLE_GTK_DOC
+  TESTS_ENVIRONMENT = cd $(srcdir) && \
+    DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+    SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
++# TESTS = $(GTKDOC_CHECK)
+ endif
+diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am
+index 8cc3d07..ce1e8ca 100644
+--- a/docs/libdbusmenu-gtk/reference/Makefile.am
++++ b/docs/libdbusmenu-gtk/reference/Makefile.am
+@@ -93,5 +93,5 @@ if ENABLE_GTK_DOC
+  TESTS_ENVIRONMENT = cd $(srcdir) && \
+    DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+    SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
++# TESTS = $(GTKDOC_CHECK)
+ endif
+-
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 64e3e75..98409d6 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -40,12 +40,6 @@ TESTS += \
+ #	test-gtk-submenu 
+ endif
+ 
+-if ENABLE_GTK_DOC
+-TESTS += \
+-	test_libdbusmenu_glib_gtkdoc \
+-	test_libdbusmenu_gtk_gtkdoc
+-endif
+-
+ # The Python test only work on the system copy of
+ # dbusmenu, so while they can be usefule they're not
+ # good tests of what you're currently building.  Handy
+@@ -545,22 +539,6 @@ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/ma
+ 	@echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> $@
+ 	@chmod +x $@
+ 
+-#########################
+-# Other
+-#########################
+-
+-test_libdbusmenu_glib_gtkdoc:
+-	@echo "#!/bin/bash" > $@
+-	@echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@
+-	@echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
+-	@chmod +x $@
+-
+-test_libdbusmenu_gtk_gtkdoc:
+-	@echo "#!/bin/bash" > $@
+-	@echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@
+-	@echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
+-	@chmod +x $@
+-
+ examplesdir = $(docdir)/examples/
+ 
+ examples_DATA = \
+-- 
+2.11.0
+
diff --git a/libraries/libdbusmenu/libdbusmenu.SlackBuild b/libraries/libdbusmenu/libdbusmenu.SlackBuild
index 536b73abc4..eef3c5121e 100644
--- a/libraries/libdbusmenu/libdbusmenu.SlackBuild
+++ b/libraries/libdbusmenu/libdbusmenu.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
-
+#
 # Slackware build script for libdbusmenu.
-
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#
+# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libdbusmenu
-VERSION=${VERSION:-16.04.0}
+VERSION=${VERSION:-16.04.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -54,13 +54,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+SRCVER=${SRCVER:-16.04.1+18.04.20171206}
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz -C $PRGNAM-$VERSION/
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,9 +72,12 @@ 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/0001_no-deprecated-gnome-common-macros.patch
+patch -p1 < $CWD/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -86,10 +92,10 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-DOCS="AUTHORS ChangeLog COPYING* INSTALL NEWS README"
+DOCS="COPYING* INSTALL NEWS README"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libdbusmenu/libdbusmenu.info b/libraries/libdbusmenu/libdbusmenu.info
index ec4a3be6f7..03244bc136 100644
--- a/libraries/libdbusmenu/libdbusmenu.info
+++ b/libraries/libdbusmenu/libdbusmenu.info
@@ -1,10 +1,10 @@
 PRGNAM="libdbusmenu"
-VERSION="16.04.0"
+VERSION="16.04.1"
 HOMEPAGE="https://launchpad.net/libdbusmenu/"
-DOWNLOAD="https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz"
-MD5SUM="3c05d53053b3ea69384b5f93d7a4c7c4"
+DOWNLOAD="http://cdn-fastly.deb.debian.org/debian/pool/main/libd/libdbusmenu/libdbusmenu_16.04.1+18.04.20171206.orig.tar.gz"
+MD5SUM="c4621eac9ceda7da6f469089474f3859"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
+REQUIRES="json-glib gnome-common"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"