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

Balló György bgyorgy at archlinux.org
Sun Jan 29 22:36:06 UTC 2017


    Date: Sunday, January 29, 2017 @ 22:36:05
  Author: bgyorgy
Revision: 209427

upgpkg: nemo-extensions 3.2.0-1

Update to new version

Modified:
  nemo-extensions/trunk/PKGBUILD
Deleted:
  nemo-extensions/trunk/clutter-gst3.patch
  nemo-extensions/trunk/gpgversion.patch
  nemo-extensions/trunk/nemo-preview-webkit2-port.patch

---------------------------------+
 PKGBUILD                        |   21 -----
 clutter-gst3.patch              |  156 --------------------------------------
 gpgversion.patch                |   11 --
 nemo-preview-webkit2-port.patch |   79 -------------------
 4 files changed, 4 insertions(+), 263 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-29 22:11:18 UTC (rev 209426)
+++ PKGBUILD	2017-01-29 22:36:05 UTC (rev 209427)
@@ -11,7 +11,7 @@
 	#'nemo-pastebin'
 	#'nemo-compare'
 	#'nemo-rabbitvcs'
-pkgver=3.0.0
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Various extensions for Nemo"
 arch=('i686' 'x86_64')
@@ -19,16 +19,10 @@
 url="https://github.com/linuxmint/nemo-extensions"
 depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
          evince gtksourceview3 webkit2gtk python2-gobject seahorse-nautilus samba)
-makedepends=(gconf gnome-common gtk-doc intltool gobject-introspection) # python2-distutils-extra
+makedepends=(gnome-common gtk-doc intltool gobject-introspection libgnome-keyring) # 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
-        nemo-preview-webkit2-port.patch)
-sha256sums=('b62b81d40a268509c5d3be58aed4d232c05433f028a6197a00b2dd0964578605'
-            '187b9c1d684b81abac7ef3095882cfe859bd50570e554d45fcfdbf6e50455b86'
-            '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0'
-            '709075fe8516c7fcb493caf4d4b889b56beac2cd678dcd7d8a0df33b334f0c0a')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${pkgver}.tar.gz")
+sha256sums=('1536fd828b2ee0a8f194155a9e13b8cce937b403b5c87d8e579d7b1ced8d6d14')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
@@ -36,15 +30,8 @@
   # Python2 fix
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  # GPG version in testing
-  patch -Np1 -i ../gpgversion.patch
-
   # Fix path for nemo-python
   sed -i 's|libdirsuffix="/i386-linux-gnu/"|libdirsuffix=""|' nemo-python/m4/python.m4
