Attachment #138793 for bug #184874

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

Lines 8-26 Link Here

(-)graphics/gtimelapse/Makefile (-6 / +10 lines)
8	MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here)	8	MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here)
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= An application for capturing images to generate timelapse videos	11	COMMENT= Application for capturing images to generate timelapse videos
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2	15	LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
		16
		17	WRKSRC= ${WRKDIR}/${PORTNAME}
16		18
17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG}
19	USES= pkgconfig	19	USES= pkgconfig
20	USE_WX= 2.8+	20	USE_WX= 2.8+
21	WRKSRC= ${WRKDIR}/${PORTNAME}	21	WX_CONF_ARGS= absolute
		22	USE_AUTOTOOLS= libtoolize aclocal automake autoconf
		23	LIBTOOLIZE_ARGS=--copy --force
		24	AUTOMAKE_ARGS= --add-missing --copy
22		25
23	PLIST_FILES= bin/${PORTNAME}	26	PLIST_FILES= bin/${PORTNAME}
24		27
25	NO_STAGE= yes	28	DESKTOP_ENTRIES="gTimelapse" "" "" "${PORTNAME}" "Graphics;GTK;" ""
		29
26	.include <bsd.port.mk>	30	.include <bsd.port.mk>




--- src/gtimelapse.cpp.orig
+++ src/gtimelapse.cpp
@@ -155,7 +155,11 @@
 					//cout << "type: RADIO" << endl;
 					//cout << "current: " << current << endl;
 
+#ifdef __clang__
+					wxString *choices = new wxString[cnt];
+#else
 					wxString choices[cnt];
+#endif
 					
 					for ( i=0; i<cnt; i++) {
 						const char *choice;
@@ -165,6 +169,10 @@
 						choices[i] = mystring;
 					}
 			
+#ifdef __clang__
+					delete [] choices;
+#endif
+
 					wxString title(label, wxConvUTF8);
 					wxString default_choice(current, wxConvUTF8);
 					wxString choice_label(uselabel, wxConvUTF8);

Return to bug 184874

Line 0 Link Here

(-)graphics/gtimelapse/files/patch-src__gtimelapse.cpp (+25 lines)
	1	--- src/gtimelapse.cpp.orig
	2	+++ src/gtimelapse.cpp
	3	@@ -155,7 +155,11 @@
	4	//cout << "type: RADIO" << endl;
	5	//cout << "current: " << current << endl;
	6
	7	+#ifdef __clang__
	8	+ wxString *choices = new wxString[cnt];
	9	+#else
	10	wxString choices[cnt];
	11	+#endif
	12
	13	for ( i=0; i<cnt; i++) {
	14	const char *choice;
	15	@@ -165,6 +169,10 @@
	16	choices[i] = mystring;
	17	}
	18
	19	+#ifdef __clang__
	20	+ delete [] choices;
	21	+#endif
	22	+
	23	wxString title(label, wxConvUTF8);
	24	wxString default_choice(current, wxConvUTF8);
	25	wxString choice_label(uselabel, wxConvUTF8);