Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=089e9e17e42f50a83f91b9f010a6fc4dd890cea7
commit 089e9e17e42f50a83f91b9f010a6fc4dd890cea7 Author: Devil505 <[email protected]> Date: Sun Apr 29 16:34:15 2012 +0200 xfburn-0.4.3-7-i686 * fixing build diff --git a/source/xfce4-extra/xfburn/FrugalBuild b/source/xfce4-extra/xfburn/FrugalBuild index 5bf65b1..3c9b215 100644 --- a/source/xfce4-extra/xfburn/FrugalBuild +++ b/source/xfce4-extra/xfburn/FrugalBuild @@ -4,12 +4,12 @@ pkgname=xfburn pkgver=0.4.3 -pkgrel=6 +pkgrel=7 pkgdesc="A CD Recorder for Xfce4" url="http://goodies.xfce.org/projects/applications/$pkgname"; makedepends=('intltool' 'pkgconfig') depends=('thunar>=1.3.2' 'libexo>=0.7.0' 'libxfcegui4>=4.9.0' \ - 'libisofs>=1.2.2' 'libburn>=1.2.2') + 'libisofs>=1.2.2' 'libburn>=1.2.2' 'gst-plugins-base') options=('scriptlet') groups=('xfce4-extra' 'xfce4-goodies') archs=('i686' 'x86_64') @@ -17,4 +17,21 @@ _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091') +build() { + Fcd + Fpatchall + + # fix build issue + sed -i '1 i\ + #include <glib-object.h>' \ + xfburn/xfburn-settings.h + + Fmake + --enable-gstreamer \ + --enable-dbus \ + --disable-hal + Fmakeinstall + Fbuild_gnome_scriptlet +} + # optimization OK diff --git a/source/xfce4-extra/xfburn/fix_empty_dir_segfault.diff b/source/xfce4-extra/xfburn/fix_empty_dir_segfault.diff new file mode 100644 index 0000000..b5543a5 --- /dev/null +++ b/source/xfce4-extra/xfburn/fix_empty_dir_segfault.diff @@ -0,0 +1,47 @@ +--- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 ++++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
