diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 44c87d4..0000000 --- a/.gitignore +++ /dev/null @@ -1,57 +0,0 @@ -/sushi-0.0.4.tar.xz -/sushi-0.0.5.tar.xz -/sushi-0.1.90.tar.xz -/sushi-0.1.92.tar.xz -/sushi-0.2.0.tar.xz -/sushi-0.2.1.tar.xz -/sushi-0.3.0.tar.xz -/sushi-0.3.91.tar.xz -/sushi-0.3.92.tar.xz -/sushi-0.4.0.tar.xz -/sushi-0.4.1.tar.xz -/sushi-0.5.1.tar.xz -/sushi-0.5.2.tar.xz -/sushi-0.5.4.tar.xz -/sushi-0.5.5.tar.xz -/sushi-3.5.90.tar.xz -/sushi-3.5.92.tar.xz -/sushi-3.6.0.tar.xz -/sushi-3.6.1.tar.xz -/sushi-3.7.3.tar.xz -/sushi-3.7.4.tar.xz -/sushi-3.7.5.tar.xz -/sushi-3.7.91.tar.xz -/sushi-3.8.0.tar.xz -/sushi-3.8.1.tar.xz -/sushi-3.11.90.tar.xz -/sushi-3.12.0.tar.xz -/sushi-3.15.90.tar.xz -/sushi-3.16.0.tar.xz -/sushi-3.17.4.tar.xz -/sushi-3.18.0.tar.xz -/sushi-3.19.90.tar.xz -/sushi-3.20.0.tar.xz -/sushi-3.21.91.tar.xz -/sushi-3.23.91.tar.xz -/sushi-3.24.0.tar.xz -/sushi-3.28.0.tar.xz -/sushi-3.28.1.tar.xz -/sushi-3.28.2.tar.xz -/sushi-3.28.3.tar.xz -/sushi-3.30.0.tar.xz -/sushi-3.31.2.tar.xz -/sushi-3.32.0.tar.xz -/sushi-3.33.3.tar.xz -/sushi-3.33.4.tar.xz -/sushi-3.33.90.tar.xz -/sushi-3.34.0.tar.xz -/sushi-3.38.0.tar.xz -/sushi-3.38.1.tar.xz -/sushi-41.0.tar.xz -/sushi-41.1.tar.xz -/sushi-41.2.tar.xz -/sushi-42.0.tar.xz -/sushi-43.0.tar.xz -/sushi-44.2.tar.xz -/sushi-45.alpha.2.tar.xz -/sushi-45.0.tar.xz diff --git a/changelog b/changelog deleted file mode 100644 index a682046..0000000 --- a/changelog +++ /dev/null @@ -1,331 +0,0 @@ -* Wed Dec 20 2023 Yaakov Selkowitz - 45.0-2 -- Make webkitgtk dependency optional - -* Wed Sep 20 2023 Kalev Lember - 45.0-1 -- Update to 45.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 45~alpha.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 03 2023 Kalev Lember - 45~alpha.2-1 -- Update to 45.alpha.2 - -* Wed May 31 2023 Kalev Lember - 44.2-1 -- Update to 44.2 - -* Sat Jan 21 2023 Fedora Release Engineering - 43.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 08 2022 FeRD (Frank Dana) - 43.0-2 -- Add patch to fix local previewing of some Evince types - -* Tue Sep 20 2022 Kalev Lember - 43.0-1 -- Update to 43.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 42.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 06 2022 David King - 42.0-1 -- Update to 42.0 - -* Thu Jun 16 2022 David King - 41.2-2 -- Exclude private library from Provides - -* Thu Jun 16 2022 David King - 41.2-1 -- Update to 41.2 - -* Wed May 04 2022 Felipe Borges - 41.1-2 -- Add gtksourceview4 runtime dependency - -* Fri Apr 01 2022 Felipe Borges - 41.1-1 -- Update to 41.1 - -* Sat Jan 22 2022 Fedora Release Engineering - 41.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 21 2021 Kalev Lember - 41.0-1 -- Update to 41.0 - -* Thu Aug 19 2021 Kalev Lember - 3.38.1-1 -- Update to 3.38.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.38.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.38.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 01 2020 David King - 3.38.0-2 -- Remove unused clutter dependencies - -* Thu Oct 22 2020 Felipe Borges - 3.38.0-1 -- Update to 3.38.0 - -* Wed Sep 23 2020 Felipe Borges - 3.34.0-4 -- Fix crash -- Related: #1880752 - -* Wed Jul 29 2020 Fedora Release Engineering - 3.34.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 3.34.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Sep 10 2019 Kalev Lember - 3.34.0-1 -- Update to 3.34.0 - -* Tue Aug 20 2019 Kalev Lember - 3.33.90-1 -- Update to 3.33.90 - -* Sat Jul 27 2019 Fedora Release Engineering - 3.33.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jul 19 2019 Kalev Lember - 3.33.4-1 -- Update to 3.33.4 - -* Mon Jun 17 2019 Kalev Lember - 3.33.3-1 -- Update to 3.33.3 - -* Mon Mar 11 2019 Kalev Lember - 3.32.0-1 -- Update to 3.32.0 - -* Thu Jan 31 2019 Kalev Lember - 3.31.2-1 -- Update to 3.31.2 -- Switch to the meson build system - -* Thu Sep 06 2018 Kalev Lember - 3.30.0-1 -- Update to 3.30.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 3.28.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 23 2018 Kalev Lember - 3.28.3-1 -- Update to 3.28.3 - -* Fri Apr 20 2018 Kalev Lember - 3.28.2-1 -- Update to 3.28.2 - -* Thu Apr 19 2018 Kalev Lember - 3.28.1-1 -- Update to 3.28.1 - -* Thu Apr 19 2018 Kalev Lember - 3.28.0-1 -- Update to 3.28.0 -- Drop ldconfig scriptlets - -* Fri Feb 09 2018 Fedora Release Engineering - 3.24.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.24.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue May 09 2017 Kalev Lember - 3.24.0-1 -- Update to 3.24.0 - -* Mon Mar 06 2017 Kalev Lember - 3.23.91-1 -- Update to 3.23.91 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.21.91-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Sep 02 2016 Kalev Lember - 3.21.91-1 -- Update to 3.21.91 -- Don't set group tags -- Update the project URL - -* Tue May 17 2016 Kalev Lember - 3.20.0-1 -- Update to 3.20.0 - -* Fri Mar 04 2016 Kalev Lember - 3.19.90-1 -- Update to 3.19.90 - -* Fri Feb 05 2016 Fedora Release Engineering - 3.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Sep 22 2015 Kalev Lember - 3.18.0-1 -- Update to 3.18.0 -- Use make_install macro - -* Mon Jul 27 2015 David King - 3.17.4-1 -- Update to 3.17.4 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.16.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 13 2015 Kalev Lember - 3.16.0-1 -- Update to 3.16.0 - -* Fri Mar 13 2015 David King - 3.15.90-2 -- Fix GSettings scriptlet - -* Tue Mar 10 2015 David King - 3.15.90-1 -- Update to 3.15.90 -- Use license macro for COPYING -- Use pkgconfig for BuildRequires -- Compile GSettings schemas - -* Thu Nov 27 2014 Haikel Guémar - 3.12.0-5 -- Rebuilt against newer libmusicbrainz5 - -* Mon Aug 18 2014 Fedora Release Engineering - 3.12.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jul 22 2014 Kalev Lember - 3.12.0-3 -- Rebuilt for gobject-introspection 1.41.4 - -* Sun Jun 08 2014 Fedora Release Engineering - 3.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 28 2014 Richard Hughes - 3.12.0-1 -- Update to 3.12.0 - -* Thu Feb 20 2014 Kalev Lember - 3.11.90-2 -- Rebuilt for cogl soname bump - -* Thu Feb 20 2014 Richard Hughes - 3.11.90-1 -- Update to 3.11.90 - -* Mon Feb 10 2014 Peter Hutterer - 3.10.0-3 -- Rebuild for libevdev soname bump - -* Wed Feb 05 2014 Kalev Lember - 3.10.0-2 -- Rebuilt for cogl soname bump - -* Wed Sep 25 2013 Kalev Lember - 3.10.0-1 -- Update to 3.10.0 - -* Fri Aug 09 2013 Kalev Lember - 3.8.1-3 -- Rebuilt for cogl 1.15.4 soname bump - -* Sun Aug 04 2013 Fedora Release Engineering - 3.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Apr 16 2013 Kalev Lember - 3.8.1-1 -- Update to 3.8.1 - -* Mon Mar 25 2013 Kalev Lember - 3.8.0-1 -- Update to 3.8.0 - -* Tue Mar 5 2013 Matthias Clasen - 3.7.91-1 -- Update to 3.7.91 - -* Thu Feb 21 2013 Kalev Lember - 3.7.5-2 -- Rebuilt for cogl soname bump - -* Thu Feb 07 2013 Richard Hughes - 3.7.5-1 -- Update to 3.7.5 - -* Fri Jan 25 2013 Peter Robinson 3.7.4-2 -- Rebuild for new cogl - -* Wed Jan 16 2013 Richard Hughes - 3.7.4-1 -- Update to 3.7.4 - -* Fri Dec 21 2012 Kalev Lember - 3.7.3-1 -- Update to 3.7.3 - -* Tue Nov 13 2012 Kalev Lember - 3.6.1-1 -- Update to 3.6.1 - -* Wed Sep 26 2012 Matthias Clasen - 3.6.0-1 -- Update to 3.6.0 - -* Wed Sep 19 2012 Kalev Lember - 3.5.92-1 -- Update to 3.5.92 - -* Thu Aug 30 2012 Bastien Nocera 3.5.90-1 -- Update to 3.5.90 -- Port to libmusicbrainz5 - -* Tue Aug 28 2012 Matthias Clasen - 0.5.5-2 -- Rebuild against new cogl/clutter - -* Wed Aug 22 2012 Richard Hughes - 0.5.5-1 -- Update to 0.5.5 - -* Fri Jul 27 2012 Fedora Release Engineering - 0.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 17 2012 Richard Hughes - 0.5.4-1 -- Update to 0.5.4 - -* Thu Jun 07 2012 Richard Hughes - 0.5.2-1 -- Update to 0.5.2 - -* Sat May 05 2012 Kalev Lember - 0.5.1-1 -- Update to 0.5.1 -- Build with libmusicbrainz4 -- Adjust the spec file for the changes in private library location -- Remove and obsolete the -devel subpackage - -* Tue Apr 17 2012 Kalev Lember - 0.4.1-1 -- Update to 0.4.1 - -* Tue Mar 27 2012 Matthias Clasen - 0.4.0-1 -- Update to 0.4.0 - -* Wed Mar 21 2012 Kalev Lember - 0.3.92-2 -- Rebuild for libevdocument3 soname bump - -* Wed Mar 21 2012 Kalev Lember - 0.3.92-1 -- Update to 0.3.92 - -* Sat Mar 10 2012 Matthias Clasen - 0.3.91-3 -- Rebuild against newer cogl - -* Tue Mar 6 2012 Matthias Clasen - 0.3.91-2 -- Rebuild against newer cogl - -* Mon Mar 5 2012 Matthias Clasen - 0.3.91-1 -- Update to 0.3.91 - -* Sun Feb 26 2012 Matthias Clasen - 0.3.0-4 -- Rebuild against new cogl - -* Thu Jan 19 2012 Matthias Clasen - 0.3.0-3 -- Rebuild against new cogl - -* Sat Jan 14 2012 Fedora Release Engineering - 0.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 20 2011 Matthias Clasen - 0.3.0-1 -- Update to 0.3.0 - -* Thu Nov 24 2011 Matthias Clasen - 0.2.1-3 -- Rebuild against new clutter - -* Wed Oct 26 2011 Fedora Release Engineering - 0.2.1-2 -- Rebuilt for glibc bug#747377 - -* Tue Oct 18 2011 Matthias Clasen - 0.2.1-1 -- Update to 0.2.1 - -* Tue Sep 27 2011 Ray - 0.2.0-1 -- Update to 0.2.0 - -* Tue Sep 20 2011 Matthias Clasen - 0.1.92-2 -- Rebuild against newer clutter - -* Tue Sep 20 2011 Elad Alfassa - 0.1.92-1 -- New upstream release - -* Tue Aug 30 2011 Elad Alfassa - 0.1.90-1 -- New upstream version - -* Tue Jul 26 2011 Matthias Clasen - 0.0.5-1 -- Update to 0.0.5 - -* Sat Jul 09 2011 Elad Alfassa - 0.0.4-1 -- Update to latest upstream version. - -* Mon Jul 04 2011 Elad Alfassa - 0.0.3-3 -- Fix issues from review - -* Sun Jul 03 2011 Elad Alfassa - 0.0.3-2 -- Added AUTHORS NEWS and TODO to doc - -* Sat Jul 02 2011 Elad Alfassa - 0.0.3-1 -- Initial build - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3103e87 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +sushi package is retired on branch c10s for CS-2019 \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 52dd72b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (sushi-45.0.tar.xz) = 25f8183e8a98ece5f8fe8b62bd60c1570e580634bc154650c044d37a18f3848fac724a2bebcc59a6d2b55290cf2ec852abda21864b15d97b3395183c2391ae0f diff --git a/sushi.spec b/sushi.spec deleted file mode 100644 index 6d4a528..0000000 --- a/sushi.spec +++ /dev/null @@ -1,67 +0,0 @@ -%global url_ver %%(echo %{version}|cut -d. -f1,2) -%global tarball_version %%(echo %{version} | tr '~' '.') - -%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so.*$ - -Name: sushi -Version: 45.0 -Release: %autorelease -Summary: A quick previewer for Nautilus - -# data/org.gnome.NautilusPreviewer.appdata.xml.in.in is CC0-1.0 -# the files in src/libsushi/ are combination of: -# LGPL-2.0-or-later -# LGPL-2.1-or-later WITH GStreamer-exception-2005 -License: GPL-2.0-or-later WITH GStreamer-exception-2008 AND CC0-1.0 AND (LGPL-2.0-or-later AND LGPL-2.1-or-later WITH GStreamer-exception-2005) -URL: https://gitlab.gnome.org/GNOME/sushi -Source0: https://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/sushi/-/merge_requests/53 -Patch0: webkit-optional.patch - -BuildRequires: gettext -BuildRequires: gjs-devel -BuildRequires: meson -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) - -Obsoletes: sushi-devel < 0.5.1 - -Requires: gtksourceview4 -Recommends: webkit2gtk4.1 - -#Description from upstream's README. -%description -This is sushi, a quick previewer for Nautilus, the GNOME desktop -file manager. - - -%prep -%autosetup -p1 -n %{name}-%{tarball_version} - - -%build -%meson -%meson_build - - -%install -%meson_install -%find_lang %{name} - - -%files -f %{name}.lang -%doc AUTHORS NEWS README.md TODO -%license COPYING -%{_bindir}/sushi -%{_libexecdir}/org.gnome.NautilusPreviewer -%{_libdir}/sushi/ -%{_datadir}/dbus-1/services/org.gnome.NautilusPreviewer.service -%{_metainfodir}/org.gnome.NautilusPreviewer.appdata.xml -%{_datadir}/sushi/ - - -%changelog -%autochangelog diff --git a/webkit-optional.patch b/webkit-optional.patch deleted file mode 100644 index 2475746..0000000 --- a/webkit-optional.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 2d3fbd0eec2806b15533b04edf8620f4f5c389d4 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 30 Nov 2023 18:26:51 -0500 -Subject: [PATCH] main: make WebKit2 optional - -webkitgtk is being removed from the core desktop dependencies, so it -should not be presumed available. ---- - meson.build | 1 - - src/ui/main.js | 1 - - src/viewers/html.js | 25 +++++++++++++++++++------ - 3 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/meson.build b/meson.build -index c7c4428..5994e21 100644 ---- a/meson.build -+++ b/meson.build -@@ -21,7 +21,6 @@ gtk_x11_dep = dependency('gtk+-x11-3.0', required: get_option('X11')) - gtk_wayland_dep = dependency('gtk+-wayland-3.0', version: '>= 3.21.5', required: get_option('wayland')) - gtksourceview_dep = dependency('gtksourceview-4', version: '>=4.0.3') - harfbuzz_dep = dependency('harfbuzz', version: '>=0.9.9') --webkit_dep = dependency('webkit2gtk-4.1') - - bindir = join_paths(get_option('prefix'), get_option('bindir')) - datadir = join_paths(get_option('prefix'), get_option('datadir')) -diff --git a/src/ui/main.js b/src/ui/main.js -index 2dd6124..9f8638a 100644 ---- a/src/ui/main.js -+++ b/src/ui/main.js -@@ -39,7 +39,6 @@ pkg.require({ - Pango: '1.0', - Soup: '3.0', - Sushi: '1.0', -- WebKit2: '4.1', - }); - - const {Gio, GLib} = imports.gi; -diff --git a/src/viewers/html.js b/src/viewers/html.js -index 985d957..01bd59f 100644 ---- a/src/viewers/html.js -+++ b/src/viewers/html.js -@@ -23,11 +23,22 @@ - * - */ - --const {Gtk, GLib, GObject, Sushi, WebKit2} = imports.gi; -+const {Gtk, GLib, GObject, Sushi} = imports.gi; -+ -+var WebKit2; -+try { -+ imports.gi.versions.WebKit2 = '4.1'; -+ WebKit2 = imports.gi.WebKit2; -+} catch(e) { -+} -+ -+var isAvailable = function() { -+ return WebKit2 !== undefined; -+} - - const Renderer = imports.ui.renderer; - --var Klass = GObject.registerClass({ -+var Klass = isAvailable() ? GObject.registerClass({ - Implements: [Renderer.Renderer], - Properties: { - fullscreen: GObject.ParamSpec.boolean('fullscreen', '', '', -@@ -67,8 +78,10 @@ var Klass = GObject.registerClass({ - get moveOnClick() { - return false; - } --}); -+}) : undefined; - --var mimeTypes = [ -- 'text/html' --]; -+var mimeTypes = []; -+if (isAvailable()) -+ mimeTypes = [ -+ 'text/html' -+ ]; --- -2.43.0 -