Attachment #204000 for bug #237549

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

Lines 16-24 Link Here

(-)Makefile (-3 / +1 lines)
16		16
17	LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick	17	LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick
18		18
19	BROKEN_powerpc64= fails to link: libGraphicsMagick++.so: undefined reference to std::__cxx11::basic_string	19	USES= bison compiler:c++11-lang gmake
20
21	USES= bison gmake
22	MAKEFILE= GNUmakefile	20	MAKEFILE= GNUmakefile
23	MAKE_JOBS_UNSAFE= yes	21	MAKE_JOBS_UNSAFE= yes
24	MAKE_ARGS= CXX="${CXX}" \	22	MAKE_ARGS= CXX="${CXX}" \

Lines 1-5 Link Here

(-)files/patch-CH2L.cpp (-7 / +10 lines)
1	--- CH2L.cpp.orig 2001-11-11 21:03:19.000000000 +0100	1	--- CH2L.cpp.orig 2001-11-11 20:03:19 UTC
2	+++ CH2L.cpp 2018-01-19 07:07:05.786197000 +0100	2	+++ CH2L.cpp
3	@@ -18,6 +18,9 @@	3	@@ -18,6 +18,9 @@
4	* Boston, MA 02111-1307, USA.	4	* Boston, MA 02111-1307, USA.
5	*	5	*
Lines 10-24 Link Here
10	#include "CH2L.h"	10	#include "CH2L.h"
11	#include "util.h"	11	#include "util.h"
12	#include "safe_ostrstream.h"	12	#include "safe_ostrstream.h"
13	@@ -28,7 +31,6 @@	13	@@ -27,8 +30,9 @@
		14	#include <stdlib.h>
14	#include <assert.h>	15	#include <assert.h>
15	#include <fstream>	16	#include <fstream>
		17	+#include <cstring>
		18	+#include <strings.h>
16		19
17	-using namespace std;	20	-using namespace std;
18	using namespace Magick;	21	using namespace Magick;
19		22
20	#define ATTRIBUTENESTLIMIT 1000	23	#define ATTRIBUTENESTLIMIT 1000
21	@@ -2086,7 +2088,7 @@	24	@@ -2086,7 +2090,7 @@ void CH2L::make_font_start()
22	}	25	}
23		26
24		27
Lines 27-33 Link Here
27	{	30	{
28	dump_text();	31	dump_text();
29	int cnt = 0;	32	int cnt = 0;
30	@@ -2225,7 +2227,7 @@	33	@@ -2225,7 +2229,7 @@ void CH2L::end_sup()
31	}	34	}
32		35
33	////////////////////////	36	////////////////////////
Lines 36-42 Link Here
36	{	39	{
37	dump_text();	40	dump_text();
38		41
39	@@ -3594,7 +3596,7 @@	42	@@ -3594,7 +3598,7 @@ void CH2L::_idle_tag_end(const string &htmltag)
40	}	43	}
41		44
42		45
Lines 45-51 Link Here
45	{	48	{
46	bool did_something = false;	49	bool did_something = false;
47	bool alignment_changed = false;	50	bool alignment_changed = false;
48	@@ -3945,7 +3947,7 @@	51	@@ -3945,7 +3949,7 @@ bool CH2L::openTableDimensionsFile()
49		52
50	mTableDimensionsFileName = tsp;	53	mTableDimensionsFileName = tsp;
51	mTableDimensionsFile.open(tsp.c_str());	54	mTableDimensionsFile.open(tsp.c_str());

Lines 1-6 Link Here

(-)files/patch-util.cpp (-4 / +8 lines)
1	--- util.cpp.orig Fri Feb 21 03:47:33 2003	1	--- util.cpp.orig 2001-10-10 12:24:27 UTC
2	+++ util.cpp Fri Feb 21 03:47:46 2003	2	+++ util.cpp
3	@@ -18,6 +18,9 @@	3	@@ -18,9 +18,13 @@
4	* Boston, MA 02111-1307, USA.	4	* Boston, MA 02111-1307, USA.
5	*	5	*
6	*/	6	*/
Lines 10-16 Link Here
10	#include "util.h"	10	#include "util.h"
11	#include <map>	11	#include <map>
12	#include <ctype.h>	12	#include <ctype.h>
13	@@ -35,7 +38,6 @@	13	+#include <cstring>
		14	#include <sys/param.h>
		15	#include <stdio.h>
		16	#include <unistd.h>
		17	@@ -35,7 +39,6 @@ extern "C"{
14	#include "fetch.h"	18	#include "fetch.h"
15	}	19	}
16	#endif	20	#endif

Return to bug 237549