[arch-commits] Commit in nemo-extensions/trunk (2 files)

[Balló György]

    Date: Sunday, January 31, 2016 @ 21:27:00
  Author: bgyorgy
Revision: 159704

upgpkg: nemo-extensions 2.8.0-2

Port nemo-preview to WebKit2

Added:
  nemo-extensions/trunk/nemo-preview-webkit2-port.patch
Modified:
  nemo-extensions/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 +++--
 nemo-preview-webkit2-port.patch |   79 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-31 20:15:33 UTC (rev 159703)
+++ PKGBUILD	2016-01-31 20:27:00 UTC (rev 159704)
@@ -13,20 +13,22 @@
 	#'nemo-rabbitvcs'
 pkgver=2.8.0
 _pkgver=2.8.x
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="https://github.com/linuxmint/nemo-extensions"
 depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
-         evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
+         evince gtksourceview3 webkit2gtk python2-gobject seahorse-nautilus samba)
 makedepends=(gconf gnome-common gtk-doc intltool gobject-introspection) # python2-distutils-extra
 options=('!emptydirs')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_pkgver}.tar.gz"
         "gpgversion.patch"
-        clutter-gst3.patch)
+        clutter-gst3.patch
+        nemo-preview-webkit2-port.patch)
 sha256sums=('21ecb2f197e17fba2046ef16493e1b4292a8cc0389c65e0ccc4562b1d0982fe5'
             '187b9c1d684b81abac7ef3095882cfe859bd50570e554d45fcfdbf6e50455b86'
-            '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0')
+            '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0'
+            '709075fe8516c7fcb493caf4d4b889b56beac2cd678dcd7d8a0df33b334f0c0a')
 
 prepare() {
   cd ${pkgbase}-${_pkgver}
@@ -42,6 +44,7 @@
 
   cd nemo-preview
   patch -Np1 -i ../../clutter-gst3.patch
+  patch -Np1 -i ../../nemo-preview-webkit2-port.patch
 }
 
 build() {

Added: nemo-preview-webkit2-port.patch
===================================================================
--- nemo-preview-webkit2-port.patch	                        (rev 0)
+++ nemo-preview-webkit2-port.patch	2016-01-31 20:27:00 UTC (rev 159704)
@@ -0,0 +1,79 @@
+From f814446e9032d64f34f2b02e4f8b899db31688e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcos=20Chavarr=C3=ADa=20Teijeiro?=
+ <chavarria1991 at gmail.com>
+Date: Mon, 17 Nov 2014 10:38:03 +0100
+Subject: Port HTML viewer to WebKit2
+
+I have updated the configure.ac dependencies and change viewer
+implementation. The enable-default-context-menu setting doesn't exists
+so I connected the context-menu signal to a functions that returns
+true to do the same.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740242
+---
+ configure.ac           |  2 +-
+ src/js/viewers/html.js | 16 +++++++---------
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2f7359..0f9f741 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(SUSHI,
+                   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 --git a/src/js/viewers/html.js b/src/js/viewers/html.js
+index 8cd9aa8..ae6bb6c 100644
+--- a/src/js/viewers/html.js
++++ b/src/js/viewers/html.js
+@@ -26,7 +26,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;
+@@ -47,18 +47,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();
+@@ -92,7 +90,7 @@ HTMLRenderer.prototype = {
+ 
+         return this._toolbarActor;
+     }
+-}
++};
+ 
+ let handler = new MimeHandler.MimeHandler();
+ let renderer = new HTMLRenderer();
+-- 
+cgit v0.11.2
+