rpms/rhythmbox/devel rhythmbox-0.11.6-libmtp-0.3.patch,1.1,1.2

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Tue Aug 12 16:08:40 UTC 2008


Author: hadess

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

Modified Files:
	rhythmbox-0.11.6-libmtp-0.3.patch 
Log Message:
Fixup patch to avoid bizarre caching problems


rhythmbox-0.11.6-libmtp-0.3.patch:

Index: rhythmbox-0.11.6-libmtp-0.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox-0.11.6-libmtp-0.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhythmbox-0.11.6-libmtp-0.3.patch	12 Aug 2008 15:37:42 -0000	1.1
+++ rhythmbox-0.11.6-libmtp-0.3.patch	12 Aug 2008 16:08:10 -0000	1.2
@@ -39,26 +39,6 @@
  	trackmeta->filesize = filesize;
  	if (mimetype == NULL) {
  		trackmeta->filetype = mimetype_to_filetype (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MIMETYPE));
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -154,6 +154,16 @@ if test "x$with_mtp" != "xno"; then
- 	  fi
-           if test "x$enable_hal" = xyes; then
- 	     use_mtp=yes
-+	     dnl Check for libmtp 0.3.0+
-+	     OLD_MTP_CFLAGS=$MTP_CFLAGS
-+	     OLD_MTP_LIBS=$MTP_LIBS
-+	     PKG_CHECK_MODULES(MTP, libmtp >= 0.3.0, found_libmtp_030_pkg=yes, found_libmtp_030_pkg=no)
-+	     if test x"$found_libmtp_030_pkg" = "xyes" ; then
-+	     	AC_DEFINE([HAVE_LIBMTP_030], 1, [indicates whether libmtp 0.3.0 is installed])
-+	     else
-+	     	MTP_CFLAGS=$OLD_MTP_CFLAGS
-+		MTP_LIBS=$OLD_MTP_LIBS
-+	     fi
-           fi
- 	  AC_SUBST(MTP_CFLAGS)
- 	  AC_SUBST(MTP_LIBS)
 diff -ur a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c
 --- a/plugins/mtpdevice/rb-mtp-source.c
 +++ b/plugins/mtpdevice/rb-mtp-source.c
@@ -74,3 +54,17 @@
  		LIBMTP_destroy_track_t (trackmeta);
  		rb_debug ("Tracktransfer failed\n");
  		return NULL;
+--- trunk/configure.ac	2008/07/29 13:17:53	5825
++++ trunk/configure.ac	2008/08/09 02:19:14	5844
+@@ -154,6 +154,11 @@
+ 	  fi
+           if test "x$enable_hal" = xyes; then
+ 	     use_mtp=yes
++	     dnl Check for libmtp 0.3.0+
++	     PKG_CHECK_EXISTS(libmtp >= 0.3.0, found_libmtp_030_pkg=yes, found_libmtp_030_pkg=no)
++	     if test x"$found_libmtp_030_pkg" = "xyes" ; then
++	       AC_DEFINE([HAVE_LIBMTP_030], 1, [indicates whether libmtp 0.3.0 is installed])
++	     fi
+           fi
+ 	  AC_SUBST(MTP_CFLAGS)
+ 	  AC_SUBST(MTP_LIBS)




More information about the fedora-extras-commits mailing list