Date: Tuesday, March 10, 2020 @ 17:39:48 Author: bgyorgy Revision: 593683
upgpkg: pdfmod 0.9.1-11: Remove deprecated gnome-doc-utils dependency Added: pdfmod/trunk/0004-yelp-tools.patch Modified: pdfmod/trunk/PKGBUILD pdfmod/trunk/pdfmod.appdata.xml -----------------------+ 0004-yelp-tools.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 14 +++++-- pdfmod.appdata.xml | 4 +- 3 files changed, 100 insertions(+), 6 deletions(-) Added: 0004-yelp-tools.patch =================================================================== --- 0004-yelp-tools.patch (rev 0) +++ 0004-yelp-tools.patch 2020-03-10 17:39:48 UTC (rev 593683) @@ -0,0 +1,88 @@ +diff --git a/Makefile.am b/Makefile.am +index f35b315..6bf871f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,6 @@ clean-local: + + EXTRA_DIST = \ + lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \ +- gnome-doc-utils.make \ + icon-theme-installer \ + intltool-extract.in \ + intltool-merge.in \ +@@ -48,7 +47,6 @@ CLEANFILES = \ + intltool-merge + + DISTCLEANFILES = \ +- gnome-doc-utils.make \ + *.bak \ + *~ \ + *.pidb +diff --git a/configure.ac b/configure.ac +index e3b4570..19d517d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) + fi + +-GNOME_DOC_INIT ++YELP_HELP_INIT + + AC_DEFUN([SHAMROCK_EXPAND_LIBDIR], + [ +diff --git a/docs/C/index.docbook b/docs/C/index.docbook +index 6b22ce1..0a29e45 100644 +--- a/docs/C/index.docbook ++++ b/docs/C/index.docbook +@@ -2,7 +2,7 @@ + <?db.chunk.max_depth 1?> + <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";> + <book id="pdfmod" lang="C"> +- <bookinfo> ++ <bookinfo id="index"> + <title>The PDF Mod Manual</title> + <abstract role="description"> + <para>This is the user's manual for PDF Mod, a simple tool for manipulating PDF documents.</para> +diff --git a/docs/Makefile.am b/docs/Makefile.am +index d9fba88..66bbf4a 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -1,9 +1,7 @@ +-include $(top_srcdir)/gnome-doc-utils.make +-dist-hook: doc-dist-hook ++@YELP_HELP_RULES@ + +-DOC_MODULE = pdfmod +-DOC_ENTITIES = +-DOC_INCLUDES = +-DOC_FIGURES = ++HELP_ID = pdfmod + +-DOC_LINGUAS = ca cs da de es fr hr pl sl sv zh_CN ++HELP_FILES = index.docbook ++ ++HELP_LINGUAS = ca cs da de es fr hr pl sl sv zh_CN +diff --git a/src/PdfMod/Gui/Actions.cs b/src/PdfMod/Gui/Actions.cs +index 3fc452b..db16fe6 100644 +--- a/src/PdfMod/Gui/Actions.cs ++++ b/src/PdfMod/Gui/Actions.cs +@@ -485,15 +485,15 @@ namespace PdfMod.Gui + var langs = GLib.Marshaller.NullTermPtrToStringArray (lang_ptr, false); + + string help_dir = null; +- foreach (var dir in new string [] { Core.Defines.PREFIX + "/share/gnome/help/", "/usr/local/share/gnome/help/", "docs/" }) { ++ foreach (var dir in new string [] { Core.Defines.PREFIX + "/share/help/", "/usr/local/share/help/", "docs/" }) { + help_dir = dir; +- if (System.IO.Directory.Exists (dir + "pdfmod/")) { ++ if (System.IO.Directory.Exists (dir + "C/pdfmod/")) { + break; + } + } + + foreach (var lang in langs) { +- var help_path = CombinePaths (help_dir, "pdfmod", lang, "pdfmod.xml"); ++ var help_path = CombinePaths (help_dir, lang, "pdfmod", "index.docbook"); + if (System.IO.File.Exists (help_path)) { + System.Diagnostics.Process.Start (String.Format ("ghelp://{0}", help_path)); + shown = true; Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-10 17:38:18 UTC (rev 593682) +++ PKGBUILD 2020-03-10 17:39:48 UTC (rev 593683) @@ -3,17 +3,18 @@ pkgname=pdfmod pkgver=0.9.1 -pkgrel=10 +pkgrel=11 pkgdesc="Simple application for modifying PDF written in C Sharp" arch=('any') -url="https://wiki.gnome.org/Apps/PdfMod"; +url="https://wiki.gnome.org/Attic/PdfMod"; license=('GPL' 'MIT') depends=('gtk-sharp-2' 'poppler-glib') -makedepends=('hyena' 'poppler-sharp' 'intltool' 'gnome-doc-utils' 'dos2unix') +makedepends=('hyena' 'poppler-sharp' 'intltool' 'yelp-tools' 'dos2unix') source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"; '0001-pdfmod-mono-2.10.patch' '0002-fix-build.patch' '0003-drop-gconf-dependency.patch' + '0004-yelp-tools.patch' 'pdfmod.appdata.xml' 'LICENSE-PDFsharp') sha256sums=('eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9' @@ -20,7 +21,8 @@ 'fad48fb68fe6a9b60032a43c6c0389092684723a3aab296e926003ff0b33880c' 'fcf26040435b88f625d2c3b36540ea6c78e767439a6dee8d2f87119e8d666978' '6a235f93ce7321cbe2e7f20094ece0659fb4648602e84a4824a0fb527be90914' - 'fb27471552fedf3d79dd1e13c49a8efb94515486b7db7370981171d3e8972c36' + '40407ed97f2e79d5c63a9a6c67ea7c21a58b95095ba5449ff607acd5c829513a' + '15a79778dfebed691b0a59a34e9a02bd0377012aa540ecd6ff65a5b2b969d7d5' '5d2b6e1a9e5582f9c5d129f222ff01ca6ce3dfa4a5c1f5c41ba827fe0fbeb4bd') prepare() { @@ -37,6 +39,10 @@ # Remove deprecated GConf dependency patch -Np1 -i ../0003-drop-gconf-dependency.patch + + # Don't use deprecated gnome-doc-utils + mv docs/C/{pdfmod.xml,index.docbook} + patch -Np1 -i ../0004-yelp-tools.patch # Fix build sed -i 's/gmcs/mcs/' configure{,.ac} Modified: pdfmod.appdata.xml =================================================================== --- pdfmod.appdata.xml 2020-03-10 17:38:18 UTC (rev 593682) +++ pdfmod.appdata.xml 2020-03-10 17:39:48 UTC (rev 593683) @@ -11,11 +11,11 @@ </description> <screenshots> <screenshot type="default"> - <image>https://wiki.gnome.org/Apps/PdfMod?action=AttachFile&do=get&target=pdfmod-0.9.1.png</image> + <image>https://wiki.gnome.org/Attic/PdfMod?action=AttachFile&do=get&target=pdfmod-0.9.1.png</image> </screenshot> </screenshots> <url type="bugtracker">https://gitlab.gnome.org/Archive/pdfmod/issues</url> - <url type="homepage">https://wiki.gnome.org/Apps/PdfMod</url> + <url type="homepage">https://wiki.gnome.org/Attic/PdfMod</url> <update_contact>[email protected]</update_contact> <translation type="gettext">pdfmod</translation> </component>
