Control: tags -1 +patch
I'm attaching patches to drop the libgnome and gconf dependencies. I
do get a crash on closing the app after opening the Bookmarks sidebar.
I don't know if that's new or not since I haven't used pdfmod much.
Thanks,
Jeremy Bicha
From 6e44a3dabee733c15481f869edb44bb8e493a4e5 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 23 Dec 2017 01:31:45 -0500
Subject: [PATCH 1/5] Build-Depend on libgtk2.0-cil-dev instead of
libgnome2.0-cil-dev
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 3c7cf20..685adb6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7.0.50),
mono-devel (>= 2.4.2),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.35.0),
- libgnome2.0-cil-dev,
libgconf2.0-cil-dev,
+ libgtk2.0-cil-dev,
libhyena-cil-dev (>= 0.5),
libpoppler-cil-dev (>= 0.0.2)
Standards-Version: 3.9.3
--
2.14.1
From 256f490e7aa4029a8f465668fb594e840a372227 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 23 Dec 2017 02:24:50 -0500
Subject: [PATCH 2/5] Revert commit that added gconf dependency
---
debian/control | 4 +-
debian/patches/Drop-gconf-dependency.patch | 227 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 8 +-
debian/rules.orig | 33 +++++
debian/rules.rej | 11 ++
6 files changed, 279 insertions(+), 5 deletions(-)
create mode 100644 debian/patches/Drop-gconf-dependency.patch
create mode 100755 debian/rules.orig
create mode 100644 debian/rules.rej
diff --git a/debian/control b/debian/control
index 685adb6..7c4f573 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: gnome
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-t...@lists.alioth.debian.org>
Uploaders: Chow Loong Jin <hyper...@debian.org>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 10),
autotools-dev,
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.2),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.35.0),
- libgconf2.0-cil-dev,
+ libglib2.0-dev,
libgtk2.0-cil-dev,
libhyena-cil-dev (>= 0.5),
libpoppler-cil-dev (>= 0.0.2)
diff --git a/debian/patches/Drop-gconf-dependency.patch b/debian/patches/Drop-gconf-dependency.patch
new file mode 100644
index 0000000..c9bce4a
--- /dev/null
+++ b/debian/patches/Drop-gconf-dependency.patch
@@ -0,0 +1,227 @@
+From: Jeremy Bicha <jbi...@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 {
diff --git a/debian/patches/series b/debian/patches/series
index 8f2bde0..d54d3f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Fix-compilation-under-Mono-2.10-bgo-644516.patch
Avoid-reusing-goto-label-names.patch
+Drop-gconf-dependency.patch
diff --git a/debian/rules b/debian/rules
index 2e6fe22..df9fb27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-include /usr/share/cli-common/cli.make
-
DEBIAN_DIR = $(dir $(firstword $(MAKEFILE_LIST)))
VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | \
sed -n 's/\-.*$$//;s/Version: //p')
@@ -11,6 +9,10 @@ USCAN = uscan \
--watchfile=$(DEBIAN_DIR)/watch \
--upstream-version=$(VERSION)
+
+override_dh_autoreconf:
+ sh autogen.sh
+
override_dh_auto_configure:
dh_auto_configure -- \
--enable-external-poppler-sharp \
@@ -30,4 +32,4 @@ get-orig-source:
--destdir=.
%:
- dh $@
+ dh $@ --with autoreconf,cli
diff --git a/debian/rules.orig b/debian/rules.orig
new file mode 100755
index 0000000..2e6fe22
--- /dev/null
+++ b/debian/rules.orig
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/cli-common/cli.make
+
+DEBIAN_DIR = $(dir $(firstword $(MAKEFILE_LIST)))
+VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | \
+ sed -n 's/\-.*$$//;s/Version: //p')
+USCAN = uscan \
+ --package=pdfmod \
+ --watchfile=$(DEBIAN_DIR)/watch \
+ --upstream-version=$(VERSION)
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --enable-external-poppler-sharp \
+ MCS=/usr/bin/mono-csc
+
+# disable tests; they need network access to download DTDs
+override_dh_auto_test:
+
+override_dh_clistrip:
+ dh_clistrip --dbg-package=pdfmod-dbg
+
+get-orig-source:
+ $(USCAN) \
+ --download \
+ --force-download \
+ --rename \
+ --destdir=.
+
+%:
+ dh $@
diff --git a/debian/rules.rej b/debian/rules.rej
new file mode 100644
index 0000000..285ff55
--- /dev/null
+++ b/debian/rules.rej
@@ -0,0 +1,11 @@
+--- debian/rules
++++ debian/rules
+@@ -11,7 +11,7 @@ USCAN = uscan \
+
+
+ override_dh_autoreconf:
+- NOCONFIGURE=1 ./autogen.sh
++ sh autogen.sh
+
+ override_dh_auto_configure:
+ dh_auto_configure -- \
--
2.14.1
From 172fe58973f3676f1a199c8273db9e72162231fd Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 23 Dec 2017 01:57:53 -0500
Subject: [PATCH 3/5] Workaround autoreconf
---
debian/patches/Add-missing-autogen.sh.patch | 114 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 115 insertions(+)
create mode 100644 debian/patches/Add-missing-autogen.sh.patch
diff --git a/debian/patches/Add-missing-autogen.sh.patch b/debian/patches/Add-missing-autogen.sh.patch
new file mode 100644
index 0000000..992ad75
--- /dev/null
+++ b/debian/patches/Add-missing-autogen.sh.patch
@@ -0,0 +1,114 @@
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Sat, 23 Dec 2017 01:57:19 -0500
+Subject: Add missing autogen.sh
+
+---
+ autogen.sh | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 99 insertions(+)
+ create mode 100755 autogen.sh
+
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..459e0a6
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,99 @@
++#! /bin/sh
++
++PROJECT=PdfMod
++FILE=
++CONFIGURE=configure.ac
++
++: ${AUTOCONF=autoconf}
++: ${AUTOHEADER=autoheader}
++: ${AUTOMAKE=automake}
++: ${LIBTOOLIZE=libtoolize}
++: ${ACLOCAL=aclocal}
++: ${LIBTOOL=libtool}
++: ${INTLTOOLIZE=intltoolize}
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++TEST_TYPE=-f
++aclocalinclude="-I . $ACLOCAL_FLAGS"
++
++DIE=0
++
++($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
++ echo
++ echo "You must have autoconf installed to compile $PROJECT."
++ echo "Download the appropriate package for your distribution,"
++ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
++ DIE=1
++}
++
++($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
++ echo
++ echo "You must have automake installed to compile $PROJECT."
++ echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz";
++ echo "(or a newer version if it is available)"
++ DIE=1
++}
++
++(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
++ ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
++ echo
++ echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
++ echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz";
++ echo "(or a newer version if it is available)"
++ DIE=1
++ }
++}
++
++($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
++ echo
++ echo "You must have intltool installed to compile $PROJECT."
++ DIE=1
++}
++
++if test "$DIE" -eq 1; then
++ exit 1
++fi
++
++#test $TEST_TYPE $FILE || {
++# echo "You must run this script in the top-level $PROJECT directory"
++# exit 1
++#}
++
++if test -z "$*"; then
++ echo "I am going to run ./configure with no arguments - if you wish "
++ echo "to pass any to it, please specify them on the $0 command line."
++fi
++
++case $CC in
++*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
++esac
++
++(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
++ echo "Running $LIBTOOLIZE ..."
++ $LIBTOOLIZE --force --copy
++}
++
++(which gnome-doc-prepare && gnome-doc-prepare --force )|| {
++ echo "**Error**: You must have gnome-common installed to compile $PROJECT."
++ exit 1
++}
++
++echo "Running $INTLTOOLIZE ..."
++$INTLTOOLIZE --force --copy
++
++echo "Running $ACLOCAL $aclocalinclude ..."
++$ACLOCAL $aclocalinclude
++
++echo "Running $AUTOMAKE --gnu $am_opt ..."
++$AUTOMAKE --add-missing --gnu $am_opt
++
++echo "Running $AUTOCONF ..."
++$AUTOCONF
++
++echo Running $srcdir/configure $conf_flags "$@" ...
++$srcdir/configure --enable-maintainer-mode $conf_flags "$@" \
++
diff --git a/debian/patches/series b/debian/patches/series
index d54d3f1..83e9706 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
Fix-compilation-under-Mono-2.10-bgo-644516.patch
Avoid-reusing-goto-label-names.patch
Drop-gconf-dependency.patch
+Add-missing-autogen.sh.patch
--
2.14.1
From 9c70a99ceb4cdf95fa0ce00903d6a3feb4a4902f Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 23 Dec 2017 02:29:18 -0500
Subject: [PATCH 4/5] Build with mcs
---
debian/control | 1 +
debian/patches/Use-mcs-instead-of-gmcs.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
create mode 100644 debian/patches/Use-mcs-instead-of-gmcs.patch
diff --git a/debian/control b/debian/control
index 7c4f573..bf962af 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 10),
autotools-dev,
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.4.2),
+ mono-mcs,
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.35.0),
libglib2.0-dev,
diff --git a/debian/patches/Use-mcs-instead-of-gmcs.patch b/debian/patches/Use-mcs-instead-of-gmcs.patch
new file mode 100644
index 0000000..6ebc50c
--- /dev/null
+++ b/debian/patches/Use-mcs-instead-of-gmcs.patch
@@ -0,0 +1,24 @@
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Sat, 23 Dec 2017 02:05:04 -0500
+Subject: Use mcs instead of gmcs
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6438aa0..aca242f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,9 +72,9 @@ SHAMROCK_EXPAND_DATADIR
+ IT_PROG_INTLTOOL([0.35.0])
+ AC_PROG_INSTALL
+
+-AC_PATH_PROG(MCS, gmcs, no)
++AC_PATH_PROG(MCS, mcs, no)
+ if test "x$MCS" = "xno"; then
+- AC_MSG_ERROR([gmcs Not found])
++ AC_MSG_ERROR([mcs Not found])
+ fi
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 83e9706..1c7f306 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Fix-compilation-under-Mono-2.10-bgo-644516.patch
Avoid-reusing-goto-label-names.patch
Drop-gconf-dependency.patch
Add-missing-autogen.sh.patch
+Use-mcs-instead-of-gmcs.patch
--
2.14.1
From e5a39943af873b6b38618a65a6f50a80f90d5cde Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@ubuntu.com>
Date: Sat, 23 Dec 2017 02:37:32 -0500
Subject: [PATCH 5/5] Update src/Makefile.in
---
debian/patches/Update-src-Makefile.in.patch | 39 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 40 insertions(+)
create mode 100644 debian/patches/Update-src-Makefile.in.patch
diff --git a/debian/patches/Update-src-Makefile.in.patch b/debian/patches/Update-src-Makefile.in.patch
new file mode 100644
index 0000000..10ca6ac
--- /dev/null
+++ b/debian/patches/Update-src-Makefile.in.patch
@@ -0,0 +1,39 @@
+From: Jeremy Bicha <jbi...@ubuntu.com>
+Date: Sat, 23 Dec 2017 02:36:31 -0500
+Subject: Update src/Makefile.in
+
+This ought to be updated by autoreconf instead
+---
+ src/Makefile.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 19d16da..6a6f132 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -87,8 +87,6 @@ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+-GCONF_SHARP_20_CFLAGS = @GCONF_SHARP_20_CFLAGS@
+-GCONF_SHARP_20_LIBS = @GCONF_SHARP_20_LIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
+ GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+@@ -240,7 +238,6 @@ RESGEN = resgen2
+ 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 \
+@@ -269,7 +266,7 @@ RESOURCES = Resources/UIManager.xml
+ EXTRAS = \
+ pdfmod.in
+
+-REFERENCES = Mono.Cairo Mono.Posix -pkg:gconf-sharp-2.0 \
++REFERENCES = Mono.Cairo Mono.Posix \
+ -pkg:glib-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:hyena \
+ -pkg:hyena.gui System System.Core -r:../bin/PdfSharp.dll \
+ $(am__append_3)
diff --git a/debian/patches/series b/debian/patches/series
index 1c7f306..2af2f0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ Avoid-reusing-goto-label-names.patch
Drop-gconf-dependency.patch
Add-missing-autogen.sh.patch
Use-mcs-instead-of-gmcs.patch
+Update-src-Makefile.in.patch
--
2.14.1
