Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=0d58571eb8b446912e37a75e4ac7dfae646bdf0b
commit 0d58571eb8b446912e37a75e4ac7dfae646bdf0b
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Mar 15 19:31:48 2011 +0100
sound-juicer-2.32.0-1-x86_64
*version bump
diff --git a/source/gnome-extra/sound-juicer/FrugalBuild
b/source/gnome-extra/sound-juicer/FrugalBuild
index c53c7c0..eb68400 100644
--- a/source/gnome-extra/sound-juicer/FrugalBuild
+++ b/source/gnome-extra/sound-juicer/FrugalBuild
@@ -3,13 +3,14 @@
# Contributor: DNAku <dn...@frugalware.org>
pkgname=sound-juicer
-pkgver=2.28.2
-pkgrel=4
+pkgver=2.32.0
+pkgrel=1
pkgdesc="Sound Juicer is a CD ripper for GNOME 2"
depends=('libstdc++' 'libcdio>=0.81-1' 'gnome-media>=2.32.0'
'gst-plugins-base>=0.10.22-2' 'gst-plugins-good>=0.10.14-2' 'libmusicbrainz'
'taglib' \
'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs'
'gst-plugins-good-flac' 'gst-plugins-base-pango' \
- 'gst-plugins-base-vorbis' 'gst-plugins-base-gio' 'brasero>=2.30.0')
-makedepends=('gnome-doc-utils' 'perl-xml-parser' 'intltool')
+ 'gst-plugins-base-vorbis' 'gst-plugins-base-gio' 'brasero>=2.91.0' \
+ 'libmusicbrainz3' 'libkrb5')
+makedepends=('gnome-doc-utils' 'perl-xml-parser' 'intltool' 'gnome-common'
'krb5')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
_F_gnome_schemas=('/etc/gconf/schemas/sound-juicer.schemas')
@@ -19,13 +20,18 @@ _F_gnome_iconcache="y"
options=('scriptlet')
Finclude gnome gnome-scriptlet
url="http://www.burtonini.com/blog/computers/sound-juicer";
-source=($source unistd.diff)
-sha1sums=('2f4c27fdaabb5ea4465e53aa8ecbbc4afb46b973' \
- 'edf0d65e024688087cfb112df3a1169e9abde168')
+source=($source gdk.diff brasero3.diff gnome3.diff)
+sha1sums=('a4ba891cd2e67095be3ff57154aa078b67d63b6c' \
+ '0257c3939c650fc3c20a68d8af65e7117dff004e' \
+ 'c69bc74d138f64170442bea66d54ed0cded04585' \
+ '5339eae06c64ed12cd64c5e841c75aa110cc17ee')
build() {
unset MAKEFLAGS
- Fbuild
+ Fpatchall
+ Fautoreconf
+ Fmake
+ Fmakeinstall
Fbuild_gnome_scriptlet
}
diff --git a/source/gnome-extra/sound-juicer/brasero3.diff
b/source/gnome-extra/sound-juicer/brasero3.diff
new file mode 100644
index 0000000..1f9f1c2
--- /dev/null
+++ b/source/gnome-extra/sound-juicer/brasero3.diff
@@ -0,0 +1,72 @@
+From 83398a1e2d1f1045353884b44c681e035b561023 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <had...@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/source/gnome-extra/sound-juicer/gdk.diff
b/source/gnome-extra/sound-juicer/gdk.diff
new file mode 100644
index 0000000..501e0da
--- /dev/null
+++ b/source/gnome-extra/sound-juicer/gdk.diff
@@ -0,0 +1,27 @@
+From a362297f7faa7b88a3cb412ebfd3b47dd0414183 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@redhat.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/source/gnome-extra/sound-juicer/gnome3.diff
b/source/gnome-extra/sound-juicer/gnome3.diff
new file mode 100644
index 0000000..f04076e
--- /dev/null
+++ b/source/gnome-extra/sound-juicer/gnome3.diff
@@ -0,0 +1,94 @@
+From f23bb0a5aac613c385272ee448afd27ce50b9ee4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <had...@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/source/gnome-extra/sound-juicer/unistd.diff
b/source/gnome-extra/sound-juicer/unistd.diff
deleted file mode 100644
index a93cfbb..0000000
--- a/source/gnome-extra/sound-juicer/unistd.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-From 0adaffaea1028f5ef90f6aff675b9c81fbfb6a54 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vu...@gnome.org>
-Date: Thu, 27 May 2010 10:36:56 +0000
-Subject: Rename play/pause/stop functions to avoid clash with unistd.h
-
----
-diff --git a/src/sj-play.c b/src/sj-play.c
-index 25aeba0..a0e19f3 100644
---- a/src/sj-play.c
-+++ b/src/sj-play.c
-@@ -84,7 +84,7 @@ select_track (void)
- * Start playing.
- */
- static void
--play (void)
-+_play (void)
- {
- gst_element_set_state (pipeline, GST_STATE_PLAYING);
-
-@@ -96,7 +96,7 @@ play (void)
- * Pause
- */
- static void
--pause (void)
-+_pause (void)
- {
- gst_element_set_state (pipeline, GST_STATE_PAUSED);
- }
-@@ -105,7 +105,7 @@ pause (void)
- * Stop and reset UI.
- */
- static void
--stop (void)
-+_stop (void)
- {
- if (pipeline != NULL)
- gst_element_set_state (pipeline, GST_STATE_NULL);
-@@ -173,7 +173,7 @@ cb_hop_track (GstBus *bus, GstMessage *message, gpointer
user_data)
- }
-
- if (next_track >= tracks) {
-- stop ();
-+ _stop ();
- seek_to_track = 0;
- } else {
- seek_to_track = next_track;
-@@ -200,7 +200,7 @@ cb_error (GstBus *bus, GstMessage *message, gpointer
user_data)
- /* There may be other (more generic) error messages on the bus; set pipeline
- * to NULL state so these messages are flushed from the bus and we don't get
- * called again for those */
-- stop ();
-+ _stop ();
- }
-
- static gchar *
-@@ -427,7 +427,7 @@ setup (GError **err)
- void
- stop_playback (void)
- {
-- stop ();
-+ _stop ();
- }
-
- /*
-@@ -440,12 +440,12 @@ on_play_activate (GtkWidget *button, gpointer user_data)
- GError *err = NULL;
-
- if (is_playing ()) {
-- pause ();
-+ _pause ();
- gtk_list_store_set (track_store, ¤t_iter,
- COLUMN_STATE, STATE_PAUSED, -1);
- } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&
- current_track == seek_to_track) {
-- play ();
-+ _play ();
- gtk_list_store_set (track_store, ¤t_iter,
- COLUMN_STATE, STATE_PLAYING, -1);
- } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&
-@@ -528,7 +528,7 @@ on_previous_track_activate(GtkWidget *button, gpointer
data)
- }
-
- if (prev_track < 0) {
-- stop ();
-+ _stop ();
- seek_to_track = 0;
- } else {
- seek_to_track = prev_track;
-@@ -550,10 +550,10 @@ set_gst_ui_and_play (void)
- ¤t_iter, COLUMN_TITLE, &title, -1);
- sj_main_set_title (title);
- g_free (title);
-- play ();
-+ _play ();
- } else {
- g_warning (G_STRLOC ": failed to select track");
-- stop ();
-+ _stop ();
- }
- }
-
---
-cgit v0.8.3.1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
