[arch-commits] Commit in pdfmod/repos/community-any (13 files)
Balló György
bgyorgy at archlinux.org
Tue Mar 10 17:39:56 UTC 2020
Date: Tuesday, March 10, 2020 @ 17:39:56
Author: bgyorgy
Revision: 593684
archrelease: copy trunk to community-any
Added:
pdfmod/repos/community-any/0001-pdfmod-mono-2.10.patch
(from rev 593683, pdfmod/trunk/0001-pdfmod-mono-2.10.patch)
pdfmod/repos/community-any/0002-fix-build.patch
(from rev 593683, pdfmod/trunk/0002-fix-build.patch)
pdfmod/repos/community-any/0003-drop-gconf-dependency.patch
(from rev 593683, pdfmod/trunk/0003-drop-gconf-dependency.patch)
pdfmod/repos/community-any/0004-yelp-tools.patch
(from rev 593683, pdfmod/trunk/0004-yelp-tools.patch)
pdfmod/repos/community-any/LICENSE-PDFsharp
(from rev 593683, pdfmod/trunk/LICENSE-PDFsharp)
pdfmod/repos/community-any/PKGBUILD
(from rev 593683, pdfmod/trunk/PKGBUILD)
pdfmod/repos/community-any/pdfmod.appdata.xml
(from rev 593683, pdfmod/trunk/pdfmod.appdata.xml)
Deleted:
pdfmod/repos/community-any/Drop-gconf-dependency.patch
pdfmod/repos/community-any/LICENSE-PDFsharp
pdfmod/repos/community-any/PKGBUILD
pdfmod/repos/community-any/fix-build.patch
pdfmod/repos/community-any/pdfmod-mono-2.10.patch
pdfmod/repos/community-any/pdfmod.appdata.xml
----------------------------------+
0001-pdfmod-mono-2.10.patch | 23 +++
0003-drop-gconf-dependency.patch | 227 +++++++++++++++++++++++++++++++++++++
0004-yelp-tools.patch | 88 ++++++++++++++
Drop-gconf-dependency.patch | 227 -------------------------------------
LICENSE-PDFsharp | 48 +++----
PKGBUILD | 129 +++++++++++----------
pdfmod-mono-2.10.patch | 25 ----
pdfmod.appdata.xml | 42 +++---
8 files changed, 452 insertions(+), 357 deletions(-)
Copied: pdfmod/repos/community-any/0001-pdfmod-mono-2.10.patch (from rev 593683, pdfmod/trunk/0001-pdfmod-mono-2.10.patch)
===================================================================
--- 0001-pdfmod-mono-2.10.patch (rev 0)
+++ 0001-pdfmod-mono-2.10.patch 2020-03-10 17:39:56 UTC (rev 593684)
@@ -0,0 +1,23 @@
+From a29cfe7f8f31ce003fa3e307d54d86a2a8e8cf19 Mon Sep 17 00:00:00 2001
+From: Nuno Araujo <nuno.araujo at russo79.com>
+Date: Mon, 21 Mar 2011 04:10:52 +0000
+Subject: Fix compilation under Mono 2.10 (bgo#644516)
+
+Force use of the overloaded implicit operator of Hyena.Gui.DragDropList
+to solve mono 2.10 compilation problems.
+
+Signed-off-by: Alexander Kojevnikov <alexander at kojevnikov.com>
+---
+diff --git a/src/PdfMod/Gui/DocumentIconView.cs b/src/PdfMod/Gui/DocumentIconView.cs
+index 5796c72..386d662 100644
+--- a/src/PdfMod/Gui/DocumentIconView.cs
++++ b/src/PdfMod/Gui/DocumentIconView.cs
+@@ -319,7 +319,7 @@ namespace PdfMod.Gui
+ if (to_index < 0)
+ return;
+
+- var pages = args.SelectionData.Data as Hyena.Gui.DragDropList<Page>;
++ Hyena.Gui.DragDropList<Page> pages = args.SelectionData;
+ to_index -= pages.Count (p => p.Index < to_index);
+ var action = new MoveAction (document, pages, to_index);
+ action.Do ();
Copied: pdfmod/repos/community-any/0002-fix-build.patch (from rev 593683, pdfmod/trunk/0002-fix-build.patch)
===================================================================
(Binary files differ)
Copied: pdfmod/repos/community-any/0003-drop-gconf-dependency.patch (from rev 593683, pdfmod/trunk/0003-drop-gconf-dependency.patch)
===================================================================
--- 0003-drop-gconf-dependency.patch (rev 0)
+++ 0003-drop-gconf-dependency.patch 2020-03-10 17:39:56 UTC (rev 593684)
@@ -0,0 +1,227 @@
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sat, 23 Dec 2017 02:22:44 -0500
+Subject: Drop gconf dependency
+
+Revert 3647e8bd20533f317c8fa0deac29e89fec0512f2
+"Remember show_toolbar and last_open folder in gconf"
+
+Similarly, undo gconf support for Bookmarks feature
+---
+ configure.ac | 1 -
+ src/Makefile.am | 2 --
+ src/PdfMod/Core/Client.cs | 2 --
+ src/PdfMod/Core/Configuration.cs | 65 ----------------------------------------
+ src/PdfMod/Gui/Actions.cs | 17 +++--------
+ src/PdfMod/Gui/BookmarkView.cs | 2 --
+ src/PdfMod/Gui/Client.cs | 3 --
+ 7 files changed, 4 insertions(+), 88 deletions(-)
+ delete mode 100644 src/PdfMod/Core/Configuration.cs
+
+diff --git a/configure.ac b/configure.ac
+index e3b4570..6438aa0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -108,7 +108,6 @@ AM_GLIB_GNU_GETTEXT
+ dnl package checks, common for all configs
+ PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
+-PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
+
+ dnl package checks, per config
+ PKG_CHECK_MODULES(HYENA, hyena >= 0.5)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9eb4c74..a3ead39 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -29,7 +29,6 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
+ FILES = \
+ PdfMod/Core/AssemblyInfo.cs \
+ PdfMod/Core/Client.cs \
+- PdfMod/Core/Configuration.cs \
+ PdfMod/Core/Defines.cs \
+ PdfMod/Gui/Actions.cs \
+ PdfMod/Gui/BookmarkView.cs \
+@@ -63,7 +62,6 @@ EXTRAS = \
+ REFERENCES = \
+ Mono.Cairo \
+ Mono.Posix \
+- -pkg:gconf-sharp-2.0 \
+ -pkg:glib-sharp-2.0 \
+ -pkg:gtk-sharp-2.0 \
+ -pkg:hyena \
+diff --git a/src/PdfMod/Core/Client.cs b/src/PdfMod/Core/Client.cs
+index e8d4d11..fac4c75 100644
+--- a/src/PdfMod/Core/Client.cs
++++ b/src/PdfMod/Core/Client.cs
+@@ -32,13 +32,11 @@ namespace PdfMod.Core
+ static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
+
+ public Document Document { get; protected set; }
+- public static Configuration Configuration { get; private set; }
+
+ public event EventHandler DocumentLoaded;
+
+ static Client ()
+ {
+- Configuration = new Configuration ();
+ InitCache ();
+ }
+
+diff --git a/src/PdfMod/Core/Configuration.cs b/src/PdfMod/Core/Configuration.cs
+deleted file mode 100644
+index 817b9f4..0000000
+--- a/src/PdfMod/Core/Configuration.cs
++++ /dev/null
+@@ -1,65 +0,0 @@
+-// Copyright (C) 2009-2010 Novell, Inc.
+-//
+-// This program is free software; you can redistribute it and/or
+-// modify it under the terms of the GNU General Public License
+-// as published by the Free Software Foundation; either version 2
+-// of the License, or (at your option) any later version.
+-//
+-// This program is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-// GNU General Public License for more details.
+-//
+-// You should have received a copy of the GNU General Public License
+-// along with this program; if not, write to the Free Software
+-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-using System;
+-
+-namespace PdfMod.Core
+-{
+- public class Configuration
+- {
+- GConf.Client client = new GConf.Client ();
+- string ns = "/apps/pdfmod/";
+-
+- public Configuration()
+- {
+- }
+-
+- T Get<T> (string key, T fallback)
+- {
+- try {
+- return (T) client.Get (ns + key);
+- } catch {
+- return fallback;
+- }
+- }
+-
+- void Set<T> (string key, T val)
+- {
+- client.Set (ns + key, val);
+- }
+-
+- public bool ShowToolbar {
+- get { return Get<bool> ("show_toolbar", true); }
+- set { Set<bool> ("show_toolbar", value); }
+- }
+-
+- public bool ShowBookmarks {
+- get { return Get<bool> ("show_bookmarks", false); }
+- set { Set<bool> ("show_bookmarks", value); }
+- }
+-
+- public string LastOpenFolder {
+- get { return Get<string> ("last_folder", System.Environment.GetFolderPath (System.Environment.SpecialFolder.Desktop)); }
+- set {
+- if (value != null && value.StartsWith ("file:/") && !value.StartsWith ("file://")) {
+- value = "file://" + value.Substring (6);
+- }
+-
+- Set<string> ("last_folder", value);
+- }
+- }
+- }
+-}
+diff --git a/src/PdfMod/Gui/Actions.cs b/src/PdfMod/Gui/Actions.cs
+index 3fc452b..9651a36 100644
+--- a/src/PdfMod/Gui/Actions.cs
++++ b/src/PdfMod/Gui/Actions.cs
+@@ -110,8 +110,8 @@ namespace PdfMod.Gui
+ AddImportant (
+ new ToggleActionEntry ("Properties", Stock.Properties, null, "<alt>Return", Catalog.GetString ("View and edit the title, keywords, and more for this document"), OnProperties, false),
+ new ToggleActionEntry ("ZoomFit", Stock.ZoomFit, null, "<control>0", null, OnZoomFit, true),
+- new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, Client.Configuration.ShowToolbar),
+- new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, Client.Configuration.ShowBookmarks),
++ new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, true),
++ new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, false),
+ new ToggleActionEntry ("FullScreenView", null, Catalog.GetString ("Fullscreen"), "F11", null, OnFullScreenView, false)
+ );
+
+@@ -230,12 +230,6 @@ namespace PdfMod.Gui
+ chooser.SelectMultiple = true;
+ chooser.AddButton (Stock.Open, ResponseType.Ok);
+
+- if (app.Document != null) {
+- chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
+- } else {
+- chooser.SetCurrentFolder (Client.Configuration.LastOpenFolder);
+- }
+-
+ var response = chooser.Run ();
+ var filenames = chooser.Filenames;
+ chooser.Destroy ();
+@@ -266,7 +260,6 @@ namespace PdfMod.Gui
+ chooser.DoOverwriteConfirmation = true;
+ chooser.CurrentName = System.IO.Path.GetFileName (app.Document.SuggestedSavePath);
+ chooser.AddButton (Stock.SaveAs, ResponseType.Ok);
+- chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
+
+ var response = chooser.Run ();
+ string filename = chooser.Filename;
+@@ -462,14 +455,12 @@ namespace PdfMod.Gui
+
+ void OnViewToolbar (object o, EventArgs args)
+ {
+- bool show = (this["ViewToolbar"] as ToggleAction).Active;
+- Client.Configuration.ShowToolbar = app.HeaderToolbar.Visible = show;
++ app.HeaderToolbar.Visible = (this["ViewToolbar"] as ToggleAction).Active;
+ }
+
+ void OnViewBookmarks (object o, EventArgs args)
+ {
+- bool show = (this["ViewBookmarks"] as ToggleAction).Active;
+- Client.Configuration.ShowBookmarks = app.BookmarkView.Visible = show;
++ app.BookmarkView.Visible = (this["ViewBookmarks"] as ToggleAction).Active;
+ if (app.BookmarkView.Visible) {
+ app.BookmarkView.GrabFocus ();
+ }
+diff --git a/src/PdfMod/Gui/BookmarkView.cs b/src/PdfMod/Gui/BookmarkView.cs
+index 00303cd..29f9d16 100644
+--- a/src/PdfMod/Gui/BookmarkView.cs
++++ b/src/PdfMod/Gui/BookmarkView.cs
+@@ -69,8 +69,6 @@ namespace PdfMod.Gui
+ model.Clear ();
+ AddOutlineCollection (document, document.Pdf.Outlines, TreeIter.Zero);
+ UpdateActions ();
+-
+- Visible = Client.Configuration.ShowBookmarks;
+ }
+
+ // Bookmark action handlers
+diff --git a/src/PdfMod/Gui/Client.cs b/src/PdfMod/Gui/Client.cs
+index d7a408b..a614dcb 100644
+--- a/src/PdfMod/Gui/Client.cs
++++ b/src/PdfMod/Gui/Client.cs
+@@ -125,8 +125,6 @@ namespace PdfMod.Gui
+ HeaderToolbar.ShowArrow = false;
+ HeaderToolbar.ToolbarStyle = ToolbarStyle.Icons;
+ HeaderToolbar.Tooltips = true;
+- HeaderToolbar.NoShowAll = true;
+- HeaderToolbar.Visible = Configuration.ShowToolbar;
+
+ // BookmarksView
+ BookmarkView = new BookmarkView (this);
+@@ -272,7 +270,6 @@ namespace PdfMod.Gui
+ path = System.IO.Path.GetFullPath (path);
+ }
+
+- Configuration.LastOpenFolder = System.IO.Path.GetDirectoryName (suggestedFilename ?? path);
+ status_label.Text = Catalog.GetString ("Loading document...");
+
+ ThreadAssist.SpawnFromMain (delegate {
Copied: pdfmod/repos/community-any/0004-yelp-tools.patch (from rev 593683, pdfmod/trunk/0004-yelp-tools.patch)
===================================================================
--- 0004-yelp-tools.patch (rev 0)
+++ 0004-yelp-tools.patch 2020-03-10 17:39:56 UTC (rev 593684)
@@ -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
++ at 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;
Deleted: Drop-gconf-dependency.patch
===================================================================
--- Drop-gconf-dependency.patch 2020-03-10 17:39:48 UTC (rev 593683)
+++ Drop-gconf-dependency.patch 2020-03-10 17:39:56 UTC (rev 593684)
@@ -1,227 +0,0 @@
-From: Jeremy Bicha <jbicha at ubuntu.com>
-Date: Sat, 23 Dec 2017 02:22:44 -0500
-Subject: Drop gconf dependency
-
-Revert 3647e8bd20533f317c8fa0deac29e89fec0512f2
-"Remember show_toolbar and last_open folder in gconf"
-
-Similarly, undo gconf support for Bookmarks feature
----
- configure.ac | 1 -
- src/Makefile.am | 2 --
- src/PdfMod/Core/Client.cs | 2 --
- src/PdfMod/Core/Configuration.cs | 65 ----------------------------------------
- src/PdfMod/Gui/Actions.cs | 17 +++--------
- src/PdfMod/Gui/BookmarkView.cs | 2 --
- src/PdfMod/Gui/Client.cs | 3 --
- 7 files changed, 4 insertions(+), 88 deletions(-)
- delete mode 100644 src/PdfMod/Core/Configuration.cs
-
-diff --git a/configure.ac b/configure.ac
-index e3b4570..6438aa0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,7 +108,6 @@ AM_GLIB_GNU_GETTEXT
- dnl package checks, common for all configs
- PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
- PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
--PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
-
- dnl package checks, per config
- PKG_CHECK_MODULES(HYENA, hyena >= 0.5)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9eb4c74..a3ead39 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -29,7 +29,6 @@ all: $(ASSEMBLY) $(PROGRAMFILES) $(BINARIES)
- FILES = \
- PdfMod/Core/AssemblyInfo.cs \
- PdfMod/Core/Client.cs \
-- PdfMod/Core/Configuration.cs \
- PdfMod/Core/Defines.cs \
- PdfMod/Gui/Actions.cs \
- PdfMod/Gui/BookmarkView.cs \
-@@ -63,7 +62,6 @@ EXTRAS = \
- REFERENCES = \
- Mono.Cairo \
- Mono.Posix \
-- -pkg:gconf-sharp-2.0 \
- -pkg:glib-sharp-2.0 \
- -pkg:gtk-sharp-2.0 \
- -pkg:hyena \
-diff --git a/src/PdfMod/Core/Client.cs b/src/PdfMod/Core/Client.cs
-index e8d4d11..fac4c75 100644
---- a/src/PdfMod/Core/Client.cs
-+++ b/src/PdfMod/Core/Client.cs
-@@ -32,13 +32,11 @@ namespace PdfMod.Core
- static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
-
- public Document Document { get; protected set; }
-- public static Configuration Configuration { get; private set; }
-
- public event EventHandler DocumentLoaded;
-
- static Client ()
- {
-- Configuration = new Configuration ();
- InitCache ();
- }
-
-diff --git a/src/PdfMod/Core/Configuration.cs b/src/PdfMod/Core/Configuration.cs
-deleted file mode 100644
-index 817b9f4..0000000
---- a/src/PdfMod/Core/Configuration.cs
-+++ /dev/null
-@@ -1,65 +0,0 @@
--// Copyright (C) 2009-2010 Novell, Inc.
--//
--// This program is free software; you can redistribute it and/or
--// modify it under the terms of the GNU General Public License
--// as published by the Free Software Foundation; either version 2
--// of the License, or (at your option) any later version.
--//
--// This program is distributed in the hope that it will be useful,
--// but WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--// GNU General Public License for more details.
--//
--// You should have received a copy of the GNU General Public License
--// along with this program; if not, write to the Free Software
--// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--
--using System;
--
--namespace PdfMod.Core
--{
-- public class Configuration
-- {
-- GConf.Client client = new GConf.Client ();
-- string ns = "/apps/pdfmod/";
--
-- public Configuration()
-- {
-- }
--
-- T Get<T> (string key, T fallback)
-- {
-- try {
-- return (T) client.Get (ns + key);
-- } catch {
-- return fallback;
-- }
-- }
--
-- void Set<T> (string key, T val)
-- {
-- client.Set (ns + key, val);
-- }
--
-- public bool ShowToolbar {
-- get { return Get<bool> ("show_toolbar", true); }
-- set { Set<bool> ("show_toolbar", value); }
-- }
--
-- public bool ShowBookmarks {
-- get { return Get<bool> ("show_bookmarks", false); }
-- set { Set<bool> ("show_bookmarks", value); }
-- }
--
-- public string LastOpenFolder {
-- get { return Get<string> ("last_folder", System.Environment.GetFolderPath (System.Environment.SpecialFolder.Desktop)); }
-- set {
-- if (value != null && value.StartsWith ("file:/") && !value.StartsWith ("file://")) {
-- value = "file://" + value.Substring (6);
-- }
--
-- Set<string> ("last_folder", value);
-- }
-- }
-- }
--}
-diff --git a/src/PdfMod/Gui/Actions.cs b/src/PdfMod/Gui/Actions.cs
-index 3fc452b..9651a36 100644
---- a/src/PdfMod/Gui/Actions.cs
-+++ b/src/PdfMod/Gui/Actions.cs
-@@ -110,8 +110,8 @@ namespace PdfMod.Gui
- AddImportant (
- new ToggleActionEntry ("Properties", Stock.Properties, null, "<alt>Return", Catalog.GetString ("View and edit the title, keywords, and more for this document"), OnProperties, false),
- new ToggleActionEntry ("ZoomFit", Stock.ZoomFit, null, "<control>0", null, OnZoomFit, true),
-- new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, Client.Configuration.ShowToolbar),
-- new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, Client.Configuration.ShowBookmarks),
-+ new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, true),
-+ new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, false),
- new ToggleActionEntry ("FullScreenView", null, Catalog.GetString ("Fullscreen"), "F11", null, OnFullScreenView, false)
- );
-
-@@ -230,12 +230,6 @@ namespace PdfMod.Gui
- chooser.SelectMultiple = true;
- chooser.AddButton (Stock.Open, ResponseType.Ok);
-
-- if (app.Document != null) {
-- chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
-- } else {
-- chooser.SetCurrentFolder (Client.Configuration.LastOpenFolder);
-- }
--
- var response = chooser.Run ();
- var filenames = chooser.Filenames;
- chooser.Destroy ();
-@@ -266,7 +260,6 @@ namespace PdfMod.Gui
- chooser.DoOverwriteConfirmation = true;
- chooser.CurrentName = System.IO.Path.GetFileName (app.Document.SuggestedSavePath);
- chooser.AddButton (Stock.SaveAs, ResponseType.Ok);
-- chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
-
- var response = chooser.Run ();
- string filename = chooser.Filename;
-@@ -462,14 +455,12 @@ namespace PdfMod.Gui
-
- void OnViewToolbar (object o, EventArgs args)
- {
-- bool show = (this["ViewToolbar"] as ToggleAction).Active;
-- Client.Configuration.ShowToolbar = app.HeaderToolbar.Visible = show;
-+ app.HeaderToolbar.Visible = (this["ViewToolbar"] as ToggleAction).Active;
- }
-
- void OnViewBookmarks (object o, EventArgs args)
- {
-- bool show = (this["ViewBookmarks"] as ToggleAction).Active;
-- Client.Configuration.ShowBookmarks = app.BookmarkView.Visible = show;
-+ app.BookmarkView.Visible = (this["ViewBookmarks"] as ToggleAction).Active;
- if (app.BookmarkView.Visible) {
- app.BookmarkView.GrabFocus ();
- }
-diff --git a/src/PdfMod/Gui/BookmarkView.cs b/src/PdfMod/Gui/BookmarkView.cs
-index 00303cd..29f9d16 100644
---- a/src/PdfMod/Gui/BookmarkView.cs
-+++ b/src/PdfMod/Gui/BookmarkView.cs
-@@ -69,8 +69,6 @@ namespace PdfMod.Gui
- model.Clear ();
- AddOutlineCollection (document, document.Pdf.Outlines, TreeIter.Zero);
- UpdateActions ();
--
-- Visible = Client.Configuration.ShowBookmarks;
- }
-
- // Bookmark action handlers
-diff --git a/src/PdfMod/Gui/Client.cs b/src/PdfMod/Gui/Client.cs
-index d7a408b..a614dcb 100644
---- a/src/PdfMod/Gui/Client.cs
-+++ b/src/PdfMod/Gui/Client.cs
-@@ -125,8 +125,6 @@ namespace PdfMod.Gui
- HeaderToolbar.ShowArrow = false;
- HeaderToolbar.ToolbarStyle = ToolbarStyle.Icons;
- HeaderToolbar.Tooltips = true;
-- HeaderToolbar.NoShowAll = true;
-- HeaderToolbar.Visible = Configuration.ShowToolbar;
-
- // BookmarksView
- BookmarkView = new BookmarkView (this);
-@@ -272,7 +270,6 @@ namespace PdfMod.Gui
- path = System.IO.Path.GetFullPath (path);
- }
-
-- Configuration.LastOpenFolder = System.IO.Path.GetDirectoryName (suggestedFilename ?? path);
- status_label.Text = Catalog.GetString ("Loading document...");
-
- ThreadAssist.SpawnFromMain (delegate {
Deleted: LICENSE-PDFsharp
===================================================================
--- LICENSE-PDFsharp 2020-03-10 17:39:48 UTC (rev 593683)
+++ LICENSE-PDFsharp 2020-03-10 17:39:56 UTC (rev 593684)
@@ -1,24 +0,0 @@
-PDFSharp is a MIT/X11 licensed project.
-
-Copyright (c) 2005-2012 empira Software GmbH, Cologne (Germany)
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
Copied: pdfmod/repos/community-any/LICENSE-PDFsharp (from rev 593683, pdfmod/trunk/LICENSE-PDFsharp)
===================================================================
--- LICENSE-PDFsharp (rev 0)
+++ LICENSE-PDFsharp 2020-03-10 17:39:56 UTC (rev 593684)
@@ -0,0 +1,24 @@
+PDFSharp is a MIT/X11 licensed project.
+
+Copyright (c) 2005-2012 empira Software GmbH, Cologne (Germany)
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-10 17:39:48 UTC (rev 593683)
+++ PKGBUILD 2020-03-10 17:39:56 UTC (rev 593684)
@@ -1,60 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Claudio Riva <firetux83 at gmail.com>
-
-pkgname=pdfmod
-pkgver=0.9.1
-pkgrel=10
-pkgdesc="Simple application for modifying PDF written in C Sharp"
-arch=('any')
-url="https://wiki.gnome.org/Apps/PdfMod"
-license=('GPL' 'MIT')
-depends=('gtk-sharp-2' 'poppler-glib')
-makedepends=('hyena' 'poppler-sharp' 'intltool' 'gnome-doc-utils' 'dos2unix')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
- pdfmod.appdata.xml
- pdfmod-mono-2.10.patch
- fix-build.patch
- Drop-gconf-dependency.patch
- LICENSE-PDFsharp)
-sha256sums=('eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9'
- 'fb27471552fedf3d79dd1e13c49a8efb94515486b7db7370981171d3e8972c36'
- 'f606f29f881f7171b43fed97aab58c1e1f5b78aa96e33d1c43e2526736651acd'
- 'd2ef10804b87ad843d0897cc784c95b6700583896fab95dd0646f5c79fdd0413'
- '6a235f93ce7321cbe2e7f20094ece0659fb4648602e84a4824a0fb527be90914'
- '5d2b6e1a9e5582f9c5d129f222ff01ca6ce3dfa4a5c1f5c41ba827fe0fbeb4bd')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Some files are distributed in DOS format
- find . -type f -exec dos2unix -q '{}' \;
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=644516
- patch -Np1 -i ../pdfmod-mono-2.10.patch
-
- # Workaround for build error (FS#39501)
- patch -Np1 -i ../fix-build.patch
-
- # Remove deprecated GConf dependency
- patch -Np1 -i ../Drop-gconf-dependency.patch
-
- # Fix build
- sed -i 's/gmcs/mcs/' configure{,.ac}
- sed -i 's|pkglib_SCRIPTS|monolibdir = $(pkglibdir)/\nmonolib_DATA|' Makefile.include
-
- autoreconf -fi
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-scrollkeeper
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
- install -Dm644 ../pdfmod.appdata.xml "$pkgdir/usr/share/metainfo/pdfmod.appdata.xml"
- install -Dm644 "$srcdir/LICENSE-PDFsharp" "$pkgdir/usr/share/licenses/$pkgname/LICENSE-PDFsharp"
-}
Copied: pdfmod/repos/community-any/PKGBUILD (from rev 593683, pdfmod/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-10 17:39:56 UTC (rev 593684)
@@ -0,0 +1,69 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Claudio Riva <firetux83 at gmail.com>
+
+pkgname=pdfmod
+pkgver=0.9.1
+pkgrel=11
+pkgdesc="Simple application for modifying PDF written in C Sharp"
+arch=('any')
+url="https://wiki.gnome.org/Attic/PdfMod"
+license=('GPL' 'MIT')
+depends=('gtk-sharp-2' 'poppler-glib')
+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'
+ 'fad48fb68fe6a9b60032a43c6c0389092684723a3aab296e926003ff0b33880c'
+ 'fcf26040435b88f625d2c3b36540ea6c78e767439a6dee8d2f87119e8d666978'
+ '6a235f93ce7321cbe2e7f20094ece0659fb4648602e84a4824a0fb527be90914'
+ '40407ed97f2e79d5c63a9a6c67ea7c21a58b95095ba5449ff607acd5c829513a'
+ '15a79778dfebed691b0a59a34e9a02bd0377012aa540ecd6ff65a5b2b969d7d5'
+ '5d2b6e1a9e5582f9c5d129f222ff01ca6ce3dfa4a5c1f5c41ba827fe0fbeb4bd')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Some files are distributed in DOS format
+ find . -type f -exec dos2unix -q '{}' \;
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=644516
+ patch -Np1 -i ../0001-pdfmod-mono-2.10.patch
+
+ # Workaround for build error (FS#39501)
+ patch -Np1 -i ../0002-fix-build.patch
+
+ # 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}
+ sed -i 's|pkglib_SCRIPTS|monolibdir = $(pkglibdir)/\nmonolib_DATA|' Makefile.include
+
+ autoreconf -fi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-scrollkeeper
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+ install -Dm0644 "$srcdir/pdfmod.appdata.xml" "$pkgdir/usr/share/metainfo/pdfmod.appdata.xml"
+ install -Dm0644 "$srcdir/LICENSE-PDFsharp" "$pkgdir/usr/share/licenses/$pkgname/LICENSE-PDFsharp"
+}
Deleted: fix-build.patch
===================================================================
(Binary files differ)
Deleted: pdfmod-mono-2.10.patch
===================================================================
--- pdfmod-mono-2.10.patch 2020-03-10 17:39:48 UTC (rev 593683)
+++ pdfmod-mono-2.10.patch 2020-03-10 17:39:56 UTC (rev 593684)
@@ -1,25 +0,0 @@
-From a29cfe7f8f31ce003fa3e307d54d86a2a8e8cf19 Mon Sep 17 00:00:00 2001
-From: Nuno Araujo <nuno.araujo at russo79.com>
-Date: Mon, 21 Mar 2011 04:10:52 +0000
-Subject: Fix compilation under Mono 2.10 (bgo#644516)
-
-Force use of the overloaded implicit operator of Hyena.Gui.DragDropList
-to solve mono 2.10 compilation problems.
-
-Signed-off-by: Alexander Kojevnikov <alexander at kojevnikov.com>
----
-diff --git a/src/PdfMod/Gui/DocumentIconView.cs b/src/PdfMod/Gui/DocumentIconView.cs
-index 5796c72..386d662 100644
---- a/src/PdfMod/Gui/DocumentIconView.cs
-+++ b/src/PdfMod/Gui/DocumentIconView.cs
-@@ -319,7 +319,7 @@ namespace PdfMod.Gui
- if (to_index < 0)
- return;
-
-- var pages = args.SelectionData.Data as Hyena.Gui.DragDropList<Page>;
-+ Hyena.Gui.DragDropList<Page> pages = args.SelectionData;
- to_index -= pages.Count (p => p.Index < to_index);
- var action = new MoveAction (document, pages, to_index);
- action.Do ();
---
-cgit v0.9.0.2
Deleted: pdfmod.appdata.xml
===================================================================
--- pdfmod.appdata.xml 2020-03-10 17:39:48 UTC (rev 593683)
+++ pdfmod.appdata.xml 2020-03-10 17:39:56 UTC (rev 593684)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
- <id>org.gnome.pdfmod</id>
- <launchable type="desktop-id">pdfmod.desktop</launchable>
- <name>PDF Mod</name>
- <summary>Remove, extract, and rotate pages in PDF documents</summary>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0</project_license>
- <description>
- <p>PDFMod is a graphical utility that allows you to split, merge and delete pages of a PDF document. You simply open a document up in PDFMod, and each page is shown in the interface, then you can delete individual pages, move the pages around (i.e. reorder them), import additional PDF documents, even rotate individual pages in your PDF.</p>
- </description>
- <screenshots>
- <screenshot type="default">
- <image>https://wiki.gnome.org/Apps/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>
- <update_contact>pdfmod-list at gnome.org</update_contact>
- <translation type="gettext">pdfmod</translation>
-</component>
Copied: pdfmod/repos/community-any/pdfmod.appdata.xml (from rev 593683, pdfmod/trunk/pdfmod.appdata.xml)
===================================================================
--- pdfmod.appdata.xml (rev 0)
+++ pdfmod.appdata.xml 2020-03-10 17:39:56 UTC (rev 593684)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>org.gnome.pdfmod</id>
+ <launchable type="desktop-id">pdfmod.desktop</launchable>
+ <name>PDF Mod</name>
+ <summary>Remove, extract, and rotate pages in PDF documents</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <description>
+ <p>PDFMod is a graphical utility that allows you to split, merge and delete pages of a PDF document. You simply open a document up in PDFMod, and each page is shown in the interface, then you can delete individual pages, move the pages around (i.e. reorder them), import additional PDF documents, even rotate individual pages in your PDF.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <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/Attic/PdfMod</url>
+ <update_contact>pdfmod-list at gnome.org</update_contact>
+ <translation type="gettext">pdfmod</translation>
+</component>
More information about the arch-commits
mailing list