[arch-commits] Commit in gnac/trunk (PKGBUILD yelp-tools.patch)

[Balló György]

    Date: Tuesday, March 10, 2020 @ 15:39:22
  Author: bgyorgy
Revision: 593657

upgpkg: gnac 0.2.4.1-8: Remove deprecated gnome-doc-utils dependency

Added:
  gnac/trunk/yelp-tools.patch
Modified:
  gnac/trunk/PKGBUILD

------------------+
 PKGBUILD         |   12 ++++++---
 yelp-tools.patch |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-10 15:35:10 UTC (rev 593656)
+++ PKGBUILD	2020-03-10 15:39:22 UTC (rev 593657)
@@ -2,13 +2,13 @@
 
 pkgname=gnac
 pkgver=0.2.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Audio converter for GNOME"
 arch=('x86_64')
 url="http://gnac.sourceforge.net/"
 license=('GPL')
 depends=('libnotify' 'gst-plugins-base' 'gtk3')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+makedepends=('intltool' 'gnome-common')
 optdepends=('gst-plugins-good: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'            
             'gst-plugins-ugly: Extra media codecs'
@@ -16,11 +16,12 @@
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         gnac.appdata.xml
         fix-build.patch
-        gstreamer-1.0.patch)
+        gstreamer-1.0.patch
+        yelp-tools.patch)
 sha256sums=('8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da'
             '936ff9d1830c2649a34cbd1f208fb572de6dd2f89aeefa20e750227287125774'
             'a7a8cc9d3cc9408776e64be50beb7c48cc1a3d9499cb98e2dac5f45a151475ac'
-            '57331aaf1987e8920594a4a753bed2c719d2152c7448ab53ba09ec208521abae')
+            '57331aaf1987e8920594a4a753bed2c719d2152c7448ab53ba09ec208521abae' SKIP)
 
 prepare() {
   cd $pkgname-$pkgver
@@ -31,6 +32,9 @@
   # Port to GStreamer 1.0
   patch -Np1 -i ../gstreamer-1.0.patch
 
+  # Don't use deprecated gnome-doc-utils
+  patch -Np1 -i ../yelp-tools.patch
+
   # Don't install icon into pixmaps
   sed -i '/pixmaps/d' data/icons/Makefile.am
 

Added: yelp-tools.patch
===================================================================
--- yelp-tools.patch	                        (rev 0)
+++ yelp-tools.patch	2020-03-10 15:39:22 UTC (rev 593657)
@@ -0,0 +1,68 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4809bd5..6043fbf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,11 +14,9 @@ INTLTOOL_BUILT = \
+ 	intltool-update
+ 
+ EXTRA_DIST = \
+-	autogen.sh \
+-	gnome-doc-utils.make
++	autogen.sh
+ 
+ DISTCLEANFILES = \
+-	gnome-doc-utils.make \
+ 	po/.intltool-merge-cache \
+ 	$(INTLTOOL_BUILT)
+ 
+diff --git a/configure.ac b/configure.ac
+index b2c5605..20a2081 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
+ dnl Check for GSettings macros
+ GLIB_GSETTINGS
+ 
+-GNOME_DOC_INIT([0.17.2])
++YELP_HELP_INIT
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])
+diff --git a/help/Makefile.am b/help/Makefile.am
+index dff2f18..760fc92 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,15 +1,14 @@
+-include $(top_srcdir)/gnome-doc-utils.make
+-dist-hook: doc-dist-hook
++ at YELP_HELP_RULES@
+ 
+-DOC_ID = gnac
++HELP_ID = gnac
+ 
+-DOC_FIGURES = \
++HELP_MEDIA = \
+ 	figures/gnac-logo.png \
+ 	figures/gnac-main-window.png
+ 
+-DOC_PAGES = \
++HELP_FILES = \
+ 	index.page \
+ 	intro.page \
+ 	license.page
+ 
+-DOC_LINGUAS = cs da de es fr ro ru sl te
++HELP_LINGUAS = cs da de es fr ro ru sl te
+diff --git a/src/gnac-ui.c b/src/gnac-ui.c
+index 76f6401..200c7db 100644
+--- a/src/gnac-ui.c
++++ b/src/gnac-ui.c
+@@ -855,7 +855,7 @@ gnac_ui_on_help_cb(GtkAction *action,
+   GError *error = NULL;
+ 
+   ret = gtk_show_uri(gtk_widget_get_screen(gnac_ui_get_widget("main_window")),
+-      "ghelp:gnac", gtk_get_current_event_time(), &error);
++      "help:gnac", gtk_get_current_event_time(), &error);
+   if (!ret && error) {
+     g_printerr("%s: %s\n", _("Could not display help"), error->message);
+     g_clear_error(&error);