diff --git a/sushi-3.32.1.tar.xz b/sushi-3.32.1.tar.xz deleted file mode 100644 index a13cc43..0000000 --- a/sushi-3.32.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52010a1fabca542f6744b2d4b61238411c9ec9f7618de77b8a919a3325de2d0a -size 65172 diff --git a/sushi-3.34.0.tar.xz b/sushi-3.34.0.tar.xz new file mode 100644 index 0000000..7b5b9f8 --- /dev/null +++ b/sushi-3.34.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8a2330baaca40f539557b336375c67893afa232690705cbba7bbf55224799fd +size 74240 diff --git a/sushi-port-to-gtksourceview4.patch b/sushi-port-to-gtksourceview4.patch deleted file mode 100644 index 32aef88..0000000 --- a/sushi-port-to-gtksourceview4.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bafeb19233325a7fc7c2e82b488abfb7a7556f61 Mon Sep 17 00:00:00 2001 -From: Martin Blanchard -Date: Sun, 19 May 2019 22:31:37 +0200 -Subject: [PATCH] Port to GtkSourceView 4 - -GtkSourceView 3 isn't maintained any more. - -https://gitlab.gnome.org/GNOME/sushi/issues/6 ---- - flatpak/org.gnome.NautilusPreviewer.json | 4 ++-- - meson.build | 2 +- - src/js/viewers/text.js | 2 +- - src/libsushi/meson.build | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/flatpak/org.gnome.NautilusPreviewer.json b/flatpak/org.gnome.NautilusPreviewer.json -index 4565b82..9a60827 100644 ---- a/flatpak/org.gnome.NautilusPreviewer.json -+++ b/flatpak/org.gnome.NautilusPreviewer.json -@@ -102,8 +102,8 @@ - "sources": [ - { - "type": "archive", -- "url": "http://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.8.tar.xz", -- "sha256": "1e9bb8ff190db705deb916dd23ff681f0e8803aec407bf0fd64c7e615ac436fe" -+ "url": "https://download.gnome.org/sources/gtksourceview/4.2/gtksourceview-4.2.0.tar.xz", -+ "sha256": "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675" - } - ] - }, -diff --git a/meson.build b/meson.build -index 56398d9..538dc4b 100644 ---- a/meson.build -+++ b/meson.build -@@ -19,7 +19,7 @@ gstreamer_base_dep = dependency('gstreamer-base-1.0') - gstreamer_pbutils_dep = dependency('gstreamer-pbutils-1.0') - gstreamer_tag_dep = dependency('gstreamer-tag-1.0') - gtk_dep = dependency('gtk+-3.0', version: '>=3.13.2') --gtksourceview_dep = dependency('gtksourceview-3.0') -+gtksourceview_dep = dependency('gtksourceview-4', version: '>=4.0.3') - harfbuzz_dep = dependency('harfbuzz', version: '>=0.9.9') - introspection_dep = dependency('gobject-introspection-1.0', version: '>=1.0.1') - musicbrainz_dep = dependency('libmusicbrainz5') -diff --git a/src/js/viewers/text.js b/src/js/viewers/text.js -index 9566adb..a044fbe 100644 ---- a/src/js/viewers/text.js -+++ b/src/js/viewers/text.js -@@ -23,7 +23,7 @@ - * - */ - --imports.gi.versions.GtkSource = '3.0'; -+imports.gi.versions.GtkSource = '4'; - - const Gdk = imports.gi.Gdk; - const GtkClutter = imports.gi.GtkClutter; -diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build -index c8ff6fa..66ef646 100644 ---- a/src/libsushi/meson.build -+++ b/src/libsushi/meson.build -@@ -62,7 +62,7 @@ gnome.generate_gir( - 'GstTag-1.0', - 'GdkPixbuf-2.0', - 'Gtk-3.0', -- 'GtkSource-3.0', -+ 'GtkSource-4', - 'EvinceDocument-3.0', - ], - install: true, --- -2.21.0 - diff --git a/sushi-rpmlintrc b/sushi-rpmlintrc new file mode 100644 index 0000000..cabbc38 --- /dev/null +++ b/sushi-rpmlintrc @@ -0,0 +1,4 @@ +# Filter out warning about devel-file in non devel package. +# There is no need for a devel package for a single gir file +addFilter("devel-file-in-non-devel-package .*/usr/share/sushi/gir-1.0/Sushi-1.0.gir"); + diff --git a/sushi.changes b/sushi.changes index f4512cd..aef70d1 100644 --- a/sushi.changes +++ b/sushi.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Tue Sep 10 18:05:59 UTC 2019 - Bjørn Lie + +- Update to version 3.34.0: + + Add support for moving Nautilus selection with arrow keys. + + Add support for parenting the window on Wayland. + + Use builder-dark style for text/source viewer. + + Add localization for appdata file. + +------------------------------------------------------------------- +Mon Sep 9 12:26:30 UTC 2019 - Bjørn Lie + +- Update to version 3.33.90: + + Add a command line launcher. + + Fix viewer mimetype matching. + + Load viewers from home directory. + + Updated translations. +- Changes from version 3.33.4: + + Add a native LibreofficeKit renderer. + + Fix translation infrastructure regression. + + Fix loading album cover art from Amazon. + + Fix several glitches on HiDpi and fractional scaling displays. + + Respect placement of close button preference. + + Fix audio metadata tags retrieval. + + Only load a single GstTagList copy. + + Fix displaying audio tag content with markup characters. + + Add an appdata file. + + Properly letterbox album cover art. + + Add a way to report loading errors in the main view. + + Scale window size with display resolution. +- Changes from version 3.33.3: + + Rewrite to use GTK directly, drop Clutter dependency. + + Use GtkSourceView 4. +- Drop sushi-port-to-gtksourceview4.patch: Fixed upstream. +- Add meson BuildRequires and macros. +- Drop pkgconfig(clutter-1.0), pkgconfig(clutter-gst-3.0), + pkgconfig(clutter-gtk-1.0), pkgconfig(clutter-x11-1.0) and + pkgconfig(gstreamer-pbutils-1.0) BuildRequires following upstream + changes. +- Add pkgconfig(epoxy), pkgconfig(gdk-pixbuf-2.0), + pkgconfig(gio-unix-2.0), pkgconfig(gstreamer-audio-1.0), + pkgconfig(gstreamer-video-1.0), pkgconfig(gtk+-wayland-3.0) and + pkgconfig(gtk+-x11-3.0) BuildRequires following upstream + changes. +- Add sushi-rpmlintrc, filter out needless warning about gir file. +- Drop libsushi-1_0-0 and typelib-1_0-Sushi-1_0 Obsoletes: No + currently supported version of openSUSE should have these + installed. + ------------------------------------------------------------------- Wed Jun 19 15:55:02 UTC 2019 - Bjørn Lie diff --git a/sushi.spec b/sushi.spec index 4255e37..4ef5ca5 100644 --- a/sushi.spec +++ b/sushi.spec @@ -17,41 +17,39 @@ Name: sushi -Version: 3.32.1 +Version: 3.34.0 Release: 0 Summary: Quick Previewer for Nautilus License: SUSE-GPL-2.0-with-plugin-exception Group: Productivity/File utilities URL: https://www.gnome.org -Source0: https://download.gnome.org/sources/sushi/3.32/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM sushi-port-to-gtksourceview4.patch -- Port to gtksourceview4 -Patch0: sushi-port-to-gtksourceview4.patch +Source0: https://download.gnome.org/sources/sushi/3.34/%{name}-%{version}.tar.xz +Source99: sushi-rpmlintrc BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: pkgconfig(clutter-1.0) >= 1.11.4 -BuildRequires: pkgconfig(clutter-gst-3.0) -BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(clutter-x11-1.0) +BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(evince-document-3.0) BuildRequires: pkgconfig(evince-view-3.0) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gjs-1.0) >= 1.38.0 BuildRequires: pkgconfig(glib-2.0) >= 2.29.14 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.6 BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) +BuildRequires: pkgconfig(gstreamer-audio-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2 +BuildRequires: pkgconfig(gtk+-wayland-3.0) +BuildRequires: pkgconfig(gtk+-x11-3.0) BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.3 BuildRequires: pkgconfig(harfbuzz) >= 0.9.9 BuildRequires: pkgconfig(libmusicbrainz5) BuildRequires: pkgconfig(webkit2gtk-4.0) Recommends: %{name}-lang Supplements: nautilus -# libsushi and the typelib were erronously installed in the system libdir... -Obsoletes: libsushi-1_0-0 < %{version} -Obsoletes: typelib-1_0-Sushi-1_0 < %{version} %description Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. @@ -72,11 +70,22 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. %files %license COPYING %doc AUTHORS NEWS README -%{_bindir}/sushi +%{_bindir}/%{name} %{_datadir}/dbus-1/services/org.gnome.NautilusPreviewer.service -%{_datadir}/sushi/ -%{_libdir}/sushi/ -%{_libexecdir}/sushi-start +%{_datadir}/metainfo/org.gnome.NautilusPreviewer.appdata.xml +%dir %{_datadir}/%{name}/gtksourceview-4 +%dir %{_datadir}/%{name}/gtksourceview-4/styles +%{_datadir}/%{name}/gtksourceview-4/styles/builder-dark.style-scheme.xml +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/gir-1.0 +%{_datadir}/%{name}/gir-1.0/Sushi-1.0.gir +%{_datadir}/%{name}/org.gnome.NautilusPreviewer.data.gresource +%{_datadir}/%{name}/org.gnome.NautilusPreviewer.src.gresource +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/girepository-1.0 +%{_libdir}/%{name}/girepository-1.0/Sushi-1.0.typelib +%{_libdir}/%{name}/libsushi-1.0.so +%{_libexecdir}/org.gnome.NautilusPreviewer %files lang -f %{name}.lang