Date: Sunday, January 31, 2016 @ 22:44:51 Author: bgyorgy Revision: 159710
archrelease: copy trunk to community-i686, community-x86_64 Deleted: nemo-extensions/repos/community-i686/PKGBUILD nemo-extensions/repos/community-i686/clutter-gst3.patch nemo-extensions/repos/community-i686/gpgversion.patch nemo-extensions/repos/community-i686/nemo-pastebin.install nemo-extensions/repos/community-x86_64/nemo-preview-webkit2-port.patch --------------------------------------------------+ community-i686/PKGBUILD | 191 --------------------- community-i686/clutter-gst3.patch | 156 ----------------- community-i686/gpgversion.patch | 11 - community-i686/nemo-pastebin.install | 11 - community-x86_64/nemo-preview-webkit2-port.patch | 79 -------- 5 files changed, 448 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-01-31 21:44:38 UTC (rev 159709) +++ community-i686/PKGBUILD 2016-01-31 21:44:51 UTC (rev 159710) @@ -1,191 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@antergos.com> - -pkgbase=nemo-extensions -pkgname=('nemo-fileroller' - 'nemo-preview' - 'nemo-python' - 'nemo-share' - 'nemo-seahorse') - #'nemo-media-columns' - #'nemo-pastebin' - #'nemo-compare' - #'nemo-rabbitvcs' -pkgver=2.8.0 -_pkgver=2.8.x -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 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 - nemo-preview-webkit2-port.patch) -sha256sums=('21ecb2f197e17fba2046ef16493e1b4292a8cc0389c65e0ccc4562b1d0982fe5' - '187b9c1d684b81abac7ef3095882cfe859bd50570e554d45fcfdbf6e50455b86' - '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0' - '709075fe8516c7fcb493caf4d4b889b56beac2cd678dcd7d8a0df33b334f0c0a') - -prepare() { - cd ${pkgbase}-${_pkgver} - - # 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() { - cd ${pkgbase}-${_pkgver} - - _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share" - for dir in ${_configure_pkgs} - do - pushd ${dir} - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \ - --disable-static --disable-schemas-compile - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make - popd - done - - _autogen_pkgs="nemo-preview nemo-python" - for dir in ${_autogen_pkgs} - do - pushd ${dir} - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \ - --disable-static --disable-schemas-compile - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make - popd - done - - # # nemo-pastebin - # cd nemo-pastebin - # python2 ./setup.py build --build-base ${srcdir}/build/ || return 1 - # cd .. - - # nemo-media-columns - # Nothing to do here - # Required python2-pypdf from AUR - - # nemo-compare - # cd nemo-compare - - # nemo-rabbitvcs - # Nothing to do here - -} - -package_nemo-fileroller(){ - pkgdesc="File archiver extension for Nemo" - depends=(nemo file-roller) - - cd ${pkgbase}-${_pkgver}/nemo-fileroller - make DESTDIR="${pkgdir}" install -} - -package_nemo-preview(){ - pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo") - depends=(nemo cjs clutter-gtk clutter-gst libmusicbrainz5 evince gtksourceview3 webkitgtk) - - cd ${pkgbase}-${_pkgver}/nemo-preview - make DESTDIR="${pkgdir}" install -} - -package_nemo-python() { - pkgdesc="Python2 binding for Nemo components" - depends=(nemo python2-gobject) - - cd ${pkgbase}-${_pkgver}/nemo-python - make DESTDIR="${pkgdir}" install -} - -package_nemo-seahorse(){ - pkgdesc="PGP encryption and signing extension for Nemo" - depends=(nemo seahorse-nautilus) - - cd ${pkgbase}-${_pkgver}/nemo-seahorse - make DESTDIR="${pkgdir}" install - - # seahorse-tool is already in seahorse-nautilus package - make -C data DESTDIR="${pkgdir}" uninstall - make -C tool DESTDIR="${pkgdir}" uninstall -} - -package_nemo-share(){ - pkgdesc="Samba extension for Nemo" - depends=(nemo samba) - - cd ${pkgbase}-${_pkgver}/nemo-share - make DESTDIR="${pkgdir}" install -} - -# package_nemo-media-columns(){ -# cd ${pkgbase}-${_pkgver}/nemo-media-columns - -# pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View") -# arch=(any) - -# install -d ${pkgdir}/usr/share/nemo-python/extensions/ -# install -Dm755 ${srcdir}/nemo-media-columns.py \ -# ${pkgdir}/usr/share/nemo-python/extensions/nemo-media-columns.py -# } - -# package_nemo-pastebin(){ -# cd ${pkgbase}-${_pkgver}/nemo-pastebin - -# pkgdesc="Nemo extension to send files to a pastebin" -# arch=(any) -# depends=(nemo pastebinit nemo-python) -# install=nemo-pastebin.install - -# python2 ./setup.py install --prefix=/usr --root=${pkgdir} \ -# --no-compile -O0 -# } - -# package_nemo-compare() { -# cd ${pkgbase}-${_pkgver}/nemo-compare - -# pkgdesc="Context menu comparison extension for Nemo file manager" -# depends=(python2 python2-xdg meld nemo-python) - -# install -d ${pkgdir}/usr/share/applications/ -# install -d ${pkgdir}/usr/share/nemo-compare/ - -# install -Dm755 ${srcdir}/data/nemo-compare-preferences.desktop \ -# /usr/share/applications/nemo-compare-preferences.desktop -# install -Dm755 ${srcdir}/data/nemo-compare-notification \ -# /usr/share/nemo-compare/nemo-compare-notification -# install -Dm755 ${srcdir}/src/nemo-compare.py \ -# /usr/share/nemo-compare/nemo-compare.py -# install -Dm755 ${srcdir}/src/utils.py \ -# /usr/share/nemo-compare/utils.py -# install -Dm755 ${srcdir}/src/nemo-compare-preferences.py \ -# /usr/share/nemo-compare/nemo-compare-preferences.py - -# } - -# package_nemo-rabbitvcs(){ -# cd ${pkgbase}-${_pkgver}/nemo-rabbitvcs - -# depends=(nemo-python python2-dbus) - -# install -d ${pkgdir}/usr/share/nemo-python/extensions/ -# install -Dm755 ${srcdir}/RabbitVCS.py \ -# ${pkgdir}/usr/share/nemo-python/extensions/RabbitVCS.py -# } - Deleted: community-i686/clutter-gst3.patch =================================================================== --- community-i686/clutter-gst3.patch 2016-01-31 21:44:38 UTC (rev 159709) +++ community-i686/clutter-gst3.patch 2016-01-31 21:44:51 UTC (rev 159710) @@ -1,156 +0,0 @@ -From ce695719d7292bfe9d8183cfa057afe1df53565b Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin <llandwer...@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: community-i686/gpgversion.patch =================================================================== --- community-i686/gpgversion.patch 2016-01-31 21:44:38 UTC (rev 159709) +++ community-i686/gpgversion.patch 2016-01-31 21:44:51 UTC (rev 159710) @@ -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: community-i686/nemo-pastebin.install =================================================================== --- community-i686/nemo-pastebin.install 2016-01-31 21:44:38 UTC (rev 159709) +++ community-i686/nemo-pastebin.install 2016-01-31 21:44:51 UTC (rev 159710) @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Deleted: community-x86_64/nemo-preview-webkit2-port.patch =================================================================== --- community-x86_64/nemo-preview-webkit2-port.patch 2016-01-31 21:44:38 UTC (rev 159709) +++ community-x86_64/nemo-preview-webkit2-port.patch 2016-01-31 21:44:51 UTC (rev 159710) @@ -1,79 +0,0 @@ -From f814446e9032d64f34f2b02e4f8b899db31688e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcos=20Chavarr=C3=ADa=20Teijeiro?= - <chavarria1...@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 -