From 53beb007a340fced01c3c5d06538e9727603ddbe Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Jun 09 2017 13:18:05 +0000 Subject: add upstream fixes --- diff --git a/nemo-extensions-3.4.0_to_master.patch b/nemo-extensions-3.4.0_to_master.patch index d50eb17..3092182 100644 --- a/nemo-extensions-3.4.0_to_master.patch +++ b/nemo-extensions-3.4.0_to_master.patch @@ -1,7 +1,7 @@ From 76941b9669f686ff7d2370f2b59e51b19b24521b Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Thu, 4 May 2017 15:21:36 +0100 -Subject: [PATCH 1/9] nemo-preview: Simplify dependencies +Subject: [PATCH 01/15] nemo-preview: Simplify dependencies --- nemo-preview/debian/control | 16 +++++++++------- @@ -85,7 +85,7 @@ index 06a8cfe..fcd2c3b 100644 From a2a3a6a3fb677f4dd102025801c24a2e24df91ed Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Sat, 6 May 2017 15:20:09 +0100 -Subject: [PATCH 2/9] nemo-emblems: Update translations +Subject: [PATCH 02/15] nemo-emblems: Update translations --- nemo-emblems/po/am.po | 8 ++++---- @@ -1704,7 +1704,7 @@ index a604842..acf6adb 100644 From a0fa86be0f99cc5a11ac7c21ed470871b70598d2 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Sat, 6 May 2017 15:20:59 +0100 -Subject: [PATCH 3/9] nemo-emblems: 3.4.1 +Subject: [PATCH 03/15] nemo-emblems: 3.4.1 --- nemo-emblems/debian/changelog | 6 ++++++ @@ -1742,7 +1742,7 @@ index 30b0850..625ddc1 100755 From 7de72bb60d4fdee83f2298d36e98c577d75005b7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 23 May 2017 14:39:08 +0100 -Subject: [PATCH 4/9] mainWindow: specify GdkX11 version to 3.0 (#217) +Subject: [PATCH 04/15] mainWindow: specify GdkX11 version to 3.0 (#217) --- nemo-preview/src/js/ui/mainWindow.js | 2 ++ @@ -1765,7 +1765,7 @@ index 2343ba6..4daf997 100644 From 1d09729a659f110443caa04ba3fbfff8b07dacf7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 23 May 2017 14:39:20 +0100 -Subject: [PATCH 5/9] specify Gdk version to 3.0 (#218) +Subject: [PATCH 05/15] specify Gdk version to 3.0 (#218) --- nemo-preview/src/js/viewers/gst.js | 1 + @@ -1787,7 +1787,7 @@ index 555b2e6..7f113b9 100644 From 41fae95202b08eecdc0d8e514ced0e7aa280ae63 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 23 May 2017 14:39:42 +0100 -Subject: [PATCH 6/9] Don't ship another copy of format.js (#215) +Subject: [PATCH 06/15] Don't ship another copy of format.js (#215) --- nemo-preview/src/Makefile-js.am | 1 - @@ -1926,7 +1926,7 @@ index bed2ac5..0000000 From ccbfcde384c6cab9b2a292d25a88c31381dd412c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 23 May 2017 14:40:29 +0100 -Subject: [PATCH 7/9] mainWindow: fix uninitialized variable (#216) +Subject: [PATCH 07/15] mainWindow: fix uninitialized variable (#216) --- nemo-preview/src/js/ui/mainWindow.js | 1 + @@ -1948,7 +1948,7 @@ index 4daf997..e9e350d 100644 From 16525a78514fe6e69af784cbb496595b2198a116 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Tue, 23 May 2017 14:42:47 +0100 -Subject: [PATCH 8/9] nemo-preview 3.4.1 +Subject: [PATCH 08/15] nemo-preview 3.4.1 --- nemo-preview/configure.ac | 2 +- @@ -1985,7 +1985,7 @@ index 148dc64..2853030 100644 From 32afa18611f7377a001c7577988f13b14fb316e2 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Tue, 23 May 2017 08:49:16 -0500 -Subject: [PATCH 9/9] nemo-dropbox :: fix error in Makefile (#213) +Subject: [PATCH 09/15] nemo-dropbox :: fix error in Makefile (#213) --- nemo-dropbox/Makefile.am | 2 +- @@ -2004,3 +2004,171 @@ index bd79291..4149847 100644 python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt $(RST2MAN) dropbox.txt > dropbox.1 + +From 4846aa4f30864fc43a4a0829c3cb5f4e5567a309 Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Thu, 8 Jun 2017 06:42:51 +0100 +Subject: [PATCH 10/15] Add missing runtime dependency + +Closes https://github.com/linuxmint/nemo-extensions/issues/222 +--- + nemo-preview/debian/control | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nemo-preview/debian/control b/nemo-preview/debian/control +index d75e552..b8e4641 100644 +--- a/nemo-preview/debian/control ++++ b/nemo-preview/debian/control +@@ -31,6 +31,7 @@ Depends: cjs, + gir1.2-clutter-gst-3.0, + gir1.2-evince-3.0, + gir1.2-gtkclutter-1.0, ++ gir1.2-webkit2-4.0, + gstreamer1.0-plugins-good, + libfreetype6, + libgirepository-1.0-1, + +From 002a277bca53b390621e71ea21a083da03aa65ba Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Fri, 9 Jun 2017 13:38:13 +0100 +Subject: [PATCH 11/15] specify webkit version to 4.0 (#225) + +--- + nemo-preview/src/js/viewers/html.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nemo-preview/src/js/viewers/html.js b/nemo-preview/src/js/viewers/html.js +index ea0e1c1..4b133b9 100644 +--- a/nemo-preview/src/js/viewers/html.js ++++ b/nemo-preview/src/js/viewers/html.js +@@ -25,6 +25,7 @@ + * + */ + ++imports.gi.versions.WebKit2 = '4.0'; + const GtkClutter = imports.gi.GtkClutter; + const Gtk = imports.gi.Gtk; + const GLib = imports.gi.GLib; + +From 874f244a8449a9dc9d9edf990b441321ba9e864f Mon Sep 17 00:00:00 2001 +From: Nurlan Musayev +Date: Fri, 9 Jun 2017 15:40:02 +0300 +Subject: [PATCH 12/15] Update ru.po (#221) + +--- + nemo-share/po/ru.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nemo-share/po/ru.po b/nemo-share/po/ru.po +index a6cffce..da8d863 100644 +--- a/nemo-share/po/ru.po ++++ b/nemo-share/po/ru.po +@@ -93,7 +93,7 @@ msgstr "Общий доступ" + + #: ../src/nemo-share.c:1115 + msgid "Folder Sharing" +-msgstr "Общий доступ к папке" ++msgstr "Общий доступ к папке" + + #: ../src/nemo-share.c:1156 + msgid "Sharing Options" + +From 3ac17ada01eecda1bd563543996fdd75053ed626 Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Fri, 9 Jun 2017 13:40:51 +0100 +Subject: [PATCH 13/15] Fix schema_name not defined and switch to xed (#224) + +--- + nemo-preview/src/js/viewers/text.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nemo-preview/src/js/viewers/text.js b/nemo-preview/src/js/viewers/text.js +index 3bad052..1c90150 100644 +--- a/nemo-preview/src/js/viewers/text.js ++++ b/nemo-preview/src/js/viewers/text.js +@@ -58,10 +58,10 @@ TextRenderer.prototype = { + this._textLoader.uri = file.get_uri(); + + this._geditScheme = 'tango'; +- let schemaName = 'org.gnome.gedit.preferences.editor'; ++ let schemaName = 'org.x.editor.preferences.editor'; + let installedSchemas = Gio.Settings.list_schemas(); + if (installedSchemas.indexOf(schemaName) > -1) { +- let geditSettings = new Gio.Settings({ schema: schema_name }); ++ let geditSettings = new Gio.Settings({ schema: schemaName }); + let geditSchemeName = geditSettings.get_string('scheme'); + if (geditSchemeName != '') + this._geditScheme = geditSchemeName; + +From e777a406a6eb281603ba9c0886c43963dd4c1f52 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre +Date: Fri, 9 Jun 2017 13:42:36 +0100 +Subject: [PATCH 14/15] nemo-share 3.4.1 + +--- + nemo-share/configure.in | 2 +- + nemo-share/debian/changelog | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/nemo-share/configure.in b/nemo-share/configure.in +index ea35f5d..8dd0886 100644 +--- a/nemo-share/configure.in ++++ b/nemo-share/configure.in +@@ -1,5 +1,5 @@ + AC_PREREQ(2.57) +-AC_INIT([nemo-share],[3.4.0]) ++AC_INIT([nemo-share],[3.4.1]) + AC_CONFIG_SRCDIR([src/nemo-share.c]) + AC_CONFIG_HEADERS([config.h]) + AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) +diff --git a/nemo-share/debian/changelog b/nemo-share/debian/changelog +index 51f1d36..6289a08 100644 +--- a/nemo-share/debian/changelog ++++ b/nemo-share/debian/changelog +@@ -1,3 +1,9 @@ ++nemo-share (3.4.1) sonya; urgency=medium ++ ++ * 3.4.1 ++ ++ -- Clement Lefebvre Fri, 09 Jun 2017 13:42:05 +0100 ++ + nemo-share (3.4.0) sonya; urgency=medium + + * 3.4.0 + +From a194394c9a8cbb7a3a6585a1a9e318518cb20069 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre +Date: Fri, 9 Jun 2017 13:43:19 +0100 +Subject: [PATCH 15/15] nemo-preview 3.4.2 + +--- + nemo-preview/configure.ac | 2 +- + nemo-preview/debian/changelog | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/nemo-preview/configure.ac b/nemo-preview/configure.ac +index 4685a2a..f93ae5c 100644 +--- a/nemo-preview/configure.ac ++++ b/nemo-preview/configure.ac +@@ -1,6 +1,6 @@ + dnl -*- mode: m4 -*- + AC_PREREQ(2.63) +-AC_INIT([nemo-preview],[3.4.1],[],[nemo-preview]) ++AC_INIT([nemo-preview],[3.4.2],[],[nemo-preview]) + + AC_CONFIG_HEADERS([config/config.h]) + AC_CONFIG_SRCDIR([src/main.c]) +diff --git a/nemo-preview/debian/changelog b/nemo-preview/debian/changelog +index 2853030..d72576a 100644 +--- a/nemo-preview/debian/changelog ++++ b/nemo-preview/debian/changelog +@@ -1,3 +1,9 @@ ++nemo-preview (3.4.2) sonya; urgency=medium ++ ++ * 3.4.2 ++ ++ -- Clement Lefebvre Fri, 09 Jun 2017 13:42:55 +0100 ++ + nemo-preview (3.4.1) sonya; urgency=medium + + * 3.4.1 diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 8893d49..48928a4 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -1,6 +1,6 @@ Name: nemo-extensions Version: 3.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extensions for Nemo License: GPLv2+ and LGPLv2 @@ -306,6 +306,9 @@ rm -rf %{buildroot}/%{_datadir}/doc/nemo-python/ %{_datadir}/applications/nemo-compare-preferences.desktop %changelog +* Fri Jun 09 2017 Leigh Scott - 3.4.0-3 +- add upstream fixes + * Wed May 31 2017 Leigh Scott - 3.4.0-2 - add upstream fixes