Attachment #92347 for bug #129983

View | Details | Raw Unified | Return to bug 129983
Collapse All | Expand All




#

PORTNAME=	xfburn
PORTVERSION=	0.4.0
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://goodies.xfce.org/releases/xfburn/



LIB_DEPENDS=	burn.23:${PORTSDIR}/devel/libburn \
		isofs.12:${PORTSDIR}/devel/libisofs
RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
		cdrdao:${PORTSDIR}/sysutils/cdrdao \
		cdrecord:${PORTSDIR}/sysutils/cdrtools

GNU_CONFIGURE=	yes

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.post.mk>

Lines 1-3 Link Here

(-)xfburn/distinfo (-3 / +3 lines)
1	MD5 (xfburn-0.3.91.tar.bz2) = fbf53524dcdc5abc630e36e48b8cf4d2	1	MD5 (xfburn-0.4.0.tar.bz2) = 621a59415138c191c25e3d30a5ed5742
2	SHA256 (xfburn-0.3.91.tar.bz2) = 54ca10ddb44367dd0b4b4a81ecbca76d28633467fb01240a8db9d0ed4d356822	2	SHA256 (xfburn-0.4.0.tar.bz2) = 69c8ab440e3338f916cf2a4310b751d9383d87cfa0bf72e05be9dfff9a3d6e30
3	SIZE (xfburn-0.3.91.tar.bz2) = 623780	3	SIZE (xfburn-0.4.0.tar.bz2) = 625794




--- 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);




%%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

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

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

@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

@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

Return to bug 129983

Lines 6-13 Link Here

