Version bump, bug #297330, fixes crash with fortify enabled.

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

3 files changed, 96 insertions, 1 deletions

diff --git a/x11-plugins/pidgin-musictracker/ChangeLog b/x11-plugins/pidgin-musictracker/ChangeLog
index e9edcb18d358..bed774e6c45d 100644
--- a/x11-plugins/pidgin-musictracker/ChangeLog
+++ b/x11-plugins/pidgin-musictracker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/pidgin-musictracker
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-musictracker/ChangeLog,v 1.10 2009/07/08 21:11:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-musictracker/ChangeLog,v 1.11 2009/12/21 20:56:16 pva Exp $
+
+*pidgin-musictracker-0.4.20 (21 Dec 2009)
+
+  21 Dec 2009; Peter Volkov <pva@gentoo.org>
+  +pidgin-musictracker-0.4.20.ebuild,
+  +files/pidgin-musictracker-0.4.20-fortify-abort.patch:
+  Version bump, bug #297330, fixes crash with fortify enabled.
 
   08 Jul 2009; Markus Meier <maekke@gentoo.org>
   pidgin-musictracker-0.4.18.ebuild:
diff --git a/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch
new file mode 100644
index 000000000000..a9b8e6a6ba00
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.20-fortify-abort.patch
@@ -0,0 +1,51 @@
+Index: src/preferences.c
+===================================================================
+--- src/preferences.c	(revision 417)
++++ src/preferences.c	(revision 420)
+@@ -205,11 +205,15 @@
+ 	purple_prefs_set_bool(data, state);
+ }
+ 
+-#define APPEND_FORMAT_MENU(name, format) \
+-	sprintf(buf, "%s - %s", name, format); \
+-	widget = gtk_menu_item_new_with_label(buf); \
+-	gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); \
+-	g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
++static void
++append_format_menu(const char *name, const char *format)
++{
++  char *buf = g_strdup_printf("%s - %s", name, format);
++  GtkWidget *widget = gtk_menu_item_new_with_label(buf);
++  g_free(buf);
++  gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget);
++  g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
++}
+ 
+ #define ADD_FORMAT_ENTRY(vbox, name, type) \
+ 	hbox = gtk_hbox_new(FALSE, 5); \
+@@ -259,16 +263,15 @@
+ 
+ 	// Popup menu for format
+ 	format_menu = gtk_menu_new();
+-	char buf[100];
+-	APPEND_FORMAT_MENU(_("Artist"), "%p");
+-	APPEND_FORMAT_MENU(_("Album"), "%a");
+-	APPEND_FORMAT_MENU(_("Title"), "%t");
+-	APPEND_FORMAT_MENU(_("Track Duration"), "%d");
+-	APPEND_FORMAT_MENU(_("Elapsed Track Time"), "%c");
+-	APPEND_FORMAT_MENU(_("Progress Bar"), "%b");
+-	APPEND_FORMAT_MENU(_("Player"), "%r");
+-	APPEND_FORMAT_MENU(_("Music Symbol (may not display on some networks)"), "%m");
+-	APPEND_FORMAT_MENU(_("Status Message"), "%s");
++	append_format_menu(_("Artist"), "%p");
++	append_format_menu(_("Album"), "%a");
++	append_format_menu(_("Title"), "%t");
++	append_format_menu(_("Track Duration"), "%d");
++	append_format_menu(_("Elapsed Track Time"), "%c");
++	append_format_menu(_("Progress Bar"), "%b");
++	append_format_menu(_("Player"), "%r");
++	append_format_menu(_("Music Symbol (may not display on some networks)"), "%m");
++	append_format_menu(_("Status Message"), "%s");
+ 	gtk_widget_show_all(format_menu);
+ 
+ 	// Format selection
diff --git a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.20.ebuild b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.20.ebuild
new file mode 100644
index 000000000000..645030bed00a
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.20.ebuild,v 1.1 2009/12/21 20:56:16 pva Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A Pidgin now playing plugin to publicise the songs you are listening to in your status message"
+HOMEPAGE="http://code.google.com/p/pidgin-musictracker/"
+SRC_URI="http://pidgin-musictracker.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=net-im/pidgin-2.0.0
+	>=dev-libs/dbus-glib-0.73
+	dev-libs/libpcre
+	>=sys-devel/gettext-0.17"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch ${FILESDIR}/${P}-fortify-abort.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--disable-werror
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failure"
+	dodoc AUTHORS ChangeLog INSTALL README THANKS || die "dodoc failed"
+}