[gentoo-commits] gentoo-x86 commit in media-sound/banshee/files: banshee-1.7.4-fix-collisions.patch banshee-1.7.4-fix-gdu-build.patch banshee-1.7.4-make-webkit-optional.patch

[Arun Raghavan (ford_prefect)]

ford_prefect    10/08/31 11:44:15

  Added:                banshee-1.7.4-fix-collisions.patch
                        banshee-1.7.4-fix-gdu-build.patch
                        banshee-1.7.4-make-webkit-optional.patch
  Log:
  Add 1.7.4 (masked). This is a development release, with a bunch of new features (Amazon support, etc.), deps (gtk-sharp-beans, gio-sharp, gstreamer-sharp, none of which are in-tree), and bugs.
  
  (Portage version: 2.2_rc71/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-fix-collisions.patch?rev=1.1&content-type=text/plain

Index: banshee-1.7.4-fix-collisions.patch
===================================================================
diff -urNp banshee-1-1.7.4.orig/data/desktop-files/Makefile.am banshee-1-1.7.4/data/desktop-files/Makefile.am
--- banshee-1-1.7.4.orig/data/desktop-files/Makefile.am	2010-08-29 12:47:14.119617115 +0530
+++ banshee-1-1.7.4/data/desktop-files/Makefile.am	2010-08-29 12:56:42.166617090 +0530
@@ -16,8 +16,8 @@ endif
 
 @INTLTOOL_DESKTOP_RULE@
 
-install-data-hook:
-	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
+#install-data-hook:
+#	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
 
 EXTRA_DIST = \
 	$(desktop_in_files) \
diff -urNp banshee-1-1.7.4.orig/src/Extensions/Banshee.AmazonMp3/Makefile.am banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.am
--- banshee-1-1.7.4.orig/src/Extensions/Banshee.AmazonMp3/Makefile.am	2010-08-29 12:47:14.366617116 +0530
+++ banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.am	2010-08-29 12:51:08.230617164 +0530
@@ -22,9 +22,9 @@ mime_DATA = banshee-amz.xml
 bamz: bamz.in
 	@echo '  GEN   $@'; sed 's,@bansheedir@,$(pkglibdir),g' < $< > $@
 
-define EXTRA_INSTALL_DATA_HOOK
-	test "$(top_srcdir)" = "$(top_builddir)" && update-mime-database -V $(DESTDIR)$(datadir)/mime || :
-endef
+#define EXTRA_INSTALL_DATA_HOOK
+#	test "$(top_srcdir)" = "$(top_builddir)" && update-mime-database -V $(DESTDIR)$(datadir)/mime || :
+#endef
 
 include $(top_srcdir)/build/build.mk
 



1.1                  media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-fix-gdu-build.patch?rev=1.1&content-type=text/plain

Index: banshee-1.7.4-fix-gdu-build.patch
===================================================================
diff -urNp banshee-1-1.7.4.orig/build/m4/shamrock/gnome-doc.m4 banshee-1-1.7.4/build/m4/shamrock/gnome-doc.m4
--- banshee-1-1.7.4.orig/build/m4/shamrock/gnome-doc.m4	2010-08-29 02:24:28.598617103 +0530
+++ banshee-1-1.7.4/build/m4/shamrock/gnome-doc.m4	2010-08-29 11:07:22.709617074 +0530
@@ -14,6 +14,8 @@ AC_DEFUN([SHAMROCK_CHECK_GNOME_DOC_UTILS
 
 	if test "x$enable_user_help" = "xyes"; then
         GNOME_DOC_INIT([$1], enable_user_help=yes, enable_user_help=no)
+    else
+        AM_CONDITIONAL(ENABLE_SK, false)
     fi
 
 	AM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test "x$enable_user_help" = "xyes")



1.1                  media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch?rev=1.1&content-type=text/plain

Index: banshee-1.7.4-make-webkit-optional.patch
===================================================================
diff -urNp banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4 banshee-1-1.7.4/build/m4/banshee/libwebkit.m4
--- banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4	2010-08-29 02:24:28.598617103 +0530
+++ banshee-1-1.7.4/build/m4/banshee/libwebkit.m4	2010-08-29 12:06:20.117617111 +0530
@@ -4,24 +4,33 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
 	SOUP_MIN_VERSION=2.26
 	SOUP_GNOME_MIN_VERSION=2.26
 
-	have_libwebkit=no
-	PKG_CHECK_MODULES(LIBWEBKIT,
-		webkit-1.0 >= $WEBKIT_MIN_VERSION
-		libsoup-2.4 >= $SOUP_MIN_VERSION,
-		have_libwebkit=yes, have_libwebkit=no)
-	AC_SUBST(LIBWEBKIT_LIBS)
-	AC_SUBST(LIBWEBKIT_CFLAGS)
-	AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
+	AC_ARG_ENABLE(webkit, AC_HELP_STRING([--disable-webkit], [Disable extensions which require WebKit]), , enable_webkit="yes")
 
-	have_libsoup_gnome=no
-	PKG_CHECK_MODULES(LIBSOUP_GNOME,
-		libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
-		have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
-	AC_SUBST(LIBSOUP_GNOME_LIBS)
-	AC_SUBST(LIBSOUP_GNOME_CFLAGS)
-	AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
-	if test x$have_libsoup_gnome = xyes; then
-		AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
+	if test "x$enable_webkit" = "xyes"; then
+		have_libwebkit=no
+		PKG_CHECK_MODULES(LIBWEBKIT,
+			webkit-1.0 >= $WEBKIT_MIN_VERSION
+			libsoup-2.4 >= $SOUP_MIN_VERSION,
+			have_libwebkit=yes, have_libwebkit=no)
+		AC_SUBST(LIBWEBKIT_LIBS)
+		AC_SUBST(LIBWEBKIT_CFLAGS)
+		AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
+
+		have_libsoup_gnome=no
+		PKG_CHECK_MODULES(LIBSOUP_GNOME,
+			libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
+			have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
+		AC_SUBST(LIBSOUP_GNOME_LIBS)
+		AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
+		if test x$have_libsoup_gnome = xyes; then
+			AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
+		fi
+	else
+		have_libwebkit=no
+		have_libsoup_gnome=no
+		AM_CONDITIONAL(HAVE_LIBWEBKIT, false)
+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, false)
 	fi
 ])