From b1ee45fa6c92eda92014f8637037cede74b9e29e Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 28 Dec 2024 12:38:52 +0300 Subject: [PATCH] import totem-43.0-6.el10 --- .gitignore | 2 +- .totem.metadata | 2 +- ...-grilo-Fix-crash-when-deleting-video.patch | 37 ++++++ SPECS/totem.spec | 112 +++++++++++++----- 4 files changed, 123 insertions(+), 30 deletions(-) create mode 100644 SOURCES/0001-grilo-Fix-crash-when-deleting-video.patch diff --git a/.gitignore b/.gitignore index a58e89b..32736df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/totem-3.38.2.tar.xz +SOURCES/totem-43.0.tar.xz diff --git a/.totem.metadata b/.totem.metadata index ebf7b93..4165c4f 100644 --- a/.totem.metadata +++ b/.totem.metadata @@ -1 +1 @@ -52522c288ea01133f4b9ad04f571f3983f77f8b8 SOURCES/totem-3.38.2.tar.xz +27a4f0e906987119d81f050fbd704576d8604d47 SOURCES/totem-43.0.tar.xz diff --git a/SOURCES/0001-grilo-Fix-crash-when-deleting-video.patch b/SOURCES/0001-grilo-Fix-crash-when-deleting-video.patch new file mode 100644 index 0000000..da96003 --- /dev/null +++ b/SOURCES/0001-grilo-Fix-crash-when-deleting-video.patch @@ -0,0 +1,37 @@ +From a9c4b7606e40847ee79ff4f7cb85e757d6cdd4ce Mon Sep 17 00:00:00 2001 +From: krifa +Date: Fri, 25 Aug 2023 21:59:31 +0200 +Subject: [PATCH] grilo: Fix crash when deleting video + +Wrong argument in the call of g_signal_handlers_(un)block_by_func + +Closes: #593 +--- + src/totem-grilo.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/totem-grilo.c b/src/totem-grilo.c +index d4490a9f6..a0f269e55 100644 +--- a/src/totem-grilo.c ++++ b/src/totem-grilo.c +@@ -2213,7 +2213,7 @@ delete_cb (TotemSelectionToolbar *bar, + GtkTreeModel *model; + GList *list, *l; + +- g_signal_handlers_block_by_func (self->browser, "view-selection-changed", self); ++ g_signal_handlers_block_by_func (self->browser, view_selection_changed_cb, self); + + model = gd_main_view_get_model (GD_MAIN_VIEW (self->browser)); + list = gd_main_view_get_selection (GD_MAIN_VIEW (self->browser)); +@@ -2228,7 +2228,7 @@ delete_cb (TotemSelectionToolbar *bar, + } + g_list_foreach (list, delete_foreach, model); + +- g_signal_handlers_unblock_by_func (self->browser, "view-selection-changed", self); ++ g_signal_handlers_unblock_by_func (self->browser, view_selection_changed_cb, self); + + g_object_set (G_OBJECT (self->browser), "selection-mode", FALSE, NULL); + } +-- +2.45.0 + diff --git a/SPECS/totem.spec b/SPECS/totem.spec index 006d2ce..5b0c25d 100644 --- a/SPECS/totem.spec +++ b/SPECS/totem.spec @@ -1,20 +1,25 @@ %global gst_plugins_base_version 1.6.0 %global gtk3_version 3.19.4 +%global tarball_version %%(echo %{version} | tr '~' '.') + Name: totem Epoch: 1 -Version: 3.38.2 -Release: 2%{?dist} +Version: 43.0 +Release: 6%{?dist} Summary: Movie player for GNOME License: GPLv2+ with exceptions URL: https://wiki.gnome.org/Apps/Videos -Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz + +# https://gitlab.gnome.org/GNOME/totem/-/merge_requests/369 +# https://gitlab.gnome.org/GNOME/totem/-/issues/593 +# https://bugzilla.redhat.com/show_bug.cgi?id=2176726 +# Fixes crash when trying to delete last video +Patch: 0001-grilo-Fix-crash-when-deleting-video.patch BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(clutter-1.0) -BuildRequires: pkgconfig(clutter-gst-3.0) -BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gstreamer-1.0) @@ -24,11 +29,16 @@ BuildRequires: pkgconfig(gstreamer-audio-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(libportal-gtk3) +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(totem-plparser) +BuildRequires: pkgconfig(x11) # Needed for the videoscale element. BuildRequires: gstreamer1-plugins-good +# For the gtkglsink element. +BuildRequires: gstreamer1-plugins-good-gtk BuildRequires: gcc-c++ BuildRequires: gettext @@ -58,8 +68,11 @@ Requires: iso-codes Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} >= %{gst_plugins_base_version} Requires: gstreamer1-plugins-good%{?_isa} +Requires: gstreamer1-plugins-good-gtk%{?_isa} Requires: gstreamer1-plugins-ugly-free%{?_isa} +%if ! 0%{?flatpak} Requires: gvfs-fuse%{?_isa} +%endif # Disabled until ported to GStreamer 1.0 # Requires: gnome-dvb-daemon Requires: grilo-plugins%{?_isa} @@ -98,7 +111,7 @@ The %{name}-devel package contains API documentation for developing developing plugins for %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{tarball_version} %build %meson -Denable-gtk-doc=true @@ -126,18 +139,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Totem.de %{_datadir}/applications/org.gnome.Totem.desktop %{_datadir}/dbus-1/services/org.gnome.Totem.service %{_datadir}/metainfo/org.gnome.Totem.appdata.xml -%dir %{_datadir}/totem -%{_datadir}/totem/controls.ui -%{_datadir}/totem/playlist.ui -%{_datadir}/totem/preferences.ui -%{_datadir}/totem/shortcuts.ui -%{_datadir}/totem/totem.ui -%{_datadir}/totem/uri.ui %dir %{_libdir}/totem %dir %{_libdir}/totem/plugins # Python plugins %if 0%{?fedora} || 0%{?rhel} > 7 -%{_libdir}/totem/plugins/dbus %{_libdir}/totem/plugins/opensubtitles %{_libdir}/totem/plugins/pythonconsole %endif @@ -150,7 +155,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Totem.de %{_libdir}/totem/plugins/screensaver %{_libdir}/totem/plugins/skipto %{_libdir}/totem/plugins/properties -%{_libdir}/totem/plugins/media-player-keys +%{_libdir}/totem/plugins/mpris %{_libdir}/totem/plugins/screenshot %{_libdir}/totem/plugins/save-file %{_libdir}/totem/plugins/variable-rate @@ -158,6 +163,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Totem.de %{_libexecdir}/totem-gallery-thumbnailer %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Totem.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Totem-symbolic.svg +%{_datadir}/icons/hicolor/symbolic/apps/totem-tv-symbolic.svg %{_mandir}/man1/totem.1* %{_datadir}/GConf/gsettings/*.convert %{_datadir}/glib-2.0/schemas/*.xml @@ -176,26 +182,76 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Totem.de %{_datadir}/gir-1.0/Totem-1.0.gir %changelog -* Mon May 22 2023 Kalev Lember - 3.38.2-2 -- Use conflicts for totem-video-thumbnailer split instead of self-obsoletes -- Resolves: rhbz#1949422 +* Sat Dec 28 2024 Arkady L. Shane - 43.0-6 +- Rebuilt for MSVSphere 10 + +* Sat Jul 20 2024 Fedora Release Engineering - 1:43.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue May 07 2024 Adam Williamson - 43.0-5 +- Backport MR #369 to fix crash when deleting last video + +* Sat Jan 27 2024 Fedora Release Engineering - 1:43.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1:43.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1:43.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 16 2022 Bastien Nocera - 43.0-1 ++ totem-43.0-1 +- Update to 43.0 + +* Tue Sep 06 2022 Bastien Nocera - 43.rc-1 ++ totem-43.rc-1 +- Update to 43.rc -* Mon Oct 18 2021 Bastien Nocera - 3.38.2-1 +* Thu Aug 18 2022 Bastien Nocera - 43.beta-1 ++ totem-43.beta-1 +- Update to 43.beta + +* Sat Jul 23 2022 Fedora Release Engineering - 1:43.alpha-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Kalev Lember - 1:43.alpha-2 +- Rebuilt for libgnome-desktop soname bump + +* Sat Jul 16 2022 Bastien Nocera - 43.alpha-1 ++ totem-43.alpha-1 +- Update to 43.alpha + +* Fri Mar 18 2022 Bastien Nocera - 42.0-1 ++ totem-42.0-1 +- Update to 42.0 + +* Fri Feb 25 2022 David King - 42~beta-1 +- Update to 42.beta + +* Sat Jan 22 2022 Fedora Release Engineering - 1:3.38.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Oct 12 2021 Bastien Nocera - 3.38.2-1 + totem-3.38.2-1 - Update to 3.38.2 -- Resolves: rhbz#2014992 -* Tue Aug 10 2021 Mohan Boddu - 1:3.38.1-2 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Thu Oct 07 2021 Kalev Lember - 1:3.38.1-4 +- Rebuild to pull in gstreamer1-plugin-openh264 as 0-day F35 update + +* Fri Jul 23 2021 Fedora Release Engineering - 1:3.38.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 29 2021 Bastien Nocera - 3.38.1-2 ++ totem-3.38.1-2 +- Remove wrongly licensed translation -* Mon Jun 21 2021 Bastien Nocera - 3.38.1-1 +* Wed Jun 16 2021 Bastien Nocera - 3.38.1-1 + totem-3.38.1-1 - Update to 3.38.1 -- Resolves: rhbz#1972740 -* Fri Apr 16 2021 Mohan Boddu - 1:3.38.0-6 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue May 25 2021 Kalev Lember - 1:3.38.0-6 +- Conflict with old totem version instead of using self-obsoletes (#1949422) * Wed Mar 03 2021 Kalev Lember - 1:3.38.0-5 - Add self-obsoletes to help with the totem-video-thumbnailer split