Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79bb922463845b419ca31382c145367daa1fa162
commit 79bb922463845b419ca31382c145367daa1fa162 Author: crazy <[EMAIL PROTECTED]> Date: Fri Sep 28 19:34:45 2007 +0200 gnomeradio-1.7-2-i686 * release bump * fixed depends / makedepends * added missing scriptlet option * added missing _F_gnome_iconcache * added 3 packport patches to fix varios issues * added myself an patch to fix GLib threading bug * closes #2426 diff --git a/source/gnome-extra/gnomeradio/FrugalBuild b/source/gnome-extra/gnomeradio/FrugalBuild index 027224d..d5ba2c6 100644 --- a/source/gnome-extra/gnomeradio/FrugalBuild +++ b/source/gnome-extra/gnomeradio/FrugalBuild @@ -3,19 +3,30 @@ pkgname=gnomeradio pkgver=1.7 -pkgrel=1 +pkgrel=2 pkgdesc="Gnomeradio is a FM-radio tuner for the GNOME desktop." url="http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio"; makedepends=('gettext' 'intltool') -depends=('gtk+2' 'libgnomeui' 'libtasn1' 'gnome-media' 'gnome-doc-utils') +depends=('gtk+2>=2.12.0-2' 'libgnomeui>=2.20.0' 'libtasn1' 'gnome-media>=2.20.1') +makedepends=('gnome-doc-utils' 'perl-xml') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/ | grep tarball | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/$pkgname-$pkgver.tar.gz) -sha1sums=('78ef49c200aa93aa23ab3bca72a158dde8b6e9b0') +source=(http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/$pkgname-$pkgver.tar.gz \ + gnomeradio-1.7-trayicon.patch \ + gnomeradio-1.7-xml-description.patch \ + gnomeradio-1.7-gui.patch \ + gnomeradio-1.7-GLib_threading_system-bug.patch) +options=('scriptlet') +sha1sums=('78ef49c200aa93aa23ab3bca72a158dde8b6e9b0' \ + '792386386ffd2c386dbe9460cc30f3119a2d2bfb' \ + 'a6a65a9462300fe0dcd98d73e38bd9b95079614a' \ + 'b49d6a57190cd1eb1529a484963e4ceb2f1b5c96' \ + 'cb01013f534f14c8dd9e91a02a0c965b9d6373bc') _F_gnome_schemas=('/etc/gconf/schemas/gnomeradio.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_iconcache="y" Finclude gnome-scriptlet # optimization OK diff --git a/source/gnome-extra/gnomeradio/gnomeradio-1.7-GLib_threading_system-bug.patch b/source/gnome-extra/gnomeradio/gnomeradio-1.7-GLib_threading_system-bug.patch new file mode 100644 index 0000000..9702b6e --- /dev/null +++ b/source/gnome-extra/gnomeradio/gnomeradio-1.7-GLib_threading_system-bug.patch @@ -0,0 +1,25 @@ +diff -Naur gnomeradio-1.7/src/gui.c gnomeradio-1.7-p/src/gui.c +--- gnomeradio-1.7/src/gui.c 2006-11-25 12:46:54.000000000 +0100 ++++ gnomeradio-1.7-p/src/gui.c 2007-09-28 19:09:19.000000000 +0200 +@@ -1075,8 +1075,11 @@ + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(PACKAGE); + ++ /* must be called before any other glib function is called */ ++ if (!g_thread_supported ()) g_thread_init(NULL); ++ + g_set_application_name(_("Gnomeradio")); +- ++ + #if GNOME_14 + ctx = g_option_context_new("- Gnomeradio"); + g_option_context_add_main_entries(ctx, entries, GETTEXT_PACKAGE); +@@ -1097,7 +1100,7 @@ + + /* Initizialize GStreamer */ + gst_init(&argc, &argv); +- ++ + /* Initizialize Gconf */ + if (!gconf_init(argc, argv, &err)) { + char *details; diff --git a/source/gnome-extra/gnomeradio/gnomeradio-1.7-gui.patch b/source/gnome-extra/gnomeradio/gnomeradio-1.7-gui.patch new file mode 100644 index 0000000..e79b0ab --- /dev/null +++ b/source/gnome-extra/gnomeradio/gnomeradio-1.7-gui.patch @@ -0,0 +1,35 @@ +--- trunk/src/gui.c 2006/11/25 12:17:14 158 ++++ trunk/src/gui.c 2007/02/24 23:58:26 169 +@@ -1113,15 +1113,6 @@ + } + + load_settings(); +- create_tray_menu(app); +- +- gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), _("manual")); +- for (ptr = settings.presets; ptr; ptr = g_list_next(ptr)) { +- preset *ps = (preset*)ptr->data; +- gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), ps->title); +- } +- preset_combo_set_item(mom_ps); +- + start_mixer(FALSE, app); + start_radio(FALSE, app); + if (is_first_start() || do_scan) { +@@ -1132,6 +1123,15 @@ + set_first_time_flag(); + } + } ++ create_tray_menu(app); ++ ++ gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), _("manual")); ++ for (ptr = settings.presets; ptr; ptr = g_list_next(ptr)) { ++ preset *ps = (preset*)ptr->data; ++ gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), ps->title); ++ } ++ preset_combo_set_item(mom_ps); ++ + gtk_widget_show_all(app); + + /* Create an tray icon */ + diff --git a/source/gnome-extra/gnomeradio/gnomeradio-1.7-trayicon.patch b/source/gnome-extra/gnomeradio/gnomeradio-1.7-trayicon.patch new file mode 100644 index 0000000..4b39ad4 --- /dev/null +++ b/source/gnome-extra/gnomeradio/gnomeradio-1.7-trayicon.patch @@ -0,0 +1,11 @@ +diff -Nur trunk/src/trayicon.c trunk.new/src/trayicon.c +--- trunk/src/trayicon.c 2006-11-05 18:42:57.000000000 +0100 ++++ trunk.new/src/trayicon.c 2007-07-16 00:40:37.000000000 +0200 +@@ -22,6 +22,7 @@ + #include <gnome.h> + #include "gui.h" + #include "trayicon.h" ++#include "eggtrayicon.h" + + static GtkWidget *showwindow_menuitem; + diff --git a/source/gnome-extra/gnomeradio/gnomeradio-1.7-xml-description.patch b/source/gnome-extra/gnomeradio/gnomeradio-1.7-xml-description.patch new file mode 100644 index 0000000..744d16b --- /dev/null +++ b/source/gnome-extra/gnomeradio/gnomeradio-1.7-xml-description.patch @@ -0,0 +1,20 @@ +diff -Nur trunk/help/C/gnomeradio.xml trunk.new/help/C/gnomeradio.xml +--- trunk/help/C/gnomeradio.xml 2006-12-02 12:35:19.000000000 +0100 ++++ trunk.new/help/C/gnomeradio.xml 2007-05-07 01:18:13.000000000 +0200 +@@ -69,7 +69,15 @@ + <title>Feedback</title> + <para> To report a bug or make a suggestion regarding &app; or this + manual, send a e-mail to <ulink url="mailto:[EMAIL PROTECTED]" type="mail">Jörgen Scheibengruber</ulink>. </para> +- </legalnotice> ++ </legalnotice> ++ <abstract role="description"> ++ <para>&application; allows you to listen FM radio in your GNOME desktop. ++ It should work with every FM tuner card that is supported by video4linux. ++ Remote controls are supported via (optional) LIRC-support. &application; ++ can also record radio as a Wave, MP3 or Ogg files. ++ This manual introduces you to &application; ++ </para> ++ </abstract> + </articleinfo> + <indexterm> + <primary>&app;</primary> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
