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

[Balló György]

    Date: Wednesday, March 11, 2020 @ 19:34:40
  Author: bgyorgy
Revision: 594603

upgpkg: filemanager-actions 3.4-5: Properly use yelp-tools

Modified:
  filemanager-actions/trunk/PKGBUILD
  filemanager-actions/trunk/yelp-tools.patch

------------------+
 PKGBUILD         |   13 +++----------
 yelp-tools.patch |   41 ++++++++++++++++++++++++++++++++---------
 2 files changed, 35 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-11 19:34:40 UTC (rev 594602)
+++ PKGBUILD	2020-03-11 19:34:40 UTC (rev 594603)
@@ -5,7 +5,7 @@
 
 pkgname=filemanager-actions
 pkgver=3.4
-pkgrel=4
+pkgrel=5
 pkgdesc="File-manager extension which offers user configurable context menu actions"
 arch=('x86_64')
 url="https://gitlab.gnome.org/GNOME/filemanager-actions"
@@ -20,7 +20,7 @@
         yelp-tools.patch
         filemanager-actions.appdata.xml)
 sha256sums=('10189781af90df4c99fde0fe98eacd2e12f4577eff5dc9b769618d980668a997'
-            '93724e3557620715ac8adb33acb7e5e64e3b940161019c1e519be92e6701985c'
+            '4dbe842a20739c05a2d8c62ab7691cfc47669d6a032ad04381624650691d7e6d'
             'b8f9057e535631d6164581763e49c2e480c02a9f75757528f2df26aa182d4670')
 
 prepare() {
@@ -31,15 +31,8 @@
   # Don't use deprecated gnome-doc-utils
   sed -i 's/ghelp:filemanager-actions-config-tool/help:fma-config-tool/' src/ui/fma-menu.c
   sed -i 's/ghelp:/help:/g' docs/manual/*/*.{xml,po}
-
-  pushd docs/manual/C
-  itstool -o messages.po
-  msgfmt messages.po
-  itstool -m messages.mo fma-config-tool.xml -o index.docbook
-  popd
-
+  mv docs/manual/C/{fma-config-tool.xml,index.docbook}
   patch -Np1 -i ../yelp-tools.patch
-
   autoreconf -fi
 }
 

Modified: yelp-tools.patch
===================================================================
--- yelp-tools.patch	2020-03-11 19:34:40 UTC (rev 594602)
+++ yelp-tools.patch	2020-03-11 19:34:40 UTC (rev 594603)
@@ -12,10 +12,10 @@
  # add --enable-html-manuals and --enable-pdf-manuals configure options
  FMA_ENABLE_MANUALS
 diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
-index e7d1e44c..0c3291c0 100644
+index e7d1e44c..8eabfa2d 100644
 --- a/docs/manual/Makefile.am
 +++ b/docs/manual/Makefile.am
-@@ -24,61 +24,14 @@
+@@ -24,61 +24,34 @@
  #   Rodrigo Moya <rodrigo at gnome-db.org>
  #   Pierre Wieser <pwieser at trychlos.org>
  #   ... and many others (see AUTHORS)
@@ -45,10 +45,9 @@
 -# Do not use the $(NULL) syntax here as this may prevent Damned-Lies
 -# to correctly generate POT files (cf. mail of Claude Paroz 2010-08-29
 -# http://mail.gnome.org/archives/gnome-i18n/2010-August/msg00229.html).
- 
+-
 -DOC_MODULE = fma-config-tool
-+ at YELP_HELP_RULES@
- 
+-
 -#DOC_ENTITIES = $(patsubst $(srcdir)/C/%,%,$(shell \ls -1 $(srcdir)/C/*.xml | $(GREP) -v $(DOC_MODULE)))
 -DOC_ENTITIES = \
 -	appendix-gnu-fdl-1.3.xml						\
@@ -70,18 +69,42 @@
 -	fma-starting.xml								\
 -	fma-where.xml									\
 -	legalnotice.xml
-+HELP_ID = fma-config-tool
  
 -#DOC_INCLUDES =
-+HELP_FILES = index.docbook
- 
+-
 -#DOC_FIGURES = $(patsubst $(srcdir)/C/%,%,$(shell \ls -1 $(srcdir)/C/figures/*.png))
 -DOC_FIGURES = \
++ at YELP_HELP_RULES@
++
++HELP_ID = fma-config-tool
++
++HELP_FILES = index.docbook
++
++HELP_EXTRA = \
++       appendix-gnu-fdl-1.3.xml                                                \
++       articleinfo.xml                                                                 \
++       fma-bugs.xml                                                                    \
++       fma-conditions.xml                                                              \
++       fma-edit.xml                                                                    \
++       fma-execution.xml                                                               \
++       fma-export.xml                                                                  \
++       fma-import.xml                                                                  \
++       fma-menus.xml                                                                   \
++       fma-misc.xml                                                                    \
++       fma-prefs.xml                                                                   \
++       fma-profiles.xml                                                                \
++       fma-properties.xml                                                              \
++       fma-save.xml                                                                    \
++       fma-sorting.xml                                                                 \
++       fma-starting.xml                                                                \
++       fma-where.xml                                                                   \
++       legalnotice.xml
++
 +HELP_MEDIA = \
  	figures/add.png									\
  	figures/fma-action-tab.png						\
  	figures/fma-basenames-tab.png					\
-@@ -132,451 +85,6 @@ DOC_FIGURES = \
+@@ -132,451 +105,6 @@ DOC_FIGURES = \
  	figures/start-zenity-result.png					\
  	figures/stock-icon-about.png