Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=5574107a9660354b66ad28d3c61ebd2f4bc58684

commit 5574107a9660354b66ad28d3c61ebd2f4bc58684
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Oct 4 17:22:17 2010 +0200

sound-juicer-2.28.2-4-x86_64
*rebuild with gnome 2.32
*gnome 2.32 bump should be finished

diff --git a/source/gnome-extra/sound-juicer/FrugalBuild 
b/source/gnome-extra/sound-juicer/FrugalBuild
index 05c1739..c53c7c0 100644
--- a/source/gnome-extra/sound-juicer/FrugalBuild
+++ b/source/gnome-extra/sound-juicer/FrugalBuild
@@ -4,9 +4,9 @@

pkgname=sound-juicer
pkgver=2.28.2
-pkgrel=3
+pkgrel=4
pkgdesc="Sound Juicer is a CD ripper for GNOME 2"
-depends=('libstdc++' 'libcdio>=0.81-1' 'gnome-media>=2.30.0-2' 
'gst-plugins-base>=0.10.22-2' 'gst-plugins-good>=0.10.14-2' 'libmusicbrainz' 
'taglib' \
+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')
@@ -19,7 +19,9 @@ _F_gnome_iconcache="y"
options=('scriptlet')
Finclude gnome gnome-scriptlet
url="http://www.burtonini.com/blog/computers/sound-juicer";
-sha1sums=('2f4c27fdaabb5ea4465e53aa8ecbbc4afb46b973')
+source=($source unistd.diff)
+sha1sums=('2f4c27fdaabb5ea4465e53aa8ecbbc4afb46b973' \
+          'edf0d65e024688087cfb112df3a1169e9abde168')

build() {
unset MAKEFLAGS
diff --git a/source/gnome-extra/sound-juicer/unistd.diff 
b/source/gnome-extra/sound-juicer/unistd.diff
new file mode 100644
index 0000000..a93cfbb
--- /dev/null
+++ b/source/gnome-extra/sound-juicer/unistd.diff
@@ -0,0 +1,103 @@
+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, &current_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, &current_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)
+         &current_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

Reply via email to