diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-08-25 14:09:34 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-08-25 14:09:34 +0000 |
| commit | b363253376bd17c9835d2502cbceee7b49bbe12a (patch) | |
| tree | c9a29f5c5fee8e8591f7612962182d0e28bdec9a /x11-toolkits/gtkmathview | |
| parent | 1bf52713023f0b38af3f8e519a026cf182fa7831 (diff) | |
| download | ports-b363253376bd17c9835d2502cbceee7b49bbe12a.tar.gz ports-b363253376bd17c9835d2502cbceee7b49bbe12a.zip | |
x11-toolkits/gtkmathview: Fix build with Clang 6
View.cc:294:10: error: no viable conversion from returned value of type 'bool' to function return type 'SmartPtr<Element>'
return false;
^~~~~
http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/gtkmathview-0.8.0_9.log
cmex10.cc:27:3: error: constant expression evaluates to 4205933842 which cannot be
narrowed to type 'int' [-Wc++11-narrowing]
0xfab17512,
^~~~~~~~~~
SVG_RenderingContext.cc:67:25: error: invalid suffix on literal; C++11 requires a
space between literal and identifier [-Wreserved-user-defined-literal]
metadata("Created by "PACKAGE" version "VERSION);
^
Notes
Notes:
svn path=/head/; revision=478041
Diffstat (limited to 'x11-toolkits/gtkmathview')
3 files changed, 34 insertions, 1 deletions
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile index 1e4078bafe4b..eba2a137d698 100644 --- a/x11-toolkits/gtkmathview/Makefile +++ b/x11-toolkits/gtkmathview/Makefile @@ -19,13 +19,15 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libgmetadom_gdome_cpp_smart.so:textproc/gmetadom GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig +USES= compiler gmake libtool 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 post-patch: @${REINPLACE_CMD} '/-lstdc++/d' ${WRKSRC}/src/Makefile.in \ diff --git a/x11-toolkits/gtkmathview/files/patch-src_backend_svg_SVG__RenderingContext.cc b/x11-toolkits/gtkmathview/files/patch-src_backend_svg_SVG__RenderingContext.cc new file mode 100644 index 000000000000..ae1243f38241 --- /dev/null +++ b/x11-toolkits/gtkmathview/files/patch-src_backend_svg_SVG__RenderingContext.cc @@ -0,0 +1,16 @@ +SVG_RenderingContext.cc:67:25: error: invalid suffix on literal; C++11 requires a + space between literal and identifier [-Wreserved-user-defined-literal] + metadata("Created by "PACKAGE" version "VERSION); + ^ + +--- src/backend/svg/SVG_RenderingContext.cc.orig 2018-08-25 14:04:53 UTC ++++ src/backend/svg/SVG_RenderingContext.cc +@@ -64,7 +64,7 @@ void + SVG_RenderingContext::documentStart(const BoundingBox& bbox) + { + beginDocument(bbox); +- metadata("Created by "PACKAGE" version "VERSION); ++ metadata("Created by " PACKAGE " version " VERSION); + } + + void diff --git a/x11-toolkits/gtkmathview/files/patch-src_engine_common_View.cc b/x11-toolkits/gtkmathview/files/patch-src_engine_common_View.cc new file mode 100644 index 000000000000..5798f6344b17 --- /dev/null +++ b/x11-toolkits/gtkmathview/files/patch-src_engine_common_View.cc @@ -0,0 +1,15 @@ +View.cc:294:10: error: no viable conversion from returned value of type 'bool' to function return type 'SmartPtr<Element>' + return false; + ^~~~~ + +--- src/engine/common/View.cc.orig 2018-08-25 13:57:22 UTC ++++ src/engine/common/View.cc +@@ -291,7 +291,7 @@ View::getCharAt(const scaled& x, const scaled& y, Char + } + } + +- return false; ++ return 0; + } + + bool |