From 61119a475556ca1a5e31dca496208afd384b600e Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Dec 29 2015 11:57:11 +0000
Subject: switch to more secure webkit version


---

diff --git a/address_webkit_cve_issues.patch b/address_webkit_cve_issues.patch
new file mode 100644
index 0000000..2d890fb
--- /dev/null
+++ b/address_webkit_cve_issues.patch
@@ -0,0 +1,57 @@
+diff -uNrp a/nemo-preview/configure.ac b/nemo-preview/configure.ac
+--- a/nemo-preview/configure.ac
++++ b/nemo-preview/configure.ac
+@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(NEMO_PREVIEW,
+                   evince-document-3.0
+                   evince-view-3.0
+                   gtksourceview-3.0
+-                  webkitgtk-3.0)
++                  webkit2gtk-4.0)
+ 
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+diff -uNrp a/nemo-preview/src/js/viewers/html.js b/nemo-preview/src/js/viewers/html.js
+--- a/nemo-preview/src/js/viewers/html.js
++++ b/nemo-preview/src/js/viewers/html.js
+@@ -28,7 +28,7 @@
+ const GtkClutter = imports.gi.GtkClutter;
+ const Gtk = imports.gi.Gtk;
+ const GLib = imports.gi.GLib;
+-const WebKit = imports.gi.WebKit;
++const WebKit = imports.gi.WebKit2;
+ const NemoPreview = imports.gi.NemoPreview;
+ 
+ const MimeHandler = imports.ui.mimeHandler;
+@@ -49,18 +49,16 @@ HTMLRenderer.prototype = {
+         this._file = file;
+         this._callback = callback;
+ 
+-        this._webView = WebKit.WebView.new();
+-        this._scrolledWin = Gtk.ScrolledWindow.new (null, null);
+-        this._scrolledWin.add(this._webView);
+-        this._scrolledWin.show_all();
++        this._webView = new WebKit.WebView();
++        this._webView.show_all();
+ 
+         /* disable the default context menu of the web view */
+-        let settings = this._webView.settings;
+-        settings.enable_default_context_menu = false;
++        this._webView.connect ("context-menu",
++                               function() {return true;});
+ 
+         this._webView.load_uri(file.get_uri());
+ 
+-        this._actor = new GtkClutter.Actor({ contents: this._scrolledWin });
++        this._actor = new GtkClutter.Actor({ contents: this._webView });
+         this._actor.set_reactive(true);
+ 
+         this._callback();
+@@ -94,7 +92,7 @@ HTMLRenderer.prototype = {
+ 
+         return this._toolbarActor;
+     }
+-}
++};
+ 
+ let handler = new MimeHandler.MimeHandler();
+ let renderer = new HTMLRenderer();
diff --git a/nemo-extensions.spec b/nemo-extensions.spec
index 9af4cc4..19d0f5b 100644
--- a/nemo-extensions.spec
+++ b/nemo-extensions.spec
@@ -2,7 +2,7 @@
 
 Name:           nemo-extensions
 Version:        2.8.x
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extensions for Nemo
 
 License:        GPLv2+ and LGPLv2
@@ -11,6 +11,7 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/nemo-extensions/tarball/%%{_internal_version} -O nemo-extensions-%%{version}.git%%{_internal_version}.tar.gz        
 #Source0:        http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-extensions-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/nemo-extensions/source/nemo-extensions-%{version}.tar.gz
+Patch0:         address_webkit_cve_issues.patch
 
 BuildRequires:  nemo-devel
 BuildRequires:  python-distutils-extra
@@ -26,7 +27,7 @@ BuildRequires:  cjs-devel
 BuildRequires:  evince-devel
 BuildRequires:  libmusicbrainz5-devel
 BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  webkitgtk3-devel
+BuildRequires:  webkitgtk4-devel
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  clutter-gst2-devel
 BuildRequires:  gtksourceview3-devel
@@ -139,6 +140,7 @@ Context menu comparison extension for Nemo file manager.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if 0%{?fedora}
 %build
@@ -338,6 +340,9 @@ fi
 %{_datadir}/applications/nemo-compare-preferences.desktop
 
 %changelog
+* Tue Dec 29 2015 Leigh Scott <leigh123linux@googlemail.com> - 2.8.x-5
+- switch to more secure webkit version
+
 * Fri Dec 04 2015 Leigh Scott <leigh123linux@googlemail.com> - 2.8.x-4
 - another friggin build fix for epel