rpms/rhythmbox/devel rhythmbox.spec, 1.161, 1.162 soup24.patch, 1.1, 1.2 rb-0.11.3-entry-reffing.patch, 1.1, NONE rb-delete-ipod-tracks.patch, 1.1, NONE rb-fix-broken-daap-playback.patch, 1.1, NONE rb-use-newer-plparser-9.patch, 1.1, NONE rhythmbox-0.11.3-add-missing-plugins-support.patch, 1.1, NONE

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Mon Feb 4 18:29:53 UTC 2008 

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18938

Modified Files:
	rhythmbox.spec soup24.patch 
Removed Files:
	rb-0.11.3-entry-reffing.patch rb-delete-ipod-tracks.patch 
	rb-fix-broken-daap-playback.patch 
	rb-use-newer-plparser-9.patch 
	rhythmbox-0.11.3-add-missing-plugins-support.patch 
Log Message:
* Mon Feb 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.4-6
- Update libsoup 2.4 patch from upstream
- Add patch to fix the media player keys API usage



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- rhythmbox.spec	29 Jan 2008 20:36:29 -0000	1.161
+++ rhythmbox.spec	4 Feb 2008 18:29:14 -0000	1.162
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -46,7 +46,7 @@
 BuildRequires: gstreamer-python
 BuildRequires: perl(XML::Parser)
 BuildRequires: xulrunner-devel
-# For the playlist parser patch
+# For the libsoup 2.4 patch
 BuildRequires: intltool autoconf automake libtool gettext check-devel
 
 ExcludeArch:    s390 s390x
@@ -59,6 +59,8 @@
 Patch2: x-content.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=509701 
 Patch3: soup24.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=510406
+Patch4: gsd-media-player-api.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -91,6 +93,7 @@
 %patch1 -p1 -b .python-threading
 %patch2 -p1 -b .x-content
 %patch3 -p0 -b .soup24
+%patch4 -p0 -b .gsd
 
 %build
 
@@ -205,6 +208,10 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Feb 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.4-6
+- Update libsoup 2.4 patch from upstream
+- Add patch to fix the media player keys API usage
+
 * Tue Jan 29 2008  Matthias Clasen <mclasen at redhat.com> - 0.11.4-5
 - Port to libsoup 2.4
 

soup24.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 soup24.patch
Index: soup24.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/soup24.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- soup24.patch	29 Jan 2008 20:36:29 -0000	1.1
+++ soup24.patch	4 Feb 2008 18:29:14 -0000	1.2
@@ -1,33 +1,47 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 5543)
-+++ configure.ac	(working copy)
-@@ -441,15 +441,9 @@
+diff --git a/configure.ac b/configure.ac
+index fcb0f29..1534352 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -441,18 +441,25 @@ fi
  dnl Check for libsoup, needed for DAAP and audioscrobbler
  if test "x$enable_daap" = "xyes" || test "x$enable_audioscrobbler" != "xno"; then
  	PKG_CHECK_MODULES(SOUP,                            \
 -		libsoup-2.2,
-+		libsoup-2.4,
- 		have_libsoup=yes,
- 		have_libsoup=no)
+-		have_libsoup=yes,
+-		have_libsoup=no)
 -	if test x"$have_libsoup" = "xno"; then
--		PKG_CHECK_MODULES(SOUP,
++		libsoup-2.4,
++		have_libsoup24=yes,
++		have_libsoup24=no)
++	if test x"$have_libsoup24" = "xno"; then
+ 		PKG_CHECK_MODULES(SOUP,
 -			libsoup-2.4,
 -			have_libsoup=yes,
 -			have_libsoup=no)
--	fi
- 	if test x"$have_libsoup" = "xyes"; then
++			libsoup-2.2,
++			have_libsoup22=yes,
++			have_libsoup22=no)
+ 	fi
+-	if test x"$have_libsoup" = "xyes"; then
++	if test x"$have_libsoup24" = "xyes" || test x"$have_libsoup22" = "xyes"; then
++		have_libsoup=yes
  		AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup support is enabled])
  	fi
-@@ -513,15 +507,10 @@
++	if test x"$have_libsoup24" = "xyes"; then
++		AC_DEFINE(HAVE_LIBSOUP_2_4, 1, [Define if libsoup 2.4 support is enabled])
++	fi
++	if test x"$have_libsoup22" = "xyes"; then
++		AC_DEFINE(HAVE_LIBSOUP_2_2, 1, [Define if libsoup 2.2 support is enabled])
++	fi
+ fi
  
+ AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup" = "xyes")
+@@ -513,27 +520,9 @@ AM_CONDITIONAL(HAVE_MUSICBRAINZ, test "x$enable_musicbrainz" = "xyes")
  
  
--AC_PATH_X
-+AC_PATH_XTRA
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+#LIBS=$X_LIBS
  
+-AC_PATH_X
+-
 -if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
 -	CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"`
 -fi
@@ -35,126 +49,266 @@
 -	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
 -fi
 -
- have_xidle=no
- AC_COMPILE_IFELSE([
- 	#include <X11/extensions/xidle.h>
-Index: lib/rb-proxy-config.c
-===================================================================
---- lib/rb-proxy-config.c	(revision 5543)
-+++ lib/rb-proxy-config.c	(working copy)
-@@ -232,22 +232,22 @@
+-have_xidle=no
+-AC_COMPILE_IFELSE([
+-	#include <X11/extensions/xidle.h>
+-int main(int argc,char **argv) {
+-  return 0;
+-}
+-], have_xidle=yes)
+-AC_MSG_CHECKING(for XIDLE extension)
+-AC_MSG_RESULT($have_xidle)
+-if test x"$have_xidle" = "xyes" ; then
+-	AC_DEFINE(HAVE_XIDLE_EXTENSION, 1, [defined if you have X11/extensions/xidle.h])
+-fi
++AC_PATH_XTRA
++CFLAGS="$CFLAGS $X_CFLAGS"
++#LIBS=$X_LIBS
+ 
+ dnl Multimedia keys
+ have_xfree=no
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 48eb4e4..21fc6d8 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -34,7 +34,8 @@ librb_la_SOURCES =					\
+ 	rb-string-value-map.c				\
+ 	rb-string-value-map.h				\
+ 	rb-async-queue-watch.c				\
+-	rb-async-queue-watch.h
++	rb-async-queue-watch.h				\
++	rb-soup-compat.h
+ 
+ if WITH_INTERNAL_GSEQUENCE
+ librb_la_SOURCES += gsequence.c gsequence.h
+diff --git a/lib/rb-proxy-config.c b/lib/rb-proxy-config.c
+index e531446..c0eab16 100644
+--- a/lib/rb-proxy-config.c
++++ b/lib/rb-proxy-config.c
+@@ -231,7 +231,28 @@ get_proxy_config (RBProxyConfig *config)
+ 	}
  }
  
- #if defined(HAVE_LIBSOUP)
--SoupUri *
+-#if defined(HAVE_LIBSOUP)
++#if defined(HAVE_LIBSOUP_2_4)
 +SoupURI *
