From 30a2d29350efce1d6e7ced0b0d0372c07dddf09a Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Sun, 7 Aug 2011 16:48:41 +0000 Subject: Apply fedora patches, fix implicits, simplify deps, bump to EAPI4. Fixes bug 272006 (Portage version: 2.2.0_alpha46/cvs/Linux x86_64) --- app-cdr/gnomebaker/ChangeLog | 13 ++++- .../files/gnomebaker-0.6.4-implicits.patch | 30 +++++++++++ .../gnomebaker/files/gnomebaker-0.6.4-ldadd.patch | 11 ++++ .../files/gnomebaker-0.6.4-libnotify-0.7.patch | 4 +- .../files/gnomebaker-0.6.4-mimetype.patch | 8 +++ .../files/gnomebaker-0.6.4-seldata.patch | 31 +++++++++++ app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild | 62 ++++++++++++++++++++++ 7 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch create mode 100644 app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch create mode 100644 app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch create mode 100644 app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch create mode 100644 app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog index 0a6b0794995e..0435424c7cea 100644 --- a/app-cdr/gnomebaker/ChangeLog +++ b/app-cdr/gnomebaker/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-cdr/gnomebaker # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.58 2011/03/27 09:59:46 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.59 2011/08/07 16:48:41 xarthisius Exp $ + +*gnomebaker-0.6.4-r1 (07 Aug 2011) + + 07 Aug 2011; Kacper Kowalik + +gnomebaker-0.6.4-r1.ebuild, +files/gnomebaker-0.6.4-implicits.patch, + +files/gnomebaker-0.6.4-ldadd.patch, + files/gnomebaker-0.6.4-libnotify-0.7.patch, + +files/gnomebaker-0.6.4-mimetype.patch, + +files/gnomebaker-0.6.4-seldata.patch: + Apply fedora patches, fix implicits, simplify deps, bump to EAPI4. Fixes bug + 272006 27 Mar 2011; Nirbheek Chauhan gnomebaker-0.6.4.ebuild: diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch new file mode 100644 index 000000000000..bbc8ec7abc52 --- /dev/null +++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch @@ -0,0 +1,30 @@ +--- a/src/preferences.h ++++ b/src/preferences.h +@@ -85,6 +85,7 @@ + + gboolean preferences_init(); + void preferences_finalise(); ++int preferences_get_default_backend(); + + gchar *preferences_get_copy_data_cd_image(); + gchar *preferences_get_copy_dvd_image(); +--- a/src/backend.h ++++ b/src/backend.h +@@ -30,6 +30,7 @@ + + + gboolean backend_is_backend_supported(enum backend b); ++gboolean backend_does_prog_exist(gchar* program); + + + #endif /* _BACKEND_H_ */ +--- a/src/gnomebaker.c ++++ b/src/gnomebaker.c +@@ -32,6 +32,7 @@ + #include "splashdlg.h" + #include "gbcommon.h" + #include ++#include + #include + #include "media.h" + #include "dataproject.h" diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch new file mode 100644 index 000000000000..b8e4cf1ed551 --- /dev/null +++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -255,7 +255,7 @@ gnomebaker_SOURCES = \ + cairofillbar.c cairofillbar.h \ + backend.c backend.h + +-gnomebaker_LDADD = @GNOMEBAKER_LIBS@ ++gnomebaker_LDADD = @GNOMEBAKER_LIBS@ -lm + gnomebaker_LDFLAGS = -export-dynamic + all: all-am + diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch index 27ae276d77a3..772d4f5d23d9 100644 --- a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch +++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch @@ -1,5 +1,5 @@ ---- src/gblibnotify.c -+++ src/gblibnotify.c +--- a/src/gblibnotify.c ++++ b/src/gblibnotify.c @@ -87,7 +87,15 @@ #ifdef HAVE_LIBNOTIFY #if (LIBNOTIFY_VERSION_MINOR >= 3) diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch new file mode 100644 index 000000000000..c0e29e66ad34 --- /dev/null +++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch @@ -0,0 +1,8 @@ +--- a/gnomebaker.desktop.in ++++ b/gnomebaker.desktop.in +@@ -17,4 +17,4 @@ X-MultipleArgs=false + Type=Application + Categories=AudioVideo;DiscBurning; + StartupNotify=true +- ++MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd; diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch new file mode 100644 index 000000000000..0be6f1e09c43 --- /dev/null +++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch @@ -0,0 +1,31 @@ +--- a/src/filebrowser.c ++++ b/src/filebrowser.c +@@ -866,7 +866,7 @@ filebrowser_get_selection(gboolean from_ + else + tree = glade_xml_get_widget(gnomebaker_getxml(), widget_browser_filelist); + +- GtkSelectionData *selection_data = g_new0(GtkSelectionData, 1); ++ GtkSelectionData *selection_data = g_slice_new0(GtkSelectionData); + filebrowser_on_drag_data_get(tree, NULL, selection_data, 0, 0, NULL); + return selection_data; + } +--- a/src/gnomebaker.c ++++ b/src/gnomebaker.c +@@ -529,7 +529,7 @@ gnomebaker_on_add_files(gpointer widget, + } + + /*gtk_selection_data_set_uris(selection_data, uris);*/ +- selection_data = g_new0(GtkSelectionData, 1); ++ selection_data = g_slice_new0(GtkSelectionData); + gtk_selection_data_set(selection_data, selection_data->target, 8, + (const guchar*)text->str, strlen(text->str) * sizeof(gchar)); + GB_TRACE("gnomebaker_on_add_files - [%s]\n", selection_data->data); +@@ -1073,7 +1073,7 @@ gnomebaker_select_files_or_folders(const + } + + /*gtk_selection_data_set_uris(selection_data, uris);*/ +- selection_data = g_new0(GtkSelectionData, 1); ++ selection_data = g_slice_new0(GtkSelectionData); + gtk_selection_data_set(selection_data, selection_data->target, 8, + (const guchar*)text->str, strlen(text->str) * sizeof(gchar)); + GB_TRACE("gnomebaker_select_files_or_folders - [%s]\n", selection_data->data); diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild new file mode 100644 index 000000000000..873d77f2f2e0 --- /dev/null +++ b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.1 2011/08/07 16:48:41 xarthisius Exp $ + +EAPI=4 +GCONF_DEBUG=no +inherit eutils gnome2 + +DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application." +HOMEPAGE="http://sourceforge.net/projects/gnomebaker" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="dvdr flac libnotify mp3 vorbis" + +RDEPEND="x11-libs/gtk+:2 + gnome-base/libgnomeui + dev-libs/libxml2:2 + gnome-base/libglade:2.0 + media-libs/gstreamer:0.10 + x11-libs/cairo + app-cdr/cdrdao + virtual/cdrtools + dvdr? ( app-cdr/dvd+rw-tools ) + flac? ( media-plugins/gst-plugins-flac + media-libs/gst-plugins-good ) + libnotify? ( x11-libs/libnotify ) + mp3? ( media-plugins/gst-plugins-mad + media-libs/gst-plugins-good ) + vorbis? ( media-plugins/gst-plugins-vorbis + media-libs/libogg + media-libs/gst-plugins-good )" +DEPEND="${RDEPEND} + app-text/rarian + dev-util/intltool + dev-util/pkgconfig + sys-devel/gettext" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-dependency-tracking + $(use_enable libnotify)" +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \ + "${FILESDIR}"/${P}-ldadd.patch \ + "${FILESDIR}"/${P}-seldata.patch \ + "${FILESDIR}"/${P}-mimetype.patch \ + "${FILESDIR}"/${P}-implicits.patch + gnome2_src_prepare +} + +src_install() { + gnome2_src_install \ + gnomebakerdocdir=/usr/share/doc/${P} \ + docdir=/usr/share/gnome/help/${PN}/C \ + gnomemenudir=/usr/share/applications + rm -rf "${D}"/usr/share/doc/${P}/*.make "${D}"/var +} -- cgit v1.2.3-65-gdbad