Accepting request 75967 from GNOME:Factory

Update to 0.0.4 (forwarded request 75948 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/75967
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sushi?expand=0&rev=3
This commit is contained in:
Sascha Peilicke 2011-07-11 14:52:21 +00:00 committed by Git OBS Bridge
commit 1b9dd2d670
5 changed files with 16 additions and 41 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62b5538c2d299e660fa721a46816313f6a581792d97bbf61f51e1997c1d78d70
size 363557

3
sushi-0.0.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a31debc573c344781055b66e118f2be8f89c05dade9bbbf717b2bff9ef7c8c29
size 359320

View File

@ -1,32 +0,0 @@
diff --git a/src/libsushi/sushi-sound-player.c b/src/libsushi/sushi-sound-player.c
index d275ac8..6406cee 100644
--- a/src/libsushi/sushi-sound-player.c
+++ b/src/libsushi/sushi-sound-player.c
@@ -131,6 +131,8 @@ sushi_sound_player_ensure_discoverer (SushiSoundPlayer *player)
G_CALLBACK (discoverer_discovered_cb), player);
gst_discoverer_start (priv->discoverer);
gst_discoverer_discover_uri_async (priv->discoverer, priv->uri);
+
+ return TRUE;
}
static void
@@ -143,8 +145,7 @@ sushi_sound_player_set_uri (SushiSoundPlayer *player,
priv = SUSHI_SOUND_PLAYER_GET_PRIVATE (player);
- if (priv->uri &&
- !strcmp (priv->uri, uri))
+ if (!g_strcmp0 (priv->uri, uri))
return;
g_free (priv->uri);
@@ -588,7 +589,7 @@ sushi_sound_player_get_playing (SushiSoundPlayer *player)
GstState state, pending;
gboolean playing;
- g_return_if_fail (SUSHI_IS_SOUND_PLAYER (player));
+ g_return_val_if_fail (SUSHI_IS_SOUND_PLAYER (player), FALSE);
priv = SUSHI_SOUND_PLAYER_GET_PRIVATE (player);

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Jul 9 14:30:38 CEST 2011 - vuntz@opensuse.org
- Update to version 0.0.4:
+ Relicense to GPLv2 with an exception clause to allow use
non-free GStreamer plugins.
+ Fix some compilation warnings.
- Drop sushi-fix-warnings.patch: fixed upstream.
- Change license tag from GPLv3 to GPLv2+.
-------------------------------------------------------------------
Sun Jul 3 18:11:14 CEST 2011 - vuntz@opensuse.org

View File

@ -18,15 +18,13 @@
Name: sushi
Version: 0.0.3
Version: 0.0.4
Release: 1
License: GPLv3
License: GPLv2+
Summary: Quick Previewer for Nautilus
Url: http://www.gnome.org
Group: Productivity/File utilities
Source0: http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM sushi-fix-warnings.patch vuntz@opensuse.org -- Fix build warnings breaking the build; sent upstream by mail
Patch0: sushi-fix-warnings.patch
Source0: http://download.gnome.org/sources/sushi/0.0/%{name}-%{version}.tar.bz2
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: unoconv
@ -66,7 +64,6 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager.
%lang_package
%prep
%setup -q
%patch0 -p1
%build
%configure