Update to 3.5.92
... and drop the libmusicbrainz5 patch.
This commit is contained in:
Kalev Lember
parent
6ceca991da
commit
7052dbd04c
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@
|
||||
/sushi-0.5.4.tar.xz
|
||||
/sushi-0.5.5.tar.xz
|
||||
/sushi-3.5.90.tar.xz
|
||||
/sushi-3.5.92.tar.xz
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
From 8a7ed88b5b91226bb3511ee8d41c6caf98bf92ef Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 30 Aug 2012 14:52:15 +0100
|
||||
Subject: [PATCH] libsushi: Port to libmusicbrainz5
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=683033
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/libsushi/sushi-cover-art.c | 26 +++++++++++++-------------
|
||||
2 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9cd1c24..d9d4e87 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(SUSHI,
|
||||
gstreamer-1.0
|
||||
gstreamer-pbutils-1.0
|
||||
gstreamer-tag-1.0
|
||||
- libmusicbrainz4
|
||||
+ libmusicbrainz5
|
||||
evince-document-3.0
|
||||
evince-view-3.0
|
||||
gtksourceview-3.0
|
||||
diff --git a/src/libsushi/sushi-cover-art.c b/src/libsushi/sushi-cover-art.c
|
||||
index cd5922e..ab90f1a 100644
|
||||
--- a/src/libsushi/sushi-cover-art.c
|
||||
+++ b/src/libsushi/sushi-cover-art.c
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "sushi-cover-art.h"
|
||||
|
||||
-#include <musicbrainz4/mb4_c.h>
|
||||
+#include <musicbrainz5/mb5_c.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
G_DEFINE_TYPE (SushiCoverArtFetcher, sushi_cover_art_fetcher, G_TYPE_OBJECT);
|
||||
@@ -212,15 +212,15 @@ fetch_uri_job (GIOSchedulerJob *sched_job,
|
||||
gpointer user_data)
|
||||
{
|
||||
FetchUriJob *job = user_data;
|
||||
- Mb4Metadata metadata;
|
||||
- Mb4Query query;
|
||||
- Mb4Release release;
|
||||
- Mb4ReleaseList release_list;
|
||||
+ Mb5Metadata metadata;
|
||||
+ Mb5Query query;
|
||||
+ Mb5Release release;
|
||||
+ Mb5ReleaseList release_list;
|
||||
gchar *retval = NULL;
|
||||
gchar **param_names = NULL;
|
||||
gchar **param_values = NULL;
|
||||
|
||||
- query = mb4_query_new ("sushi", NULL, 0);
|
||||
+ query = mb5_query_new ("sushi", NULL, 0);
|
||||
|
||||
param_names = g_new (gchar*, 3);
|
||||
param_values = g_new (gchar*, 3);
|
||||
@@ -234,20 +234,20 @@ fetch_uri_job (GIOSchedulerJob *sched_job,
|
||||
param_names[2] = NULL;
|
||||
param_values[2] = NULL;
|
||||
|
||||
- metadata = mb4_query_query (query, "release", "", "",
|
||||
+ metadata = mb5_query_query (query, "release", "", "",
|
||||
2, param_names, param_values);
|
||||
|
||||
- mb4_query_delete (query);
|
||||
+ mb5_query_delete (query);
|
||||
|
||||
if (metadata) {
|
||||
- release_list = mb4_metadata_get_releaselist (metadata);
|
||||
+ release_list = mb5_metadata_get_releaselist (metadata);
|
||||
int i;
|
||||
- int release_list_length = mb4_release_list_size (release_list);
|
||||
+ int release_list_length = mb5_release_list_size (release_list);
|
||||
for (i = 0; i < release_list_length; i++) {
|
||||
gchar asin[255];
|
||||
|
||||
- release = mb4_release_list_item (release_list, i);
|
||||
- mb4_release_get_asin (release, asin, 255);
|
||||
+ release = mb5_release_list_item (release_list, i);
|
||||
+ mb5_release_get_asin (release, asin, 255);
|
||||
|
||||
if (asin != NULL &&
|
||||
asin[0] != '\0') {
|
||||
@@ -256,7 +256,7 @@ fetch_uri_job (GIOSchedulerJob *sched_job,
|
||||
}
|
||||
}
|
||||
}
|
||||
- mb4_metadata_delete (metadata);
|
||||
+ mb5_metadata_delete (metadata);
|
||||
|
||||
if (retval == NULL) {
|
||||
/* FIXME: do we need a better error? */
|
||||
--
|
||||
1.7.11.2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
e17336a9bdb26fe37b08c5f12de98227 sushi-3.5.90.tar.xz
|
||||
4f46297df125153dab903e14d36e081e sushi-3.5.92.tar.xz
|
||||
|
||||
11
sushi.spec
11
sushi.spec
@ -1,12 +1,12 @@
|
||||
Name: sushi
|
||||
Version: 3.5.90
|
||||
Version: 3.5.92
|
||||
Release: 1%{?dist}
|
||||
Summary: A quick previewer for Nautilus
|
||||
Group: User Interface/Desktops
|
||||
|
||||
License: GPLv2+ with exceptions
|
||||
URL: http://live.gnome.org/ThreePointOne/Features/FilePreviewing
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.5/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: gtksourceview3-devel
|
||||
BuildRequires: intltool
|
||||
@ -22,8 +22,6 @@ BuildRequires: webkitgtk3-devel
|
||||
|
||||
Obsoletes: sushi-devel < 0.5.1
|
||||
|
||||
Patch0: 0001-libsushi-Port-to-libmusicbrainz5.patch
|
||||
|
||||
#Description from upstream's README.
|
||||
%description
|
||||
This is sushi, a quick previewer for Nautilus, the GNOME desktop
|
||||
@ -32,8 +30,6 @@ file manager.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .mb5
|
||||
sed -i -e 's/libmusicbrainz4/libmusicbrainz5/g' configure
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
@ -61,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 19 2012 Kalev Lember <kalevlember@gmail.com> - 3.5.92-1
|
||||
- Update to 3.5.92
|
||||
|
||||
* Thu Aug 30 2012 Bastien Nocera <bnocera@redhat.com> 3.5.90-1
|
||||
- Update to 3.5.90
|
||||
- Port to libmusicbrainz5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user