Drop old patches, refresh the remaining one

8 files changed, 24 insertions, 442 deletions

diff --git a/debian/patches/00-build_for_4.5.patch b/debian/patches/00-build_for_4.5.patch
deleted file mode 100644
index 480d6a8..0000000
--- a/debian/patches/00-build_for_4.5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/build/m4/shamrock/mono.m4
-+++ b/build/m4/shamrock/mono.m4
-@@ -13,6 +13,11 @@
- 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
- ])
- 
-+AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER],
-+[
-+	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
-+])
-+
- AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
- [
- 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
-@@ -65,4 +70,3 @@
- 		fi
- 	done
- ])
--
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,8 +27,8 @@
- SHAMROCK_CHECK_MONO_MODULE(2.8)
- SHAMROCK_FIND_MONO_RUNTIME
-     
--PKG_CHECK_EXISTS([mono >= 2.8],
--[SHAMROCK_FIND_MONO_4_0_COMPILER
-+PKG_CHECK_EXISTS([mono >= 3.2.8],
-+[SHAMROCK_FIND_MONO_4_5_COMPILER
- SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
-     System
- ])]
diff --git a/debian/patches/01-enable_tests_conditional.patch b/debian/patches/01-enable_tests_conditional.patch
deleted file mode 100644
index 88ca15c..0000000
--- a/debian/patches/01-enable_tests_conditional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix a test in order to use autoreconf
-Author: Thanh Tung Nguyen <thngtong@gmail.com>
-Forwarded: no
-Last-Update: 2014-04-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/build/build.rules.mk
-+++ b/build/build.rules.mk
-@@ -19,7 +19,7 @@
- INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
- 
- if ENABLE_TESTS
--    LINK = " $(NUNIT_LIBS)"
-+    LINK_NUNIT = "$(NUNIT_LIBS)"
-     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
- endif
- 
---- a/build/build.environment.mk
-+++ b/build/build.environment.mk
-@@ -19,7 +19,7 @@
- LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
- LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
- 
--REF_SPARKLESHARE = $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
-+REF_SPARKLESHARE = $(LINK_NUNIT) $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
- 
- # Cute hack to replace a space with something
- colon:= :
diff --git a/debian/patches/02-m4_macro_dir.patch b/debian/patches/02-m4_macro_dir.patch
deleted file mode 100644
index 5a3ba3d..0000000
--- a/debian/patches/02-m4_macro_dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Add correctly the m4 macros directories
-Author: Thanh Tung Nguyen <thngtong@gmail.com>
-Forwarded: no
-Last-Update: 2013-12-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
-+
- basedirs = build SparkleLib SparkleLib/Git
- 
- SUBDIRS = $(basedirs) $(GUISUBDIRS)
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,9 @@
- AC_INIT([SparkleShare], sparkleshare_version)
- AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
- AM_MAINTAINER_MODE
-+LT_INIT
-+
-+AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
- 
- dnl Export Version Info
- AC_SUBST([ASM_VERSION], [sparkleshare_version])
-@@ -15,8 +18,6 @@
-         AC_MSG_ERROR([You need to install pkg-config])
- fi
- 
--AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
--
- SHAMROCK_EXPAND_LIBDIR
- SHAMROCK_EXPAND_BINDIR
- SHAMROCK_EXPAND_DATADIR
diff --git a/debian/patches/03-add_stop_command.patch b/debian/patches/03-add_stop_command.patch
index 74d7564..440f2b4 100644
--- a/debian/patches/03-add_stop_command.patch
+++ b/debian/patches/03-add_stop_command.patch
@@ -3,30 +3,36 @@ Author: Neil McGovern <neilm@debian.org>
 
 --- a/SparkleShare/Linux/sparkleshare.in
 +++ b/SparkleShare/Linux/sparkleshare.in
-@@ -8,6 +8,10 @@
- start() {
-   if [ -n "${SSH_AGENT_PID}" -o -n "${SSH_AUTH_SOCK}" ] ; then
-     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
-+    pid=$!
-+    uid=`id -u`
-+    mkdir -p /var/run/user/$uid/sparkleshare/
-+    echo $pid > /var/run/user/$uid/sparkleshare/pidfile
-   else
-     ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 &
-   fi
-@@ -23,6 +27,15 @@
-     curl --insecure --output ~/SparkleShare/.$invite.xml $open
-     start
+@@ -15,6 +15,21 @@
+   help|--help|version|--version)
+     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" help
      ;;
 +  stop|--stop)
 +    uid=`id -u`