- rb_proxy_config_get_libsoup_uri (RBProxyConfig *config)
- {
--	SoupUri *uri = NULL;
++rb_proxy_config_get_libsoup_uri (RBProxyConfig *config)
++{
 +	SoupURI *uri = NULL;
- 
- 	if (!config->enabled)
- 		return NULL;
- 
--	uri = g_new0 (SoupUri, 1);
--	uri->protocol = SOUP_PROTOCOL_HTTP;
++
++	if (!config->enabled)
++		return NULL;
++
 +	uri = soup_uri_new (NULL);
 +	soup_uri_set_scheme (uri, SOUP_URI_SCHEME_HTTP);
 +	soup_uri_set_host (uri, config->host);
 +	soup_uri_set_port (uri, config->port);
- 
--	uri->host = g_strdup (config->host);
--	uri->port = config->port;
- 	if (config->auth_enabled) {
--		uri->user = g_strdup (config->username);
--		uri->passwd = g_strdup (config->password);
++
++	if (config->auth_enabled) {
 +		soup_uri_set_user (uri, config->username);
 +		soup_uri_set_password (uri, config->password);
- 	}
- 
- 	return uri;
-Index: lib/rb-proxy-config.h
-===================================================================
---- lib/rb-proxy-config.h	(revision 5543)
-+++ lib/rb-proxy-config.h	(working copy)
-@@ -25,7 +25,6 @@
++	}
++
++	return uri;
++}
++#elif defined(HAVE_LIBSOUP_2_2)
+ SoupUri *
+ rb_proxy_config_get_libsoup_uri (RBProxyConfig *config)
+ {
+diff --git a/lib/rb-proxy-config.h b/lib/rb-proxy-config.h
+index 5e95819..60eb04e 100644
+--- a/lib/rb-proxy-config.h
++++ b/lib/rb-proxy-config.h
+@@ -24,8 +24,8 @@
+ #include <glib-object.h>
  
  #if defined(HAVE_LIBSOUP)
++#include "rb-soup-compat.h"
  #include <libsoup/soup.h>
 -#include <libsoup/soup-uri.h>
  #endif
  
  G_BEGIN_DECLS
-@@ -66,7 +65,7 @@
+@@ -65,9 +65,7 @@ GType		rb_proxy_config_get_type (void);
+ 
  RBProxyConfig *	rb_proxy_config_new (void);
  
- #if defined(HAVE_LIBSOUP)
+-#if defined(HAVE_LIBSOUP)
 -SoupUri *	rb_proxy_config_get_libsoup_uri (RBProxyConfig *config);
+-#endif
 +SoupURI *	rb_proxy_config_get_libsoup_uri (RBProxyConfig *config);
- #endif
[...1863 lines suppressed...]
-+				 (SoupServerCallback)login_cb,
++				 (SoupServerCallback) login_cb,
 +				 share, NULL);
 +	soup_server_add_handler (share->priv->server, "/logout",
-+				 (SoupServerCallback)logout_cb,
++				 (SoupServerCallback) logout_cb,
 +				 share, NULL);
 +	soup_server_add_handler (share->priv->server, "/update",
-+				 (SoupServerCallback)update_cb,
++				 (SoupServerCallback) update_cb,
 +				 share, NULL);
 +	soup_server_add_handler (share->priv->server, "/databases",
-+				 (SoupServerCallback)databases_cb,
++				 (SoupServerCallback) databases_cb,
 +				 share, NULL);
-+
++#else
+ 	soup_server_add_handler (share->priv->server,
+ 				 NULL,
+ 				 NULL,
+ 				 (SoupServerCallbackFn)server_cb,
+ 				 NULL,
+ 				 share);
++#endif
  	soup_server_run_async (share->priv->server);
  
  	/* using direct since there is no g_uint_hash or g_uint_equal */
-Index: plugins/daap/rb-daap-src.c
-===================================================================
---- plugins/daap/rb-daap-src.c	(revision 5543)
-+++ plugins/daap/rb-daap-src.c	(working copy)
-@@ -34,8 +34,7 @@
+diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
+index 7ecd7bc..994926e 100644
+--- a/plugins/daap/rb-daap-src.c
++++ b/plugins/daap/rb-daap-src.c
+@@ -34,8 +34,8 @@
  #include <unistd.h>
  #include <ctype.h>
  
 -#include <libsoup/soup-headers.h>
 -#include <libsoup/soup-misc.h>
++#include "rb-soup-compat.h"
 +#include <libsoup/soup.h>
  
  #include <glib/gi18n.h>
  #include <gst/gst.h>
-@@ -432,7 +431,7 @@
+@@ -432,7 +432,12 @@ rb_daap_src_open (RBDAAPSrc *src)
  	gchar *host;
  	guint port;
  	gchar *path;
--	GHashTable *header_table;
++#if defined(HAVE_LIBSOUP_2_4)
 +	SoupMessageHeaders *header_table;
++#else
+ 	GHashTable *header_table;
++	char *dup_headers;
++#endif
  	gchar *request;
  	gchar *response;
  	gchar *end_headers;
-@@ -441,7 +440,6 @@
+@@ -441,7 +446,6 @@ rb_daap_src_open (RBDAAPSrc *src)
  	guint http_status;
  	gchar *http_status_phrase = NULL;
  	gboolean parse_result;
@@ -1300,83 +1663,84 @@
  
  	if (src->buffer_base) {
  		g_free (src->buffer_base);
-@@ -536,59 +534,34 @@
+@@ -536,6 +540,15 @@ rb_daap_src_open (RBDAAPSrc *src)
  		return FALSE;
  	}
  
--	/* for compatibility with older versions of libsoup, we may need to retry
--	 * the soup_headers_parse_response call with slightly different arguments.
--	 * since this function modifies the string passed in, we need to copy it
--	 * before the first call.
--	 *
--	 * > 2.2.99 wants the full response header, including the trailing blank line,
--	 * with the length passed in up to the start of the start of the trailing
--	 * blank line.
--	 */
--	dup_headers = g_strndup (response, (end_headers + 4) - response);
--
--	header_table = g_hash_table_new (soup_str_case_hash, soup_str_case_equal);
--	parse_result = soup_headers_parse_response (dup_headers,
++#if defined(HAVE_LIBSOUP_2_4)
 +	header_table = soup_message_headers_new (SOUP_MESSAGE_HEADERS_RESPONSE);
 +	parse_result = soup_headers_parse_response (response,
- 						    ((end_headers+2) - response),
- 						    header_table,
- 						    NULL,
- 						    &http_status,
- 						    &http_status_phrase);
--	g_free (dup_headers);
--	if (parse_result == FALSE) {
--		/*
--		 * < 2.2.98 wants the headers terminated before the trailing blank line.
--		 */
--		end_headers[2] = '\0';
--		parse_result = soup_headers_parse_response (response,
--							    (end_headers+2 - response),
--							    header_table,
--							    NULL,
--							    &http_status,
--							    &http_status_phrase);
--	}
--
++						    ((end_headers+2) - response),
++						    header_table,
++						    NULL,
++						    &http_status,
++						    &http_status_phrase);
++#else
+ 	/* for compatibility with older versions of libsoup, we may need to retry
+ 	 * the soup_headers_parse_response call with slightly different arguments.
+ 	 * since this function modifies the string passed in, we need to copy it
+@@ -567,28 +580,42 @@ rb_daap_src_open (RBDAAPSrc *src)
+ 							    &http_status,
+ 							    &http_status_phrase);
+ 	}
++#endif
+ 
  	if (parse_result) {
  		if (http_status == 200 || http_status == 206) {
--			GSList *val;
-+			const char *val;
- 
--			val = g_hash_table_lookup (header_table, "Transfer-Encoding");
-+			val = soup_message_headers_get (header_table, "Transfer-Encoding");
++			const char *enc_str = NULL;
++			const char *len_str = NULL;
++#if defined(HAVE_LIBSOUP_2_4)
++			enc_str = soup_message_headers_get (header_table, "Transfer-Encoding");
++			len_str = soup_message_headers_get (header_table, "Content-Length");
++#else
+ 			GSList *val;
+-
+ 			val = g_hash_table_lookup (header_table, "Transfer-Encoding");
  			if (val) {
 -				if (g_strcasecmp ((gchar *)val->data, "chunked") == 0) {
-+				if (g_strcasecmp (val, "chunked") == 0) {
++				enc_str = ((const char *)val->data);
++			}
++			val = g_hash_table_lookup (header_table, "Content-Length");
++			if (val) {
++				len_str = ((const char *)val->data);
++			}
++#endif
++
++			if (enc_str) {
++				if (g_strcasecmp (enc_str, "chunked") == 0) {
  					src->chunked = TRUE;
  				} else {
  					GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL),
 -							   ("Unknown HTTP transfer encoding \"%s\"", val->data));
-+							   ("Unknown HTTP transfer encoding \"%s\"", val));
++							   ("Unknown HTTP transfer encoding \"%s\"", enc_str));
  				}
  			} else {
  				src->chunked = FALSE;
 -				val = g_hash_table_lookup (header_table, "Content-Length");
-+				val = soup_message_headers_get (header_table, "Content-Length");
- 				if (val) {
+-				if (val) {
++				if (len_str) {
  					char *e;
 -					src->size = strtoul ((char *)val->data, &e, 10);
 -					if (e == val->data) {
-+					src->size = strtoul (val, &e, 10);
-+					if (e == (char *)val) {
++					src->size = strtoul (len_str, &e, 10);
++					if (e == len_str) {
  						GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL),
 -								   ("Couldn't read HTTP content length \"%s\"", val->data));
-+								   ("Couldn't read HTTP content length \"%s\"", val));
++								   ("Couldn't read HTTP content length \"%s\"", len_str));
  						ok = FALSE;
  					}
  				} else {
-@@ -609,8 +582,7 @@
+@@ -609,8 +636,13 @@ rb_daap_src_open (RBDAAPSrc *src)
  		ok = FALSE;
  	}
  	g_free (http_status_phrase);
--	soup_message_clear_headers (header_table);
--	g_hash_table_destroy (header_table);
++
++#if defined(HAVE_LIBSOUP_2_4)
 +	soup_message_headers_free (header_table);
++#else
+ 	soup_message_clear_headers (header_table);
+ 	g_hash_table_destroy (header_table);
++#endif
  
  	end_headers += 4;
  


--- rb-0.11.3-entry-reffing.patch DELETED ---


--- rb-delete-ipod-tracks.patch DELETED ---


--- rb-fix-broken-daap-playback.patch DELETED ---


--- rb-use-newer-plparser-9.patch DELETED ---


--- rhythmbox-0.11.3-add-missing-plugins-support.patch DELETED ---

More information about the fedora-extras-commits mailing list