rpms/sushi
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/sushi.git#920f5e608a95b250dd78dd849dd362baa9eb8680
This commit is contained in:
DistroBaker 2020-12-01 10:16:55 +00:00
parent 3cadc607d6
commit a7f6565d37
4 changed files with 14 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -45,3 +45,4 @@
/sushi-3.33.4.tar.xz
/sushi-3.33.90.tar.xz
/sushi-3.34.0.tar.xz
/sushi-3.38.0.tar.xz

2
sources
View File

@ -1 +1 @@
SHA512 (sushi-3.34.0.tar.xz) = bde009b30106bf31199c8c3b040743de5f5c782fd540612a34055bef9a22f9a08c4ed0ae7c5fc3cbfdc67a5d12f28bc70ca5135ba227403e8d127295a1253d18
SHA512 (sushi-3.38.0.tar.xz) = c8d0dd7d9cf9d28496c6c4ac5f327bcf605994f189c476fe891d42c0c225d0368311baf06d7d6092805f729908491590bf719a9822513f96e2afe17e8ab962bd

156
sushi-define-getters.patch
View File

@ -1,156 +0,0 @@
From 47736b0547e40b543cdf0c6aab167f81da57bd1b Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Wed, 23 Sep 2020 12:59:53 +0200
Subject: [PATCH] viewers: Implement getters in the viewers child classes
I have no idea why the getters defined in Renderer.Renderer are not
inherited by their derived classes. I am not very versed in modern
GJS, neither interested much in it.
This fixes sushi tho. :)
---
src/viewers/evince.js | 8 ++++++++
src/viewers/font.js | 8 ++++++++
src/viewers/gst.js | 8 ++++++++
src/viewers/html.js | 8 ++++++++
src/viewers/image.js | 8 ++++++++
src/viewers/libreoffice.js | 8 ++++++++
src/viewers/text.js | 8 ++++++++
7 files changed, 56 insertions(+)
diff --git a/src/viewers/evince.js b/src/viewers/evince.js
index 5330eea..9eb36a9 100644
--- a/src/viewers/evince.js
+++ b/src/viewers/evince.js
@@ -42,6 +42,14 @@ var Klass = GObject.registerClass({
false)
},
}, class EvinceRenderer extends Gtk.ScrolledWindow {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file, fileInfo) {
super._init({ visible: true,
min_content_height: Constants.VIEW_MIN,
diff --git a/src/viewers/font.js b/src/viewers/font.js
index 9bba13d..330c92b 100644
--- a/src/viewers/font.js
+++ b/src/viewers/font.js
@@ -38,6 +38,14 @@ var Klass = GObject.registerClass({
false)
},
}, class FontRenderer extends Sushi.FontWidget {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file) {
super._init({ uri: file.get_uri(),
visible: true })
diff --git a/src/viewers/gst.js b/src/viewers/gst.js
index 14d4b00..0c5654a 100644
--- a/src/viewers/gst.js
+++ b/src/viewers/gst.js
@@ -39,6 +39,14 @@ var Klass = GObject.registerClass({
false)
},
}, class GstRenderer extends Sushi.MediaBin {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file) {
super._init({ uri: file.get_uri() });
diff --git a/src/viewers/html.js b/src/viewers/html.js
index a20d55d..3de4455 100644
--- a/src/viewers/html.js
+++ b/src/viewers/html.js
@@ -38,6 +38,14 @@ var Klass = GObject.registerClass({
false)
},
}, class HTMLRenderer extends WebKit2.WebView {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file) {
super._init();
diff --git a/src/viewers/image.js b/src/viewers/image.js
index bae07cd..8befc05 100644
--- a/src/viewers/image.js
+++ b/src/viewers/image.js
@@ -38,6 +38,14 @@ var Klass = GObject.registerClass({
false)
},
}, class ImageRenderer extends Gtk.DrawingArea {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file) {
super._init();
diff --git a/src/viewers/libreoffice.js b/src/viewers/libreoffice.js
index d153223..8302b4e 100644
--- a/src/viewers/libreoffice.js
+++ b/src/viewers/libreoffice.js
@@ -24,6 +24,14 @@ var Klass = GObject.registerClass({
false)
},
}, class LibreofficeRenderer extends Gtk.ScrolledWindow {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file) {
super._init({ hexpand: true,
visible: true,
diff --git a/src/viewers/text.js b/src/viewers/text.js
index 52d4b17..c621efd 100644
--- a/src/viewers/text.js
+++ b/src/viewers/text.js
@@ -38,6 +38,14 @@ var Klass = GObject.registerClass({
false)
},
}, class TextRenderer extends Gtk.ScrolledWindow {
+ get ready() {
+ return !!this._ready;
+ }
+
+ get fullscreen() {
+ return !!this._fullscreen;
+ }
+
_init(file, fileInfo) {
super._init();
--
2.28.0

22
sushi.spec
View File

@ -1,22 +1,20 @@
%global url_ver %%(echo %{version}|cut -d. -f1,2)
Name: sushi
Version: 3.34.0
Release: 4%{?dist}
Version: 3.38.0
Release: 2%{?dist}
Summary: A quick previewer for Nautilus
License: GPLv2+ with exceptions
URL: https://gitlab.gnome.org/GNOME/sushi
Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
Patch0: sushi-define-getters.patch
Source0: https://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
BuildRequires: gettext
BuildRequires: gjs-devel
BuildRequires: meson
BuildRequires: pkgconfig(clutter-gst-3.0)
BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(clutter-x11-1.0)
BuildRequires: pkgconfig(evince-document-3.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtksourceview-4)
BuildRequires: pkgconfig(libmusicbrainz5)
@ -32,8 +30,6 @@ file manager.
%prep
%setup -q
%patch0 -p1
%build
%meson
@ -57,6 +53,12 @@ file manager.
%changelog
* Tue Dec 01 2020 David King <amigadave@amigadave.com> - 3.38.0-2
- Remove unused clutter dependencies
* Thu Oct 22 2020 Felipe Borges <feborges@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Wed Sep 23 2020 Felipe Borges <feborges@redhat.com> - 3.34.0-4
- Fix crash
- Related: #1880752