From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PtjL7-0004jz-A4 for garchives@archives.gentoo.org; Sun, 27 Feb 2011 16:19:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C3531C04A; Sun, 27 Feb 2011 16:19:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 059081C04A for ; Sun, 27 Feb 2011 16:19:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70A961B4246 for ; Sun, 27 Feb 2011 16:19:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 95AE48006A for ; Sun, 27 Feb 2011 16:19:12 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <98ab5d21c116e9d0736113bbb0761a32c87a2ece.abcd@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-sound/sound-juicer/, media-sound/sound-juicer/files/ X-VCS-Repository: proj/gnome X-VCS-Files: media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-api.patch media-sound/sound-juicer/files/sound-juicer-2.32.0-gtk3-only.patch media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.patch media-sound/sound-juicer/sound-juicer-2.32.0-r300.ebuild X-VCS-Directories: media-sound/sound-juicer/ media-sound/sound-juicer/files/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 98ab5d21c116e9d0736113bbb0761a32c87a2ece Date: Sun, 27 Feb 2011 16:19:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a9639f71a0e3a2840c6e2b964f0d8328 commit: 98ab5d21c116e9d0736113bbb0761a32c87a2ece Author: Jonathan Callen gentoo org> AuthorDate: Sun Feb 27 16:18:19 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sun Feb 27 16:18:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D98ab5d21 media-sound/sound-juicer: add GTK+3 version (Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --for= ce, 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 +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 + 5 + Multiple Albums Found= + dialog +- False + + + True +@@ -735,7 +734,6 @@ audio-volume-medium + Preferences + False + dialog +- False + + + +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 + #include + #include +-#include ++#include + #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 + #include + #include +-#include ++#include + #include "sj-structures.h" +=20 + 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 + #include + #include +-#include ++#include + #include +=20 + #include "bacon-message-connection.h" +@@ -886,10 +886,10 @@ static void reread_cd (gboolean ignore_no_media) +=20 + /* Set watch cursor */ + if (realized) { +- cursor =3D gdk_cursor_new_for_display (gdk_drawable_get_display (wi= ndow), GDK_WATCH); ++ cursor =3D 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))); + } +=20 + /* 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 + #include + #include +-#include ++#include + #include +=20 + #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.pat= ch 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 +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 +=20 +-AC_MSG_CHECKING([which gtk+ version to compile against]) +-AC_ARG_WITH([gtk], +- [AS_HELP_STRING([--with-gtk=3D2.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=3D2.0]) +-AC_MSG_RESULT([$with_gtk]) +- +-case "$with_gtk" in +- 2.0) GTK_API_VERSION=3D2.0 +- GTK_REQUIRED=3D2.20.0 +- LIBBRASERO_MEDIA_PC=3D"libbrasero-media >=3D 2.26" +- LIBCANBERRA_GTK_PC=3Dlibcanberra-gtk +- GNOME_MEDIA_PROFILES_PC=3D"gnome-media-profiles >=3D 2.11.91" +- ;; +- 3.0) GTK_API_VERSION=3D3.0 +- GTK_REQUIRED=3D2.90.0 +- LIBBRASERO_MEDIA_PC=3Dlibbrasero-media3 +- LIBCANBERRA_GTK_PC=3Dlibcanberra-gtk3 +- GNOME_MEDIA_PROFILES_PC=3Dgnome-media-profiles-3.0 +- ;; +-esac ++GTK_REQUIRED=3D2.90.0 +=20 + AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) +=20 +@@ -70,7 +47,7 @@ AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) +=20 + # Find libbrasero-media +-PKG_CHECK_MODULES(BURN, $LIBBRASERO_MEDIA_PC) ++PKG_CHECK_MODULES(BURN, libbrasero-media3) + AC_SUBST(BURN_CFLAGS) + AC_SUBST(BURN_LIBS) +=20 +@@ -81,7 +58,7 @@ LIBS=3D"$LIBS $BURN_LIBS" + # LIBS=3D"$oldlibs" +=20 + # Find the UI libraries +-PKG_CHECK_MODULES(UI, gtk+-$GTK_API_VERSION >=3D $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 >=3D $GTK_REQUIRED gconf-2.0 gio-2.0 gmo= dule-export-2.0 dbus-glib-1 libcanberra-gtk3) + AC_SUBST(UI_CFLAGS) + AC_SUBST(UI_LIBS) +=20 +@@ -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 no= t found. This will cause Sound Juicer to fail at runtime.])) +=20 + # 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) +=20 +-- +cgit v0.8.3.4 diff --git a/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-k= eys.patch b/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-ke= ys.patch new file mode 100644 index 0000000..205c023 --- /dev/null +++ b/media-sound/sound-juicer/files/sound-juicer-2.32.0-new-gdk-keys.pat= ch @@ -0,0 +1,26 @@ +From a362297f7faa7b88a3cb412ebfd3b47dd0414183 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +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=3D630868 +--- +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) +=20 + static const GtkStockItem sj_stock_items[] =3D + { +- { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_Return, N= ULL } ++ { SJ_STOCK_EXTRACT, N_("E_xtract"), GDK_CONTROL_MASK, GDK_KEY_Retur= n, NULL } + }; +=20 + if (initialized) +-- +cgit v0.8.3.4 diff --git a/media-sound/sound-juicer/sound-juicer-2.32.0-r300.ebuild b/m= edia-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=3D"3" +GCONF_DEBUG=3D"yes" + +inherit gnome2 eutils autotools + +DESCRIPTION=3D"CD ripper for GNOME 2" +HOMEPAGE=3D"http://www.burtonini.com/blog/computers/sound-juicer/" + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=3D"test" + +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.18 + >=3Dx11-libs/gtk+-2.90:3 + media-libs/libcanberra[gtk3] + >=3Dapp-cdr/brasero-2.90 + >=3Dgnome-base/gconf-2 + sys-apps/dbus + dev-libs/dbus-glib + + >=3Dmedia-libs/musicbrainz-3.0.2:3 + media-libs/libgnome-media-profiles + + >=3Dmedia-libs/gstreamer-0.10.15:0.10 + >=3Dmedia-libs/gst-plugins-base-0.10:0.10" + +RDEPEND=3D"${COMMON_DEPEND} + >=3Dmedia-plugins/gst-plugins-gconf-0.10:0.10 + >=3Dmedia-plugins/gst-plugins-gio-0.10:0.10 + || ( + >=3Dmedia-plugins/gst-plugins-cdparanoia-0.10:0.10 + >=3Dmedia-plugins/gst-plugins-cdio-0.10:0.10 ) + >=3Dmedia-plugins/gst-plugins-meta-0.10-r2:0.10" + +DEPEND=3D"${COMMON_DEPEND} + >=3Ddev-util/pkgconfig-0.9 + >=3Ddev-util/intltool-0.40 + >=3Dapp-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=3D"${G2CONF} + --disable-scrollkeeper GST_INSPECT=3D/bin/true" + DOCS=3D"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" +}