-+    if [ -e /var/run/user/$uid/sparkleshare/pidfile ] ; then
-+      pid=`cat /var/run/user/$uid/sparkleshare/pidfile`
++    if [ -e /run/user/$uid/sparkleshare/pidfile ] ; then
++      pid=$(cat /run/user/$uid/sparkleshare/pidfile)
 +      (kill $pid 2>&1) >/dev/null
 +      rm /var/run/user/$uid/sparkleshare/pidfile
 +    fi
 +    ;;
-+
++  start|--start)
++    mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe"
++    pid=$!
++    uid=$(id -u)
++    mkdir -p /run/user/$uid/sparkleshare
++    echo $pid > /run/user/$uid/sparkleshare/pidfile
++    ;;
    *)
-     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" --help
+     mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2
      ;;
+--- a/SparkleShare/Linux/SparkleShare.Autostart.desktop
++++ b/SparkleShare/Linux/SparkleShare.Autostart.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=SparkleShare
+ Type=Application
+-Exec=sh -c "type -P sparkleshare &>/dev/null && sparkleshare || flatpak run org.sparkleshare.SparkleShare"
++Exec=/usr/bin/sparkleshare start
+ Icon=org.sparkleshare.SparkleShare
+ Terminal=false
+ X-GNOME-Autostart-enabled=true
diff --git a/debian/patches/04-glib_application_run.diff b/debian/patches/04-glib_application_run.diff
deleted file mode 100644
index 4e4a881..0000000
--- a/debian/patches/04-glib_application_run.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Andrew Shadura <andrewsh@debian.org>
-Description: In our runtime version, GLib.Application.Run requires the first argument to be int.
-
---- a/SparkleShare/Linux/SparkleUI.cs
-+++ b/SparkleShare/Linux/SparkleUI.cs
-@@ -61,7 +61,7 @@
- 
-         public void Run ()
-         {   
--            (this.application as GLib.Application).Run (null, null);
-+            (this.application as GLib.Application).Run (0, null);
-         }
- 
- 
diff --git a/debian/patches/05-changes-from-master.patch b/debian/patches/05-changes-from-master.patch
deleted file mode 100644
index 3c7b566..0000000
--- a/debian/patches/05-changes-from-master.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From fdfb44aa0103bf6d02bef1c834f7961a391183c6 Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Mon, 4 Jan 2016 18:56:14 +0000
-Subject: [PATCH 1/8] Update Authors.txt
-
----
- legal/Authors.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/legal/Authors.txt b/legal/Authors.txt
-index b15e2ec..186ac29 100755
---- a/legal/Authors.txt
-+++ b/legal/Authors.txt
-@@ -12,7 +12,7 @@ Code:
- 	Chris Magee <chris.magee@gametheworld.com>
- 	Gabriel Burt <gabriel.burt@gmail.com>
- 	Garrett LeSage <garrett@novell.com>
--	Hylke Bons <hylkebons@gmail.com>
-+	Hylke Bons <hi@planetpeanut.uk>
- 	Jonathan Haines <jonno.haines@gmail.com>
- 	Kristi Tsukida <kristi.tsukida@gmail.com>
- 	Konstantinos Vaggelakos <kozze89@gmail.com>
-@@ -39,7 +39,7 @@ Design:
- 
- 	Andreas Nilsson <andreasn@gnome.org>
- 	Jakub Steiner <jimmac@redhat.com>
--	Hylke Bons <hylkebons@gmail.com>
-+	Hylke Bons <hi@planetpeanut.uk>
- 	Lapo Calamandrei <calamandrei@gmail.com>
- 	Sam Hewitt <hewittsamuel@gmail.com>
- 
-
-From 8eb0eb3f2caffe093ea26607add816838bd2857b Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Tue, 26 Jan 2016 02:44:33 +0000
-Subject: [PATCH 2/8] windows setup: Keep cool on errors
-
----
- SparkleShare/Windows/SparkleSetup.cs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs
-index d51d69e..cbf306b 100644
---- a/SparkleShare/Windows/SparkleSetup.cs
-+++ b/SparkleShare/Windows/SparkleSetup.cs
-@@ -509,7 +509,7 @@ public SparkleSetup ()
- 
-                         help_block.Inlines.Add (new Bold (new Run (Controller.PreviousUrl)));
-                         help_block.Inlines.Add (" is the address we’ve compiled. Does this look alright?\n\n");
--                        help_block.Inlines.Add ("Is this computer’s Client ID known by the host??");
-+                        help_block.Inlines.Add ("Is this computer’s Client ID known by the host?");
- 
-                         if (warnings.Length > 0) {
-                             bullets_block.Text += "\n\n•";
-
-From 555591ef0619fb3155e359d46fdcdf47a81fb1bf Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Tue, 26 Jan 2016 03:26:13 +0000
-Subject: [PATCH 3/8] event log: Disable plugins in WebView. Fixes #1638
-
----
- SparkleShare/Linux/SparkleEventLog.cs | 1 +
- SparkleShare/Mac/SparkleEventLog.cs   | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
-index db6ff3f..8fcac27 100755
---- a/SparkleShare/Linux/SparkleEventLog.cs
-+++ b/SparkleShare/Linux/SparkleEventLog.cs
-@@ -70,6 +70,7 @@ public SparkleEventLog () : base ("Recent Changes")
-                 new Gdk.RGBA () { Red = 1, Green = 1, Blue=1, Alpha = 1 });
- 
-             this.web_view = new WebView () { Editable = false };
-+			this.web_view.Settings.EnablePlugins = false;
-             this.web_view.NavigationRequested += WebViewNavigationRequested;
- 
-             this.scrolled_window.Add (this.web_view);
-diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
-index 6ea3c73..6859e1f 100755
---- a/SparkleShare/Mac/SparkleEventLog.cs
-+++ b/SparkleShare/Mac/SparkleEventLog.cs
-@@ -76,6 +76,8 @@ public SparkleEventLog () : base ()
-                     new SizeF (ContentView.Frame.Width, ContentView.Frame.Height - 39))
-             };
- 
-+            this.web_view.Preferences.PlugInsEnabled = false;
-+
-             this.cover = new NSBox () {
-                 Frame = new RectangleF (
-                     new PointF (-1, -1),
-
-From 101a29552f87ad36423cfc80c402f8e5f7eefcaa Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Wed, 27 Jan 2016 13:50:56 +0000
-Subject: [PATCH 4/8] linux: Update app data spec
-
----
- SparkleShare/Linux/sparkleshare.appdata.xml        | 26 ---------------------
- .../Linux/sparkleshare.desktop.appdata.xml         | 27 ++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 26 deletions(-)
- delete mode 100644 SparkleShare/Linux/sparkleshare.appdata.xml
- create mode 100644 SparkleShare/Linux/sparkleshare.desktop.appdata.xml
-
-diff --git a/SparkleShare/Linux/sparkleshare.desktop.appdata.xml b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
-new file mode 100644
-index 0000000..6df28d1
---- /dev/null
-+++ b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<component type="desktop">
-+  <id type="desktop">sparkleshare.desktop</id>
-+  <metadata_licence>CC0-1.0</metadata_licence>
-+  <project_license>GPL-3.0</project_license>
-+  <name>SparkleShare</name>
-+  <summary>Self hosted, instant, secure file sync</summary>
-+  <description>
-+    <p>SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or "projects") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file.</p>
-+    <p>SparkleShare was made to cover certain use cases, but doesn't handle every scenario well. To help you decide if SparkleShare is right for you, here's a few examples of what it does well and less well:</p>
-+    <p>Great:</p>
-+    <ul>
-+      <li>Frequently changing project files, like text, office documents, and images</li>
-+      <li>Tracking and syncing files edited by multiple people</li>
-+      <li>Reverting a file to any point in its history</li>
-+      <li>Preventing spying on your files on the server using encryption</li>
-+    </ul>
-+    <p>Not so great:</p>
-+    <ul>
-+      <li>Full computer backups</li>
-+      <li>Storing your photo or music collection</li>
-+      <li>Large binary files that change often, like video editing projects</li>
-+    </ul>
-+    <p>Have fun!</p>
-+  </description>
-+  <url type="homepage">http://www.sparkleshare.org/</url>
-+</component>
-
-From aaed7c8e884b587f5278cea373db0c68f288cbce Mon Sep 17 00:00:00 2001
-From: payalord <payalord@gmail.com>
-Date: Fri, 29 Jan 2016 17:21:50 -0500
-Subject: [PATCH 6/8] Corrected msysGit link
-
-Old link(http://msysgit.github.io/) redirects to Git 2.x now, and there is issue to run SparkleShare with it. SparkleShare works fine with Git 1.x
-"Git for Windows 1.x was retired on August 18th, 2015, superseded by Git for Windows 2.x": https://github.com/msysgit/msysgit
----
- SparkleShare/Windows/README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SparkleShare/Windows/README.md b/SparkleShare/Windows/README.md
-index 17ff4a6..e53fdf8 100644
---- a/SparkleShare/Windows/README.md
-+++ b/SparkleShare/Windows/README.md
-@@ -6,7 +6,7 @@ You can choose to build SparkleShare from source or to run the Windows installer
- 
- Install version 4.0 of the [.NET Framework](http://www.microsoft.com/download/en/details.aspx?id=17851) if you haven't already.
- 
--Install [msysGit](http://msysgit.github.io/) and copy the contents of the install folder
-+Install [msysGit](https://github.com/msysgit/msysgit/releases) and copy the contents of the install folder
- (`C:\Program Files (x86)\Git` by default) to `C:\path\to\SparkleShare-sources\bin\msysgit\` (create the "bin"-folder in the SparkleShare source directory).
- 
- Open a command prompt and execute the following:
-
-From fc1368ba1bafbcc400b4ae2cae1e084d00993d5c Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Mon, 29 Feb 2016 16:39:28 +0000
-Subject: [PATCH 7/8] Update Program.cs
-
----
- SparkleShare/Program.cs | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs
-index db3431b..1dfe811 100644
---- a/SparkleShare/Program.cs
-+++ b/SparkleShare/Program.cs
-@@ -46,8 +46,7 @@ public static void Main (string [] args)
-                 string n = Environment.NewLine;
- 
-                 Console.WriteLine (n +
--                    "SparkleShare is a collaboration and sharing tool that is" + n +
--                    "designed to keep things simple and to stay out of your way." + n +
-+                    "Share and collaborate by syncing with any Git repository instantly." + n +
-                     n +
-                     "Version: " + SparkleLib.SparkleBackend.Version + n +
-                     "Copyright (C) 2010 Hylke Bons and others" + n +
-
-From 2c598a24d01b0fe6a6f38c850800f07377f1c952 Mon Sep 17 00:00:00 2001
-From: Hylke Bons <hylkebons@gmail.com>
-Date: Wed, 16 Mar 2016 11:57:45 +0000
-Subject: [PATCH 8/8] Update README.md
-
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index f029e78..a2908d7 100644
---- a/README.md
-+++ b/README.md
-@@ -25,7 +25,7 @@ Here are instructions to build SparkleShare on [Linux distributions](SparkleShar
- 
- 
- ## Useful links
--[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: #sparkleshare on irc.gnome.org.
-+[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: `#sparkleshare` on `irc.gnome.org`.
- 
- 
- ## Finally
diff --git a/debian/patches/06-move_to_webkit2.patch b/debian/patches/06-move_to_webkit2.patch
deleted file mode 100644
index 3bec00e..0000000
--- a/debian/patches/06-move_to_webkit2.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Build with webkit2
-Source: https://src.fedoraproject.org/rpms/sparkleshare/blob/master/f/SparkleShare-1.5.0-move_to_webkit2.patch
-diff -up SparkleShare-1.5.0/build/build.environment.mk.move_to_webkit2 SparkleShare-1.5.0/build/build.environment.mk
---- SparkleShare-1.5.0/build/build.environment.mk.move_to_webkit2	2015-12-22 15:21:47.000000000 +0100
-+++ SparkleShare-1.5.0/build/build.environment.mk	2017-10-07 15:48:37.719880936 +0200
-@@ -12,7 +12,7 @@ LINK_MONO_POSIX = -r:Mono.Posix
- LINK_GLIB = $(GLIBSHARP_LIBS)
- LINK_GTK = $(GTKSHARP_LIBS)
- LINK_GNOME = $(GNOME_SHARP_LIBS)
--LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS)
-+LINK_WEBKIT = $(WEBKIT2_SHARP_LIBS)
- LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS)
- 
- REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
-diff -up SparkleShare-1.5.0/configure.ac.move_to_webkit2 SparkleShare-1.5.0/configure.ac
---- SparkleShare-1.5.0/configure.ac.move_to_webkit2	2015-12-22 15:21:47.000000000 +0100
-+++ SparkleShare-1.5.0/configure.ac	2017-10-07 16:08:53.666097084 +0200
-@@ -66,12 +66,12 @@ if test "$OSNAME" = "Linux" ; then
- 
- 	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp-3.0)
- 
--	dnl check for webkitgtk-sharp
--	PKG_CHECK_MODULES(WEBKITGTK_SHARP, webkitgtk-sharp-3.0, have_webkitgtk_sharp=yes, have_webkitgtk_sharp=no)
--	if test "x$have_webkitgtk_sharp" = "xno" ; then
--		AC_ERROR("webkitgtk-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
-+	dnl check for webkit2-sharp
-+	PKG_CHECK_MODULES(WEBKIT2_SHARP, webkit2-sharp-4.0, have_webkit2_sharp=yes, have_webkit2_sharp=no)
-+	if test "x$have_webkit2_sharp" = "xno" ; then
-+		AC_ERROR("webkit2-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
- 	fi
--	AC_SUBST(WEBKITGTK_SHARP_LIBS)
-+	AC_SUBST(WEBKIT2_SHARP_LIBS)
- 
- 	APPINDICATOR_REQUIRED=0.1
- 
-diff -up SparkleShare-1.5.0/SparkleShare/Linux/SparkleEventLog.cs.move_to_webkit2 SparkleShare-1.5.0/SparkleShare/Linux/SparkleEventLog.cs
---- SparkleShare-1.5.0/SparkleShare/Linux/SparkleEventLog.cs.move_to_webkit2	2015-12-22 15:21:47.000000000 +0100
-+++ SparkleShare-1.5.0/SparkleShare/Linux/SparkleEventLog.cs	2017-10-07 16:21:12.318399060 +0200
-@@ -18,7 +18,7 @@
- using System;
- 
- using Gtk;
--using WebKit;
-+using WebKit2;
- 
- namespace SparkleShare {
- 
-@@ -71,7 +71,7 @@ namespace SparkleShare {
- 
-             this.web_view = new WebView () { Editable = false };
- 			this.web_view.Settings.EnablePlugins = false;
--            this.web_view.NavigationRequested += WebViewNavigationRequested;
-+            //this.web_view.NavigationRequested += WebViewNavigationRequested;
- 
-             this.scrolled_window.Add (this.web_view);
-             
-@@ -263,12 +264,22 @@ namespace SparkleShare {
-             html = html.Replace ("<!-- $document-moved-background-image -->", "file://" + new string [] {icons_path, "document-moved.png"}.Combine ());
-                     
-             this.spinner.Stop ();
--            this.scrolled_window.Remove (this.web_view);
-+            this.scrolled_window.Remove (this.scrolled_window.Child);
-             this.web_view.Dispose ();
- 
-             this.web_view = new WebView () { Editable = false };
--            this.web_view.LoadString (html, "text/html", "UTF-8", "file://");
--            this.web_view.NavigationRequested += WebViewNavigationRequested;
-+            this.web_view.LoadHtml (html, "file:///");
-+         
-+
-+
-+            web_view.DecidePolicy += delegate(object o, DecidePolicyArgs args) {
-+                Console.WriteLine (":::: " + (args.Decision as NavigationPolicyDecision).NavigationAction.Request.Uri);
-+              //  if (args.Decision. == PolicyDecisionType.NavigationAction) {
-+                   
-+              //  }
-+            };
-+
-+            //this.web_view.NavigationRequested += WebViewNavigationRequested;
-             this.scrolled_window.Add (this.web_view);
- 
-             this.content_wrapper.Remove (this.content_wrapper.Child);
-@@ -276,14 +287,14 @@ namespace SparkleShare {
-             this.scrolled_window.ShowAll ();
-         }
- 
--
--        private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
-+        /*
-+        private void WebViewNavigationRequested (object o, WebKit2.NavigationRequestedArgs args) {
-             Controller.LinkClicked (args.Request.Uri);
- 
-             // Don't follow HREFs (as this would cause a page refresh)
-             if (!args.Request.Uri.Equals ("file:"))
-                 args.RetVal = 1;
--        }
-+        }*/
-     }
- }
- 
-
diff --git a/debian/patches/series b/debian/patches/series
index eb85623..63e8c6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
-00-build_for_4.5.patch
-01-enable_tests_conditional.patch
-02-m4_macro_dir.patch
 03-add_stop_command.patch
-04-glib_application_run.diff
-05-changes-from-master.patch
-06-move_to_webkit2.patch