svn commit: r500204 - in head/textproc/htmltolatex: . files

[Piotr Kubaj]

Author: pkubaj
Date: Sat Apr 27 09:04:29 2019
New Revision: 500204
URL: https://svnweb.freebsd.org/changeset/ports/500204

Log:
  textproc/htmltolatex: fix build with GCC-based architectures
  
  Add USES=compiler:c++11-lang.
  
  Add include <cstring> and <strings.h> to CH2L.cpp.
  
  Add include <cstring> to util.cpp.
  
  Required to build with GCC (used on GCC architectures):
  undefined reference to std::__cxx11::basic_string
  
  PR:		237549
  Approved by:	pi (maintainer), tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D20050

Modified:
  head/textproc/htmltolatex/Makefile
  head/textproc/htmltolatex/files/patch-CH2L.cpp
  head/textproc/htmltolatex/files/patch-util.cpp

Modified: head/textproc/htmltolatex/Makefile
==============================================================================
--- head/textproc/htmltolatex/Makefile	Sat Apr 27 09:01:24 2019	(r500203)
+++ head/textproc/htmltolatex/Makefile	Sat Apr 27 09:04:29 2019	(r500204)
@@ -16,9 +16,7 @@ LICENSE_FILE=	${WRKSRC}/copying.txt
 
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick
 
-BROKEN_powerpc64=	fails to link: libGraphicsMagick++.so: undefined reference to std::__cxx11::basic_string
-
-USES=		bison gmake
+USES=		bison compiler:c++11-lang gmake
 MAKEFILE=	GNUmakefile
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS=	CXX="${CXX}" \

Modified: head/textproc/htmltolatex/files/patch-CH2L.cpp
==============================================================================
--- head/textproc/htmltolatex/files/patch-CH2L.cpp	Sat Apr 27 09:01:24 2019	(r500203)
+++ head/textproc/htmltolatex/files/patch-CH2L.cpp	Sat Apr 27 09:04:29 2019	(r500204)
@@ -1,5 +1,5 @@
---- CH2L.cpp.orig	2001-11-11 21:03:19.000000000 +0100
-+++ CH2L.cpp	2018-01-19 07:07:05.786197000 +0100
+--- CH2L.cpp.orig	2001-11-11 20:03:19 UTC
++++ CH2L.cpp
 @@ -18,6 +18,9 @@
   * Boston, MA 02111-1307, USA.
   *
@@ -10,15 +10,18 @@
  #include "CH2L.h"
  #include "util.h"
  #include "safe_ostrstream.h"
-@@ -28,7 +31,6 @@
+@@ -27,8 +30,9 @@
+ #include <stdlib.h>
  #include <assert.h>
  #include <fstream>
++#include <cstring>
++#include <strings.h>
  
 -using namespace std;
  using namespace Magick;
  
  #define ATTRIBUTENESTLIMIT	1000
-@@ -2086,7 +2088,7 @@
+@@ -2086,7 +2090,7 @@ void CH2L::make_font_start()
  }
  
  
@@ -27,7 +30,7 @@
  {
  	dump_text();
  	int cnt = 0;
-@@ -2225,7 +2227,7 @@
+@@ -2225,7 +2229,7 @@ void CH2L::end_sup()
  }
  
  ////////////////////////
@@ -36,7 +39,7 @@
  {
  	dump_text();
  
-@@ -3594,7 +3596,7 @@
+@@ -3594,7 +3598,7 @@ void CH2L::_idle_tag_end(const string &htmltag)
  }
  
  
@@ -45,7 +48,7 @@
  { 
  	bool did_something = false;
  	bool alignment_changed = false;
-@@ -3945,7 +3947,7 @@
+@@ -3945,7 +3949,7 @@ bool CH2L::openTableDimensionsFile()
  
  		mTableDimensionsFileName = tsp;
  		mTableDimensionsFile.open(tsp.c_str());

Modified: head/textproc/htmltolatex/files/patch-util.cpp
==============================================================================
--- head/textproc/htmltolatex/files/patch-util.cpp	Sat Apr 27 09:01:24 2019	(r500203)
+++ head/textproc/htmltolatex/files/patch-util.cpp	Sat Apr 27 09:04:29 2019	(r500204)
@@ -1,6 +1,6 @@
---- util.cpp.orig	Fri Feb 21 03:47:33 2003
-+++ util.cpp	Fri Feb 21 03:47:46 2003
-@@ -18,6 +18,9 @@
+--- util.cpp.orig	2001-10-10 12:24:27 UTC
++++ util.cpp
+@@ -18,9 +18,13 @@
   * Boston, MA 02111-1307, USA.
   *
   */
@@ -10,7 +10,11 @@
  #include "util.h"
  #include <map>
  #include <ctype.h>
-@@ -35,7 +38,6 @@
++#include <cstring>
+ #include <sys/param.h>
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -35,7 +39,6 @@ extern "C"{
  #include "fetch.h"
  }
  #endif