(-)xfburn/Makefile (-6 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= xfburn	8	PORTNAME= xfburn
9	PORTVERSION= 0.3.91	9	PORTVERSION= 0.4.0
10	PORTREVISION= 1
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://goodies.xfce.org/releases/xfburn/	11	MASTER_SITES= http://goodies.xfce.org/releases/xfburn/
13		12
Lines 16-23 Link Here
16		15
17	LIB_DEPENDS= burn.23:${PORTSDIR}/devel/libburn \	16	LIB_DEPENDS= burn.23:${PORTSDIR}/devel/libburn \
18	isofs.12:${PORTSDIR}/devel/libisofs	17	isofs.12:${PORTSDIR}/devel/libisofs
19	RUN_DEPENDS= hal-device:${PORTSDIR}/sysutils/hal \	18	RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao \
20	cdrdao:${PORTSDIR}/sysutils/cdrdao \
21	cdrecord:${PORTSDIR}/sysutils/cdrtools	19	cdrecord:${PORTSDIR}/sysutils/cdrtools
22		20
23	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
Lines 26-33 Link Here
26	USE_BZIP2= yes	24	USE_BZIP2= yes
27	USE_GMAKE= yes	25	USE_GMAKE= yes
28	USE_GETTEXT= yes	26	USE_GETTEXT= yes
29	INSTALLS_ICONS= yes
30	USE_GNOME= intltool pkgconfig	27	USE_GNOME= intltool pkgconfig
31	USE_XFCE= configenv libexo libgui	28	USE_XFCE= configenv libexo libgui
		29	INSTALLS_ICONS= yes
		30
		31	OPTIONS = DBUS "Enable dbus support" on\
		32	HAL "Enable hal support" on\
		33	GSTREAMER "Enable gstreamer for audio support" off
		34
		35	.include <bsd.port.pre.mk>
		36
		37	.ifdef WITH_DBUS
		38	LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
		39	.else
		40	CONFIGURE_ARGS+= --disable-dbus
		41	.endif
		42
		43	.ifdef WITH_HAL
		44	LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
		45	.else
		46	CONFIGURE_ARGS+= --disable-hal
		47	.endif
		48
		49	.ifdef WITH_GSTREAMER
		50	USE_GSTREAMER= core
		51	.warning "GSTREAMER support not complete yet"
		52	.else
		53	CONFIGURE_ARGS+= --disable-gstreamer
		54	.endif
32		55
33	.include <bsd.port.mk>	56	.include <bsd.port.post.mk>

Lines 1-47 Link Here

(-)xfburn/files/patch-xfburn-xfburn-data-composition.c (-47 lines)
1	--- xfburn/xfburn-data-composition.c.orig 2008-09-14 04:41:53.000000000 -0400
2	+++ xfburn/xfburn-data-composition.c 2008-11-16 19:57:03.000000000 -0500
3	@@ -1099,6 +1099,7 @@
4	DATA_COMPOSITION_COLUMN_ICON, icon_directory,
5	DATA_COMPOSITION_COLUMN_CONTENT, name,
6	DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_DIRECTORY,
7	+ DATA_COMPOSITION_COLUMN_PATH, path,
8	DATA_COMPOSITION_COLUMN_SIZE, (guint64) 4, -1);
9	xfburn_disc_usage_add_size (XFBURN_DISC_USAGE (priv->disc_usage), (guint64) 4);
10	gdk_threads_leave ();
11	@@ -1742,10 +1743,7 @@
12	gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_TYPE, &type,
13	DATA_COMPOSITION_COLUMN_CONTENT, &name, DATA_COMPOSITION_COLUMN_PATH, &src, -1);
14
15	- if (type == DATA_COMPOSITION_TYPE_DIRECTORY)
16	- r = iso_tree_add_new_dir (parent, name, &dir);
17	- else
18	- r = iso_tree_add_node (image, parent, src, &node);
19	+ r = iso_tree_add_node (image, parent, src, &node);
20
21	if (r < 0) {
22	if (r == ISO_NULL_POINTER)
23	@@ -1758,9 +1756,11 @@
24	g_error ("Failed adding %s as a node to the image: code %d!", src, r);
25	}
26
27	- /* FIXME: do we need to call iso_node_ref on node? Probably not... */
28	+ /* why was this called again? iso_tree_add_node seems to do
29	+ * a good job setting the name by itself.
30	if (type != DATA_COMPOSITION_TYPE_DIRECTORY)
31	iso_node_set_name (node, name);
32	+ */
33
34	g_free (name);
35	g_free (src);
36	@@ -1768,10 +1768,9 @@
37	if (type == DATA_COMPOSITION_TYPE_DIRECTORY && gtk_tree_model_iter_has_child (model, iter)) {
38	GtkTreeIter child;
39
40	- /* FIXME: this should not cause a sigfault...
41	if (iso_node_get_type(node) != LIBISO_DIR)
42	g_error ("Expected %s to be a directory, but it isn't...\n", src);
43	- */
44	+ dir = (IsoDir *)node;
45
46	gtk_tree_model_iter_children (model, &child, iter);
47	fill_image_with_composition (model, image, dir, &child);

Lines 1-6 Link Here

(-)xfburn/pkg-plist (-1 / +6 lines)
1	%%DATADIR%%/xfburn-toolbars.ui	1	%%DATADIR%%/xfburn-toolbars.ui
2	%%DATADIR%%/xfburn.ui	2	%%DATADIR%%/xfburn.ui
3	bin/xfburn	3	bin/xfburn
		4	share/Thunar/sendto/thunar-sendto-xfburn.desktop
4	share/applications/xfburn.desktop	5	share/applications/xfburn.desktop
5	share/icons/hicolor/16x16/stock/media/stock_xfburn-audio-cd.png	6	share/icons/hicolor/16x16/stock/media/stock_xfburn-audio-cd.png
6	share/icons/hicolor/16x16/stock/media/stock_xfburn-blank-cdrw.png	7	share/icons/hicolor/16x16/stock/media/stock_xfburn-blank-cdrw.png
Lines 34-40 Link Here
34	share/icons/hicolor/48x48/stock/media/stock_xfburn-data-copy.png	35	share/icons/hicolor/48x48/stock/media/stock_xfburn-data-copy.png
35	share/icons/hicolor/48x48/stock/media/stock_xfburn-import-session.png	36	share/icons/hicolor/48x48/stock/media/stock_xfburn-import-session.png
36	share/icons/hicolor/48x48/stock/media/stock_xfburn-new-data-composition.png	37	share/icons/hicolor/48x48/stock/media/stock_xfburn-new-data-composition.png
37	share/icons/hicolor/icon-theme.cache
38	share/icons/hicolor/scalable/stock/media/stock_xfburn-audio-cd.svg	38	share/icons/hicolor/scalable/stock/media/stock_xfburn-audio-cd.svg
39	share/icons/hicolor/scalable/stock/media/stock_xfburn-blank-cdrw.svg	39	share/icons/hicolor/scalable/stock/media/stock_xfburn-blank-cdrw.svg
40	share/icons/hicolor/scalable/stock/media/stock_xfburn-burn-cd.svg	40	share/icons/hicolor/scalable/stock/media/stock_xfburn-burn-cd.svg
Lines 72-77 Link Here
72	share/locale/ru/LC_MESSAGES/xfburn.mo	72	share/locale/ru/LC_MESSAGES/xfburn.mo
73	share/locale/sq/LC_MESSAGES/xfburn.mo	73	share/locale/sq/LC_MESSAGES/xfburn.mo
74	share/locale/sv/LC_MESSAGES/xfburn.mo	74	share/locale/sv/LC_MESSAGES/xfburn.mo
		75	share/locale/tr/LC_MESSAGES/xfburn.mo
75	share/locale/uk/LC_MESSAGES/xfburn.mo	76	share/locale/uk/LC_MESSAGES/xfburn.mo
76	share/locale/ur/LC_MESSAGES/xfburn.mo	77	share/locale/ur/LC_MESSAGES/xfburn.mo
77	share/locale/zh_CN/LC_MESSAGES/xfburn.mo	78	share/locale/zh_CN/LC_MESSAGES/xfburn.mo
Lines 139-144 Link Here
139	@dirrmtry share/locale/sq	140	@dirrmtry share/locale/sq
140	@dirrmtry share/locale/sv/LC_MESSAGES	141	@dirrmtry share/locale/sv/LC_MESSAGES
141	@dirrmtry share/locale/sv	142	@dirrmtry share/locale/sv
		143	@dirrmtry share/locale/tr/LC_MESSAGES
		144	@dirrmtry share/locale/tr
142	@dirrmtry share/locale/uk/LC_MESSAGES	145	@dirrmtry share/locale/uk/LC_MESSAGES
143	@dirrmtry share/locale/uk	146	@dirrmtry share/locale/uk
144	@dirrmtry share/locale/ur/LC_MESSAGES	147	@dirrmtry share/locale/ur/LC_MESSAGES
Lines 147-150 Link Here
147	@dirrmtry share/locale/zh_CN	150	@dirrmtry share/locale/zh_CN
148	@dirrmtry share/locale/zh_TW/LC_MESSAGES	151	@dirrmtry share/locale/zh_TW/LC_MESSAGES
149	@dirrmtry share/locale/zh_TW	152	@dirrmtry share/locale/zh_TW
		153	@dirrmtry share/Thunar/sendto
		154	@dirrmtry share/Thunar
150	@unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null \|\| /usr/bin/true	155	@unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null \|\| /usr/bin/true