diff options
| -rw-r--r-- | app-cdr/xfburn/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/xfburn/Manifest | 21 | ||||
| -rw-r--r-- | app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch | 51 | ||||
| -rw-r--r-- | app-cdr/xfburn/metadata.xml | 7 | ||||
| -rw-r--r-- | app-cdr/xfburn/xfburn-0.4.3-r1.ebuild | 42 | ||||
| -rw-r--r-- | app-cdr/xfburn/xfburn-0.4.3-r2.ebuild | 47 |
6 files changed, 17 insertions, 158 deletions
diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog index 6dba783624f8..9e707c4696a0 100644 --- a/app-cdr/xfburn/ChangeLog +++ b/app-cdr/xfburn/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/xfburn # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.40 2012/01/02 12:59:57 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.41 2012/01/02 13:02:04 ssuominen Exp $ + + 02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -xfburn-0.4.3-r1.ebuild, + -xfburn-0.4.3-r2.ebuild, + -files/xfburn-0.4.3-empty_directory_segmentation_fault.patch: + old 02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xfburn-0.4.3-r3.ebuild: ppc stable wrt #395727 diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest index a7766002ba7b..374149a79abf 100644 --- a/app-cdr/xfburn/Manifest +++ b/app-cdr/xfburn/Manifest @@ -2,23 +2,20 @@ Hash: SHA1 AUX xfburn-0.4.3-empty_directory_segmentation_fault-2.patch 1552 RMD160 7be46a0babba8fb482c0f1f537e8ccbe938de085 SHA1 ff74a755efa17b7bb104dc240564c1bf8aea7bf3 SHA256 b652dcab849b6d0036321980499a63dfc763c9486ac719546b67b0021275efec -AUX xfburn-0.4.3-empty_directory_segmentation_fault.patch 1600 RMD160 77de719551a90a3c6c5b0396ef588e56aed8ece2 SHA1 6456f186567aede44acdb573119b33df4083bf68 SHA256 bf89abd6499f784b30dc33b1ef05911a6a6c15aae1517824563f0b00aba027c1 AUX xfburn-0.4.3-update_desktop_entry.patch 548 RMD160 6b421fc8c21d48964eaa4fd62ef33a98437f780c SHA1 86ca21c9c286dc874f2d8073b06454dce22993c7 SHA256 d4951a830908551089ea1c7aca4e8151697b27a487dbec4f38af6218659ddf18 DIST xfburn-0.4.3.tar.bz2 652080 RMD160 01dff258d42d05812cf0697304ebe0062291b185 SHA1 52d33e56b7ce9774fba680f50723eaf1a7215091 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe DIST xfburn_0.4.3-4.debian.tar.gz 25747 RMD160 e5eb2cc78aad447e194ef0f30521ec32c3b1fd3e SHA1 31aca5d1b08a1ff3ecd6315cbb86c765685140b7 SHA256 d5d2de1bccf7e5e4083beada69385a3e5a1d0636534b87fbd0af84cf1a8e53e5 -EBUILD xfburn-0.4.3-r1.ebuild 1109 RMD160 55cd3f38d32cbf1452e66e6f3f8eb47d8c7fdf49 SHA1 ea78c6fe06474e48da6c372a70d7a7e17e1639df SHA256 58da13a4f52c93cb7ebfa25744aac73a203717be7437d3e6e7403f153e710b03 -EBUILD xfburn-0.4.3-r2.ebuild 1238 RMD160 a3c3bd074463c92624e19a2be5496b4cadf39d61 SHA1 b339c4d3680cd8f28173c47727b6836a3915bc41 SHA256 d4c1294834266be5112735b6b5d6ba831b5554980093793d1303783b504ad78b EBUILD xfburn-0.4.3-r3.ebuild 1355 RMD160 1e87f477549deeb4d5f89a26b83b0fe6c2637866 SHA1 ebbcd278cc12ba214b03c7a2b8bf3504a70b23fa SHA256 0513e317fc9b0c86b8a63655874199a727c0cab270e8dee64b762067a1316696 -MISC ChangeLog 7368 RMD160 65da0309be61a5ad983847ec3498c2cbdb63bb04 SHA1 e6d5847b8dd24f514f56b4002d3ffc0405a13bcd SHA256 1edf86c94164c72d107f117e13c4a1aac826de96f981848ad4c318c6ed857657 -MISC metadata.xml 569 RMD160 7924d2fa97fc89007c4f2fd5d0a100b99eced706 SHA1 b55b51a5adbe95b51cee59960d0a439eb38db395 SHA256 b77cc26004978479303a4b0159aa70a4d07dfaae2d474089ac1390965c409979 +MISC ChangeLog 7545 RMD160 c932698c4a84d0784d44c560afe6c0148d6f45c6 SHA1 f95c55cfb0dc8c6ee613a5909f4c1bd0cf5e906b SHA256 ae0815601825bfac782ff31d934e3a6ab4cc9fbef1e98a69fae28765b8c091eb +MISC metadata.xml 416 RMD160 c23d4bd0dece8f53867f77a21ce4a936f7f19801 SHA1 bf72b7563cf956510fe92c621c5a9655eb929d0b SHA256 2b6481a76d444a68722d1817dff6eaff3d83b1a5de2b8d940153a854f946a070 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPAaniAAoJEEdUh39IaPFNMm0H+wXgJTOvyLn9dgbdBTARbeUI -Mcj50yvY5yO4iGDe3ivvIcj8gTgwbxfr+DXYh9OU56cNz506ULlKfNdCMngfQExb -aLWmLMEAzpDRnr9gvFDhO+uh7fpTNNamKPsW/ofYOMZO2cezk4kDA8W80lvqhhb5 -lODL3UuGCJvO7gvHMFMyoPOTxtQAg9h84yMiJk7uvQ6ibSjGuT+6vKXRDWQA0lDX -yJWiXhJBG2dE0xtry36O/pJteHthi3UCWCnu5vFBw6nKhpGs72Aw2Om/julDVSoj -ppWPDBt6vo0MLvYjN2u8MX7AqflI0BrJl+XhDThbQl/n9w7LT76StJtY29vf36A= -=mLXk +iQEcBAEBAgAGBQJPAapjAAoJEEdUh39IaPFNmYYH/RGoHHcpF1fFrcov3kHzT3H5 +0fnavfibL7TzxVzXDxcWBQC5R+exCEjXWYS4wJTlsG7OS/vYL+znhNEw0bZu+Olm +dGGkM6urMSpZqPEuKXQD6Fi5maB8Feer/KOpHSbH//lBuQ3zVWn9tMs2XUeN/TUz +BPvAI6e1qBObDIoMSjhqiYMFmkcmqH70Zrrje09rk1mUpnwdIWfklgg+Ctl1/Cpp +uzcSi238OH3Mb1oPfKZbYudtLCMi5Xlwsx6snSsPKP6+GxG5ttDiTh70GKCMimNT +tKJnEc9bso7erwgMwEOKbrM/EqXXe88SdsGAkbSUUzrvi85+oMWeCMWl8NWDu8o= +=ixuq -----END PGP SIGNATURE----- diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch deleted file mode 100644 index d80f98eff580..000000000000 --- a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch +++ /dev/null @@ -1,51 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=331135 -http://bugzilla.xfce.org/show_bug.cgi?id=6805 - ---- xfburn/xfburn-data-composition.c -+++ xfburn/xfburn-data-composition.c -@@ -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); - diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml index e9e695875599..3f7e35e557e2 100644 --- a/app-cdr/xfburn/metadata.xml +++ b/app-cdr/xfburn/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>xfce</herd> -<herd>media-optical</herd> + <herd>xfce</herd> + <herd>media-optical</herd> <upstream> <maintainer> <email>mario@xfce.org</email> @@ -14,7 +14,4 @@ <name>David Mohr</name> </maintainer> </upstream> - <use> - <flag name='thunar'>Use Thunar VFS layer for mimetype and icons support (WARNING: deprecated, will be replaced by GIO in future)</flag> - </use> </pkgmetadata> diff --git a/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild deleted file mode 100644 index ff8c3aa3cab7..000000000000 --- a/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild,v 1.8 2011/05/19 22:18:17 ssuominen Exp $ - -EAPI=4 -inherit xfconf - -DESCRIPTION="GTK+ based CD and DVD burning application" -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn" -SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="dbus debug gstreamer thunar" - -RDEPEND=">=dev-libs/libburn-0.4.2 - >=dev-libs/libisofs-0.6.2 - >=x11-libs/gtk+-2.10:2 - x11-themes/hicolor-icon-theme - >=xfce-base/libxfcegui4-4.8 - >=xfce-base/exo-0.6 - dbus? ( >=dev-libs/dbus-glib-0.88 ) - gstreamer? ( media-libs/gstreamer:0.10 - >=media-libs/gst-plugins-base-0.10.20:0.10 ) - thunar? ( xfce-extra/thunar-vfs )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - sys-devel/gettext" - -pkg_setup() { - XFCONF=( - $(use_enable dbus) - $(xfconf_use_debug) - $(use_enable gstreamer) - --disable-hal - $(use_enable thunar thunar-vfs) - ) - - DOCS=( AUTHORS ChangeLog NEWS README TODO ) -} diff --git a/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild deleted file mode 100644 index b5c6419cdac1..000000000000 --- a/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild,v 1.2 2011/10/29 17:06:28 ssuominen Exp $ - -EAPI=4 -inherit xfconf - -DESCRIPTION="GTK+ based CD and DVD burning application" -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn" -SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dbus debug gstreamer thunar" - -RDEPEND=">=dev-libs/libburn-0.4.2 - >=dev-libs/libisofs-0.6.2 - >=x11-libs/gtk+-2.10:2 - x11-themes/hicolor-icon-theme - >=xfce-base/libxfcegui4-4.8 - >=xfce-base/exo-0.6 - dbus? ( >=dev-libs/dbus-glib-0.88 ) - gstreamer? ( media-libs/gstreamer:0.10 - >=media-libs/gst-plugins-base-0.10.20:0.10 ) - thunar? ( xfce-extra/thunar-vfs )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - sys-devel/gettext" - -pkg_setup() { - PATCHES=( - "${FILESDIR}"/${P}-update_desktop_entry.patch - "${FILESDIR}"/${P}-empty_directory_segmentation_fault.patch - ) - - XFCONF=( - $(use_enable dbus) - $(xfconf_use_debug) - $(use_enable gstreamer) - --disable-hal - $(use_enable thunar thunar-vfs) - ) - - DOCS=( AUTHORS ChangeLog NEWS README TODO ) -} |