Attachment #179891 for bug #217001

Lines 3-9 Link Here

(-)b/graphics/gle-graphics/Makefile (-2 / +1 lines)
3		3
4	PORTNAME= gle-graphics	4	PORTNAME= gle-graphics
5	DISTVERSION= 4.2.4cf	5	DISTVERSION= 4.2.4cf
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= graphics print	7	CATEGORIES= graphics print
8	MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1}	8	MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1}
9	DISTNAME= ${PORTNAME}-${DISTVERSION}-src	9	DISTNAME= ${PORTNAME}-${DISTVERSION}-src
Lines 42-48 PLIST_SUB+= PORTVERSION=${PORTVERSION} Link Here
42		42
43	REINPLACE_FILES= configure	43	REINPLACE_FILES= configure
44		44
45	USE_GCC= yes
46	USE_GL= yes	45	USE_GL= yes
47	USE_LDCONFIG= yes	46	USE_LDCONFIG= yes
48	USE_QT4= gui moc network opengl rcc qmake_build	47	USE_QT4= gui moc network opengl rcc qmake_build




--- 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 Link Here

(-)b/graphics/gle-graphics/files/patch-src_gle_op__def.h (+11 lines)
1	--- src/gle/op_def.h.orig 2011-10-26 21:10:54 UTC
2	+++ src/gle/op_def.h
3	@@ -40,7 +40,7 @@ struct op_key {
4	char name[256];
5	int typ;
6	int pos;
7	- int idx;
8	+ signed long idx;
9	};
10
11	#define typ_end 0




--- 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);




--- 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"

Return to bug 217001

Added Link Here

(-)b/graphics/gle-graphics/files/patch-src_gle_d__x.cpp (+20 lines)
1	--- src/gle/d_x.cpp.orig 2011-10-26 21:10:54 UTC
2	+++ src/gle/d_x.cpp
3	@@ -199,7 +199,7 @@ void X11GLEDevice::setfillstyle(int i) {
4	#define BM_HEIGHT 16
5	Pixmap bm;
6	//unsigned
7	-const char bm_bits[][32] = {
8	+const unsigned char bm_bits[][32] = {
9	{ 0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04,
10	0x00, 0x02, 0x00, 0x01, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00,
11	0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00}, /* SHADE */
12	@@ -238,7 +238,7 @@ const char bm_bits[][32] = {
13	0x1c, 0x38, 0x0e, 0x70, 0x07, 0xe0, 0x03, 0xc0} /* GRID 5 */
14	};
15
16	- bm = XCreateBitmapFromData(dpy,window1,bm_bits[i],BM_WIDTH,BM_HEIGHT);
17	+ bm = XCreateBitmapFromData(dpy,window1,(const char*)bm_bits[i],BM_WIDTH,BM_HEIGHT);
18	XSetStipple(dpy, gcf, bm);
19	XSetFillStyle(dpy, gcf, FillStippled);
20	XFreePixmap(dpy, bm);

Added Link Here

(-)b/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp (+18 lines)
1	--- src/gle/surface/ffitcontour.cpp.orig 2011-06-13 08:36:41 UTC
2	+++ src/gle/surface/ffitcontour.cpp
3	@@ -43,15 +43,9 @@
4
5	/* "f2c.h" defines abs() -- conflict with the definition in <math.h> */
6	/* changing the order solves the problem */
7	-#if ( defined(__OS2__) && defined(__EMX__) ) \|\| defined(__WIN32__)
8	#include <stdio.h>
9	#include <math.h>
10	#include "f2c.h"
11	-#else
12	-#include "f2c.h"
13	-#include <stdio.h>
14	-#include <math.h>
15	-#endif
16
17	doublereal gutre2_(real* a, real* b);
18	void gd_message__(const char *s, int l);

Added Link Here

(-)b/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h (+15 lines)
1	--- src/gle/tokens/StringKeyHash.h.orig 2012-02-19 21:07:34 UTC
2	+++ src/gle/tokens/StringKeyHash.h
3	@@ -75,10 +75,12 @@
4	using namespace std;
5
6	#ifndef GCC2
7	+#ifndef _LIBCPP_VERSION
8	#ifndef _MSC_VER
9	using namespace __gnu_cxx; // using gnu extensions such as "hash"
10	#endif
11	#endif
12	+#endif
13
14	#include "RefCount.h"
15	#include "BinIO.h"