Attachment #138745 for bug #184828

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




WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

USE_BZIP2=	yes
USES=		dos2unix gmake
DOS2UNIX_GLOB=	*.cpp *.h
USE_WX=		2.6+
WX_UNICODE=	yes
USES=		dos2unix gmake

PLIST_FILES=	bin/xorg-edit \
		lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \


DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true

NO_STAGE=	yes
post-patch:
	@${REINPLACE_CMD} -e \
		's|^CXX =|CXX ?=| ; \

	@${ECHO_CMD} '	$$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile

do-install:
	(cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${STAGEDIR}${PREFIX}/bin)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \
		${STAGEDIR}${PREFIX}/lib/xorg-edit)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES
	(cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \
		${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices
	(cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \
		${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices)

.include <bsd.port.mk>




--- xorgedit/guiframe.cpp.orig
+++ xorgedit/guiframe.cpp
@@ -182,8 +182,13 @@
   otherSectionTab = new wxPanel(layout);                       // iles/modules/extensions/dri tab panel
   wxBoxSizer *otherSectionTabSizer=new wxBoxSizer(wxVERTICAL);
 
+#ifdef __clang__
+  wxString *tempList = new wxString[devListSize+1];  // initial list for combo und choice elements
+  wxString *optList = new wxString[optListSize];   // initial list for option combo und choice elements
+#else
   wxString tempList[devListSize+1];  // initial list for combo und choice elements
   wxString optList[optListSize];   // initial list for option combo und choice elements
+#endif
 
   optList[0]=_("----------");
   optList[1]=_("Add Option");
@@ -821,6 +826,11 @@
     if (ShowError()) return;
   }
   SetSaved(true);
+
+#ifdef __clang__
+  delete[] optList;
+  delete[] tempList;
+#endif
 }
 
 const bool GuiFrame::CreateBackup(void) const
@@ -1832,8 +1842,13 @@
 
   warningText->SetLabel(_("Warning: Improper use of this tool can cause damage to your\nxorg.conf and may not start your Xserver.\nYou must restart X to take the changes effect."));
 
+#ifdef __clang__
+  wxString *tempList = new wxString[devListSize+1];  // initial list for combo und choice elements
+  wxString *optList = new wxString[optListSize];   // initial list for option combo und choice elements
+#else
   wxString tempList[devListSize+1];  // initial list for combo und choice elements
   wxString optList[optListSize];   // initial list for option combo und choice elements
+#endif
   unsigned int offset=0;
   unsigned int i;
 
@@ -2269,6 +2284,11 @@
 
   driBox->SetLabel(_("DRI"));
   return(false);
+
+#ifdef __clang__
+  delete[] optList;
+  delete[] tempList;
+#endif
 }
 
 void GuiFrame::SetSaved(const bool save)

Return to bug 184828

Lines 15-24 Link Here

(-)x11/xorg-edit/Makefile (-9 / +8 lines)
15	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	15	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
16		16
17	USE_BZIP2= yes	17	USE_BZIP2= yes
		18	USES= dos2unix gmake
18	DOS2UNIX_GLOB= .cpp .h	19	DOS2UNIX_GLOB= .cpp .h
19	USE_WX= 2.6+	20	USE_WX= 2.6+
20	WX_UNICODE= yes	21	WX_UNICODE= yes
21	USES= dos2unix gmake
22		22
23	PLIST_FILES= bin/xorg-edit \	23	PLIST_FILES= bin/xorg-edit \
24	lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \	24	lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \
Lines 34-40 Link Here
34		34
35	DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true	35	DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true
36		36
37	NO_STAGE= yes
38	post-patch:	37	post-patch:
39	@${REINPLACE_CMD} -e \	38	@${REINPLACE_CMD} -e \
40	's\|^CXX =\|CXX ?=\| ; \	39	's\|^CXX =\|CXX ?=\| ; \
Lines 58-72 Link Here
58	@${ECHO_CMD} ' $$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile	57	@${ECHO_CMD} ' $$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile
59		58
60	do-install:	59	do-install:
61	(cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${PREFIX}/bin)	60	(cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${STAGEDIR}${PREFIX}/bin)
62	@${MKDIR} ${PREFIX}/lib/xorg-edit	61	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit
63	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \	62	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \
64	${PREFIX}/lib/xorg-edit)	63	${STAGEDIR}${PREFIX}/lib/xorg-edit)
65	@${MKDIR} ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES	64	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES
66	(cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \	65	(cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \
67	${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES)	66	${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES)
68	@${MKDIR} ${PREFIX}/lib/xorg-edit/options/devices	67	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices
69	(cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \	68	(cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \
70	${PREFIX}/lib/xorg-edit/options/devices)	69	${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices)
71		70
72	.include <bsd.port.mk>	71	.include <bsd.port.mk>

Line 0 Link Here

(-)x11/xorg-edit/files/patch-xorgedit__guiframe.cpp (+54 lines)
	1	--- xorgedit/guiframe.cpp.orig
	2	+++ xorgedit/guiframe.cpp
	3	@@ -182,8 +182,13 @@
	4	otherSectionTab = new wxPanel(layout); // iles/modules/extensions/dri tab panel
	5	wxBoxSizer *otherSectionTabSizer=new wxBoxSizer(wxVERTICAL);
	6
	7	+#ifdef __clang__
	8	+ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements
	9	+ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements
	10	+#else
	11	wxString tempList[devListSize+1]; // initial list for combo und choice elements
	12	wxString optList[optListSize]; // initial list for option combo und choice elements
	13	+#endif
	14
	15	optList[0]=_("----------");
	16	optList[1]=_("Add Option");
	17	@@ -821,6 +826,11 @@
	18	if (ShowError()) return;
	19	}
	20	SetSaved(true);
	21	+
	22	+#ifdef __clang__
	23	+ delete[] optList;
	24	+ delete[] tempList;
	25	+#endif
	26	}
	27
	28	const bool GuiFrame::CreateBackup(void) const
	29	@@ -1832,8 +1842,13 @@
	30
	31	warningText->SetLabel(_("Warning: Improper use of this tool can cause damage to your\nxorg.conf and may not start your Xserver.\nYou must restart X to take the changes effect."));
	32
	33	+#ifdef __clang__
	34	+ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements
	35	+ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements
	36	+#else
	37	wxString tempList[devListSize+1]; // initial list for combo und choice elements
	38	wxString optList[optListSize]; // initial list for option combo und choice elements
	39	+#endif
	40	unsigned int offset=0;
	41	unsigned int i;
	42
	43	@@ -2269,6 +2284,11 @@
	44
	45	driBox->SetLabel(_("DRI"));
	46	return(false);
	47	+
	48	+#ifdef __clang__
	49	+ delete[] optList;
	50	+ delete[] tempList;
	51	+#endif
	52	}
	53
	54	void GuiFrame::SetSaved(const bool save)