From eec46d64c05d97f24c3c4bc218cee53441afc579 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 18 Nov 2017 23:42:38 +1100 Subject: various packages: fix git am failures --- src/file-1-fixes.patch | 20 +++-- src/freeimage-1-fixes.patch | 42 +++++------ src/libxml2-1-fixes.patch | 13 ++-- src/ocaml-lablgl-1-fixes.patch | 36 ++++----- src/ocaml-xml-light-1-fixes.patch | 154 ++++++++++++++++---------------------- src/pango-1-fixes.patch | 43 +++-------- src/qwtplot3d-1-fixes.patch | 150 +++++++++++++++++-------------------- src/vtk-1-fixes.patch | 75 ++++++++++--------- 8 files changed, 235 insertions(+), 298 deletions(-) diff --git a/src/file-1-fixes.patch b/src/file-1-fixes.patch index 95ff1f6..f5432e9 100644 --- a/src/file-1-fixes.patch +++ b/src/file-1-fixes.patch @@ -1,15 +1,16 @@ This file is part of MXE. See LICENSE.md for licensing information. -From https://github.com/file/file/commit/d5f2c28536f1645e3da25fa3f8da5a0a45404dc4. +Contains ad hoc patches for cross building. -From 4e654ecfd1ca6535540b7d33dcd66051b9b62def Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Christos Zoulas -Date: Mon, 27 Jul 2015 00:14:29 -0400 +Date: Sat, 18 Nov 2017 22:17:57 +1100 Subject: [PATCH] PR/466: Windows fixes. +From https://github.com/file/file/commit/d5f2c28536f1645e3da25fa3f8da5a0a45404dc4. diff --git a/src/file.h b/src/file.h -index 1b4ef6f..00d2abe 100644 +index 1111111..2222222 100644 --- a/src/file.h +++ b/src/file.h @@ -44,9 +44,11 @@ @@ -25,7 +26,7 @@ index 1b4ef6f..00d2abe 100644 #include /* Include that here, to make sure __P gets defined */ diff --git a/src/gmtime_r.c b/src/gmtime_r.c -index 963dfee..7e27ed6 100644 +index 1111111..2222222 100644 --- a/src/gmtime_r.c +++ b/src/gmtime_r.c @@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: gmtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $") @@ -38,7 +39,7 @@ index 963dfee..7e27ed6 100644 struct tm *tmp = gmtime(t); if (tmp == NULL) diff --git a/src/localtime_r.c b/src/localtime_r.c -index 69d78d9..35c3b40 100644 +index 1111111..2222222 100644 --- a/src/localtime_r.c +++ b/src/localtime_r.c @@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: localtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $") @@ -51,7 +52,7 @@ index 69d78d9..35c3b40 100644 struct tm *tmp = localtime(t); if (tmp == NULL) diff --git a/src/magic.c b/src/magic.c -index bc8c344..59b7e45 100644 +index 1111111..2222222 100644 --- a/src/magic.c +++ b/src/magic.c @@ -137,6 +137,14 @@ _w32_get_magic_relative_to(char **hmagicpath, HINSTANCE module) @@ -70,7 +71,7 @@ index bc8c344..59b7e45 100644 if (sp > 3 && stricmp(&dllpath[sp - 3], "bin") == 0) { _w32_append_path(hmagicpath, diff --git a/src/readelf.c b/src/readelf.c -index bc6e7f6..ab36d26 100644 +index 1111111..2222222 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -1054,9 +1054,11 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, @@ -98,6 +99,3 @@ index bc6e7f6..ab36d26 100644 file_badread(ms); free(nbuf); return -1; --- -1.9.1 - diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index 2581970..a1333b0 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -4,7 +4,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Sat, 27 Oct 2012 22:57:27 +0200 +Date: Sat, 18 Nov 2017 22:27:54 +1100 Subject: [PATCH] include string.h for memset taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504 @@ -27,7 +27,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore -Date: Sat, 11 May 2013 15:15:39 +1000 +Date: Sat, 18 Nov 2017 22:28:39 +1100 Subject: [PATCH] mingw-w64 fixes @@ -56,7 +56,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: fiesh -Date: Tue, 22 Dec 2015 13:45:56 +0100 +Date: Sat, 18 Nov 2017 22:29:10 +1100 Subject: [PATCH] fix freeimage build Add the FREEIMAGE_LIB define in order to keep the build process from @@ -67,31 +67,31 @@ index 1111111..2222222 100644 --- a/Makefile.fip +++ b/Makefile.fip @@ -17,7 +17,7 @@ MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS - CFLAGS += $(INCLUDE) --CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -+CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DFREEIMAGE_LIB - CXXFLAGS += $(INCLUDE) - - ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) + MODULES := $(MODULES:.cpp=.o) + CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DFREEIMAGE_LIB + CXXFLAGS += $(INCLUDE) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek -Date: Wed, 04 May 2016 18:43:16 +0300 +Date: Sat, 18 Nov 2017 22:29:57 +1100 Subject: [PATCH] fix build with GCC >= 6.x + diff --git a/Makefile.mingw b/Makefile.mingw index 1111111..2222222 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -67,7 +67,7 @@ MODULES := $(MODULES:.cpp=.o) - RESOURCE = $(RCFILE:.rc=.coff) - CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS) - CFLAGS += $(INCLUDE) --CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -DNDEBUG $(WIN32_CXXFLAGS) -+CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -Wno-narrowing -DNDEBUG $(WIN32_CXXFLAGS) - CXXFLAGS += $(INCLUDE) - RCFLAGS ?= -DNDEBUG - LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS) - + RESOURCE = $(RCFILE:.rc=.coff) + CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS) + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -DNDEBUG $(WIN32_CXXFLAGS) ++CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -Wno-narrowing -DNDEBUG $(WIN32_CXXFLAGS) + CXXFLAGS += $(INCLUDE) + RCFLAGS ?= -DNDEBUG + LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS) diff --git a/src/libxml2-1-fixes.patch b/src/libxml2-1-fixes.patch index 0bbae07..536bde2 100644 --- a/src/libxml2-1-fixes.patch +++ b/src/libxml2-1-fixes.patch @@ -1,13 +1,15 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 91a883b212d0ea5f1d36618362baeca2f35abb29 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Sat, 16 Jun 2012 19:44:21 +0200 +Date: Sat, 18 Nov 2017 22:36:56 +1100 Subject: [PATCH] .pc requires.private liblzma diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index f5f5f03..21b14d1 100644 +index 1111111..2222222 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in @@ -8,6 +8,7 @@ Name: libXML @@ -16,8 +18,5 @@ index f5f5f03..21b14d1 100644 Requires: +Requires.private: liblzma Libs: -L${libdir} -lxml2 - Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ --- -1.7.10.4 - diff --git a/src/ocaml-lablgl-1-fixes.patch b/src/ocaml-lablgl-1-fixes.patch index 30fe324..8a8ec72 100644 --- a/src/ocaml-lablgl-1-fixes.patch +++ b/src/ocaml-lablgl-1-fixes.patch @@ -2,19 +2,19 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 29ddb2d1493f45ac281bbaa6cae80b3767201c9b Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 10 May 2012 20:07:55 +0200 -Subject: [PATCH 1/2] small modification of Makefile for cross-compilation ; - includes external glext.h +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:42:47 +1100 +Subject: [PATCH] small modification of Makefile for cross-compilation +includes external glext.h diff --git a/src/Makefile b/src/Makefile -index d930dfe..93f62bf 100644 +index 1111111..2222222 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -28,10 +28,10 @@ all: var2def$(XE) var2switch$(XE) lablgl.cma - opt: lablgl.cmxa +@@ -31,10 +31,10 @@ opt: lablgl.cmxa + tools: var2def$(XE) var2switch$(XE) var2def$(XE): var2def.ml - $(LINKER) -pp camlp4o var2def.ml -o $@ @@ -28,7 +28,7 @@ index d930dfe..93f62bf 100644 liblablgl$(XA): $(COBJS) diff --git a/src/glext.h b/src/glext.h new file mode 100644 -index 0000000..9048515 +index 1111111..2222222 --- /dev/null +++ b/src/glext.h @@ -0,0 +1,11127 @@ @@ -11160,7 +11160,7 @@ index 0000000..9048515 + +#endif diff --git a/src/ml_shader.c b/src/ml_shader.c -index e10cbce..e337d9b 100644 +index 1111111..2222222 100644 --- a/src/ml_shader.c +++ b/src/ml_shader.c @@ -12,7 +12,7 @@ @@ -11172,18 +11172,15 @@ index e10cbce..e337d9b 100644 #endif #include --- -1.8.1.2 - -From 3693a79d1c425d88b20be62f8ca2064bd82bf2c7 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 4 Aug 2013 21:35:28 +0200 -Subject: [PATCH 2/2] ml_gl.c : refer to new glext.h +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:43:31 +1100 +Subject: [PATCH] ml_gl.c : refer to new glext.h diff --git a/src/ml_gl.c b/src/ml_gl.c -index c9b04ad..3ccedaa 100644 +index 1111111..2222222 100644 --- a/src/ml_gl.c +++ b/src/ml_gl.c @@ -10,7 +10,7 @@ @@ -11195,6 +11192,3 @@ index c9b04ad..3ccedaa 100644 #undef GL_VERSION_1_3 #endif #include --- -1.8.1.2 - diff --git a/src/ocaml-xml-light-1-fixes.patch b/src/ocaml-xml-light-1-fixes.patch index f4ec62c..b9dd1f5 100644 --- a/src/ocaml-xml-light-1-fixes.patch +++ b/src/ocaml-xml-light-1-fixes.patch @@ -2,99 +2,71 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 8f7239bcdd0f1c3879d548ddfb34c8befa70c9fb Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 11 May 2012 00:50:32 +0200 -Subject: [PATCH 1/2] allows use of ocaml tools for cross-compilation +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:47:03 +1100 +Subject: [PATCH] allows use of ocaml tools for cross-compilation and use + prefixed ocamldoc diff --git a/Makefile b/Makefile -index c978890..5c15ace 100644 +index 1111111..2222222 100644 --- a/Makefile +++ b/Makefile -@@ -1,8 +1,11 @@ - # Makefile generated by OCamake - # http://tech.motion-twin.com - .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly -+OCAMLC=@target@-ocamlc -+OCAMLOPT=@target@-ocamlopt - --INSTALLDIR=`ocamlc -where` -+ -+INSTALLDIR=@installdir@ - CFLAGS= - LFLAGS= -a - LIBS= -@@ -19,16 +22,16 @@ doc: - ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli - - test.exe: xml-light.cma -- ocamlc xml-light.cma test.ml -o test.exe -- -+ $(OCAMLC) xml-light.cma test.ml -o test.exe -+ - test_opt.exe: xml-light.cmxa -- ocamlopt xml-light.cmxa test.ml -o test_opt.exe -+ $(OCAMLOPT) xml-light.cmxa test.ml -o test_opt.exe - - xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo -- ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo -+ $(OCAMLC) -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo - - xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx -- ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx -+ $(OCAMLOPT) -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx - - dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi - -@@ -68,13 +71,13 @@ wclean: - - # SUFFIXES - .ml.cmo: -- ocamlc $(CFLAGS) -c $< -+ $(OCAMLC) $(CFLAGS) -c $< - - .ml.cmx: -- ocamlopt $(CFLAGS) -c $< -+ $(OCAMLOPT) $(CFLAGS) -c $< - - .mli.cmi: -- ocamlc $(CFLAGS) $< -+ $(OCAMLC) $(CFLAGS) $< - - .mll.ml: - ocamllex $< --- -1.7.9.5 - - -From 4ec44e9cba7be6abfe9c121b753f8d6bd5b3ee8b Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 30 Sep 2012 21:38:52 +0200 -Subject: [PATCH 2/2] use prefixed ocamldoc - - -diff --git a/Makefile b/Makefile -index 5c15ace..0e60588 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,6 +3,7 @@ - .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly - OCAMLC=@target@-ocamlc - OCAMLOPT=@target@-ocamlopt -+OCAMLDOC=@target@-ocamldoc - - - INSTALLDIR=@installdir@ -@@ -19,7 +20,7 @@ install: all opt - - doc: - mkdir doc -- ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli -+ $(OCAMLDOC) -sort -html -d doc xml.mli dtd.mli xmlParser.mli - - test.exe: xml-light.cma - $(OCAMLC) xml-light.cma test.ml -o test.exe --- -1.7.9.5 - +@@ -1,8 +1,12 @@ + # Makefile generated by OCamake + # http://tech.motion-twin.com + .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly ++OCAMLC=@target@-ocamlc ++OCAMLOPT=@target@-ocamlopt ++OCAMLDOC=@target@-ocamldoc + +-INSTALLDIR=`ocamlc -where` ++ ++INSTALLDIR=@installdir@ + CFLAGS= + LFLAGS= -a + LIBS= +@@ -16,19 +20,19 @@ install: all opt + + doc: + mkdir doc +- ocamldoc -sort -html -d doc xml.mli dtd.mli xmlParser.mli ++ $(OCAMLDOC) -sort -html -d doc xml.mli dtd.mli xmlParser.mli + + test.exe: xml-light.cma +- ocamlc xml-light.cma test.ml -o test.exe +- ++ $(OCAMLC) xml-light.cma test.ml -o test.exe ++ + test_opt.exe: xml-light.cmxa +- ocamlopt xml-light.cmxa test.ml -o test_opt.exe ++ $(OCAMLOPT) xml-light.cmxa test.ml -o test_opt.exe + + xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo +- ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo ++ $(OCAMLC) -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo + + xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx +- ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx ++ $(OCAMLOPT) -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx + + dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi + +@@ -68,13 +72,13 @@ wclean: + + # SUFFIXES + .ml.cmo: +- ocamlc $(CFLAGS) -c $< ++ $(OCAMLC) $(CFLAGS) -c $< + + .ml.cmx: +- ocamlopt $(CFLAGS) -c $< ++ $(OCAMLOPT) $(CFLAGS) -c $< + + .mli.cmi: +- ocamlc $(CFLAGS) $< ++ $(OCAMLC) $(CFLAGS) $< + + .mll.ml: + ocamllex $< diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch index d39654c..cd79c89 100644 --- a/src/pango-1-fixes.patch +++ b/src/pango-1-fixes.patch @@ -1,33 +1,15 @@ This file is part of MXE. See LICENSE.md for licensing information. -From 525d3bc5b5f7e7d2c705c2b53cc8bf91d56e4641 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 29 Sep 2010 00:50:08 +0200 -Subject: [PATCH 2/4] add missing lib to pango.pc for static linking +Contains ad hoc patches for cross building. - -diff --git a/pango.pc.in b/pango.pc.in -index 17a8b7a..16c5981 100644 ---- a/pango.pc.in -+++ b/pango.pc.in -@@ -10,4 +10,4 @@ Description: Internationalized text handling - Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 --Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ -+Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ - Libs.private: -lm --- -1.7.10.4 - - -From 93cb665f6fcfa4d3cbe1edb06a09850c47807b0d Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Mon, 18 Jun 2012 21:36:53 +0200 -Subject: [PATCH 4/4] kill gtk-doc (MXE specific) +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:51:50 +1100 +Subject: [PATCH] kill gtk-doc (MXE specific) diff --git a/Makefile.am b/Makefile.am -index 1ac018a..1999723 100644 +index 1111111..2222222 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ @@ -39,7 +21,7 @@ index 1ac018a..1999723 100644 EXTRA_DIST = \ autogen.sh \ diff --git a/autogen.sh b/autogen.sh -index bc7c59c..4e1918c 100755 +index 1111111..2222222 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,14 +7,6 @@ test -n "$srcdir" || srcdir=. @@ -58,10 +40,10 @@ index bc7c59c..4e1918c 100755 if test -z $AUTORECONF; then echo "*** No autoreconf found, please install it ***" diff --git a/configure.ac b/configure.ac -index ac62a89..96837d6 100644 +index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac -@@ -563,14 +563,7 @@ dnl ************************** +@@ -483,14 +483,7 @@ dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** @@ -75,8 +57,5 @@ index ac62a89..96837d6 100644 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) +enable_gtk_doc=no - AC_ARG_ENABLE(man, - AC_HELP_STRING([--enable-man], --- -1.7.10.4 - + AC_ARG_ENABLE(doc-cross-references, + AC_HELP_STRING([--disable-doc-cross-references], diff --git a/src/qwtplot3d-1-fixes.patch b/src/qwtplot3d-1-fixes.patch index 6064a9a..4084fd2 100644 --- a/src/qwtplot3d-1-fixes.patch +++ b/src/qwtplot3d-1-fixes.patch @@ -2,113 +2,101 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 0ee512abc5ac926ebe37ea50ecac9c314efd8f53 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:05:36 +0200 -Subject: [PATCH 1/4] add missing #include +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:56:46 +1100 +Subject: [PATCH] add missing #include diff --git a/src/qwt3d_function.cpp b/src/qwt3d_function.cpp -index 28d874e..72f93a9 100644 +index 1111111..2222222 100644 --- a/src/qwt3d_function.cpp +++ b/src/qwt3d_function.cpp @@ -1,3 +1,4 @@ -+#include - #include "qwt3d_surfaceplot.h" - #include "qwt3d_function.h" - --- -1.7.7 ++#include + #include "qwt3d_surfaceplot.h" + #include "qwt3d_function.h" + - -From 252126201db746fd5772e0ac201d7975aa705236 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:06:42 +0200 -Subject: [PATCH 2/4] add missing #include +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:57:14 +1100 +Subject: [PATCH] add missing #include We use symbols defined in this header. Should not rely on Qt to include this file indirectly. diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h -index e5499c2..48052ae 100644 +index 1111111..2222222 100644 --- a/include/qwt3d_openglhelper.h +++ b/include/qwt3d_openglhelper.h @@ -1,3 +1,4 @@ -+#include - #ifndef __openglhelper_2003_06_06_15_49__ - #define __openglhelper_2003_06_06_15_49__ - --- -1.7.7 - ++#include + #ifndef __openglhelper_2003_06_06_15_49__ + #define __openglhelper_2003_06_06_15_49__ + -From ac2860d954caeac6ce7701a0ee196e1533bc047e Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:22:24 +0200 -Subject: [PATCH 3/4] configure project for MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:57:46 +1100 +Subject: [PATCH] configure project for MXE diff --git a/qwtplot3d.pro b/qwtplot3d.pro -index d4fa0c1..94f92ee 100644 +index 1111111..2222222 100644 --- a/qwtplot3d.pro +++ b/qwtplot3d.pro @@ -3,7 +3,7 @@ - - TARGET = qwtplot3d - TEMPLATE = lib --CONFIG += qt warn_on opengl thread zlib debug -+CONFIG += qt warn_on opengl thread zlib static release - MOC_DIR = tmp - OBJECTS_DIR = tmp - INCLUDEPATH = include + + TARGET = qwtplot3d + TEMPLATE = lib +-CONFIG += qt warn_on opengl thread zlib debug ++CONFIG += qt warn_on opengl thread zlib static release + MOC_DIR = tmp + OBJECTS_DIR = tmp + INCLUDEPATH = include @@ -12,13 +12,13 @@ DESTDIR = lib - #DESTDIR = ../../../lib - QT += opengl - --win32:TEMPLATE = vclib --win32:CONFIG += dll exceptions -+#win32:TEMPLATE = vclib -+win32:CONFIG += exceptions - win32:dll:DEFINES += QT_DLL QWT3D_DLL QWT3D_MAKEDLL - win32:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_STL - - # Comment the next line, if you have zlib on your windows system --win32:CONFIG -= zlib -+#win32:CONFIG -= zlib - - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions - unix:VERSION = 0.2.6 --- -1.7.7 - - -From 6a316d1844a2634ebc4374e1e9d01502204d8c7e Mon Sep 17 00:00:00 2001 -From: MXE -Date: Thu, 20 Oct 2011 21:47:18 +0200 -Subject: [PATCH 4/4] fix building examples for MXE + #DESTDIR = ../../../lib + QT += opengl + +-win32:TEMPLATE = vclib +-win32:CONFIG += dll exceptions ++#win32:TEMPLATE = vclib ++win32:CONFIG += exceptions + win32:dll:DEFINES += QT_DLL QWT3D_DLL QWT3D_MAKEDLL + win32:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_STL + + # Comment the next line, if you have zlib on your windows system +-win32:CONFIG -= zlib ++#win32:CONFIG -= zlib + + linux-g++:TMAKE_CXXFLAGS += -fno-exceptions + unix:VERSION = 0.2.6 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 18 Nov 2017 22:58:05 +1100 +Subject: [PATCH] fix building examples for MXE diff --git a/examples/common.pro b/examples/common.pro -index 2b7fb83..a89066d 100644 +index 1111111..2222222 100644 --- a/examples/common.pro +++ b/examples/common.pro @@ -11,12 +11,12 @@ unix:LIBS += -lqwtplot3d -L../../lib - linux-g++:QMAKE_CXXFLAGS += -fno-exceptions - - win32{ -- LIBS += ../../lib/qwtplot3d.lib -- TEMPLATE = vcapp -- DEFINES += QT_DLL QWT3D_DLL -+ LIBS += -L../../lib -lqwtplot3d -+# TEMPLATE = vcapp -+# DEFINES += QT_DLL QWT3D_DLL - RC_FILE = ../icon.rc - contains (CONFIG, debug) { -- QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt -+# QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt - } - - } --- -1.7.7 - + linux-g++:QMAKE_CXXFLAGS += -fno-exceptions + + win32{ +- LIBS += ../../lib/qwtplot3d.lib +- TEMPLATE = vcapp +- DEFINES += QT_DLL QWT3D_DLL ++ LIBS += -L../../lib -lqwtplot3d ++# TEMPLATE = vcapp ++# DEFINES += QT_DLL QWT3D_DLL + RC_FILE = ../icon.rc + contains (CONFIG, debug) { +- QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt ++# QMAKE_LFLAGS += /NODEFAULTLIB:msvcrt + } + + } diff --git a/src/vtk-1-fixes.patch b/src/vtk-1-fixes.patch index 1e13226..02625e0 100644 --- a/src/vtk-1-fixes.patch +++ b/src/vtk-1-fixes.patch @@ -4,13 +4,45 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= -Date: Sat, 22 Jun 2013 18:44:18 +1000 +Date: Sat, 18 Nov 2017 23:04:57 +1100 Subject: [PATCH] fix libharu shared linking ---- a/IO/Export/CMakeLists.txt 2017-05-19 15:20:47.000000000 +0200 -+++ b/IO/Export/CMakeLists.txt 2017-06-05 11:13:51.646391244 +0200 -@@ -33,6 +33,16 @@ +diff --git a/CMake/FindLibHaru.cmake b/CMake/FindLibHaru.cmake +index 1111111..2222222 100644 +--- a/CMake/FindLibHaru.cmake ++++ b/CMake/FindLibHaru.cmake +@@ -19,7 +19,7 @@ + + find_path(LIBHARU_INCLUDE_DIR hpdf.h) + +-find_library(LIBHARU_LIBRARY NAMES hpdf) ++find_library(LIBHARU_LIBRARY NAMES hpdf hpdfs) + + # handle the QUIETLY and REQUIRED arguments and set FONTCONFIG_FOUND to TRUE if + # all listed variables are TRUE +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -251,9 +251,9 @@ endif() + # Full functional CMAKE_CROSSCOMPILING_EMULATOR support for custom_command and + # custom_target is available in CMake 3.8.0 + # It was first added in CMake 3.6.0 and later fixed in CMake 3.8.0 (commit e7480d67, CMake issue #16288) +-set(_crosscompiling_emulator_support_custom_target 1) +-if(CMAKE_VERSION VERSION_LESS 3.8.0) +- set(_crosscompiling_emulator_support_custom_target 0) ++set(_crosscompiling_emulator_support_custom_target 0) ++if(DEFINED CMAKE_CROSSCOMPILING_EMULATOR AND NOT CMAKE_VERSION VERSION_LESS 3.8.0) ++ set(_crosscompiling_emulator_support_custom_target 1) + endif() + # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED + if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED) +diff --git a/IO/Export/CMakeLists.txt b/IO/Export/CMakeLists.txt +index 1111111..2222222 100644 +--- a/IO/Export/CMakeLists.txt ++++ b/IO/Export/CMakeLists.txt +@@ -33,6 +33,16 @@ set_source_files_properties( ABSTRACT ) @@ -27,20 +59,11 @@ Subject: [PATCH] fix libharu shared linking vtk_module_library(vtkIOExport ${Module_SRCS}) include(vtkOpenGL) vtk_opengl_link(vtkIOExport) ---- a/CMake/FindLibHaru.cmake 2017-05-19 15:20:47.000000000 +0200 -+++ b/VTK-8.0.0.rc1/CMake/FindLibHaru.cmake 2017-06-05 12:56:24.120790922 +0200 -@@ -19,7 +19,7 @@ - - find_path(LIBHARU_INCLUDE_DIR hpdf.h) - --find_library(LIBHARU_LIBRARY NAMES hpdf) -+find_library(LIBHARU_LIBRARY NAMES hpdf hpdfs) - - # handle the QUIETLY and REQUIRED arguments and set FONTCONFIG_FOUND to TRUE if - # all listed variables are TRUE ---- a/Rendering/OpenGL2/CMakeLists.txt 2017-05-19 15:20:47.000000000 +0200 -+++ b/Rendering/OpenGL2/CMakeLists.txt 2017-06-06 01:11:16.512084625 +0200 -@@ -122,6 +122,11 @@ +diff --git a/Rendering/OpenGL2/CMakeLists.txt b/Rendering/OpenGL2/CMakeLists.txt +index 1111111..2222222 100644 +--- a/Rendering/OpenGL2/CMakeLists.txt ++++ b/Rendering/OpenGL2/CMakeLists.txt +@@ -122,6 +122,11 @@ set_source_files_properties( vtkTransformFeedback WRAP_EXCLUDE) @@ -52,19 +75,3 @@ Subject: [PATCH] fix libharu shared linking set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx vtkOpenGLGL2PSHelper - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -251,9 +251,9 @@ endif() - # Full functional CMAKE_CROSSCOMPILING_EMULATOR support for custom_command and - # custom_target is available in CMake 3.8.0 - # It was first added in CMake 3.6.0 and later fixed in CMake 3.8.0 (commit e7480d67, CMake issue #16288) --set(_crosscompiling_emulator_support_custom_target 1) --if(CMAKE_VERSION VERSION_LESS 3.8.0) -- set(_crosscompiling_emulator_support_custom_target 0) -+set(_crosscompiling_emulator_support_custom_target 0) -+if(DEFINED CMAKE_CROSSCOMPILING_EMULATOR AND NOT CMAKE_VERSION VERSION_LESS 3.8.0) -+ set(_crosscompiling_emulator_support_custom_target 1) - endif() - # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED - if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED) -- cgit v0.12