summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-08-07 16:48:41 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-08-07 16:48:41 +0000
commit30a2d29350efce1d6e7ced0b0d0372c07dddf09a (patch)
tree03572d07ccb311485baca5558b4ce7126d4b004d /app-cdr/gnomebaker/files
parentversion bump (diff)
downloadgentoo-2-30a2d29350efce1d6e7ced0b0d0372c07dddf09a.tar.gz
gentoo-2-30a2d29350efce1d6e7ced0b0d0372c07dddf09a.tar.bz2
gentoo-2-30a2d29350efce1d6e7ced0b0d0372c07dddf09a.zip
Apply fedora patches, fix implicits, simplify deps, bump to EAPI4. Fixes bug 272006
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/gnomebaker/files')
-rw-r--r--app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch30
-rw-r--r--app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch11
-rw-r--r--app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch4
-rw-r--r--app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch8
-rw-r--r--app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch31
5 files changed, 82 insertions, 2 deletions
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 <libgnomevfs/gnome-vfs-mime-utils.h>
++#include <libgnomevfs/gnome-vfs-ops.h>
+ #include <gst/gst.h>
+ #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);