diff --git a/.gitignore b/.gitignore index 1455a39..c9facbc 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /gnome-music-3.17.92.tar.xz /gnome-music-3.18.0.tar.xz /gnome-music-3.18.2.tar.xz +/gnome-music-3.19.4.tar.xz diff --git a/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch b/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch deleted file mode 100644 index 06c2727..0000000 --- a/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b5d91d28673c4633f369daa576761cfe0c0ee92b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 2 Dec 2015 11:20:31 +0100 -Subject: [PATCH] build: Use grilo 0.3 for GNOME 3.20 - -https://bugzilla.gnome.org/show_bug.cgi?id=758942 ---- - configure.ac | 4 ++-- - gnomemusic/grilo.py | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f8c34b8..654e4a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,8 +37,8 @@ PKG_CHECK_MODULES(MEDIAART, [libmediaart-2.0]) - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` - AC_SUBST(GLIB_COMPILE_RESOURCES) - --GRL_MIN_VERSION=0.2.6 --PKG_CHECK_MODULES(GRL, grilo-0.2 >= $GRL_MIN_VERSION) -+GRL_MIN_VERSION=0.3.0 -+PKG_CHECK_MODULES(GRL, grilo-0.3 >= $GRL_MIN_VERSION) - - AC_CONFIG_FILES([ - Makefile -diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py -index a810628..7943150 100644 ---- a/gnomemusic/grilo.py -+++ b/gnomemusic/grilo.py -@@ -26,7 +26,7 @@ - # delete this exception statement from your version. - - import gi --gi.require_version('Grl', '0.2') -+gi.require_version('Grl', '0.3') - from gi.repository import GLib, GObject - from gnomemusic.query import Query - from gnomemusic import log, TrackerWrapper -@@ -73,12 +73,12 @@ class Grilo(GObject.GObject): - if not (GLib.file_test(self.playlist_path, GLib.FileTest.IS_DIR)): - GLib.mkdir_with_parents(self.playlist_path, int("0755", 8)) - self.options = Grl.OperationOptions() -- self.options.set_flags(Grl.ResolutionFlags.FAST_ONLY | -- Grl.ResolutionFlags.IDLE_RELAY) -+ self.options.set_resolution_flags(Grl.ResolutionFlags.FAST_ONLY | -+ Grl.ResolutionFlags.IDLE_RELAY) - - self.full_options = Grl.OperationOptions() -- self.full_options.set_flags(Grl.ResolutionFlags.FULL | -- Grl.ResolutionFlags.IDLE_RELAY) -+ self.full_options.set_resolution_flags(Grl.ResolutionFlags.FULL | -+ Grl.ResolutionFlags.IDLE_RELAY) - - self.sources = {} - self.blacklist = ['grl-filesystem', 'grl-bookmarks', 'grl-metadata-store', 'grl-podcasts'] --- -2.5.0 - diff --git a/gnome-music.spec b/gnome-music.spec index 14061cb..aa9ae55 100644 --- a/gnome-music.spec +++ b/gnome-music.spec @@ -4,8 +4,8 @@ Name: gnome-music Summary: Music player and management application for GNOME -Version: 3.18.2 -Release: 4%{?dist} +Version: 3.19.4 +Release: 1%{?dist} # The sources are under the GPLv2+ license, except for: # - the bundled libgd which is LGPLv2+, @@ -14,12 +14,7 @@ Release: 4%{?dist} # Also: https://bugzilla.gnome.org/show_bug.cgi?id=706457 License: (GPLv2+ with exceptions) and LGPLv2+ and CC-BY-SA URL: http://wiki.gnome.org/Apps/Music -Source0: https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-build-Use-grilo-0.3-for-GNOME-3.20.patch -Patch1: symbolic-icon.patch -Patch2: grilo-0.3-part-two.patch -Patch3: grilo-0.3-part-three.patch +Source0: https://download.gnome.org/sources/%{name}/3.19/%{name}-%{version}.tar.xz BuildRequires: /usr/bin/appstream-util BuildRequires: desktop-file-utils @@ -30,10 +25,8 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_v BuildRequires: pkgconfig(grilo-0.3) >= %{grilo_version} BuildRequires: pkgconfig(libmediaart-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(tracker-sparql-1.0) BuildRequires: python3-devel -# For patch0 -BuildRequires: autoconf automake libtool -BuildRequires: yelp-tools Requires: gdk-pixbuf2 Requires: gobject-introspection >= %{gobject_introspection_version} @@ -67,9 +60,6 @@ Music player and management application for GNOME. %build -# For patch0, and patch1 too! -autoreconf -fi - %configure --disable-silent-rules make %{?_smp_mflags} @@ -122,6 +112,9 @@ fi %changelog +* Wed Jan 20 2016 Kalev Lember - 3.19.4-1 +- Update to 3.19.4 + * Sun Dec 27 2015 Michael Catanzaro - 3.18.2-4 - Add more grilo 0.3 patches diff --git a/grilo-0.3-part-three.patch b/grilo-0.3-part-three.patch deleted file mode 100644 index 12a8008..0000000 --- a/grilo-0.3-part-three.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9305e30c4c841eac7b9354f9849faf30988af5a0 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sat, 26 Dec 2015 13:53:11 -0600 -Subject: More grilo-0.3 fallout... - ---- - gnomemusic/grilo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py -index 24dfd45..0d1bc31 100644 ---- a/gnomemusic/grilo.py -+++ b/gnomemusic/grilo.py -@@ -294,7 +294,7 @@ class Grilo(GObject.GObject): - item_id = item.get_id() - - query = None -- if isinstance(item, Grl.MediaAudio): -+ if item.is_audio(): - query = Query.get_album_for_song_id(item_id) - else: - query = Query.get_album_for_album_id(item_id) --- -cgit v0.11.2 diff --git a/grilo-0.3-part-two.patch b/grilo-0.3-part-two.patch deleted file mode 100644 index b908cf8..0000000 --- a/grilo-0.3-part-two.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b516ad24f25b208ced74b9a93d1fca8a3189c3b Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sat, 26 Dec 2015 09:24:18 -0600 -Subject: Update for grilo-0.3 harder - ---- - gnomemusic/grilo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py -index 7943150..24dfd45 100644 ---- a/gnomemusic/grilo.py -+++ b/gnomemusic/grilo.py -@@ -98,7 +98,7 @@ class Grilo(GObject.GObject): - self.registry.connect('source_removed', self._on_source_removed) - - try: -- self.registry.load_all_plugins() -+ self.registry.load_all_plugins(True) - except GLib.GError: - logger.error('Failed to load plugins.') - if self.tracker is not None: --- -cgit v0.11.2 - diff --git a/sources b/sources index 65b9c3e..62d2a9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -644980dc5c917e497023d6056532d3fd gnome-music-3.18.2.tar.xz +70127387813c29afcb51c979c1505a60 gnome-music-3.19.4.tar.xz diff --git a/symbolic-icon.patch b/symbolic-icon.patch deleted file mode 100644 index bafa86e..0000000 --- a/symbolic-icon.patch +++ /dev/null @@ -1,122 +0,0 @@ -From d64c6ab8f21c1c809c8863c4d7bb6d454b33cab4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sat, 26 Dec 2015 18:55:16 -0600 -Subject: Add symbolic icon - -By Jakub. This was needed for GNOME 3.16, so we're a bit late.... ---- - data/Makefile.am | 26 +++---------------- - data/icons/HighContrast/16x16/apps/gnome-music.png | Bin 497 -> 0 bytes - data/icons/HighContrast/22x22/apps/gnome-music.png | Bin 780 -> 0 bytes - data/icons/HighContrast/24x24/apps/gnome-music.png | Bin 811 -> 0 bytes - .../HighContrast/256x256/apps/gnome-music.png | Bin 14183 -> 0 bytes - data/icons/HighContrast/32x32/apps/gnome-music.png | Bin 1205 -> 0 bytes - data/icons/HighContrast/48x48/apps/gnome-music.png | Bin 1962 -> 0 bytes - .../hicolor/symbolic/apps/gnome-music-symbolic.svg | 28 +++++++++++++++++++++ - 8 files changed, 31 insertions(+), 23 deletions(-) - delete mode 100644 data/icons/HighContrast/16x16/apps/gnome-music.png - delete mode 100644 data/icons/HighContrast/22x22/apps/gnome-music.png - delete mode 100644 data/icons/HighContrast/24x24/apps/gnome-music.png - delete mode 100644 data/icons/HighContrast/256x256/apps/gnome-music.png - delete mode 100644 data/icons/HighContrast/32x32/apps/gnome-music.png - delete mode 100644 data/icons/HighContrast/48x48/apps/gnome-music.png - create mode 100644 data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg - -diff --git a/data/Makefile.am b/data/Makefile.am -index c1b8a13..b1c9c88 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -29,45 +29,26 @@ hicolor_icon48dir = $(datadir)/icons/hicolor/48x48/apps - hicolor_icon48_DATA = icons/hicolor/48x48/apps/gnome-music.png - hicolor_icon256dir = $(datadir)/icons/hicolor/256x256/apps - hicolor_icon256_DATA = icons/hicolor/256x256/apps/gnome-music.png -+hicolor_iconsymbolicdir = $(datadir)/icons/hicolor/symbolic/apps -+hicolor_iconsymbolic_DATA = icons/hicolor/symbolic/apps/gnome-music-symbolic.svg - hicolor_icon_files = \ - $(hicolor_icon16_DATA) \ - $(hicolor_icon22_DATA) \ - $(hicolor_icon32_DATA) \ - $(hicolor_icon48_DATA) \ - $(hicolor_icon256_DATA) \ -+ $(hicolor_iconsymbolic_DATA) \ - icons/hicolor/gnome-music.svg - --hicontrast_icon16dir = $(datadir)/icons/HighContrast/16x16/apps --hicontrast_icon16_DATA = icons/HighContrast/16x16/apps/gnome-music.png --hicontrast_icon22dir = $(datadir)/icons/HighContrast/22x22/apps --hicontrast_icon22_DATA = icons/HighContrast/22x22/apps/gnome-music.png --hicontrast_icon32dir = $(datadir)/icons/HighContrast/32x32/apps --hicontrast_icon32_DATA = icons/HighContrast/32x32/apps/gnome-music.png --hicontrast_icon48dir = $(datadir)/icons/HighContrast/48x48/apps --hicontrast_icon48_DATA = icons/HighContrast/48x48/apps/gnome-music.png --hicontrast_icon256dir = $(datadir)/icons/HighContrast/256x256/apps --hicontrast_icon256_DATA = icons/HighContrast/256x256/apps/gnome-music.png --hicontrast_icon_files = \ -- $(hicontrast_icon16_DATA) \ -- $(hicontrast_icon22_DATA) \ -- $(hicontrast_icon32_DATA) \ -- $(hicontrast_icon48_DATA) \ -- $(hicontrast_icon256_DATA) -- --gtk_update_hicontrast_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/HighContrast -- - install-data-hook: update-icon-cache - uninstall-hook: update-icon-cache - update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk hicolor icon cache."; \ - $(gtk_update_hicolor_icon_cache); \ -- echo "Updating Gtk highcontrast icon cache."; \ -- $(gtk_update_hicontrast_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_hicolor_icon_cache)"; \ -- echo "*** $(gtk_update_hicontrast_icon_cache)"; \ - fi - - -@@ -81,7 +62,6 @@ gschemas.compiled: $(gsettings_SCHEMAS) Makefile - - EXTRA_DIST = \ - $(hicolor_icon_files) \ -- $(hicontrast_icon_files) \ - $(resource_files) \ - gnome-music.appdata.xml.in \ - gnome-music.desktop.in \ -diff --git a/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg b/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg -new file mode 100644 -index 0000000..95db22b ---- /dev/null -+++ b/data/icons/hicolor/symbolic/apps/gnome-music-symbolic.svg -@@ -0,0 +1,28 @@ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ Gnome Symbolic Icon Theme -+ -+ -+ -+ -+ -+ -+ Gnome Symbolic Icon Theme -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -cgit v0.11.2 -