x11-toolkits/gtkmathview: Fix build on GCC-based architectures

- Add USES=compiler:c++11-lang gnome localbase:ldflags
- Add include <cstring> to fix detection of some functions

PR:		235938
Submitted by:	pkubaj@anongoth.pl

12 files changed, 80 insertions, 17 deletions

diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index eba2a137d698..3eac33087f29 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -19,15 +19,15 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 		libgmetadom_gdome_cpp_smart.so:textproc/gmetadom
 
 GNU_CONFIGURE=	yes
-USES=		compiler gmake libtool pathfix pkgconfig
+USES=		compiler:c++11-lang gmake gnome libtool localbase:ldflags \
+		pathfix pkgconfig
 USE_GNOME=	gtk20 libxml2 pangox-compat
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_clang=	-Wno-c++11-narrowing
+CXXFLAGS_gcc=	-Wno-error=narrowing
 
 post-patch:
 	@${REINPLACE_CMD} '/-lstdc++/d' ${WRKSRC}/src/Makefile.in \
diff --git a/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc b/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc
index c9ca5b5c2449..82e4d42a22a4 100644
--- a/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc
+++ b/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc
@@ -1,10 +1,12 @@
---- mathmlps/main.cc.orig	2013-10-04 15:05:03.000000000 +0200
-+++ mathmlps/main.cc	2013-10-04 15:05:17.000000000 +0200
-@@ -18,6 +18,7 @@
+--- mathmlps/main.cc.orig	2007-08-17 10:02:46 UTC
++++ mathmlps/main.cc
+@@ -18,7 +18,9 @@
  
  #include <config.h>
  
 +#include <unistd.h>
  #include <cassert>
++#include <cstring>
  #include <fstream>
  
+ #include <popt.h>
diff --git a/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc
new file mode 100644
index 000000000000..e5d62356be08
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc
@@ -0,0 +1,10 @@
+--- mathmlsvg/SMS.cc.orig	2007-08-17 10:02:46 UTC
++++ mathmlsvg/SMS.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
diff --git a/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc
index f479be675a53..a9977aa99f23 100644
--- a/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc
+++ b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc
@@ -1,9 +1,10 @@
---- mathmlsvg/main.cc.orig	2013-10-04 15:04:01.000000000 +0200
-+++ mathmlsvg/main.cc	2013-10-04 15:04:19.000000000 +0200
-@@ -18,6 +18,7 @@
+--- mathmlsvg/main.cc.orig	2007-08-17 10:02:46 UTC
++++ mathmlsvg/main.cc
+@@ -18,6 +18,8 @@
  
  #include <config.h>
  
++#include <cstring>
 +#include <unistd.h>
  #include <cassert>
  #include <fstream>
diff --git a/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc b/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc
new file mode 100644
index 000000000000..1a9976e336f2
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc
@@ -0,0 +1,10 @@
+--- src/backend/common/t1lib_T1FontManager.cc.orig	2019-02-23 05:24:00 UTC
++++ src/backend/common/t1lib_T1FontManager.cc
+@@ -17,6 +17,7 @@
+ // along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ #include <config.h>
++#include <cstdlib>
+ 
+ #include <t1lib.h>
+ 
diff --git a/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc b/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc
new file mode 100644
index 000000000000..d22e8f1fb23e
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc
@@ -0,0 +1,10 @@
+--- src/backend/ps/T1_FontDataBase.cc.orig	2007-08-17 10:02:40 UTC
++++ src/backend/ps/T1_FontDataBase.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <t1lib.h>
+ #include <config.h>
++#include <cstring>
+ #include <map>
+ #include <string>
+ #include <stdlib.h>
diff --git a/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc b/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc
new file mode 100644
index 000000000000..603a2158bf23
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc
@@ -0,0 +1,10 @@
+--- src/engine/mathml/mathVariantAux.cc.orig	2019-02-22 10:59:22 UTC
++++ src/engine/mathml/mathVariantAux.cc
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #include "mathVariantAux.hh"
+ 
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh
index fbca99d158e7..3c120dbe942e 100644
--- a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh
@@ -1,6 +1,6 @@
---- src/frontend/common/TemplateBuilder.hh.orig	2013-10-04 14:50:03.000000000 +0200
-+++ src/frontend/common/TemplateBuilder.hh	2013-10-04 14:55:16.000000000 +0200
-@@ -47,12 +47,12 @@
+--- src/frontend/common/TemplateBuilder.hh.orig	2007-08-17 10:02:34 UTC
++++ src/frontend/common/TemplateBuilder.hh
+@@ -47,12 +47,12 @@ class TemplateBuilder : public Builder (protected)
    SmartPtr<typename ElementBuilder::type>
    getElement(const typename Model::Element& el) const
    {
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh
index 3c67d40d3b8b..ca0259a42c11 100644
--- a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh
@@ -1,6 +1,6 @@
---- src/frontend/common/TemplateElementIterator.hh.orig	2013-10-04 14:59:19.000000000 +0200
-+++ src/frontend/common/TemplateElementIterator.hh	2013-10-04 14:59:40.000000000 +0200
-@@ -43,7 +43,7 @@
+--- src/frontend/common/TemplateElementIterator.hh.orig	2007-08-17 10:02:34 UTC
++++ src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@ class GMV_MathView_EXPORT TemplateElementIterator : pu
    findValidNodeForward(const typename Model::Node& p0) const
    {
      for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh
new file mode 100644
index 000000000000..2588dd6b6eed
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh
@@ -0,0 +1,10 @@
+--- src/frontend/gmetadom/gmetadom.hh.orig	2019-02-22 10:53:28 UTC
++++ src/frontend/gmetadom/gmetadom.hh
+@@ -19,6 +19,7 @@
+ #ifndef __gmetadom_hh__
+ #define __gmetadom_hh__
+ 
++#include <cstring>
+ #include <GdomeSmartDOM.hh>
+ 
+ namespace DOM = GdomeSmartDOM;
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh
new file mode 100644
index 000000000000..6ec353fe0573
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh
@@ -0,0 +1,10 @@
+--- src/frontend/gmetadom/gmetadom_Model.hh.orig	2007-08-17 10:02:34 UTC
++++ src/frontend/gmetadom/gmetadom_Model.hh
+@@ -20,6 +20,7 @@
+ #define __gmetadom_Model_hh__
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #include <GdomeSmartDOM.hh>
+ 
diff --git a/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc b/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc
index e9a31a1551b3..54794f30e2f3 100644
--- a/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc
+++ b/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc
@@ -1,6 +1,6 @@
 --- src/widget/gtkmathview_common.cc.orig	2007-08-17 10:02:35 UTC
 +++ src/widget/gtkmathview_common.cc
-@@ -909,7 +909,7 @@ gtk_math_view_button_release_event(GtkWi
+@@ -909,7 +909,7 @@ gtk_math_view_button_release_event(GtkWidget* widget, 
  	  math_view->select_state == SELECT_STATE_NO &&
  	  fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
  	  fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
@@ -9,7 +9,7 @@
  	{
  	  // the mouse should have not moved more than one pixel in each direction
  	  // and the time elapsed from the press event should be no more than 250ms
-@@ -969,7 +969,7 @@ gtk_math_view_motion_notify_event(GtkWid
+@@ -969,7 +969,7 @@ gtk_math_view_motion_notify_event(GtkWidget* widget, G
        (math_view->select_state == SELECT_STATE_YES ||
         fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
         fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||