[gentoo-commits] proj/gnome:master commit in: media-sound/sound-juicer/, media-sound/sound-juicer/files/

[Jonathan Callen]

commit:     98ab5d21c116e9d0736113bbb0761a32c87a2ece
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 16:18:19 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 16:18:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=98ab5d21

media-sound/sound-juicer: add GTK+3 version

(Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 .../files/sound-juicer-2.32.0-gtk3-api.patch       |   93 ++++++++++++++++++++
 .../files/sound-juicer-2.32.0-gtk3-only.patch      |   71 +++++++++++++++
 .../files/sound-juicer-2.32.0-new-gdk-keys.patch   |   26 ++++++
 .../sound-juicer/sound-juicer-2.32.0-r300.ebuild   |   69 +++++++++++++++
 4 files changed, 259 insertions(+), 0 deletions(-)

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch
new file mode 100644
index 0000000..df898eb
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch
@@ -0,0 +1,93 @@
+From f23bb0a5aac613c385272ee448afd27ce50b9ee4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@××××××.net>
+Date: Mon, 15 Nov 2010 17:47:54 +0000
+Subject: Update for new GTK+ 3.x and libgnome-media-profiles
+
+---
+diff --git a/data/sound-juicer.ui b/data/sound-juicer.ui
+index 12de20c..50042c7 100644
+--- a/data/sound-juicer.ui
++++ b/data/sound-juicer.ui
+@@ -615,7 +615,6 @@ audio-volume-medium</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Multiple Albums Found</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox2">
+         <property name="visible">True</property>
+@@ -735,7 +734,6 @@ audio-volume-medium</property>
+     <property name="title" translatable="yes">Preferences</property>
+     <property name="resizable">False</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
+     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox4">
+diff --git a/libjuicer/sj-extractor.c b/libjuicer/sj-extractor.c
+index dab6ec0..52f80d2 100644
+--- a/libjuicer/sj-extractor.c
++++ b/libjuicer/sj-extractor.c
+@@ -30,7 +30,7 @@
+ #include <glib-object.h>
+ #include <gst/gst.h>
+ #include <gst/tag/tag.h>
+-#include <profiles/gnome-media-profiles.h>
++#include <libgnome-media-profiles/gnome-media-profiles.h>
+ #include "sj-extractor.h"
+ #include "sj-structures.h"
+ #include "sj-error.h"
+diff --git a/libjuicer/sj-extractor.h b/libjuicer/sj-extractor.h
+index d9d8717..bbe23fc 100644
+--- a/libjuicer/sj-extractor.h
++++ b/libjuicer/sj-extractor.h
+@@ -26,7 +26,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <gio/gio.h>
+-#include <profiles/audio-profile.h>
++#include <libgnome-media-profiles/audio-profile.h>
+ #include "sj-structures.h"
+ 
+ G_BEGIN_DECLS
+diff --git a/src/sj-main.c b/src/sj-main.c
+index 351fb66..f9d3d71 100644
+--- a/src/sj-main.c
++++ b/src/sj-main.c
+@@ -33,7 +33,7 @@
+ #include <gconf/gconf-client.h>
+ #include <brasero-medium-selection.h>
+ #include <brasero-volume.h>
+-#include <profiles/gnome-media-profiles.h>
++#include <libgnome-media-profiles/gnome-media-profiles.h>
+ #include <gst/gst.h>
+ 
+ #include "bacon-message-connection.h"
+@@ -886,10 +886,10 @@ static void reread_cd (gboolean ignore_no_media)
+ 
+   /* Set watch cursor */
+   if (realized) {
+-    cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (window), GDK_WATCH);
++    cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (window)), GDK_WATCH);
+     gdk_window_set_cursor (window, cursor);
+     gdk_cursor_unref (cursor);
+-    gdk_display_sync (gdk_drawable_get_display (window));
++    gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (window)));
+   }
+ 
+   /* Set statusbar message */
+diff --git a/src/sj-prefs.c b/src/sj-prefs.c
+index 698b4aa..aeb2bc5 100644
+--- a/src/sj-prefs.c
++++ b/src/sj-prefs.c
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+-#include <profiles/gnome-media-profiles.h>
++#include <libgnome-media-profiles/gnome-media-profiles.h>
+ #include <brasero-drive-selection.h>
+ 
+ #include "sj-util.h"
+--
+cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch
new file mode 100644
index 0000000..2e1a83a
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch
@@ -0,0 +1,71 @@
+From 83398a1e2d1f1045353884b44c681e035b561023 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@××××××.net>
+Date: Mon, 15 Nov 2010 17:43:37 +0000
+Subject: build: Remove ability to build against GTK+ 2.x
+
+---
+diff --git a/configure.in b/configure.in
+index 8727f14..9e5f0c8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -34,30 +34,7 @@ GNOME_CXX_WARNINGS
+ GNOME_DEBUG_CHECK
+ GNOME_MAINTAINER_MODE_DEFINES
+ 
+-AC_MSG_CHECKING([which gtk+ version to compile against])
+-AC_ARG_WITH([gtk],
+-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+-  [case "$with_gtk" in
+-     2.0|3.0) ;;
+-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+-   esac],
+-  [with_gtk=2.0])
+-AC_MSG_RESULT([$with_gtk])
+-
+-case "$with_gtk" in
+-  2.0) GTK_API_VERSION=2.0
+-       GTK_REQUIRED=2.20.0
+-       LIBBRASERO_MEDIA_PC="libbrasero-media >= 2.26"
+-       LIBCANBERRA_GTK_PC=libcanberra-gtk
+-       GNOME_MEDIA_PROFILES_PC="gnome-media-profiles >= 2.11.91"
+-       ;;
+-  3.0) GTK_API_VERSION=3.0
+-       GTK_REQUIRED=2.90.0
+-       LIBBRASERO_MEDIA_PC=libbrasero-media3
+-       LIBCANBERRA_GTK_PC=libcanberra-gtk3
+-       GNOME_MEDIA_PROFILES_PC=gnome-media-profiles-3.0
+-       ;;
+-esac
++GTK_REQUIRED=2.90.0
+ 
+ AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
+ 
+@@ -70,7 +47,7 @@ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+ # Find libbrasero-media
+-PKG_CHECK_MODULES(BURN, $LIBBRASERO_MEDIA_PC)
++PKG_CHECK_MODULES(BURN, libbrasero-media3)
+ AC_SUBST(BURN_CFLAGS)
+ AC_SUBST(BURN_LIBS)
+ 
+@@ -81,7 +58,7 @@ LIBS="$LIBS $BURN_LIBS"
+ # LIBS="$oldlibs"
+ 
+ # Find the UI libraries
+-PKG_CHECK_MODULES(UI, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 $LIBCANBERRA_GTK_PC)
++PKG_CHECK_MODULES(UI, gtk+-3.0 >= $GTK_REQUIRED gconf-2.0 gio-2.0 gmodule-export-2.0 dbus-glib-1 libcanberra-gtk3)
+ AC_SUBST(UI_CFLAGS)
+ AC_SUBST(UI_LIBS)
+ 
+@@ -96,7 +73,7 @@ AM_GST_ELEMENT_CHECK(wavenc,,AC_MSG_WARN([The 'wavenc' element was not found. Th
+ AM_GST_ELEMENT_CHECK(giosink,,AC_MSG_WARN([The 'giosink' element was not found. This will cause Sound Juicer to fail at runtime.]))
+ 
+ # Find GNOME Media Profiles
+-PKG_CHECK_MODULES(MEDIA_PROFILES, $GNOME_MEDIA_PROFILES_PC)
++PKG_CHECK_MODULES(MEDIA_PROFILES, libgnome-media-profiles-3.0)
+ AC_SUBST(MEDIA_PROFILES_CFLAGS)
+ AC_SUBST(MEDIA_PROFILES_LIBS)
+ 
+--
+cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch
new file mode 100644
index 0000000..205c023
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch
@@ -0,0 +1,26 @@
+From a362297f7faa7b88a3cb412ebfd3b47dd0414183 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@××××××.com>
+Date: Fri, 01 Oct 2010 15:03:30 +0000
+Subject: Use new GDK key names
+
+This fixes the build against GTK3 (and works with 2.22 as well).
+This commit does not make the chances to configure.in to actually
+build against GTK3, though.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=630868
+---
+diff --git a/src/sj-main.c b/src/sj-main.c
+index 43f1a6f..351fb66 100644
+--- a/src/sj-main.c
++++ b/src/sj-main.c
+@@ -113,7 +113,7 @@ sj_stock_init (void)
+ 
+   static const GtkStockItem sj_stock_items[] =
+   {
+-    { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_Return, NULL }
++    { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_KEY_Return, NULL }
+   };
+ 
+   if (initialized)
+--
+cgit v0.8.3.4

diff --git a/media-sound/sound-juicer/sound-juicer-2.32.0-r300.ebuild b/media-sound/sound-juicer/sound-juicer-2.32.0-r300.ebuild
new file mode 100644
index 0000000..a326978
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-2.32.0-r300.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.32.0.ebuild,v 1.2 2010/12/08 17:01:34 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="CD ripper for GNOME 2"
+HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-2.90:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	>=gnome-base/gconf-2
+	sys-apps/dbus
+	dev-libs/dbus-glib
+
+	>=media-libs/musicbrainz-3.0.2:3
+	media-libs/libgnome-media-profiles
+
+	>=media-libs/gstreamer-0.10.15:0.10
+	>=media-libs/gst-plugins-base-0.10:0.10"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-plugins/gst-plugins-gconf-0.10:0.10
+	>=media-plugins/gst-plugins-gio-0.10:0.10
+	|| (
+		>=media-plugins/gst-plugins-cdparanoia-0.10:0.10
+		>=media-plugins/gst-plugins-cdio-0.10:0.10 )
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	>=app-text/scrollkeeper-0.3.5
+	app-text/gnome-doc-utils
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+pkg_setup() {
+	# GST_INSPECT needed to get around some sandboxing checks
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper GST_INSPECT=/bin/true"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Patches from upstream, remove in next version
+	epatch "${FILESDIR}/${P}-new-gdk-keys.patch"
+	epatch "${FILESDIR}/${P}-gtk3-only.patch"
+	epatch "${FILESDIR}/${P}-gtk3-api.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn "If ${PN} does not rip to some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+}