summaryrefslogtreecommitdiff
path: root/graphics/gle-graphics/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/gle-graphics/files')
-rw-r--r--graphics/gle-graphics/files/patch-Makefile.in19
-rw-r--r--graphics/gle-graphics/files/patch-src__gui__MakefileAC.in11
-rw-r--r--graphics/gle-graphics/files/patch-src_fbuild_Makefile.in11
-rw-r--r--graphics/gle-graphics/files/patch-src_gle_d__x.cpp20
-rw-r--r--graphics/gle-graphics/files/patch-src_gle_op__def.h11
-rw-r--r--graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp18
-rw-r--r--graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h15
-rw-r--r--graphics/gle-graphics/files/patch-src_makefmt_Makefile.in11
-rw-r--r--graphics/gle-graphics/files/patch-src_manip_all.h11
-rw-r--r--graphics/gle-graphics/files/patch-src_manip_filemenu.cpp17
10 files changed, 0 insertions, 144 deletions
diff --git a/graphics/gle-graphics/files/patch-Makefile.in b/graphics/gle-graphics/files/patch-Makefile.in
deleted file mode 100644
index 7ab1b244b5d1..000000000000
--- a/graphics/gle-graphics/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig 2015-02-23 13:12:35 UTC
-+++ Makefile.in
-@@ -101,7 +101,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
- MKDIR_P=@MKDIR_P@
-
--PKGCONFIGDIR=$(INSTALL_LIB)/pkgconfig
-+PKGCONFIGDIR=$(PREFIX)/libdata/pkgconfig
- MANDIR=@mandir@
-
- GLE_VERSION=@GLE_VERSION@
-@@ -514,7 +514,6 @@ doc:
- $(MAKE) -C gle-refman -f Makefile.gcc pdf
- cp gle-refman/gle-manual.pdf build/doc/
- cp README.txt build/doc/
-- cp LICENSE.txt build/doc/
-
- autopackage:
- (export APBUILD_STATIC_LIBGCC=1; export APBUILD_STATIC="tiff png12 png jpeg z"; makepackage platform/autopackage/gle4.apspec)
diff --git a/graphics/gle-graphics/files/patch-src__gui__MakefileAC.in b/graphics/gle-graphics/files/patch-src__gui__MakefileAC.in
deleted file mode 100644
index 2455ac08e490..000000000000
--- a/graphics/gle-graphics/files/patch-src__gui__MakefileAC.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gui/MakefileAC.in.orig 2014-07-28 01:23:03.000000000 +0200
-+++ ./src/gui/MakefileAC.in 2014-07-28 01:23:25.000000000 +0200
-@@ -65,7 +65,7 @@
- TOMAKE:=$(TOMAKE) install_qgle_name_mac
- endif
- ifeq (@HAVE_FREEBSD@,1)
-- QMAKE_OPTS:=-spec freebsd-g++
-+ QMAKE_OPTS:=-spec freebsd-g++ QMAKE_CXX="$(CXX)" QMAKE_LINK="$(CXX)"
- endif
- endif
- ifeq (@HAVE_MAC@,1)
diff --git a/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in b/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in
deleted file mode 100644
index 0fa934b339e5..000000000000
--- a/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fbuild/Makefile.in.orig 2015-02-23 12:40:36 UTC
-+++ src/fbuild/Makefile.in
-@@ -64,7 +64,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES)
- $(CXX) $(CPPFLAGS) -c $< -o $@
-
- $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp
-- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
-+ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
-
- clean:
- -$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF)
diff --git a/graphics/gle-graphics/files/patch-src_gle_d__x.cpp b/graphics/gle-graphics/files/patch-src_gle_d__x.cpp
deleted file mode 100644
index 97eeecd0ca0a..000000000000
--- a/graphics/gle-graphics/files/patch-src_gle_d__x.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);
diff --git a/graphics/gle-graphics/files/patch-src_gle_op__def.h b/graphics/gle-graphics/files/patch-src_gle_op__def.h
deleted file mode 100644
index 4a71a91985a7..000000000000
--- a/graphics/gle-graphics/files/patch-src_gle_op__def.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp b/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp
deleted file mode 100644
index 112255800db4..000000000000
--- a/graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp
+++ /dev/null
@@ -1,18 +0,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);
diff --git a/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h b/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h
deleted file mode 100644
index ee5c8ece529a..000000000000
--- a/graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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"
diff --git a/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in b/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in
deleted file mode 100644
index 8b0d113a9960..000000000000
--- a/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/makefmt/Makefile.in.orig 2015-02-23 12:40:36 UTC
-+++ src/makefmt/Makefile.in
-@@ -60,7 +60,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES)
- $(CXX) $(CPPFLAGS) -c $< -o $@
-
- $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp
-- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
-+ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF)
-
- clean:
- -$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF)
diff --git a/graphics/gle-graphics/files/patch-src_manip_all.h b/graphics/gle-graphics/files/patch-src_manip_all.h
deleted file mode 100644
index 81fd7e98942d..000000000000
--- a/graphics/gle-graphics/files/patch-src_manip_all.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/manip/all.h.orig 2010-12-26 17:07:31 UTC
-+++ src/manip/all.h
-@@ -143,7 +143,7 @@ typedef char (*(*TOKENS)[500]);
- typedef unsigned char uchar;
- typedef double dbl;
- char *unquote(char *s);
--const char *gledir(const char *s);
-+string gledir(const char *s);
- int set_missing(int x, int y);
- double vcell(int x, int y);
- void var_find_rc(int *idx, int *var, int *nd, int c);
diff --git a/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp b/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp
deleted file mode 100644
index fa79ffdfd975..000000000000
--- a/graphics/gle-graphics/files/patch-src_manip_filemenu.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/manip/filemenu.cpp.orig 2010-06-14 15:34:39 UTC
-+++ src/manip/filemenu.cpp
-@@ -404,10 +404,12 @@ void do_help(const char *k1, const char
- gotoxy(1,1);
- wprintf("Manip help on topic {%s}, sub topic {%s}",k1,k2);
- scr_menubg();
-- hfile = fopen(gledir(hfilename),"r");
-+ string fname = gledir(hfilename);
-+ hfilename = fname.c_str();
-+ hfile = fopen(fname.c_str(),"r");
- if (hfile==NULL) {
- gotoxy(1,3);
-- wprintf("Unable to open {%s} \n",gledir(hfilename));
-+ wprintf("Unable to open {%s} \n",hfilename);
- text_inkey();
- return;
- }