Index: head/x11-toolkits/gtkmathview/Makefile =================================================================== --- head/x11-toolkits/gtkmathview/Makefile (revision 493642) +++ head/x11-toolkits/gtkmathview/Makefile (revision 493643) @@ -1,42 +1,42 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gtkmathview PORTVERSION= 0.8.0 PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= GTK Widget to Render MathML Documents LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xsltproc:textproc/libxslt LIB_DEPENDS= libpopt.so:devel/popt \ libt1.so:devel/t1lib \ 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 \ ${WRKSRC}/src/view/Makefile.in ${WRKSRC}/viewer/Makefile.in @${REINPLACE_CMD} '/^mathmlps_LDADD =/s|=|= ../src/libmathview.la|' \ ${WRKSRC}/mathmlps/Makefile.in @${REINPLACE_CMD} '/^mathmlsvg_LDADD =/s|=|= $$(XML_LIBS) ../src/libmathview.la|' \ ${WRKSRC}/mathmlsvg/Makefile.in @${REINPLACE_CMD} '/^test_rendering_LDADD =/s|=|= ../src/libmathview.la|' \ ${WRKSRC}/viewer/Makefile.in .include Index: head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc (revision 493642) +++ head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc (revision 493643) @@ -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 +#include #include ++#include #include + #include Index: head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc (revision 493643) @@ -0,0 +1,10 @@ +--- mathmlsvg/SMS.cc.orig 2007-08-17 10:02:46 UTC ++++ mathmlsvg/SMS.cc +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include "defs.h" + #include "AbstractLogger.hh" Property changes on: head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_SMS.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc (revision 493642) +++ head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc (revision 493643) @@ -1,10 +1,11 @@ ---- 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 ++#include +#include #include #include Index: head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc (revision 493643) @@ -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 . + + #include ++#include + + #include + Property changes on: head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib__T1FontManager.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc (revision 493643) @@ -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 + #include ++#include + #include + #include + #include Property changes on: head/x11-toolkits/gtkmathview/files/patch-src_backend_ps_T1__FontDataBase.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc (revision 493643) @@ -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 + + #include ++#include + + #include "mathVariantAux.hh" + Property changes on: head/x11-toolkits/gtkmathview/files/patch-src_engine_mathml_mathVariantAux.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh (revision 493642) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh (revision 493643) @@ -1,18 +1,18 @@ ---- 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 getElement(const typename Model::Element& el) const { - if (SmartPtr elem = smart_cast(linkerAssoc(el))) + if (SmartPtr elem = smart_cast(this->linkerAssoc(el))) return elem; else { - SmartPtr elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); - linkerAdd(el, elem); + elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); + this->linkerAdd(el, elem); return elem; } } Index: head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh (revision 493642) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh (revision 493643) @@ -1,11 +1,11 @@ ---- 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)) - if (valid(p)) return Model::asElement(p); + if (this->valid(p)) return Model::asElement(p); return typename Model::Element(); } Index: head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh (revision 493643) @@ -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 + #include + + namespace DOM = GdomeSmartDOM; Property changes on: head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom.hh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh (nonexistent) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh (revision 493643) @@ -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 ++#include + + #include + Property changes on: head/x11-toolkits/gtkmathview/files/patch-src_frontend_gmetadom_gmetadom__Model.hh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc =================================================================== --- head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc (revision 493642) +++ head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc (revision 493643) @@ -1,20 +1,20 @@ --- 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 && - abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE) + abs((long)math_view->button_press_time - (long)event->time) <= CLICK_TIME_RANGE) { // 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 || - abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE)) + abs((long)math_view->button_press_time - (long)event->time) > CLICK_TIME_RANGE)) { if (math_view->select_state == SELECT_STATE_NO) {