From f66dbc5d5401e6a61e257451cc27c3017afc32c3ef66e806f7f120a0159656e9 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 15 Jan 2016 19:17:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=21 --- nemo-extensions.changes | 7 ++++ nemo-extensions.spec | 40 ++----------------- nemo-media-columns_use-exiftool.patch | 56 --------------------------- 3 files changed, 11 insertions(+), 92 deletions(-) delete mode 100644 nemo-media-columns_use-exiftool.patch diff --git a/nemo-extensions.changes b/nemo-extensions.changes index c1c8a23..9162c87 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 14 23:57:30 UTC 2016 - sor.alexei@meowr.ru + +- Remove nemo-extension-media-columns package completely: + extension slows Nemo down considerably, both with and without + nemo-media-columns_use-exiftool.patch. + ------------------------------------------------------------------- Sun Dec 13 16:17:59 UTC 2015 - sor.alexei@meowr.ru diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 6a7771a..e7f87f0 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -16,6 +16,8 @@ # +# Do not package nemo-extension-media-columns for now: slows Nemo down. + %define _version 2.8.x Name: nemo-extensions Version: 2.8.0 @@ -29,12 +31,10 @@ Source: https://github.com/linuxmint/%{name}/archive/%{_version}.tar.gz# Patch0: nemo-seahorse_gpg-2.1.patch # PATCH-FIX-UPSTREAM nemo-terminal_vte-2.91.patch Patch1: nemo-terminal_vte-2.91.patch -# PATCH-FIX-UPSTREAM nemo-media-columns_use-exiftool.patch boo#958867 sor.alexei@meowr.ru -- Use exiftool as exiv2 shows some instability under nemo-python. -Patch2: nemo-media-columns_use-exiftool.patch # PATCH-FIX-OPENSUSE nemo-seahorse_no-nautilus-conflicts.patch sor.alexei@meowr.ru -- Strip conflicted with nautilus-extension-seahorse files. -Patch3: nemo-seahorse_no-nautilus-conflicts.patch +Patch2: nemo-seahorse_no-nautilus-conflicts.patch # PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation. -Patch4: nemo-dropbox_no-dropbox-bin.patch +Patch3: nemo-dropbox_no-dropbox-bin.patch BuildRequires: docutils BuildRequires: gettext-runtime BuildRequires: gnome-common @@ -200,28 +200,6 @@ menu of all images. This opens a dialog where you set the desired image size and file name. A click on "Resize" finally resizes the image(s) using ImageMagick's convert tool. -%package -n nemo-extension-media-columns -Summary: Nemo Media Columns -License: GPL-3.0 -Group: System/GUI/Other -Requires: exiftool -Requires: nemo >= %{_version} -Requires: python-gobject -Requires: python-imaging -Requires: python-kaa-metadata -Requires: python-mutagen -Requires: python-nemo = %{version} -Requires: python-pypdf -# nemo-media-columns was last used in openSUSE 13.2. -Provides: nemo-media-columns = %{version} -Obsoletes: nemo-media-columns < %{version} -BuildArch: noarch - -%description -n nemo-extension-media-columns -This extension is meant to be used with the Nemo File Manager. -It provides additional columns for the List View related to -media-type files. - %package -n nemo-extension-pastebin Summary: Pastebin extension for Nemo file manager License: GPL-2.0+ @@ -342,7 +320,6 @@ directory in Nemo. %patch1 %patch2 %patch3 -%patch4 # Remove spurious executable permission. chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3 @@ -424,10 +401,6 @@ done popd %find_lang nemo-compare -# For nemo-extension-media-columns. -install -Dm 0755 nemo-media-columns/nemo-media-columns.py \ - %{buildroot}%{_datadir}/nemo-python/extensions/nemo-media-columns.py - # For nemo-extension-pastebin. sed -i 's/^\(Exec=nemo-pastebin-configurator\)/\1.py/' %{buildroot}%{_datadir}/applications/nemo-pastebin-configurator.desktop %suse_update_desktop_file nemo-pastebin-configurator System FileManager @@ -566,11 +539,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/nemo/extensions-3.0/libnemo-image-converter.so %{_datadir}/nemo-image-converter/ -%files -n nemo-extension-media-columns -%defattr(-,root,root) -%doc nemo-media-columns/AUTHORS nemo-media-columns/COPYING nemo-media-columns/debian/changelog -%{_datadir}/nemo-python/extensions/nemo-media-columns.py - %files -n nemo-extension-pastebin -f nemo-pastebin.lang %defattr(-,root,root) %doc nemo-pastebin/COPYING nemo-pastebin/debian/changelog diff --git a/nemo-media-columns_use-exiftool.patch b/nemo-media-columns_use-exiftool.patch deleted file mode 100644 index b3861ee..0000000 --- a/nemo-media-columns_use-exiftool.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- nemo-media-columns.orig/nemo-media-columns.py -+++ nemo-media-columns/nemo-media-columns.py -@@ -29,7 +29,7 @@ from gi.repository import Nemo, GObject, - from mutagen.easyid3 import EasyID3 - from mutagen.mp3 import MPEGInfo - # for exif support --import pyexiv2 -+import json, subprocess - # for reading videos. for future improvement, this can also read mp3! - import kaa.metadata - # for reading image dimensions -@@ -141,32 +141,32 @@ class ColumnExtension(GObject.GObject, N - if file.is_mime_type('image/jpeg') or file.is_mime_type('image/png') or file.is_mime_type('image/gif') or file.is_mime_type('image/bmp'): - # EXIF handling routines - try: -- metadata = pyexiv2.ImageMetadata(filename) -- metadata.read() -+ metadata = json.loads(subprocess.check_output(['exiftool', '-j', filename]))[0] -+ - try: -- exif_datetimeoriginal = metadata['Exif.Photo.DateTimeOriginal'] -- file.add_string_attribute('exif_datetime_original',str(exif_datetimeoriginal.raw_value)) -+ exif_datetimeoriginal = metadata['DateTimeOriginal'] -+ file.add_string_attribute('exif_datetime_original',str(exif_datetimeoriginal)) - except: - file.add_string_attribute('exif_datetime_original',"") - try: -- exif_imagesoftware = metadata['Exif.Image.Software'] -- file.add_string_attribute('exif_software',str(exif_imagesoftware.raw_value)) -+ exif_imagesoftware = metadata['Software'] -+ file.add_string_attribute('exif_software',str(exif_imagesoftware)) - except: - file.add_string_attribute('exif_software',"") - try: -- exif_photoflash = metadata['Exif.Photo.Flash'] -- file.add_string_attribute('exif_flash',str(exif_photoflash.raw_value)) -+ exif_photoflash = metadata['Flash'] -+ file.add_string_attribute('exif_flash',str(exif_photoflash)) - except: - file.add_string_attribute('exif_flash',"") - try: -- exif_pixelydimension = metadata['Exif.Photo.PixelYDimension'] -+ exif_pixelydimension = metadata['PixelYDimension'] - exif_pixelxdimension = metadata['Exif.Photo.PixelXDimension'] -- file.add_string_attribute('exif_pixeldimensions',str(exif_pixelydimension.raw_value)+'x'+str(exif_pixelxdimension.raw_value)) -+ file.add_string_attribute('exif_pixeldimensions',str(exif_pixelydimension)+'x'+str(exif_pixelxdimension)) - except: - file.add_string_attribute('exif_pixeldimensions',"") - try: -- exif_rating = metadata['Xmp.xmp.Rating'] -- file.add_string_attribute('exif_rating',str(exif_rating.raw_value)) -+ exif_rating = metadata['Rating'] -+ file.add_string_attribute('exif_rating',str(exif_rating)) - except: - file.add_string_attribute('exif_rating',"") - except: