Attachment #158623 for bug #201479

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




# $FreeBSD: head/editors/xmlcopyeditor/Makefile 382163 2015-03-24 19:37:43Z marino $

PORTNAME=	xmlcopyeditor
PORTVERSION=	1.2.1.3
PORTREVISION=	4
CATEGORIES=	editors
MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}



LICENSE=	GPLv2

USE_WX=		2.8+
WX_COMPS=	wx contrib
WX_CONF_ARGS=	absolute
WX_UNICODE=	yes
USES=		gettext iconv dos2unix libtool
GNU_CONFIGURE=	yes

BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
		libxslt.so:${PORTSDIR}/textproc/libxslt \
		libaspell.so:${PORTSDIR}/textproc/aspell \

		libxml2.so:${PORTSDIR}/textproc/libxml2 \
		libexpat.so:${PORTSDIR}/textproc/expat2

USE_WX=		2.8+
WX_COMPS=	wx contrib
WX_CONF_ARGS=	absolute
WX_UNICODE=	yes
USES=		dos2unix gettext gmake iconv libtool
GNU_CONFIGURE=	yes

BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
    		intltool-update:${PORTSDIR}/textproc/intltool
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

CPPFLAGS+=	-I${LOCALBASE}/include \

Lines 1-2 Link Here

(-)xmlcopyeditor/distinfo (-2 / +2 lines)
1	SHA256 (xmlcopyeditor-1.2.0.11.tar.gz) = b63a1f5c124d163cf93760fd60cc86c179d4d2b474a875132648f305bc44757b	1	SHA256 (xmlcopyeditor-1.2.1.3.tar.gz) = 9b684b5042b4af85d3626fd55108bd1d63c0007b5c794ef7cc4b026012b29d2f
2	SIZE (xmlcopyeditor-1.2.0.11.tar.gz) = 1965438	2	SIZE (xmlcopyeditor-1.2.1.3.tar.gz) = 4266907

Line 0 Link Here

(-)xmlcopyeditor/files/patch-po_Makefile.in.in.diff (+10 lines)
	1	+++ po/Makefile.in.in
	2	@@ -34,7 +34,7 @@
	3	datarootdir = @datarootdir@
	4	libdir = @libdir@
	5	DATADIRNAME = @DATADIRNAME@
	6	-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
	7	+itlocaledir = @localedir@
	8	subdir = po
	9	install_sh = @install_sh@
	10	# Automake >= 1.8 provides @mkdir_p@.




