Attachment 92347 Details for Bug 129983 – file.diff

[patch] file.diff

file.diff (text/plain), 6.22 KB, created by J.R. Oldroyd on 2008-12-27 22:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2008-12-27 22:20:03 UTC

Size: 6.22 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/xfburn/Makefile xfburn/Makefile
>--- /usr/ports/sysutils/xfburn/Makefile	2008-11-29 15:16:51.000000000 -0500
>+++ xfburn/Makefile	2008-12-27 16:40:44.000000000 -0500
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	xfburn
>-PORTVERSION=	0.3.91
>-PORTREVISION=	1
>+PORTVERSION=	0.4.0
> CATEGORIES=	sysutils
> MASTER_SITES=	http://goodies.xfce.org/releases/xfburn/
> 
>@@ -16,8 +15,7 @@
> 
> LIB_DEPENDS=	burn.23:${PORTSDIR}/devel/libburn \
> 		isofs.12:${PORTSDIR}/devel/libisofs
>-RUN_DEPENDS=	hal-device:${PORTSDIR}/sysutils/hal \
>-		cdrdao:${PORTSDIR}/sysutils/cdrdao \
>+RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
> 		cdrecord:${PORTSDIR}/sysutils/cdrtools
> 
> GNU_CONFIGURE=	yes
>@@ -26,8 +24,33 @@
> USE_BZIP2=	yes
> USE_GMAKE=	yes
> USE_GETTEXT=	yes
>-INSTALLS_ICONS=	yes
> USE_GNOME=	intltool pkgconfig
> USE_XFCE=	configenv libexo libgui
>+INSTALLS_ICONS=	yes
>+
>+OPTIONS =	DBUS		"Enable dbus support"	on\
>+		HAL		"Enable hal support"	on\
>+		GSTREAMER	"Enable gstreamer for audio support"	off
>+
>+.include <bsd.port.pre.mk>
>+
>+.ifdef WITH_DBUS
>+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
>+.else
>+CONFIGURE_ARGS+=	--disable-dbus
>+.endif
>+
>+.ifdef WITH_HAL
>+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
>+.else
>+CONFIGURE_ARGS+=	--disable-hal
>+.endif
>+
>+.ifdef WITH_GSTREAMER
>+USE_GSTREAMER=	core
>+.warning	"GSTREAMER support not complete yet"
>+.else
>+CONFIGURE_ARGS+=	--disable-gstreamer
>+.endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN /usr/ports/sysutils/xfburn/distinfo xfburn/distinfo
>--- /usr/ports/sysutils/xfburn/distinfo	2008-11-21 15:53:17.000000000 -0500
>+++ xfburn/distinfo	2008-12-27 15:41:16.000000000 -0500
>@@ -1,3 +1,3 @@
>-MD5 (xfburn-0.3.91.tar.bz2) = fbf53524dcdc5abc630e36e48b8cf4d2
>-SHA256 (xfburn-0.3.91.tar.bz2) = 54ca10ddb44367dd0b4b4a81ecbca76d28633467fb01240a8db9d0ed4d356822
>-SIZE (xfburn-0.3.91.tar.bz2) = 623780
>+MD5 (xfburn-0.4.0.tar.bz2) = 621a59415138c191c25e3d30a5ed5742
>+SHA256 (xfburn-0.4.0.tar.bz2) = 69c8ab440e3338f916cf2a4310b751d9383d87cfa0bf72e05be9dfff9a3d6e30
>+SIZE (xfburn-0.4.0.tar.bz2) = 625794
>diff -ruN /usr/ports/sysutils/xfburn/files/patch-xfburn-xfburn-data-composition.c xfburn/files/patch-xfburn-xfburn-data-composition.c
>--- /usr/ports/sysutils/xfburn/files/patch-xfburn-xfburn-data-composition.c	2008-11-29 15:16:51.000000000 -0500
>+++ xfburn/files/patch-xfburn-xfburn-data-composition.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,47 +0,0 @@
>---- xfburn/xfburn-data-composition.c.orig	2008-09-14 04:41:53.000000000 -0400
>-+++ xfburn/xfburn-data-composition.c	2008-11-16 19:57:03.000000000 -0500
>-@@ -1099,6 +1099,7 @@
>-                           DATA_COMPOSITION_COLUMN_ICON, icon_directory,
>-                           DATA_COMPOSITION_COLUMN_CONTENT, name,
>-                           DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_DIRECTORY, 
>-+                          DATA_COMPOSITION_COLUMN_PATH, path,
>-                           DATA_COMPOSITION_COLUMN_SIZE, (guint64) 4, -1);
>-       xfburn_disc_usage_add_size (XFBURN_DISC_USAGE (priv->disc_usage), (guint64) 4);
>-       gdk_threads_leave ();
>-@@ -1742,10 +1743,7 @@
>-       gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_TYPE, &type,
>- 			  DATA_COMPOSITION_COLUMN_CONTENT, &name, DATA_COMPOSITION_COLUMN_PATH, &src, -1);
>- 
>--      if (type == DATA_COMPOSITION_TYPE_DIRECTORY)
>--        r = iso_tree_add_new_dir (parent, name, &dir);
>--      else
>--        r = iso_tree_add_node (image, parent, src, &node);
>-+      r = iso_tree_add_node (image, parent, src, &node);
>- 
>-       if (r < 0) {
>-         if (r == ISO_NULL_POINTER)
>-@@ -1758,9 +1756,11 @@
>-           g_error ("Failed adding %s as a node to the image: code %d!", src, r);
>-       }
>- 
>--      /* FIXME: do we need to call iso_node_ref on node? Probably not... */
>-+      /* why was this called again? iso_tree_add_node seems to do
>-+       * a good job setting the name by itself.
>-       if (type != DATA_COMPOSITION_TYPE_DIRECTORY)
>-         iso_node_set_name (node, name);
>-+      */
>- 
>-       g_free (name);
>-       g_free (src);
>-@@ -1768,10 +1768,9 @@
>-       if (type == DATA_COMPOSITION_TYPE_DIRECTORY && gtk_tree_model_iter_has_child (model, iter)) {
>- 	GtkTreeIter child;
>- 
>--        /* FIXME: this should not cause a sigfault... 
>-         if (iso_node_get_type(node) != LIBISO_DIR)
>-             g_error ("Expected %s to be a directory, but it isn't...\n", src);
>--        */
>-+        dir = (IsoDir *)node;
>- 
>- 	gtk_tree_model_iter_children (model, &child, iter);
>- 	fill_image_with_composition (model, image, dir, &child);
>diff -ruN /usr/ports/sysutils/xfburn/pkg-plist xfburn/pkg-plist
>--- /usr/ports/sysutils/xfburn/pkg-plist	2008-11-21 15:53:17.000000000 -0500
>+++ xfburn/pkg-plist	2008-12-27 17:02:52.000000000 -0500
>@@ -1,6 +1,7 @@
> %%DATADIR%%/xfburn-toolbars.ui
> %%DATADIR%%/xfburn.ui
> bin/xfburn
>+share/Thunar/sendto/thunar-sendto-xfburn.desktop
> share/applications/xfburn.desktop
> share/icons/hicolor/16x16/stock/media/stock_xfburn-audio-cd.png
> share/icons/hicolor/16x16/stock/media/stock_xfburn-blank-cdrw.png
>@@ -34,7 +35,6 @@
> share/icons/hicolor/48x48/stock/media/stock_xfburn-data-copy.png
> share/icons/hicolor/48x48/stock/media/stock_xfburn-import-session.png
> share/icons/hicolor/48x48/stock/media/stock_xfburn-new-data-composition.png
>-share/icons/hicolor/icon-theme.cache
> share/icons/hicolor/scalable/stock/media/stock_xfburn-audio-cd.svg
> share/icons/hicolor/scalable/stock/media/stock_xfburn-blank-cdrw.svg
> share/icons/hicolor/scalable/stock/media/stock_xfburn-burn-cd.svg
>@@ -72,6 +72,7 @@
> share/locale/ru/LC_MESSAGES/xfburn.mo
> share/locale/sq/LC_MESSAGES/xfburn.mo
> share/locale/sv/LC_MESSAGES/xfburn.mo
>+share/locale/tr/LC_MESSAGES/xfburn.mo
> share/locale/uk/LC_MESSAGES/xfburn.mo
> share/locale/ur/LC_MESSAGES/xfburn.mo
> share/locale/zh_CN/LC_MESSAGES/xfburn.mo
>@@ -139,6 +140,8 @@
> @dirrmtry share/locale/sq
> @dirrmtry share/locale/sv/LC_MESSAGES
> @dirrmtry share/locale/sv
>+@dirrmtry share/locale/tr/LC_MESSAGES
>+@dirrmtry share/locale/tr
> @dirrmtry share/locale/uk/LC_MESSAGES
> @dirrmtry share/locale/uk
> @dirrmtry share/locale/ur/LC_MESSAGES
>@@ -147,4 +150,6 @@
> @dirrmtry share/locale/zh_CN
> @dirrmtry share/locale/zh_TW/LC_MESSAGES
> @dirrmtry share/locale/zh_TW
>+@dirrmtry share/Thunar/sendto
>+@dirrmtry share/Thunar
> @unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 129983: 92347