main/xfburn: misc patches from fedora

3 files changed, 90 insertions, 5 deletions

diff --git a/main/xfburn/APKBUILD b/main/xfburn/APKBUILD
index 44a080b98..3ce2c055c 100644
--- a/main/xfburn/APKBUILD
+++ b/main/xfburn/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfburn
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="a simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
 arch="all"
@@ -12,7 +12,10 @@ makedepends="libburn-dev libisofs-dev libxfcegui4-dev thunar-dev librsvg-dev
 install=
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/xfburn-$pkgver.tar.bz2
-	fix_empty_dir_segfault.patch"
+	fix_empty_dir_segfault.patch
+	xfburn-0.4.3-if-with-several-statements.patch
+	xfburn-0.4.3-desktop-file.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -29,8 +32,7 @@ prepare() {
 		xfburn/xfburn-settings.h
 }
 
-build () 
-{ 
+build () {
 	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
@@ -49,4 +51,14 @@ package() {
 }
 
 md5sums="147cdc2d909e751125be16103b8dc81f  xfburn-0.4.3.tar.bz2
-7e04ba806e3a0d945d5921dc5d875bdd  fix_empty_dir_segfault.patch"
+7e04ba806e3a0d945d5921dc5d875bdd  fix_empty_dir_segfault.patch
+66f61a08305577efb1d27f0265475d5a  xfburn-0.4.3-if-with-several-statements.patch
+2a49044f041c50951aef1e22606e2e18  xfburn-0.4.3-desktop-file.patch"
+sha256sums="c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe  xfburn-0.4.3.tar.bz2
+fe7a5678b1ca55d324b8369c304007ccd0103bf6ba2b5a94a8e5fd2cc35ebb63  fix_empty_dir_segfault.patch
+0301453fc4433350540134a9258b1647f945465ddb7cd1d4f710c702d85fb1be  xfburn-0.4.3-if-with-several-statements.patch
+a2bf198d7a5610342caa69c07c2165478765edca5d7fccc60e98b4123ad3e3f4  xfburn-0.4.3-desktop-file.patch"
+sha512sums="3b82d763f6ac542eeaac0d752faa487f9f5101b6e2d11080e4ec80141496a3c80edfeb0249b37d7bef49505b37c1dd60468253758bbedbd1258a8f3f0db99205  xfburn-0.4.3.tar.bz2
+fd34ca1a36ad8faef1199d5688c02977a40deb5cd20bc04abd084fc4109a723d445a133930fe3a71827b72735489e708d4ef403be4f508cff496156cc83d3ee5  fix_empty_dir_segfault.patch
+aee7e0e25642bc615769fc4b4d2ccceec5bd412b5702100a462cb2ca28b64049cba0e783fde6fd8d107a553f3bcae536b1d2b7feed66cc17a8ceff7dc32e40d5  xfburn-0.4.3-if-with-several-statements.patch
+7ed8152ef2c33a136b88d6b2ea9c22b76a0f1d722773a85cc204634a82526227851e2f4eb465e31dcbbec985be5479bd87568a8edc0c1ad357ee78d84662dd45  xfburn-0.4.3-desktop-file.patch"
diff --git a/main/xfburn/xfburn-0.4.3-desktop-file.patch b/main/xfburn/xfburn-0.4.3-desktop-file.patch
new file mode 100644
index 000000000..7669b5fb8
--- /dev/null
+++ b/main/xfburn/xfburn-0.4.3-desktop-file.patch
@@ -0,0 +1,19 @@
+--- xfburn-0.4.3.orig/xfburn.desktop.in	2009-08-13 01:12:26.000000000 +0200
++++ xfburn-0.4.3/xfburn.desktop.in	2012-09-28 22:12:14.840869423 +0200
+@@ -6,7 +6,7 @@
+ Exec=xfburn
+ TryExec=xfburn
+ Icon=media-cdrom
+-MimeType=application/x-cd-image
++MimeType=application/x-cd-image;
+ Terminal=false
+ Categories=X-XFCE;GTK;DiscBurning;Archiving;AudioVideo;
+ StartupNotify=true
+@@ -14,7 +14,6 @@
+ Actions=BurnImage;
+ 
+ [Desktop Action BurnImage]
+-MimeType=application/x-cd-image
+ Icon=media-cdrom
+ Exec=xfburn -i %f
+ _Name=Burn Image (xfburn)
diff --git a/main/xfburn/xfburn-0.4.3-if-with-several-statements.patch b/main/xfburn/xfburn-0.4.3-if-with-several-statements.patch
new file mode 100644
index 000000000..18de28f58
--- /dev/null
+++ b/main/xfburn/xfburn-0.4.3-if-with-several-statements.patch
@@ -0,0 +1,54 @@
+same as http://git.xfce.org/apps/xfburn/commit/?id=e1d6bfc2 but against 0.4.3
+https://bugzilla.xfce.org/show_bug.cgi?id=7103
+
+diff -dur xfburn-0.4.3.orig/xfburn/xfburn-data-composition.c xfburn-0.4.3/xfburn/xfburn-data-composition.c
+--- xfburn-0.4.3.orig/xfburn/xfburn-data-composition.c	2009-12-04 08:46:43.000000000 +0100
++++ xfburn-0.4.3/xfburn/xfburn-data-composition.c	2012-09-28 21:59:01.975954901 +0200
+@@ -1075,7 +1075,9 @@
+     
+     /* ensure that we can only drop on top of folders, not files */
+     if (insertion) {
++      gdk_threads_enter ();
+       gtk_tree_model_get (model, insertion, DATA_COMPOSITION_COLUMN_TYPE, &parent_type, -1);
++      gdk_threads_leave ();
+ 
+       if (parent_type == DATA_COMPOSITION_TYPE_FILE) {
+         DBG ("Parent is file, and we're dropping into %d", position);
+@@ -1116,9 +1118,7 @@
+     } else {
+       tree_path = gtk_tree_path_new_first ();
+     }
+-    gdk_threads_leave ();
+     
+-    gdk_threads_enter ();
+     if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
+       xfce_err (_("A file with the same name is already present in the composition."));
+ 
+@@ -1821,10 +1821,11 @@
+       
+       if (thread_add_file_to_list (composition, model, full_path, &iter, &iter_where_insert, position)) {
+         if (position == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE 
+-            || position == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
++            || position == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) {
+           gdk_threads_enter ();
+           gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), priv->path_where_insert, FALSE);
+           gdk_threads_leave ();
++        }
+       }
+       
+     } else  {
+diff -dur xfburn-0.4.3.orig/xfburn/xfburn-utils.h xfburn-0.4.3/xfburn/xfburn-utils.h
+--- xfburn-0.4.3.orig/xfburn/xfburn-utils.h	2009-12-04 08:30:28.000000000 +0100
++++ xfburn-0.4.3/xfburn/xfburn-utils.h	2012-09-28 21:59:01.976954907 +0200
+@@ -27,6 +27,11 @@
+ 
+ #include "xfburn-global.h"
+ 
++/*
++#define XFBURN_GDK_ENTER() { DBG("gdk-thread-enter"); gdk_threads_enter(); }
++#define XFBURN_GDK_LEAVE() { DBG("gdk-thread-leave"); gdk_threads_leave(); }
++*/
++
+ void xfburn_busy_cursor (GtkWidget *);
+ void xfburn_default_cursor (GtkWidget *);
+