+++ src/Makefile.in
@@ -283,8 +283,8 @@
@@ -260,8 +260,8 @@
 # these are the headers for your project
 noinst_HEADERS = $(srcdir)/*.h
 xmlcopyeditordir = ${prefix}/share/xmlcopyeditor

+applicationsdir = ${prefix}/share/applications
 
 # the application source, library search path, and link libraries
 xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \
@@ -287,19 +287,6 @@
 	-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
 
 nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
-	$(srcdir)/copying/*.txt \
-	$(srcdir)/copying/Apache/LICENSE-2.0 \
-	$(srcdir)/copying/Apache/LICENSE-2_files/* \
-	$(srcdir)/copying/Aspell/* \
-	$(srcdir)/copying/boost_shared_ptr/* \
-	$(srcdir)/copying/Expat/* \
-	$(srcdir)/copying/libxml2/* \
-	$(srcdir)/copying/libxslt/* \
-	$(srcdir)/copying/PCRE/* \
-	$(srcdir)/copying/Scintilla/* \
-	$(srcdir)/copying/wxStEditor/* \
-	$(srcdir)/copying/wxStyledTextCtrl/* \
-	$(srcdir)/copying/xmlcopyeditor/* \
 	$(srcdir)/dtd/*.* \
 	$(srcdir)/dtd/dita/*.* \
 	$(srcdir)/dtd/docbook/4.4/*.* \

Lines 1-11 Link Here

(-)xmlcopyeditor/files/patch-src_styledialog.cpp (-11 lines)
1	--- src/styledialog.cpp.orig 2013-11-21 15:48:45.000000000 +0100
2	+++ src/styledialog.cpp 2013-11-21 15:50:28.000000000 +0100
3	@@ -705,7 +705,7 @@
4
5	WrapExpat we;
6	ofs << "<table><tr><th>Term</th><th>Frequency</th></tr>";
7	- std::map<std::string, int>::iterator mapIterator;
8	+ std::map<std::string, int, NoCaseCompare>::iterator mapIterator;
9	int matchTotal = 0;
10
11	for (




--- src/wrapxerces.cpp.orig	2013-11-21 15:51:13.000000000 +0100
+++ src/wrapxerces.cpp	2013-11-21 16:01:41.000000000 +0100
@@ -201,12 +201,12 @@
 		return wxConvUTF8;
 	case 2:
 	{
-		const static wxMBConvUTF16 conv;
+		static wxMBConvUTF16 conv;
 		return conv;
 	}
 	case 4:
 	{
-		const static wxMBConvUTF32 conv;
+		static wxMBConvUTF32 conv;
 		return conv;
 	}
 	default:




--- src/xmlcopyeditor.cpp.orig	2013-08-07 15:31:32.000000000 +0200
+++ src/xmlcopyeditor.cpp	2013-08-07 15:35:13.000000000 +0200
@@ -2887,7 +2887,7 @@
 
 		const int arraySize = templateArray.GetCount();
 
-		wxString choiceArray[arraySize + 1];
+		wxString *choiceArray = new wxString[arraySize + 1];
 		for ( int i = 0; i < arraySize; ++i )
 			* ( choiceArray + i ) = templateArray.Item ( i );
 
@@ -2901,6 +2901,7 @@
 			return;
 		}
 		typeSelection = scd.GetStringSelection();
+        delete [] choiceArray;
 	}
 
 	if ( typeSelection == defaultSelection )
@@ -4384,20 +4385,23 @@
 	encodingVector.push_back ( _T ( "ISO-8859-1" ) );
 	encodingVector.push_back ( _T ( "US-ASCII" ) );
 	const int vectorSize = encodingVector.size();
-	wxString choiceArray[vectorSize + 1];
+	wxString *choiceArray = new wxString[vectorSize + 1];
 	for ( int i = 0; i < vectorSize; ++i )
 		* ( choiceArray + i ) = encodingVector.at ( i );
 	wxSingleChoiceDialog scd (
 	    this, _ ( "Choose an encoding:" ), _ ( "Encoding" ), vectorSize, choiceArray );
 
-	if ( scd.ShowModal() == wxID_CANCEL )
+	if ( scd.ShowModal() == wxID_CANCEL ) {
+        delete [] choiceArray;
 		return;
+    }
 
 	wxString selection;
 	std::string selectionUtf8, bufferUtf8;
 
 	selection = scd.GetStringSelection();
 	selectionUtf8 = selection.mb_str ( wxConvUTF8 );
+    delete [] choiceArray;
 
 	getRawText ( doc, bufferUtf8 );
 	XmlEncodingHandler::setUtf8 ( bufferUtf8, true );

Lines 1-5 Link Here

(-)xmlcopyeditor/pkg-plist (-26 / +34 lines)
1	bin/xmlcopyeditor	1	bin/xmlcopyeditor
		2	man/man1/xmlcopyeditor.1.gz
		3	share/appdata/xmlcopyeditor.appdata.xml
2	share/applications/xmlcopyeditor.desktop	4	share/applications/xmlcopyeditor.desktop
		5	share/locale/ca/LC_MESSAGES/xmlcopyeditor.mo
		6	share/locale/de/LC_MESSAGES/xmlcopyeditor.mo
		7	share/locale/en_US/LC_MESSAGES/xmlcopyeditor.mo
		8	share/locale/es/LC_MESSAGES/xmlcopyeditor.mo
		9	share/locale/fr/LC_MESSAGES/xmlcopyeditor.mo
		10	share/locale/it/LC_MESSAGES/xmlcopyeditor.mo
		11	share/locale/km/LC_MESSAGES/xmlcopyeditor.mo
		12	share/locale/nl/LC_MESSAGES/xmlcopyeditor.mo
		13	share/locale/ru/LC_MESSAGES/xmlcopyeditor.mo
		14	share/locale/sk/LC_MESSAGES/xmlcopyeditor.mo
		15	share/locale/sv/LC_MESSAGES/xmlcopyeditor.mo
		16	share/locale/uk_UA/LC_MESSAGES/xmlcopyeditor.mo
		17	share/locale/zh_CN/LC_MESSAGES/xmlcopyeditor.mo
		18	share/locale/zh_TW/LC_MESSAGES/xmlcopyeditor.mo
3	share/pixmaps/xmlcopyeditor.png	19	share/pixmaps/xmlcopyeditor.png
4	%%DATADIR%%/catalog/catalog	20	%%DATADIR%%/catalog/catalog
5	%%DATADIR%%/dtd/NewsML_1.2.dtd	21	%%DATADIR%%/dtd/NewsML_1.2.dtd
Lines 168-213 Link Here
168	%%DATADIR%%/png/stock_calc-accept-green.png	184	%%DATADIR%%/png/stock_calc-accept-green.png
169	%%DATADIR%%/png/stock_calc-accept.png	185	%%DATADIR%%/png/stock_calc-accept.png
170	%%DATADIR%%/png/stock_close.png	186	%%DATADIR%%/png/stock_close.png
171	%%DATADIR%%/png/stock_copy-16.png	187	%%DATADIR%%/png/stock_copy_16.png
172	%%DATADIR%%/png/stock_cut-16.png	188	%%DATADIR%%/png/stock_cut_16.png
173	%%DATADIR%%/png/stock_dialog-info-32.png	189	%%DATADIR%%/png/stock_dialog-info-32.png
174	%%DATADIR%%/png/stock_dialog-question-32.png	190	%%DATADIR%%/png/stock_dialog-question-32.png
175	%%DATADIR%%/png/stock_dialog-stop-32.png	191	%%DATADIR%%/png/stock_dialog-stop-32.png
176	%%DATADIR%%/png/stock_dialog-warning-32.png	192	%%DATADIR%%/png/stock_dialog-warning-32.png
177	%%DATADIR%%/png/stock_filters.png	193	%%DATADIR%%/png/stock_filters.png
178	%%DATADIR%%/png/stock_help-16.png	194	%%DATADIR%%/png/stock_help_16.png
179	%%DATADIR%%/png/stock_hyperlink.png	195	%%DATADIR%%/png/stock_hyperlink.png
180	%%DATADIR%%/png/stock_internet-16.png
181	%%DATADIR%%/png/stock_internet.png	196	%%DATADIR%%/png/stock_internet.png
182	%%DATADIR%%/png/stock_new-16.png	197	%%DATADIR%%/png/stock_internet_16.png
183	%%DATADIR%%/png/stock_new.png	198	%%DATADIR%%/png/stock_new.png
184	%%DATADIR%%/png/stock_open-16.png	199	%%DATADIR%%/png/stock_new_16.png
		200	%%DATADIR%%/png/stock_next.png
		201	%%DATADIR%%/png/stock_next_16.png
185	%%DATADIR%%/png/stock_open.png	202	%%DATADIR%%/png/stock_open.png
186	%%DATADIR%%/png/stock_paste-16.png	203	%%DATADIR%%/png/stock_open_16.png
187	%%DATADIR%%/png/stock_print-16.png	204	%%DATADIR%%/png/stock_paste_16.png
188	%%DATADIR%%/png/stock_print-preview-16.png	205	%%DATADIR%%/png/stock_previous.png
		206	%%DATADIR%%/png/stock_previous_16.png
189	%%DATADIR%%/png/stock_print.png	207	%%DATADIR%%/png/stock_print.png
190	%%DATADIR%%/png/stock_redo-16.png	208	%%DATADIR%%/png/stock_print_16.png
		209	%%DATADIR%%/png/stock_print_preview_16.png
191	%%DATADIR%%/png/stock_redo.png	210	%%DATADIR%%/png/stock_redo.png
192	%%DATADIR%%/png/stock_save-16.png	211	%%DATADIR%%/png/stock_redo_16.png
193	%%DATADIR%%/png/stock_save.png	212	%%DATADIR%%/png/stock_save.png
194	%%DATADIR%%/png/stock_search-16.png	213	%%DATADIR%%/png/stock_save_16.png
195	%%DATADIR%%/png/stock_spellcheck-16.png	214	%%DATADIR%%/png/stock_search_16.png
196	%%DATADIR%%/png/stock_spellcheck.png	215	%%DATADIR%%/png/stock_spellcheck.png
197	%%DATADIR%%/png/stock_undo-16.png	216	%%DATADIR%%/png/stock_spellcheck_16.png
198	%%DATADIR%%/png/stock_undo.png	217	%%DATADIR%%/png/stock_undo.png
199	%%DATADIR%%/po/ca/messages.mo	218	%%DATADIR%%/png/stock_undo_16.png
200	%%DATADIR%%/po/de/messages.mo
201	%%DATADIR%%/po/es/messages.mo
202	%%DATADIR%%/po/fr/messages.mo
203	%%DATADIR%%/po/it/messages.mo
204	%%DATADIR%%/po/nl/messages.mo
205	%%DATADIR%%/po/ru/messages.mo
206	%%DATADIR%%/po/sk/messages.mo
207	%%DATADIR%%/po/sv/messages.mo
208	%%DATADIR%%/po/uk_UA/messages.mo
209	%%DATADIR%%/po/zh_CN/messages.mo
210	%%DATADIR%%/po/zh_TW/messages.mo
211	%%DATADIR%%/rng/docbook.rnc	219	%%DATADIR%%/rng/docbook.rnc
212	%%DATADIR%%/rng/docbook.rng	220	%%DATADIR%%/rng/docbook.rng
213	%%DATADIR%%/rng/docbookxi.rnc	221	%%DATADIR%%/rng/docbookxi.rnc

Return to bug 201479

Lines 2-9 Link Here

(-)xmlcopyeditor/Makefile (-10 / +10 lines)
2	# $FreeBSD: head/editors/xmlcopyeditor/Makefile 382163 2015-03-24 19:37:43Z marino $	2	# $FreeBSD: head/editors/xmlcopyeditor/Makefile 382163 2015-03-24 19:37:43Z marino $
3		3
4	PORTNAME= xmlcopyeditor	4	PORTNAME= xmlcopyeditor
5	PORTVERSION= 1.2.0.11	5	PORTVERSION= 1.2.1.3
6	PORTREVISION= 4
7	CATEGORIES= editors	6	CATEGORIES= editors
8	MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}	7	MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
9		8
Lines 12-25 Link Here
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	USE_WX= 2.8+
16	WX_COMPS= wx contrib
17	WX_CONF_ARGS= absolute
18	WX_UNICODE= yes
19	USES= gettext iconv dos2unix libtool
20	GNU_CONFIGURE= yes
21
22	BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
23	LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \	14	LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
24	libxslt.so:${PORTSDIR}/textproc/libxslt \	15	libxslt.so:${PORTSDIR}/textproc/libxslt \
25	libaspell.so:${PORTSDIR}/textproc/aspell \	16	libaspell.so:${PORTSDIR}/textproc/aspell \
Lines 27-32 Link Here
27	libxml2.so:${PORTSDIR}/textproc/libxml2 \	18	libxml2.so:${PORTSDIR}/textproc/libxml2 \
28	libexpat.so:${PORTSDIR}/textproc/expat2	19	libexpat.so:${PORTSDIR}/textproc/expat2
29		20
		21	USE_WX= 2.8+
		22	WX_COMPS= wx contrib
		23	WX_CONF_ARGS= absolute
		24	WX_UNICODE= yes
		25	USES= dos2unix gettext gmake iconv libtool
		26	GNU_CONFIGURE= yes
		27
		28	BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
		29	intltool-update:${PORTSDIR}/textproc/intltool
30	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	30	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
31		31
32	CPPFLAGS+= -I${LOCALBASE}/include \	32	CPPFLAGS+= -I${LOCALBASE}/include \

Lines 1-6 Link Here

(-)xmlcopyeditor/files/patch-src_Makefile.in.diff (-24 / +3 lines)
1	--- src/Makefile.in.orig 2012-10-07 15:20:23.000000000 +0200	1	+++ src/Makefile.in
2	+++ src/Makefile.in 2012-12-02 17:24:51.000000000 +0100	2	@@ -283,8 +283,8 @@
3	@@ -260,8 +260,8 @@
4	# these are the headers for your project	3	# these are the headers for your project
5	noinst_HEADERS = $(srcdir)/*.h	4	noinst_HEADERS = $(srcdir)/*.h
6	xmlcopyeditordir = ${prefix}/share/xmlcopyeditor	5	xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
Lines 10-33 Link Here
10	+applicationsdir = ${prefix}/share/applications	9	+applicationsdir = ${prefix}/share/applications
11		10
12	# the application source, library search path, and link libraries	11	# the application source, library search path, and link libraries
13	xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \	12	xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \
14	@@ -287,19 +287,6 @@
15	-lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
16
17	nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
18	- $(srcdir)/copying/*.txt \
19	- $(srcdir)/copying/Apache/LICENSE-2.0 \
20	- $(srcdir)/copying/Apache/LICENSE-2_files/* \
21	- $(srcdir)/copying/Aspell/* \
22	- $(srcdir)/copying/boost_shared_ptr/* \
23	- $(srcdir)/copying/Expat/* \
24	- $(srcdir)/copying/libxml2/* \
25	- $(srcdir)/copying/libxslt/* \
26	- $(srcdir)/copying/PCRE/* \
27	- $(srcdir)/copying/Scintilla/* \
28	- $(srcdir)/copying/wxStEditor/* \
29	- $(srcdir)/copying/wxStyledTextCtrl/* \
30	- $(srcdir)/copying/xmlcopyeditor/* \
31	$(srcdir)/dtd/. \
32	$(srcdir)/dtd/dita/. \
33	$(srcdir)/dtd/docbook/4.4/. \

Lines 1-17 Link Here

(-)xmlcopyeditor/files/patch-src_wrapxerces.cpp (-17 lines)
1	--- src/wrapxerces.cpp.orig 2013-11-21 15:51:13.000000000 +0100
2	+++ src/wrapxerces.cpp 2013-11-21 16:01:41.000000000 +0100
3	@@ -201,12 +201,12 @@
4	return wxConvUTF8;
5	case 2:
6	{
7	- const static wxMBConvUTF16 conv;
8	+ static wxMBConvUTF16 conv;
9	return conv;
10	}
11	case 4:
12	{
13	- const static wxMBConvUTF32 conv;
14	+ static wxMBConvUTF32 conv;
15	return conv;
16	}
17	default:

Lines 1-45 Link Here

(-)xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp (-45 lines)
1	--- src/xmlcopyeditor.cpp.orig 2013-08-07 15:31:32.000000000 +0200
2	+++ src/xmlcopyeditor.cpp 2013-08-07 15:35:13.000000000 +0200
3	@@ -2887,7 +2887,7 @@
4
5	const int arraySize = templateArray.GetCount();
6
7	- wxString choiceArray[arraySize + 1];
8	+ wxString *choiceArray = new wxString[arraySize + 1];
9	for ( int i = 0; i < arraySize; ++i )
10	* ( choiceArray + i ) = templateArray.Item ( i );
11
12	@@ -2901,6 +2901,7 @@
13	return;
14	}
15	typeSelection = scd.GetStringSelection();
16	+ delete [] choiceArray;
17	}
18
19	if ( typeSelection == defaultSelection )
20	@@ -4384,20 +4385,23 @@
21	encodingVector.push_back ( _T ( "ISO-8859-1" ) );
22	encodingVector.push_back ( _T ( "US-ASCII" ) );
23	const int vectorSize = encodingVector.size();
24	- wxString choiceArray[vectorSize + 1];
25	+ wxString *choiceArray = new wxString[vectorSize + 1];
26	for ( int i = 0; i < vectorSize; ++i )
27	* ( choiceArray + i ) = encodingVector.at ( i );
28	wxSingleChoiceDialog scd (
29	this, _ ( "Choose an encoding:" ), _ ( "Encoding" ), vectorSize, choiceArray );
30
31	- if ( scd.ShowModal() == wxID_CANCEL )
32	+ if ( scd.ShowModal() == wxID_CANCEL ) {
33	+ delete [] choiceArray;
34	return;
35	+ }
36
37	wxString selection;
38	std::string selectionUtf8, bufferUtf8;
39
40	selection = scd.GetStringSelection();
41	selectionUtf8 = selection.mb_str ( wxConvUTF8 );
42	+ delete [] choiceArray;
43
44	getRawText ( doc, bufferUtf8 );
45	XmlEncodingHandler::setUtf8 ( bufferUtf8, true );