-
-  cd nemo-preview
-  patch -Np1 -i ../../clutter-gst3.patch
-  patch -Np1 -i ../../nemo-preview-webkit2-port.patch
 }
 
 build() {

Deleted: clutter-gst3.patch
===================================================================
--- clutter-gst3.patch	2017-01-29 22:11:18 UTC (rev 209426)
+++ clutter-gst3.patch	2017-01-29 22:36:05 UTC (rev 209427)
@@ -1,156 +0,0 @@
-From ce695719d7292bfe9d8183cfa057afe1df53565b Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <llandwerlin at gmail.com>
-Date: Sat, 17 Oct 2015 00:24:42 +0100
-Subject: viewer: gst: port to ClutterGst 3.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756725
----
- configure.ac          |  2 +-
- src/js/viewers/gst.js | 56 +++++++++++++++++++++++++++------------------------
- 2 files changed, 31 insertions(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3b5ff56..7e869d5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,7 @@ PKG_CHECK_MODULES(SUSHI,
-                   clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-                   gtk+-3.0 >= $GTK_MIN_VERSION
-                   clutter-gtk-1.0 >= $CLUTTER_GTK_MIN_VERSION
--                  clutter-gst-2.0
-+                  clutter-gst-3.0
-                   gstreamer-1.0
-                   gstreamer-pbutils-1.0
-                   gstreamer-tag-1.0
-diff --git a/src/js/viewers/gst.js b/src/js/viewers/gst.js
-index 3560277..6a010f6 100644
---- a/src/js/viewers/gst.js
-+++ b/src/js/viewers/gst.js
-@@ -23,7 +23,7 @@
-  *
-  */
- 
--imports.gi.versions.ClutterGst = '2.0';
-+imports.gi.versions.ClutterGst = '3.0';
- const ClutterGst = imports.gi.ClutterGst;
- const Clutter = imports.gi.Clutter;
- const Gdk = imports.gi.Gdk;
-@@ -60,29 +60,33 @@ const GstRenderer = new Lang.Class({
-     },
- 
-     clear : function() {
--        this._video.playing = false;
-+        this._player.playing = false;
-     },
- 
-     _createVideo : function(file) {
--        this._video =
--            new ClutterGst.VideoTexture({ sync_size: false });
-+        this._player = new ClutterGst.Playback();
-+        this._video = new Clutter.Actor({
-+            content: new ClutterGst.Aspectratio({
-+                player: this._player
-+            })
-+        });
- 
--        this._video.set_uri(file.get_uri());
--        this._video.playing = true;
-+        this._player.set_uri(file.get_uri());
-+        this._player.playing = true;
- 
-         this._videoSizeChangeId =
--            this._video.connect('size-change',
--                                Lang.bind(this,
--                                          this._onVideoSizeChange));
--        this._video.connect('notify::playing',
--                            Lang.bind(this,
--                                      this._onVideoPlayingChange));
--        this._video.connect('notify::progress',
--                            Lang.bind(this,
--                                      this._onVideoProgressChange));
--        this._video.connect('notify::duration',
--                            Lang.bind(this,
--                                      this._onVideoDurationChange));
-+            this._player.connect('size-change',
-+                                 Lang.bind(this,
-+                                           this._onVideoSizeChange));
-+        this._player.connect('notify::playing',
-+                             Lang.bind(this,
-+                                       this._onVideoPlayingChange));
-+        this._player.connect('notify::progress',
-+                             Lang.bind(this,
-+                                       this._onVideoProgressChange));
-+        this._player.connect('notify::duration',
-+                             Lang.bind(this,
-+                                       this._onVideoDurationChange));
-     },
- 
-     _updateProgressBar : function() {
-@@ -90,7 +94,7 @@ const GstRenderer = new Lang.Class({
-             return;
- 
-         this._isSettingValue = true;
--        this._progressBar.set_value(this._video.progress * 1000);
-+        this._progressBar.set_value(this._player.progress * 1000);
-         this._isSettingValue = false;
-     },
- 
-@@ -99,7 +103,7 @@ const GstRenderer = new Lang.Class({
-             return;
- 
-         let currentTime =
--            Math.floor(this._video.duration * this._video.progress);
-+            Math.floor(this._player.duration * this._player.progress);
- 
-         this._currentLabel.set_text(Utils.formatTimeString(currentTime));
-     },
-@@ -108,7 +112,7 @@ const GstRenderer = new Lang.Class({
-         if (!this._mainToolbar)
-             return;
- 
--        let totalTime = this._video.duration;
-+        let totalTime = this._player.duration;
- 
-         this._durationLabel.set_text(Utils.formatTimeString(totalTime));
-     },
-@@ -123,7 +127,7 @@ const GstRenderer = new Lang.Class({
-     },
- 
-     _onVideoPlayingChange : function() {
--        if (this._video.playing)
-+        if (this._player.playing)
-             this._toolbarPlay.set_icon_name('media-playback-pause-symbolic');
-         else
-         {
-@@ -166,8 +170,8 @@ const GstRenderer = new Lang.Class({
- 
-         this._toolbarPlay.connect('clicked',
-                                   Lang.bind(this, function () {
--                                      let playing = !this._video.playing;
--                                      this._video.playing = playing;
-+                                      let playing = !this._player.playing;
-+                                      this._player.playing = playing;
-                                   }));
- 
-         this._progressBar =
-@@ -178,7 +182,7 @@ const GstRenderer = new Lang.Class({
-         this._progressBar.connect('value-changed',
-                                   Lang.bind(this, function() {
-                                       if(!this._isSettingValue)
--                                          this._video.progress = this._progressBar.get_value() / 1000;
-+                                          this._player.progress = this._progressBar.get_value() / 1000;
-                                   }));
- 
-         item = new Gtk.ToolItem();
-@@ -200,7 +204,7 @@ const GstRenderer = new Lang.Class({
-         return this._toolbarActor;
-     },
- 
--    _onVideoSizeChange : function(video, width, height) {
-+    _onVideoSizeChange : function(player, width, height) {
-         this._videoWidth = width;
-         this._videoHeight = height;
- 
--- 
-cgit v0.11.2
-

Deleted: gpgversion.patch
===================================================================
--- gpgversion.patch	2017-01-29 22:11:18 UTC (rev 209426)
+++ gpgversion.patch	2017-01-29 22:36:05 UTC (rev 209427)
@@ -1,11 +0,0 @@
---- nemo-extensions-2.4.x.o/nemo-seahorse/configure.ac	2014-11-01 05:42:22.000000000 -0500
-+++ nemo-extensions-2.4.x/nemo-seahorse/configure.ac	2014-11-16 12:38:22.529985197 -0500
-@@ -58,7 +58,7 @@
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	ok="no"
- 	if test "$GNUPG" != "no"; then

Deleted: nemo-preview-webkit2-port.patch
===================================================================
--- nemo-preview-webkit2-port.patch	2017-01-29 22:11:18 UTC (rev 209426)
+++ nemo-preview-webkit2-port.patch	2017-01-29 22:36:05 UTC (rev 209427)
@@ -1,79 +0,0 @@
-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
-



More information about the arch-commits mailing list