diff options
3 files changed, 7 insertions, 86 deletions
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 deleted file mode 100644 index 4955c7c309..0000000000 --- a/libraries/libdbusmenu/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 eef3c5121e..137021957e 100644 --- a/libraries/libdbusmenu/libdbusmenu.SlackBuild +++ b/libraries/libdbusmenu/libdbusmenu.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for libdbusmenu. # -# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libdbusmenu -VERSION=${VERSION:-16.04.1} +VERSION=${VERSION:-18.10.20180917~bzr490} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -SRCVER=${SRCVER:-16.04.1+18.04.20171206} +SRCVER=${SRCVER:-18.10.20180917~bzr490+repack1} set -e @@ -63,7 +63,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz -C $PRGNAM-$VERSION/ +tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,7 +73,6 @@ find -L . \ -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" \ diff --git a/libraries/libdbusmenu/libdbusmenu.info b/libraries/libdbusmenu/libdbusmenu.info index 03244bc136..2baf8eea4f 100644 --- a/libraries/libdbusmenu/libdbusmenu.info +++ b/libraries/libdbusmenu/libdbusmenu.info @@ -1,8 +1,8 @@ PRGNAM="libdbusmenu" -VERSION="16.04.1" +VERSION="18.10.20180917~bzr490" HOMEPAGE="https://launchpad.net/libdbusmenu/" -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="http://cdn-fastly.deb.debian.org/debian/pool/main/libd/libdbusmenu/libdbusmenu_18.10.20180917~bzr490+repack1.orig.tar.xz" +MD5SUM="260b9a1ca7865ae6b7582f01b24469af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="json-glib gnome-common" |