svn commit: r447478 - in head/graphics/gle-graphics: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sun Aug 6 17:53:23 UTC 2017
Author: rakuco
Date: Sun Aug 6 17:53:22 2017
New Revision: 447478
URL: https://svnweb.freebsd.org/changeset/ports/447478
Log:
Fix libc++ and GCC6 build errors.
This allows us to drop USE_GCC=yes while also allowing it to build with GCC 6,
which uses -std=gnu++14 by default.
PR: 217001
Submitted by: jbeich
Approved by: nivit (maintainer)
Added:
head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp (contents, props changed)
head/graphics/gle-graphics/files/patch-src_gle_op__def.h (contents, props changed)
head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp (contents, props changed)
head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h (contents, props changed)
Modified:
head/graphics/gle-graphics/Makefile
Modified: head/graphics/gle-graphics/Makefile
==============================================================================
--- head/graphics/gle-graphics/Makefile Sun Aug 6 17:37:25 2017 (r447477)
+++ head/graphics/gle-graphics/Makefile Sun Aug 6 17:53:22 2017 (r447478)
@@ -3,7 +3,7 @@
PORTNAME= gle-graphics
DISTVERSION= 4.2.4cf
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics print
MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@@ -42,7 +42,6 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}
REINPLACE_FILES= configure
-USE_GCC= yes
USE_GL= yes
USE_LDCONFIG= yes
USE_QT4= corelib gui moc network opengl rcc qmake_build
Added: head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gle-graphics/files/patch-src_gle_d__x.cpp Sun Aug 6 17:53:22 2017 (r447478)
@@ -0,0 +1,20 @@
+--- src/gle/d_x.cpp.orig 2011-10-26 21:10:54 UTC
++++ src/gle/d_x.cpp
+@@ -199,7 +199,7 @@ void X11GLEDevice::setfillstyle(int i) {
+ #define BM_HEIGHT 16
+ Pixmap bm;
+ //unsigned
+-const char bm_bits[][32] = {
++const unsigned char bm_bits[][32] = {
+ { 0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04,
+ 0x00, 0x02, 0x00, 0x01, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00,
+ 0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00}, /* SHADE */
+@@ -238,7 +238,7 @@ const char bm_bits[][32] = {
+ 0x1c, 0x38, 0x0e, 0x70, 0x07, 0xe0, 0x03, 0xc0} /* GRID 5 */
+ };
+
+- bm = XCreateBitmapFromData(dpy,window1,bm_bits[i],BM_WIDTH,BM_HEIGHT);
++ bm = XCreateBitmapFromData(dpy,window1,(const char*)bm_bits[i],BM_WIDTH,BM_HEIGHT);
+ XSetStipple(dpy, gcf, bm);
+ XSetFillStyle(dpy, gcf, FillStippled);
+ XFreePixmap(dpy, bm);
Added: head/graphics/gle-graphics/files/patch-src_gle_op__def.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gle-graphics/files/patch-src_gle_op__def.h Sun Aug 6 17:53:22 2017 (r447478)
@@ -0,0 +1,11 @@
+--- src/gle/op_def.h.orig 2011-10-26 21:10:54 UTC
++++ src/gle/op_def.h
+@@ -40,7 +40,7 @@ struct op_key {
+ char name[256];
+ int typ;
+ int pos;
+- int idx;
++ signed long idx;
+ };
+
+ #define typ_end 0
Added: head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp Sun Aug 6 17:53:22 2017 (r447478)
@@ -0,0 +1,18 @@
+--- src/gle/surface/ffitcontour.cpp.orig 2011-06-13 08:36:41 UTC
++++ src/gle/surface/ffitcontour.cpp
+@@ -43,15 +43,9 @@
+
+ /* "f2c.h" defines abs() -- conflict with the definition in <math.h> */
+ /* changing the order solves the problem */
+-#if ( defined(__OS2__) && defined(__EMX__) ) || defined(__WIN32__)
+ #include <stdio.h>
+ #include <math.h>
+ #include "f2c.h"
+-#else
+-#include "f2c.h"
+-#include <stdio.h>
+-#include <math.h>
+-#endif
+
+ doublereal gutre2_(real* a, real* b);
+ void gd_message__(const char *s, int l);
Added: head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h Sun Aug 6 17:53:22 2017 (r447478)
@@ -0,0 +1,15 @@
+--- src/gle/tokens/StringKeyHash.h.orig 2012-02-19 21:07:34 UTC
++++ src/gle/tokens/StringKeyHash.h
+@@ -75,10 +75,12 @@
+ using namespace std;
+
+ #ifndef GCC2
++#ifndef _LIBCPP_VERSION
+ #ifndef _MSC_VER
+ using namespace __gnu_cxx; // using gnu extensions such as "hash"
+ #endif
+ #endif
++#endif
+
+ #include "RefCount.h"
+ #include "BinIO.h"
More information about the svn-ports-head
mailing list