d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various packages: refresh patches 

brings patches into common format to reduce noise in diffs
This commit is contained in:
Tony Theodore 2017-11-18 19:44:18 +11:00
parent 628590f62d
commit cd1655c9ef
67 changed files with 496 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/apps/clementine-1-fixes.patch
View File

@ -140,7 +140,6 @@ Original patch by Arfrever
This fixes https://github.com/clementine-player/Clementine/issues/5297
https://github.com/clementine-player/Clementine/pull/5669
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 1111111..2222222 100644
--- a/src/core/database.cpp
@ -176,7 +175,6 @@ It looks like there is a problem with build of src/ui/appearancesettingspage.cpp
It might fix it.
https://github.com/clementine-player/Clementine/pull/5784
diff --git a/src/ui/appearancesettingspage.cpp b/src/ui/appearancesettingspage.cpp
index 1111111..2222222 100644
--- a/src/ui/appearancesettingspage.cpp

3
plugins/apps/clementine_qt4-1-fixes.patch
View File

@ -86,14 +86,13 @@ Original patch by Arfrever
This fixes https://github.com/clementine-player/Clementine/issues/5297
https://github.com/clementine-player/Clementine/pull/5669
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 1111111..2222222 100644
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() {
StaticInit();
{
+
+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER

26
plugins/luarocks/lua-rapidjson-1-fixes.patch
View File

@ -1,16 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From dbedfa6c3b350b6cb2c13d17790a17129ce28721 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 11 Oct 2015 22:47:50 +0200
Subject: [PATCH 1/2] use Unix file functions on MinGW
Subject: [PATCH] use Unix file functions on MinGW
---
src/rapidjson.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/rapidjson.cpp b/src/rapidjson.cpp
index 3b5b129..955009f 100644
index 1111111..2222222 100644
--- a/src/rapidjson.cpp
+++ b/src/rapidjson.cpp
@@ -54,7 +54,7 @@ static void setfuncs(lua_State* L, const luaL_Reg *funcs)
@ -31,21 +30,15 @@ index 3b5b129..955009f 100644
fopen_s(&fp, filename, "wb");
#else
fp = fopen(filename, "w");
--
1.7.10.4
From ad7426ad156f90dcf2b051fe125900caf5b8b2da Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 11 Oct 2015 22:48:26 +0200
Subject: [PATCH 2/2] link with Lua libraries on MinGW and MXE
Subject: [PATCH] link with Lua libraries on MinGW and MXE
---
rapidjson-0.2.2-1.rockspec | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/rapidjson-0.2.2-1.rockspec b/rapidjson-0.2.2-1.rockspec
index 9efe7e1..6ad9188 100644
index 1111111..2222222 100644
--- a/rapidjson-0.2.2-1.rockspec
+++ b/rapidjson-0.2.2-1.rockspec
@@ -27,6 +27,13 @@ dependencies = {
@ -76,6 +69,3 @@ index 9efe7e1..6ad9188 100644
+ mxe = link,
}
}
--
1.7.10.4

2
plugins/luarocks/luarocks-1-fixes.patch
View File

@ -25,7 +25,7 @@ diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 1111111..2222222 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -137,6 +140,7 @@ local platform_order = {
@@ -137,6 +137,7 @@ local platform_order = {
linux = 7,
macosx = 8,
cygwin = 9,

12
src/agg-1-fixes.patch
View File

@ -1,16 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 2617d6a743ad197dc7ae0278a9c7015cc7dff61f 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 <mabrand@mabrand.nl>
Date: Tue, 12 Jun 2012 17:05:49 +0200
Subject: [PATCH] automake 1.12 compatibility fix
---
configure.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.in b/configure.in
index fceca82..317e17b 100644
index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,6 @@ dnl Checks for programs.
@ -21,6 +20,3 @@ index fceca82..317e17b 100644
if test "x$U" != "x"; then
AC_MSG_ERROR(Compiler not ANSI compliant)
fi
--
1.7.10.4

2
src/aubio-1-fixes.patch
View File

@ -236,7 +236,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 21:27:05 -0500
Subject: [PATCH] [MXE] disable tests and examples
Subject: [PATCH] disable tests and examples
diff --git a/wscript b/wscript

11
src/boost-1-fixes.patch
View File

@ -1,5 +1,7 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: xantares <xantares09@hotmail.com>
Date: Mon, 28 Sep 2015 08:21:42 +0000
@ -7,7 +9,7 @@ Subject: [PATCH] Fix {make,jump}_fcontext visibility with mingw
taken from: https://github.com/boostorg/context/pull/22
diff --git a/libs/context/src/asm/jump_i386_ms_pe_gas.asm b/src/asm/jump_i386_ms_pe_gas.asm
diff --git a/libs/context/src/asm/jump_i386_ms_pe_gas.asm b/libs/context/src/asm/jump_i386_ms_pe_gas.asm
index 1111111..2222222 100644
--- a/libs/context/src/asm/jump_i386_ms_pe_gas.asm
+++ b/libs/context/src/asm/jump_i386_ms_pe_gas.asm
@ -18,7 +20,7 @@ index 1111111..2222222 100644
+
+.section .drectve
+.ascii " -export:\"jump_fcontext\""
diff --git a/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm b/src/asm/jump_x86_64_ms_pe_gas.asm
diff --git a/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm b/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm
index 1111111..2222222 100644
--- a/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm
+++ b/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm
@ -29,7 +31,7 @@ index 1111111..2222222 100644
+
+.section .drectve
+.ascii " -export:\"jump_fcontext\""
diff --git a/libs/context/src/asm/make_i386_ms_pe_gas.asm b/src/asm/make_i386_ms_pe_gas.asm
diff --git a/libs/context/src/asm/make_i386_ms_pe_gas.asm b/libs/context/src/asm/make_i386_ms_pe_gas.asm
index 1111111..2222222 100644
--- a/libs/context/src/asm/make_i386_ms_pe_gas.asm
+++ b/libs/context/src/asm/make_i386_ms_pe_gas.asm
@ -40,7 +42,7 @@ index 1111111..2222222 100644
+
+.section .drectve
+.ascii " -export:\"make_fcontext\""
diff --git a/libs/context/src/asm/make_x86_64_ms_pe_gas.asm b/src/asm/make_x86_64_ms_pe_gas.asm
diff --git a/libs/context/src/asm/make_x86_64_ms_pe_gas.asm b/libs/context/src/asm/make_x86_64_ms_pe_gas.asm
index 1111111..2222222 100644
--- a/libs/context/src/asm/make_x86_64_ms_pe_gas.asm
+++ b/libs/context/src/asm/make_x86_64_ms_pe_gas.asm
@ -51,4 +53,3 @@ index 1111111..2222222 100644
+
+.section .drectve
+.ascii " -export:\"make_fcontext\""

9
src/cpp-netlib-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 12d808cb5f167015b193f3a7f61f4414f93e3876 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 30 Nov 2015 20:34:28 +1100
Subject: [PATCH] fix dll installation and ws2_32 linking errors
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
index 3f22165..baa70e4 100644
index 1111111..2222222 100644
--- a/libs/network/src/CMakeLists.txt
+++ b/libs/network/src/CMakeLists.txt
@@ -21,6 +21,7 @@ install(TARGETS cppnetlib-uri
@ -41,6 +41,3 @@ index 3f22165..baa70e4 100644
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
--
2.4.9 (Apple Git-60)

67
src/dcmtk-1-fixes.patch
View File

@ -2,7 +2,7 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From ac29986df03482c61dbd7271554e6bc453228bd6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Joerg Riesmeier <dicom@offis.de>
Date: Thu, 17 Nov 2011 16:13:14 +0000
Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
@ -14,31 +14,9 @@ Conflicts:
CHANGES.361
ofstd/libsrc/ofchrenc.cc
---
dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++-----------
dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++----
dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++----
dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++-------
dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++-------
dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++-----
dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++----
dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++----
dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------
dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------
dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++----
dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++----
dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++----
dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------
dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++-----
dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------
dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++----
dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++----
dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++--------
ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++-----
20 files changed, 168 insertions(+), 108 deletions(-)
diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
index 7e3894d..1ed9291 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
@@ -1,6 +1,6 @@
@ -121,7 +99,7 @@ index 7e3894d..1ed9291 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
index 5357780..bf1161e 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
@@ -1,6 +1,6 @@
@ -163,7 +141,7 @@ index 5357780..bf1161e 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
index 0c06de7..3f03b6b 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
@@ -1,6 +1,6 @@
@ -205,7 +183,7 @@ index 0c06de7..3f03b6b 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
index a5bed81..bc809ab 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
@@ -1,6 +1,6 @@
@ -257,7 +235,7 @@ index a5bed81..bc809ab 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h
index 2bcd71e..c8afd70 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicorot.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h
@@ -1,6 +1,6 @@
@ -309,7 +287,7 @@ index 2bcd71e..c8afd70 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h
index 006a829..3bccc45 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicosct.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h
@@ -1,6 +1,6 @@
@ -353,7 +331,7 @@ index 006a829..3bccc45 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
index 10d8b70..52580ec 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
@@ -1,6 +1,6 @@
@ -395,7 +373,7 @@ index 10d8b70..52580ec 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
index 2e5eef7..1ae2352 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
@@ -1,6 +1,6 @@
@ -437,7 +415,7 @@ index 2e5eef7..1ae2352 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
index 85f973d..d9cc7ed 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
@@ -1,6 +1,6 @@
@ -491,7 +469,7 @@ index 85f973d..d9cc7ed 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
index 6b523fb..ecd2038 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
@@ -1,6 +1,6 @@
@ -545,7 +523,7 @@ index 6b523fb..ecd2038 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
index ed27796..93d28cc 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
@@ -1,6 +1,6 @@
@ -587,7 +565,7 @@ index ed27796..93d28cc 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
index 518fed7..0dd9d5b 100644
index 1111111..2222222 100644
--- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
@@ -1,6 +1,6 @@
@ -629,7 +607,7 @@ index 518fed7..0dd9d5b 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
index 4933fe1..05c198c 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
@@ -1,6 +1,6 @@
@ -671,7 +649,7 @@ index 4933fe1..05c198c 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
index a88ab9d..52d71a3 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
@@ -1,6 +1,6 @@
@ -719,7 +697,7 @@ index a88ab9d..52d71a3 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
index e815e90..c190dd6 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
@@ -1,6 +1,6 @@
@ -765,7 +743,7 @@ index e815e90..c190dd6 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
index 4ef277d..e729424 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
@@ -1,6 +1,6 @@
@ -813,7 +791,7 @@ index 4ef277d..e729424 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
index 60c9abb..8f89855 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
@@ -1,6 +1,6 @@
@ -855,7 +833,7 @@ index 60c9abb..8f89855 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
index edb452e..2e7e3a0 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
@@ -1,6 +1,6 @@
@ -897,7 +875,7 @@ index edb452e..2e7e3a0 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
index 758dde2..0bcbc70 100644
index 1111111..2222222 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
@@ -1,6 +1,6 @@
@ -972,7 +950,7 @@ index 758dde2..0bcbc70 100644
* Updated copyright header. Added reference to COPYRIGHT file.
*
diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h
index 1a7f208..a534ebf 100644
index 1111111..2222222 100644
--- a/ofstd/include/dcmtk/ofstd/ofoset.h
+++ b/ofstd/include/dcmtk/ofstd/ofoset.h
@@ -1,6 +1,6 @@
@ -1022,6 +1000,3 @@ index 1a7f208..a534ebf 100644
** Revision 1.11 2010-10-14 13:15:50 joergr
** Updated copyright header. Added reference to COPYRIGHT file.
**
--
1.7.9.2

1
src/devil-1-fixes.patch
View File

@ -60,7 +60,6 @@ Subject: [PATCH] fix resource paths
DevIL/src-IL/msvc/IL.rc has weird EOL issues and patches don't
apply - use $(SED) in build rule instead
diff --git a/DevIL/src-ILU/msvc/ILU.rc b/DevIL/src-ILU/msvc/ILU.rc
index 1111111..2222222 100644
--- a/DevIL/src-ILU/msvc/ILU.rc

32
src/flann-1-fixes.patch
View File

@ -1,9 +1,11 @@
This file is part of MXE. See LICENSE.md for licensing information.
From cdd24cfc910a9a171451ad005fbcaa5530590609 Mon Sep 17 00:00:00 2001
From: MXE
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 10 Aug 2014 19:35:55 -0700
Subject: [PATCH 1/3] Disable targets
Subject: [PATCH] Disable targets
Disable examples, test, and documentation in the CMakeLists.txt file.
(The file unfortunately does not provide switches for this purpose.)
@ -11,7 +13,7 @@ Disable examples, test, and documentation in the CMakeLists.txt file.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3279915..c1f930a 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,9 +155,9 @@ endif(WIN32)
@ -27,19 +29,16 @@ index 3279915..c1f930a 100644
# CPACK options
--
1.9.1
From 2102cb0509bd4ab569be05472baaef2970129124 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 11 Aug 2014 10:09:08 -0700
Subject: [PATCH 2/3] Fix gcc compile flags
Subject: [PATCH] Fix gcc compile flags
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1f930a..02928d3 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,12 +146,12 @@ include_directories(${PROJECT_SOURCE_DIR}/src/cpp)
@ -58,22 +57,18 @@ index c1f930a..02928d3 100644
add_subdirectory( cmake )
add_subdirectory( src )
--
1.9.1
From 7f37bdf57f85753e0258be10bc7b1f98535145be Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 11 Aug 2014 09:57:42 -0700
Subject: [PATCH 3/3] Use BUILD_SHARED_LIBS to control which kind of libs to
build
Subject: [PATCH] Use BUILD_SHARED_LIBS to control which kind of libs to build
Also removes the Linux-only --whole-archive trick, and CUDA libs.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 78a204a..7e6e353 100644
index 1111111..2222222 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -8,58 +8,17 @@ file(GLOB_RECURSE C_SOURCES flann.cpp)
@ -217,6 +212,3 @@ index 78a204a..7e6e353 100644
endif()
install (
--
1.9.1

15
src/fontconfig-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From da6c9bfc3d57f3aa192972717cb5c84a56e1c422 Mon Sep 17 00:00:00 2001
From: MXE
Date: Tue, 05 Jul 2016 21:56:34 +0300
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Tue, 5 Jul 2016 21:56:34 +0300
Subject: [PATCH] fix mktemp_s
diff --git a/configure.ac b/configure.ac
index f8dadf1..bde05c8 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ AC_TYPE_PID_T
@ -20,7 +22,7 @@ index f8dadf1..bde05c8 100644
dnl AC_CHECK_FUNCS doesn't check for header files.
dnl posix_fadvise() may be not available in older libc.
diff --git a/src/fccompat.c b/src/fccompat.c
index f4f3f5f..68a70ff 100644
index 1111111..2222222 100644
--- a/src/fccompat.c
+++ b/src/fccompat.c
@@ -152,8 +152,8 @@ FcMakeTempfile (char *template)
@ -34,6 +36,3 @@ index f4f3f5f..68a70ff 100644
return -1;
fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
#endif
--
1.8.4.5

11
src/fribidi-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From c4dc7b368af33821eca1be8a4ec88929b44f3d06 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 <mabrand@mabrand.nl>
Date: Tue, 17 Jul 2012 10:07:07 +0200
Subject: [PATCH] only include glib.h
diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
index 5d45e74..e596dee 100644
index 1111111..2222222 100644
--- a/charset/fribidi-char-sets.c
+++ b/charset/fribidi-char-sets.c
@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = {
@ -20,7 +22,7 @@ index 5d45e74..e596dee 100644
#else /* !FRIBIDI_USE_GLIB */
static char
diff --git a/lib/mem.h b/lib/mem.h
index c875e0b..031fcc3 100644
index 1111111..2222222 100644
--- a/lib/mem.h
+++ b/lib/mem.h
@@ -42,7 +42,7 @@
@ -32,6 +34,3 @@ index c875e0b..031fcc3 100644
#endif /* !__FRIBIDI_DOC */
#define FriBidiMemChunk GMemChunk
--
1.7.10.4

31
src/gdk-pixbuf-1-fixes.patch
View File

@ -2,17 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 38f4e914e458de6963a3fddbb57dbf8cd0fb83b4 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 24 Sep 2010 23:31:24 +0200
Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 411ceb6..64db155 100644
index 1111111..2222222 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -230,12 +230,12 @@ get_file_formats (void)
@@ -193,12 +193,12 @@ get_file_formats (void)
#ifdef G_OS_WIN32
@ -27,18 +27,15 @@ index 411ceb6..64db155 100644
DWORD fdwReason,
LPVOID lpvReserved)
{
--
1.7.10.4
From 0903d316c228bf2a6ba9fe11188851a357cde43e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 12 Oct 2012 12:24:51 +0200
Subject: [PATCH 2/3] add libtiff to required.private in .pc
Subject: [PATCH] add libtiff to required.private in .pc
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 7addefc..a07a46f 100644
index 1111111..2222222 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -12,7 +12,7 @@ Name: GdkPixbuf
@ -50,21 +47,18 @@ index 7addefc..a07a46f 100644
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@
Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
--
1.7.10.4
From 1e76ff73dcd6f191584bb05c8ccc9b0a16394a0d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 12 Oct 2012 12:25:27 +0200
Subject: [PATCH 3/3] allow static
Subject: [PATCH] allow static
diff --git a/configure.ac b/configure.ac
index a5224f8..a1fc2d0 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,16 +131,16 @@ case $host in
@@ -136,16 +136,16 @@ case $host in
;;
esac
@ -91,6 +85,3 @@ index a5224f8..a1fc2d0 100644
dnl Initialize libtool
LT_PREREQ([2.2.6])
--
1.7.10.4

4
src/geos-1-fixes.patch
View File

@ -5,7 +5,9 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Mon, 7 Aug 2017 15:24:32 +0200
Subject: [PATCH] Always link as static (based on the previous patch by Timothy Gu)
Subject: [PATCH] Always link as static (based on the previous patch by Timothy
Gu)
diff --git a/tools/geos-config.in b/tools/geos-config.in
index 1111111..2222222 100644

4
src/glib-1-fixes.patch
View File

@ -171,8 +171,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@cl.no>
Date: Fri, 15 Jun 2012 15:29:38 +0200
Subject: [PATCH] Ensure globals are initialized even when DllMain is not
being run
Subject: [PATCH] Ensure globals are initialized even when DllMain is not being
run
diff --git a/glib/gmain.c b/glib/gmain.c

2
src/gnutls-1-fixes.patch
View File

@ -80,7 +80,7 @@ diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,24 +483,19 @@ with_libidn=no
@@ -489,24 +489,19 @@ with_libidn=no
if test "$try_libidn" = yes;then
if test "$try_libidn2" = yes;then

11
src/gtkglarea-1-fixes.patch
View File

@ -2,8 +2,8 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 8ca212a3a9fa7a034b1fa3680422e9a7cad21d4a Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 17 Jun 2012 09:05:56 +0200
Subject: [PATCH] deactivates dll build which is not supported by mxe, and
introduce option --disable-shared to handle it.
@ -12,7 +12,7 @@ taken from
https://github.com/GNOME/gtkglarea/pull/1
diff --git a/configure.ac b/configure.ac
index 07be73f..2728c10 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,16 @@ if test "$native_win32" = "yes"; then
@ -53,7 +53,7 @@ index 07be73f..2728c10 100644
echo "---"
echo "Configuration summary"
diff --git a/gtkgl/Makefile.am b/gtkgl/Makefile.am
index c7e65cd..23d4fdb 100644
index 1111111..2222222 100644
--- a/gtkgl/Makefile.am
+++ b/gtkgl/Makefile.am
@@ -1,28 +1,28 @@
@ -103,6 +103,3 @@ index c7e65cd..23d4fdb 100644
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: $(UNINSTALL_EXTRA)
--
1.7.9.5

48
src/gtkglext-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From c79e894db7f1a5cbd6ba57352f79d68595175666 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 1 Oct 2010 14:43:15 +0200
Subject: [PATCH 1/4] remove pangox dependency
Subject: [PATCH] remove pangox dependency
diff --git a/configure.in b/configure.in
index e5b678c..54bb867 100644
index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
@@ -349,7 +349,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [\
@ -29,20 +29,17 @@ index e5b678c..54bb867 100644
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
--
1.7.1
From a6894898cad4238a3676cf6fbfe6c378217317ca Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 1 Oct 2010 14:44:37 +0200
Subject: [PATCH 2/4] use correct glib mkenums patch
Subject: [PATCH] use correct glib mkenums patch
This patch has been taken from:
https://bugzilla.gnome.org/show_bug.cgi?id=618599
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 525bfc2..fbeae34 100644
index 1111111..2222222 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -157,7 +157,7 @@ $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@AP
@ -64,7 +61,7 @@ index 525bfc2..fbeae34 100644
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
index 005bd1b..ace11c7 100644
index 1111111..2222222 100644
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -844,7 +844,7 @@ $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@AP
@ -85,20 +82,17 @@ index 005bd1b..ace11c7 100644
--fhead "#include \"gdkgl.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--
1.7.1
From 9080ce06af85a0beee38f0d391ee8fab8dc07fdf Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 1 Oct 2010 14:47:30 +0200
Subject: [PATCH 3/4] don't use deprecated functions
Subject: [PATCH] don't use deprecated functions
This patch has been taken from:
https://bugzilla.gnome.org/show_bug.cgi?id=618601
diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
index ecb41ef..2a31c5a 100644
index 1111111..2222222 100644
--- a/gtk/gtkglwidget.c
+++ b/gtk/gtkglwidget.c
@@ -127,7 +127,7 @@ gtk_gl_widget_size_allocate (GtkWidget *widget,
@ -175,18 +169,15 @@ index ecb41ef..2a31c5a 100644
return gdk_window_get_gl_window (widget->window);
}
--
1.7.1
From eb64eb053481321cb1b0d3ec9e2fcb46c55c0972 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 1 Oct 2010 14:50:25 +0200
Subject: [PATCH 4/4] removed import declarations
Subject: [PATCH] removed import declarations
diff --git a/gdk/gdkgldefs.h b/gdk/gdkgldefs.h
index 1120822..62a84c2 100644
index 1111111..2222222 100644
--- a/gdk/gdkgldefs.h
+++ b/gdk/gdkgldefs.h
@@ -27,9 +27,9 @@ G_BEGIN_DECLS
@ -202,7 +193,7 @@ index 1120822..62a84c2 100644
#else
# define GDK_GL_VAR extern
diff --git a/gtk/gtkgldefs.h b/gtk/gtkgldefs.h
index c917007..5ed957e 100644
index 1111111..2222222 100644
--- a/gtk/gtkgldefs.h
+++ b/gtk/gtkgldefs.h
@@ -25,9 +25,9 @@ G_BEGIN_DECLS
@ -217,6 +208,3 @@ index c917007..5ed957e 100644
# endif
#else
# define GTK_GL_VAR extern
--
1.7.1

22
src/gtkglextmm-1-fixes.patch
View File

@ -2,16 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 865936e91293bdc59c2e9c47e5a4b54fb6f1629e Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 29 Sep 2010 23:08:44 +0200
Subject: [PATCH] allow deprecated GThreadFunctions and GdkSpanFunc
diff -ur a/gdkglext/gdkmm/gl/Makefile.in b/gdkglext/gdkmm/gl/Makefile.in
--- a/gdkglext/gdkmm/gl/Makefile.in 2006-02-28 02:45:07.000000000 +0100
+++ b/gdkglext/gdkmm/gl/Makefile.in 2013-06-29 07:14:29.684968635 +0200
@@ -210,7 +210,6 @@
diff --git a/gdkglext/gdkmm/gl/Makefile.in b/gdkglext/gdkmm/gl/Makefile.in
index 1111111..2222222 100644
--- a/gdkglext/gdkmm/gl/Makefile.in
+++ b/gdkglext/gdkmm/gl/Makefile.in
@@ -210,7 +210,6 @@ sublib_topdir = gdkglext
sublib_cflags = \
$(GDKGLEXTMM_DEP_CFLAGS) \
-DGDKMM_GL_COMPILATION \
@ -19,10 +20,11 @@ diff -ur a/gdkglext/gdkmm/gl/Makefile.in b/gdkglext/gdkmm/gl/Makefile.in
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED
diff -ur a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in
--- a/gtkglext/gtkmm/gl/Makefile.in 2006-02-28 02:45:09.000000000 +0100
+++ b/gtkglext/gtkmm/gl/Makefile.in 2013-06-29 07:19:30.968981703 +0200
@@ -208,8 +208,6 @@
diff --git a/gtkglext/gtkmm/gl/Makefile.in b/gtkglext/gtkmm/gl/Makefile.in
index 1111111..2222222 100644
--- a/gtkglext/gtkmm/gl/Makefile.in
+++ b/gtkglext/gtkmm/gl/Makefile.in
@@ -208,8 +208,6 @@ sublib_cflags = \
-I$(top_srcdir)/gdkglext \
$(GTKGLEXTMM_DEP_CFLAGS) \
-DGTKMM_GL_COMPILATION \

24
src/guile-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 73756a80498d5c05f28bd4166c239e604125d9e4 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 10 Oct 2014 15:10:32 +1100
Subject: [PATCH 1/2] original patch fixes
Subject: [PATCH] original patch fixes
diff --git a/guile-readline/configure b/guile-readline/configure
index 3048732..9bee51b 100755
index 1111111..2222222 100755
--- a/guile-readline/configure
+++ b/guile-readline/configure
@@ -12086,7 +12086,7 @@ if test "$MINGW32" = "yes" ; then
@ -22,7 +22,7 @@ index 3048732..9bee51b 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -l${termlib}" >&5
$as_echo_n "checking for tgoto in -l${termlib}... " >&6; }
diff --git a/libguile/__scm.h b/libguile/__scm.h
index e75f1a9..2b5d159 100644
index 1111111..2222222 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -150,7 +150,7 @@
@ -34,18 +34,15 @@ index e75f1a9..2b5d159 100644
# define SCM_API __declspec (dllimport) extern
#elif defined (SCM_EXPORT) || defined (DLL_EXPORT)
# define SCM_API __declspec (dllexport) extern
--
1.9.3 (Apple Git-50)
From c63aecfe677d7e3d47457c54ce077cf509ad8961 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 10 Oct 2014 15:16:19 +1100
Subject: [PATCH 2/2] fix mingw-w64 build
Subject: [PATCH] fix mingw-w64 build
diff --git a/libguile/posix.c b/libguile/posix.c
index 2ecd8ae..a4e3562 100644
index 1111111..2222222 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -968,7 +968,7 @@ SCM_DEFINE (scm_execl, "execl", 1, 0, 1,
@ -81,6 +78,3 @@ index 2ecd8ae..a4e3562 100644
/* extra "const" in mingw formals, provokes warning from gcc */
(const char * const *)
#endif
--
1.9.3 (Apple Git-50)

2
src/harfbuzz-1-fixes.patch
View File

@ -1,5 +1,7 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Niels Kristian Bech Jensen <nkbj1970@hotmail.com>
Date: Sat, 22 Aug 2015 11:25:36 +0200

2
src/hyperscan-1-fixes.patch
View File

@ -4,7 +4,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 25 Aug 2016 10:28:30 +0200
Date: Thu, 25 Aug 2016 10:28:30 +0200
Subject: [PATCH] update preprocessor conditions
Add macro NATIVE_WIN32 = Windows && !MinGW.

9
src/icu4c-1-fixes.patch
View File

@ -2,17 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From a091ad517752ea98dd9ae471997c15d61b0f8559 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 May 2013 23:44:41 +1000
Subject: [PATCH] fixes for static cross-build
diff --git a/source/config/icu.pc.in b/source/config/icu.pc.in
index 406b196..cc53055 100644
index 1111111..2222222 100644
--- a/source/config/icu.pc.in
+++ b/source/config/icu.pc.in
@@ -5,7 +5,7 @@ exec_prefix = @exec_prefix@
@@ -11,7 +11,7 @@ exec_prefix = @exec_prefix@
#bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
@ -21,4 +21,3 @@ index 406b196..cc53055 100644
#datarootdir = @datarootdir@
#datadir = @datadir@
#sbindir = @sbindir@

9
src/jpeg-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From e523bccfefbf105ebe00d986bb1f057dfc304247 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 <mabrand@mabrand.nl>
Date: Sat, 17 Aug 2013 20:16:41 +0200
Subject: [PATCH] include stdio.h for FILE
diff --git a/jpeglib.h b/jpeglib.h
index 0a6dac4..2028d4e 100644
index 1111111..2222222 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -33,6 +33,8 @@ extern "C" {
@ -19,6 +21,3 @@ index 0a6dac4..2028d4e 100644
/* Version IDs for the JPEG library.
* Might be useful for tests like "#if JPEG_LIB_VERSION >= 90".
*/
--
1.8.1.4

10
src/lcms-1-fixes.patch
View File

@ -2,14 +2,11 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 664fb3591893facfe280cb930e20b61355e32ac1 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 23 Dec 2011 00:01:31 +0100
Subject: [PATCH] add missing static dependencies to .pc file
---
lcms2.pc.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lcms2.pc.in b/lcms2.pc.in
index 1111111..2222222 100644
@ -23,6 +20,3 @@ index 1111111..2222222 100644
+Libs.private: -ljpeg @LIB_MATH@ @LIB_THREAD@
Cflags: -I${includedir}
+Requires: libtiff-4
--
1.7.8

9
src/lcms1-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 6f4063fc97b3acc653605c077c94b862a9808fd4 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 23 Dec 2011 00:07:18 +0100
Subject: [PATCH] add missing static dependencies to .pc file
diff --git a/lcms.pc.in b/lcms.pc.in
index b3897b0..c72ef2f 100755
index 1111111..2222222 100755
--- a/lcms.pc.in
+++ b/lcms.pc.in
@@ -7,4 +7,6 @@ Name: @PACKAGE@
@ -19,6 +19,3 @@ index b3897b0..c72ef2f 100755
+Libs.private: -ljpeg
Cflags: -I${includedir}
+Requires.private: libtiff-4
--
1.7.8

24
src/libbs2b-1-fixes.patch
View File

@ -1,16 +1,18 @@
This file is part of MXE. See LICENSE.md for licensing information.
From e91b3a8a4edb0d574f0c71372eddf9889c13dc8e Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 31 Aug 2014 13:57:14 -0700
Subject: [PATCH 1/2] build: Modernize
Subject: [PATCH] build: Modernize
dist-lzma was removed in automake 1.11.2.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/configure.ac b/configure.ac
index 5a2f76c..288031a 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,13 +5,13 @@ AC_PREREQ([2.63])
@ -29,19 +31,16 @@ index 5a2f76c..288031a 100644
PKG_PROG_PKG_CONFIG
# Checks for libraries.
--
1.9.1
From 38e7d5e2641c79c4f34a4731f3f68d60865a9a6b Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 31 Aug 2014 14:11:44 -0700
Subject: [PATCH 2/2] Make libsndfile optional
Subject: [PATCH] Make libsndfile optional
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/configure.ac b/configure.ac
index 288031a..44b3340 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,10 @@ PKG_PROG_PKG_CONFIG
@ -58,7 +57,7 @@ index 288031a..44b3340 100644
# Checks for header files.
AC_CHECK_HEADERS([fcntl.h malloc.h string.h])
diff --git a/src/Makefile.am b/src/Makefile.am
index 414aeec..cb46f1a 100644
index 1111111..2222222 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,6 @@
@ -90,6 +89,3 @@ index 414aeec..cb46f1a 100644
bs2bstream_SOURCES = \
bs2bstream.c
+endif
--
1.9.1

33
src/libcaca-1-fixes.patch
View File

@ -1,14 +1,16 @@
This file is part of MXE. See LICENSE.md for licensing information.
From b9f723cf31e007004ccc748a0e16c594fa7fdf35 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 2 Aug 2014 15:12:50 -0700
Subject: [PATCH 1/3] Fix Windows build for ncurses and slang
Subject: [PATCH] Fix Windows build for ncurses and slang
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/caca/driver/ncurses.c b/caca/driver/ncurses.c
index 7171e91..8161c0f 100644
index 1111111..2222222 100644
--- a/caca/driver/ncurses.c
+++ b/caca/driver/ncurses.c
@@ -187,7 +187,7 @@
@ -50,7 +52,7 @@ index 7171e91..8161c0f 100644
{
sigwinch_d->resize.resized = 1;
diff --git a/caca/driver/slang.c b/caca/driver/slang.c
index 9714956..4dd9fb6 100644
index 1111111..2222222 100644
--- a/caca/driver/slang.c
+++ b/caca/driver/slang.c
@@ -131,7 +131,7 @@ static int slang_init_graphics(caca_display_t *dp)
@ -71,19 +73,16 @@ index 9714956..4dd9fb6 100644
static RETSIGTYPE sigwinch_handler(int sig)
{
sigwinch_d->resize.resized = 1;
--
1.8.3.2
From 0313fb009eca09481d216938db989db9f50672ee Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 3 Aug 2014 10:56:02 -0700
Subject: [PATCH 2/3] Fix pkg-config file and caca-config script
Subject: [PATCH] Fix pkg-config file and caca-config script
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/caca-config.in b/caca-config.in
index a54e6e1..f48d9de 100644
index 1111111..2222222 100644
--- a/caca-config.in
+++ b/caca-config.in
@@ -67,7 +67,7 @@ do
@ -96,7 +95,7 @@ index a54e6e1..f48d9de 100644
*)
usage 1 1>&2
diff --git a/caca/caca.pc.in b/caca/caca.pc.in
index fa683fb..6e50668 100644
index 1111111..2222222 100644
--- a/caca/caca.pc.in
+++ b/caca/caca.pc.in
@@ -9,5 +9,5 @@ Version: @VERSION@
@ -106,19 +105,16 @@ index fa683fb..6e50668 100644
-Libs.private: @ZLIB_LIBS@
+Libs.private: @ZLIB_LIBS@ @CACA_LIBS@
Cflags: -I${includedir}
--
1.8.3.2
From 50e5c99690c593cc974a49ae21af8fca288bc854 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 3 Aug 2014 11:13:23 -0700
Subject: [PATCH 3/3] Fix freeglut detection on Windows
Subject: [PATCH] Fix freeglut detection on Windows
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/configure.ac b/configure.ac
index 641dd17..3ce7057 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,22 +232,83 @@ fi
@ -218,6 +214,3 @@ index 641dd17..3ce7057 100644
fi
PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"])
fi
--
1.8.3.2

24
src/libevent-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From cf3aef0903fef54aa0ae4bdf997c4bafb7128bb5 Mon Sep 17 00:00:00 2001
From: MXE
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 25 Apr 2013 18:17:52 +1000
Subject: [PATCH 1/2] fix obsolete AM_CONFIG_HEADER
Subject: [PATCH] fix obsolete AM_CONFIG_HEADER
diff --git a/configure.in b/configure.in
index 18165f3..524d343 100644
index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_INIT(event.c)
@ -19,18 +21,15 @@ index 18165f3..524d343 100644
AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
dnl Initialize prefix.
--
1.8.2.1
From 9b22ff6236276fc5d8fd0c4ead9841b6b49b02c8 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 25 Apr 2013 19:02:55 +1000
Subject: [PATCH 2/2] remove broken test specification
Subject: [PATCH] remove broken test specification
diff --git a/test/Makefile.am b/test/Makefile.am
index b10c41a..86cad83 100644
index 1111111..2222222 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -19,7 +19,6 @@ endif
@ -41,6 +40,3 @@ index b10c41a..86cad83 100644
BUILT_SOURCES =
if BUILD_REGRESS
--
1.8.2.1

35
src/libgcrypt-1-fixes.patch
View File

@ -2,16 +2,16 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 6e118d36f8c15474065fe357446cf288cdc1e179 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 4 Dec 2014 15:07:43 +1100
Subject: [PATCH 1/3] fix for mingw cross building
Subject: [PATCH] fix for mingw cross building
Taken from:
https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
diff --git a/acinclude.m4 b/acinclude.m4
index 96be833..9e14e12 100644
index 1111111..2222222 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
@ -26,7 +26,7 @@ index 96be833..9e14e12 100644
x86_64-*-mingw32*)
ac_cv_sys_symbol_underscore=no
diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
index e607806..4c57111 100644
index 1111111..2222222 100644
--- a/mpi/generic/mpi-asm-defs.h
+++ b/mpi/generic/mpi-asm-defs.h
@@ -4,5 +4,9 @@
@ -40,7 +40,7 @@ index e607806..4c57111 100644
#endif
+#endif
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index 898ca47..afd1a1f 100644
index 1111111..2222222 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -169,6 +169,12 @@ typedef int mpi_size_t; /* (must be a signed type) */
@ -108,7 +108,7 @@ index 898ca47..afd1a1f 100644
/* Define stuff for longlong.h. */
diff --git a/src/libgcrypt.def b/src/libgcrypt.def
index 067cb84..df71bba 100644
index 1111111..2222222 100644
--- a/src/libgcrypt.def
+++ b/src/libgcrypt.def
@@ -1,3 +1,4 @@
@ -124,21 +124,18 @@ index 067cb84..df71bba 100644
gcry_check_version @1
gcry_control @2
--
2.7.4
From 9ff9c0ae66b9f51decfda8dffa2024d8dbaa9fe6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <saiarcot895@gmail.com>
Date: Fri, 12 Jun 2015 14:53:55 -0700
Subject: [PATCH 2/3] Don't call git to determine the revision.
Subject: [PATCH] Don't call git to determine the revision.
diff --git a/configure.ac b/configure.ac
index f683e21..d43c012 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [0])
@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [1])
# processing is done by autoconf and not during the configure run.
m4_define(mym4_version,
[mym4_version_major.mym4_version_minor.mym4_version_micro])
@ -154,14 +151,11 @@ index f683e21..d43c012 100644
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
--
2.7.4
From 7a22846e84ca5047b2f5cae7eb12ccab53c03026 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Jun 2015 17:17:25 +0200
Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
Subject: [PATCH] configure.ac: no serial-tests if automake < 1.12
Earlier versions of automake complain if they get a configuration
parameter which they don't understand. The error is:
@ -174,7 +168,7 @@ Fix libgcrypt build under x86_64
See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
diff --git a/configure.ac b/configure.ac
index d43c012..b6f20ae 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION
@ -203,6 +197,3 @@ index d43c012..b6f20ae 100644
AC_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([compat])
--
2.7.4

1
src/libgda-1-fixes.patch
View File

@ -10,7 +10,6 @@ Subject: [PATCH] Misc. demos/ corrections
Fix of libgda-ui/demos/ddl_queries.c was excluded, because
we need this only to fix Perl failure.
diff --git a/libgda-ui/demos/geninclude.pl.in b/libgda-ui/demos/geninclude.pl.in
index 1111111..2222222 100755
--- a/libgda-ui/demos/geninclude.pl.in

9
src/libglade-1-fixes.patch
View File

@ -2,15 +2,15 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 01e3cf1fae96edc0b5e8ccd0bf2c2ea11d0a6987 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 4 Aug 2013 23:32:15 +0200
Subject: [PATCH] comment out production of some file for make install to
succeed
diff --git a/glade/Makefile.am b/glade/Makefile.am
index f6271f7..fae55bc 100644
index 1111111..2222222 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -13,10 +13,10 @@ if OS_WIN32
@ -26,6 +26,3 @@ index f6271f7..fae55bc 100644
else
export_symbols = -export-symbols-regex "^[^_].*"
--
1.8.1.2

13
src/libgsf-1-fixes.patch
View File

@ -2,17 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 23:34:26 +0200
Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index d7a7247..cc52d99 100644
index 1111111..2222222 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -115,9 +115,9 @@ static GTypeModule *static_type_module = NULL;
@@ -76,9 +76,9 @@ static GTypeModule *static_type_module = NULL;
#include <windows.h>
static HMODULE gsf_dll_hmodule;
BOOL WINAPI
@ -24,6 +24,3 @@ index d7a7247..cc52d99 100644
{
if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
return TRUE;
--
1.7.1

68
src/libidn-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 6c79d4a98dca226b41987ecccd7919b698df597e Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "a@mxe.org" <a@mxe.org>
Date: Fri, 25 Nov 2011 15:58:28 +0100
Subject: [PATCH 1/4] fix Libs.private
Subject: [PATCH] fix Libs.private
diff --git a/libidn.pc.in b/libidn.pc.in
index 74b84be6..629de30a 100644
index 1111111..2222222 100644
--- a/libidn.pc.in
+++ b/libidn.pc.in
@@ -19,5 +19,5 @@ Description: IETF stringprep, nameprep, punycode, IDNA text processing.
@ -17,19 +19,16 @@ index 74b84be6..629de30a 100644
-Libs.private: @LTLIBICONV@
+Libs.private: -lintl -liconv
Cflags: -I${includedir}
--
2.11.0
From 884d44d1d9752062c86c4dd2bddd8b40d9f80222 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 1 Feb 2017 10:44:36 +0100
Subject: [PATCH 2/4] Update intprops.h for gcc-7 compatibility
Subject: [PATCH] Update intprops.h for gcc-7 compatibility
(cherry picked from commit 230930b3bc3e431b819eb45420cb42475d83ca93)
diff --git a/gl/intprops.h b/gl/intprops.h
index e1fce5c9..eb06b691 100644
index 1111111..2222222 100644
--- a/gl/intprops.h
+++ b/gl/intprops.h
@@ -1,18 +1,18 @@
@ -188,7 +187,7 @@ index e1fce5c9..eb06b691 100644
#endif
diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h
index e1fce5c9..eb06b691 100644
index 1111111..2222222 100644
--- a/lib/gltests/intprops.h
+++ b/lib/gltests/intprops.h
@@ -1,18 +1,18 @@
@ -346,19 +345,16 @@ index e1fce5c9..eb06b691 100644
# endif
#endif
--
2.11.0
From e2cb42d99c6dccb4436bdeb8ecfeb2db9de08f18 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 1 Feb 2017 10:45:29 +0100
Subject: [PATCH 3/4] Increase value for -Wframe-larger-than (gcc-7)
Subject: [PATCH] Increase value for -Wframe-larger-than (gcc-7)
(cherry picked from commit a6fcdb4f953e40ea162a9104cac034bce01706af)
diff --git a/configure.ac b/configure.ac
index 649ddcd5..c802c5df 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ AC_ARG_ENABLE([gcc-warnings],
@ -370,19 +366,16 @@ index 649ddcd5..c802c5df 100644
nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
nw="$nw -Wpadded" # Struct in src/idn_cmd.h is not padded
--
2.11.0
From 94e4faf96e711d10e04fae12c90c1be20e490391 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Wed, 1 Feb 2017 11:06:39 +0100
Subject: [PATCH 4/4] Fix -Wformat warnings
Subject: [PATCH] Fix -Wformat warnings
(cherry picked from commit 7148adf34dae30345c2e4d9d437838a45ba6f6e8)
diff --git a/examples/example.c b/examples/example.c
index 6e917838..24f64e04 100644
index 1111111..2222222 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -55,7 +55,7 @@ main (void)
@ -413,7 +406,7 @@ index 6e917838..24f64e04 100644
}
diff --git a/examples/example3.c b/examples/example3.c
index fc11c1c0..ffb90424 100644
index 1111111..2222222 100644
--- a/examples/example3.c
+++ b/examples/example3.c
@@ -56,7 +56,7 @@ main (void)
@ -435,7 +428,7 @@ index fc11c1c0..ffb90424 100644
free (p);
diff --git a/examples/example4.c b/examples/example4.c
index 1b319c94..a3315a14 100644
index 1111111..2222222 100644
--- a/examples/example4.c
+++ b/examples/example4.c
@@ -56,7 +56,7 @@ main (void)
@ -457,7 +450,7 @@ index 1b319c94..a3315a14 100644
free (p);
diff --git a/examples/example5.c b/examples/example5.c
index df557984..29d40b9d 100644
index 1111111..2222222 100644
--- a/examples/example5.c
+++ b/examples/example5.c
@@ -68,7 +68,7 @@ main (void)
@ -470,7 +463,7 @@ index df557984..29d40b9d 100644
p = stringprep_locale_to_utf8 (buf);
diff --git a/src/idn.c b/src/idn.c
index be1c7d1b..13eb3c9c 100644
index 1111111..2222222 100644
--- a/src/idn.c
+++ b/src/idn.c
@@ -419,7 +419,7 @@ main (int argc, char *argv[])
@ -483,7 +476,7 @@ index be1c7d1b..13eb3c9c 100644
fprintf (stdout, "%s\n", p);
diff --git a/tests/tst_idna.c b/tests/tst_idna.c
index 415764ee..4ac046fd 100644
index 1111111..2222222 100644
--- a/tests/tst_idna.c
+++ b/tests/tst_idna.c
@@ -220,13 +220,14 @@ doit (void)
@ -572,7 +565,7 @@ index 415764ee..4ac046fd 100644
printf ("ERROR\n");
}
diff --git a/tests/tst_idna2.c b/tests/tst_idna2.c
index 65b3a4d8..38932caa 100644
index 1111111..2222222 100644
--- a/tests/tst_idna2.c
+++ b/tests/tst_idna2.c
@@ -461,14 +461,14 @@ static const struct idna idna[] = {
@ -611,7 +604,7 @@ index 65b3a4d8..38932caa 100644
printf ("ERROR\n");
}
diff --git a/tests/tst_idna3.c b/tests/tst_idna3.c
index a189378f..f65628c1 100644
index 1111111..2222222 100644
--- a/tests/tst_idna3.c
+++ b/tests/tst_idna3.c
@@ -59,13 +59,13 @@ doit (void)
@ -643,7 +636,7 @@ index a189378f..f65628c1 100644
if (out)
idn_free (out);
diff --git a/tests/tst_nfkc.c b/tests/tst_nfkc.c
index d150fecf..f5af9c6a 100644
index 1111111..2222222 100644
--- a/tests/tst_nfkc.c
+++ b/tests/tst_nfkc.c
@@ -68,18 +68,18 @@ void
@ -678,7 +671,7 @@ index d150fecf..f5af9c6a 100644
printf ("ERROR\n");
}
diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c
index 3dc5466d..11d0ede1 100644
index 1111111..2222222 100644
--- a/tests/tst_pr29.c
+++ b/tests/tst_pr29.c
@@ -91,7 +91,7 @@ static const struct tv tv[] = {
@ -736,7 +729,7 @@ index 3dc5466d..11d0ede1 100644
if (debug)
printf ("FATAL\n");
diff --git a/tests/tst_punycode.c b/tests/tst_punycode.c
index 493b8a21..997744a5 100644
index 1111111..2222222 100644
--- a/tests/tst_punycode.c
+++ b/tests/tst_punycode.c
@@ -173,7 +173,8 @@ doit (void)
@ -795,7 +788,7 @@ index 493b8a21..997744a5 100644
printf ("ERROR\n");
}
diff --git a/tests/tst_strerror.c b/tests/tst_strerror.c
index 71fff59a..730f5e49 100644
index 1111111..2222222 100644
--- a/tests/tst_strerror.c
+++ b/tests/tst_strerror.c
@@ -110,7 +110,7 @@ doit (void)
@ -881,7 +874,7 @@ index 71fff59a..730f5e49 100644
}
}
diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c
index 149ce6f5..7c9ab06e 100644
index 1111111..2222222 100644
--- a/tests/tst_stringprep.c
+++ b/tests/tst_stringprep.c
@@ -205,7 +205,7 @@ doit (void)
@ -936,7 +929,7 @@ index 149ce6f5..7c9ab06e 100644
printf ("ERROR\n");
}
diff --git a/tests/tst_tld.c b/tests/tst_tld.c
index 2f8e12e8..d038c790 100644
index 1111111..2222222 100644
--- a/tests/tst_tld.c
+++ b/tests/tst_tld.c
@@ -80,7 +80,7 @@ const Tld_table * my_tld_tables[] =
@ -1016,7 +1009,7 @@ index 2f8e12e8..d038c790 100644
}
}
diff --git a/tests/utils.c b/tests/utils.c
index 717ee012..5577dc32 100644
index 1111111..2222222 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -49,7 +49,7 @@ escapeprint (const char *str, size_t len)
@ -1046,6 +1039,3 @@ index 717ee012..5577dc32 100644
if ((i + 1) % 8 == 0)
printf (" ");
if ((i + 1) % 16 == 0 && i + 1 < len)
--
2.11.0

18
src/libircclient-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From aab6124359bbf8d0b3003ccf4adc791e0d921aa3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 8 Oct 2013 22:37:07 +0200
Subject: [PATCH 1/2] use the proper WIN32 define
Subject: [PATCH] use the proper WIN32 define
diff --git a/include/libircclient.h b/include/libircclient.h
index 250a0d1..7ff83be 100644
index 1111111..2222222 100644
--- a/include/libircclient.h
+++ b/include/libircclient.h
@@ -46,7 +46,7 @@
@ -21,18 +21,15 @@ index 250a0d1..7ff83be 100644
#include <sys/select.h> /* fd_set */
#else
#include <winsock2.h>
--
1.8.1.4
From 1ac4521bd869d7cb3a82640d44f80cb9f9388eb7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 8 Oct 2013 22:37:29 +0200
Subject: [PATCH 2/2] fix missing header
Subject: [PATCH] fix missing header
diff --git a/include/libircclient.h b/include/libircclient.h
index 7ff83be..677f41f 100644
index 1111111..2222222 100644
--- a/include/libircclient.h
+++ b/include/libircclient.h
@@ -133,6 +133,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s
@ -43,6 +40,3 @@ index 7ff83be..677f41f 100644
#undef IN_INCLUDE_LIBIRC_H
--
1.8.1.4

3
src/libjpeg-turbo-1-fixes.patch
View File

@ -3,14 +3,13 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MXE
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 23:16:12 +1000
Subject: [PATCH] fix typedef conflicts
taken from:
https://aur.archlinux.org/cgit/aur.git/tree/0001-header-compat.mingw.patch?h=mingw-w64-libjpeg-turbo
diff --git a/jmorecfg.h b/jmorecfg.h
index 1111111..2222222 100644
--- a/jmorecfg.h

7
src/liblastfm-1-fixes.patch
View File

@ -2,14 +2,15 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 480e2ec663ef867e7892dbbc624737cae176c717 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 6 Feb 2015 01:55:40 +0100
Subject: [PATCH] Add LASTFM_LIB_VERSION_SUFFIX to include dir as well
https://github.com/lastfm/liblastfm/commit/480e2ec663ef867e7892dbbc624737cae176c717
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 211ca7e..0f872fb 100644
index 1111111..2222222 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,4 +105,4 @@ install(TARGETS ${LASTFM_LIB_TARGET_NAME}
@ -19,7 +20,7 @@ index 211ca7e..0f872fb 100644
-install(FILES ${liblastfm_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm/)
+install(FILES ${liblastfm_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lastfm${LASTFM_LIB_VERSION_SUFFIX}/)
diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt
index fbc492c..126f8d9 100644
index 1111111..2222222 100644
--- a/src/fingerprint/CMakeLists.txt
+++ b/src/fingerprint/CMakeLists.txt
@@ -48,4 +48,4 @@ install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME}

9
src/liblaxjson-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From e11d3cd0b909b21c97e6a0e3379d4ad42cc5c537 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 21 Oct 2015 20:51:02 +1100
Subject: [PATCH] add install components
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f008f13..cf89967 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,5 +39,8 @@ set_target_properties(primitives_test PROPERTIES
@ -23,6 +23,3 @@ index f008f13..cf89967 100644
+install(TARGETS laxjson COMPONENT shared-lib
+ DESTINATION lib
+ RUNTIME DESTINATION bin)
--
2.3.8 (Apple Git-58)

9
src/libmicrohttpd-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From e4d4a423ea51d159b7a214b2aa2f6f36ab49df70 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Tue, 12 Nov 2013 00:45:28 +1100
Subject: [PATCH] add requirements to pkg-config file
diff --git a/libmicrohttpd.pc.in b/libmicrohttpd.pc.in
index 54ce379..5cb9321 100644
index 1111111..2222222 100644
--- a/libmicrohttpd.pc.in
+++ b/libmicrohttpd.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
@ -21,6 +21,3 @@ index 54ce379..5cb9321 100644
Conflicts:
Libs: -L${libdir} -lmicrohttpd
Libs.private: @MHD_LIBDEPS@
--
1.8.4

41
src/librsvg-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 6cf410c4901e851d53e6dd211b5cad0ca48ff61a Mon Sep 17 00:00:00 2001
From: MXE <a@mxe.cc>
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 27 Sep 2010 12:00:52 +0200
Subject: [PATCH 1/3] fix .pc requirements
Subject: [PATCH] fix .pc requirements
diff --git a/librsvg.pc.in b/librsvg.pc.in
index a451de0..9488551 100644
index 1111111..2222222 100644
--- a/librsvg.pc.in
+++ b/librsvg.pc.in
@@ -9,7 +9,7 @@ css_supported=true
@ -21,14 +21,11 @@ index a451de0..9488551 100644
Requires.private:
Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
--
1.8.3.2
From 8b8816e8d52da47ce9e14f6ec1f823f17184c29d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 18 Aug 2014 12:27:28 +0800
Subject: [PATCH 2/3] rsvg-base.c: Have realpath() Work On Windows
Subject: [PATCH] rsvg-base.c: Have realpath() Work On Windows
Use _fullpath() on Windows to do the job for realpath() as realpath() does
not exist on Windows.
@ -40,13 +37,14 @@ Taken from: https://bug710163.bugzilla-attachments.gnome.org/attachment.cgi?id=2
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/rsvg-base.c b/rsvg-base.c
index 683d607..c40669a 100644
index 1111111..2222222 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -58,6 +58,15 @@
@@ -57,6 +57,15 @@
#include "rsvg-paint-server.h"
#include "rsvg-xml.h"
/*
+/*
+ * XXX: Perhaps do a GIO-based implementation for
+ * realpath() or use gnulib implementation for this
+ * https://bugzilla.gnome.org/show_bug.cgi?id=710163
@ -55,19 +53,15 @@ index 683d607..c40669a 100644
+#define realpath(a,b) _fullpath(b,a,_MAX_PATH)
+#endif
+
+/*
/*
* This is configurable at runtime
*/
#define RSVG_DEFAULT_DPI_X 90.0
--
1.8.3.2
From 4a2811e8f55e757d36bfb182990038bdfb48e514 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Wed, 17 Sep 2014 17:00:13 -0700
Subject: [PATCH 3/3] [MXE] Disable checking gio-unix-2.0 and disable
rsvg_convert program
Subject: [PATCH] Disable checking gio-unix-2.0 and disable rsvg_convert
program
rsvg_convert uses Unix features.
@ -75,7 +69,7 @@ I decided not to change the Makefile.am and configure.in because autoreconf
doesn't work on librsvg. Didn't investigate further.
diff --git a/Makefile.in b/Makefile.in
index 782d576..d2e21e8 100644
index 1111111..2222222 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ PRE_UNINSTALL = :
@ -88,7 +82,7 @@ index 782d576..d2e21e8 100644
@OS_WIN32_TRUE@am__append_2 = -mwindows
@HAVE_INTROSPECTION_TRUE@am__append_3 = $(nodist_gir_DATA) $(nodist_typelibs_DATA)
diff --git a/configure b/configure
index 6c4d27f..0a4dfb7 100755
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -13662,12 +13662,12 @@ if test -n "$RSVG_CONVERT_CFLAGS"; then
@ -141,6 +135,3 @@ index 6c4d27f..0a4dfb7 100755
$RSVG_CONVERT_PKG_ERRORS
--
1.8.3.2

3
src/libspatialindex-1-fixes.patch
View File

@ -5,7 +5,8 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Thu, 24 Aug 2017 10:53:39 +0200
Subject: [PATCH] Remove explicit header check - mingw does not ship with this header.
Subject: [PATCH] Remove explicit header check - mingw does not ship with this
header.
diff --git a/configure.ac b/configure.ac

22
src/libssh2-1-fixes.patch
View File

@ -1,7 +1,11 @@
From 65ae975e2a670869580e289d5d9bf255d2a10209 Mon Sep 17 00:00:00 2001
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 2 Sep 2012 00:55:28 +0200
Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
Subject: [PATCH] include gpg-error with gcrypt for static linking
(mxe-specific)
Git rid of the extra -lgcrypt here since we have to pass the
@ -9,7 +13,7 @@ whole list via LIBS. Otherwise, LIBS gets simplified with
-lgcrypt appearing only after its static dependencies.
diff --git a/acinclude.m4 b/acinclude.m4
index 734ef07..a6ee65a 100644
index 1111111..2222222 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
@ -20,18 +24,15 @@ index 734ef07..a6ee65a 100644
found_crypto=libgcrypt
else
# restore
--
2.9.3
From fb65371e600772e72491f06a368a727c96d525c7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 7 Nov 2016 10:47:13 +0100
Subject: [PATCH 2/2] fix yes/no in lib path
Subject: [PATCH] fix yes/no in lib path
diff --git a/acinclude.m4 b/acinclude.m4
index a6ee65a..510a0d3 100644
index 1111111..2222222 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [
@ -56,6 +57,3 @@ index a6ee65a..510a0d3 100644
AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
#include <gcrypt.h>
])
--
2.9.3

26
src/libvpx-1-fixes.patch
View File

@ -2,21 +2,18 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 1408d07fb86254ae1aded0e8cf38e7e0c2550550 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 5 Sep 2013 14:25:31 -0700
Subject: [PATCH 1/2] Linking as test is not good for cross compiling
Subject: [PATCH] Linking as test is not good for cross compiling
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
configure | 3 ---
1 file changed, 3 deletions(-)
diff --git a/configure b/configure
index be36e56..987b2e9 100755
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -490,9 +490,6 @@ process_detect() {
@@ -561,9 +561,6 @@ process_detect() {
}
fi
check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
@ -26,19 +23,16 @@ index be36e56..987b2e9 100755
# check system headers
check_header stdint.h
check_header pthread.h
--
1.8.1.2
From bada4be247273378809a30bf9a0ca7d9c9d2b936 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 5 Sep 2013 14:28:28 -0700
Subject: [PATCH 2/2] Fix /bin/bash
Subject: [PATCH] Fix /bin/bash
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh
index 4defcc2..12e3573 100755
index 1111111..2222222 100755
--- a/build/make/gen_msvs_def.sh
+++ b/build/make/gen_msvs_def.sh
@@ -1,4 +1,4 @@
@ -48,7 +42,7 @@ index 4defcc2..12e3573 100755
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh
index 6d42941..4418034 100755
index 1111111..2222222 100755
--- a/build/make/gen_msvs_proj.sh
+++ b/build/make/gen_msvs_proj.sh
@@ -1,4 +1,4 @@
@ -58,7 +52,7 @@ index 6d42941..4418034 100755
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
index 240678b..2089f68 100755
index 1111111..2222222 100755
--- a/build/make/gen_msvs_sln.sh
+++ b/build/make/gen_msvs_sln.sh
@@ -1,4 +1,4 @@
@ -67,5 +61,3 @@ index 240678b..2089f68 100755
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
--
1.8.1.2

27
src/libwebsockets-1-fixes.patch
View File

@ -1,6 +1,8 @@
This file is part of MXE. See LICENSE.md for licensing information.
From e34eaa834b15533c6280b67d93d505432bd2fa94 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 4 Aug 2014 18:28:33 -0700
Subject: [PATCH] Remove the special _shared lib
@ -8,10 +10,10 @@ Subject: [PATCH] Remove the special _shared lib
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff9a24e..962df28 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,43 +372,41 @@ source_group("Sources" FILES ${SOURCES})
@@ -380,43 +380,41 @@ source_group("Sources" FILES ${SOURCES})
#
# Create the lib.
#
@ -77,7 +79,7 @@ index ff9a24e..962df28 100644
PROPERTIES
SOVERSION ${SOVERSION})
endforeach()
@@ -460,7 +458,7 @@ if (NOT LWS_WITHOUT_EXTENSIONS)
@@ -468,7 +466,7 @@ if (NOT LWS_WITHOUT_EXTENSIONS)
endif()
# Make sure ZLib is compiled before the libs.
@ -86,7 +88,7 @@ index ff9a24e..962df28 100644
add_dependencies(${lib} ZLIB)
endforeach()
@@ -524,7 +522,7 @@ if (UNIX)
@@ -538,7 +536,7 @@ if (UNIX)
endif()
# Setup the linking for all libs.
@ -95,7 +97,7 @@ index ff9a24e..962df28 100644
target_link_libraries(${lib} ${LIB_LIST})
endforeach()
@@ -557,11 +555,8 @@ if (NOT LWS_WITHOUT_TESTAPPS)
@@ -571,11 +569,8 @@ if (NOT LWS_WITHOUT_TESTAPPS)
source_group("Headers Private" FILES ${TEST_HDR})
source_group("Sources" FILES ${TEST_SRCS})
add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR})
@ -109,7 +111,7 @@ index ff9a24e..962df28 100644
target_link_libraries(${TEST_NAME} websockets)
add_dependencies(${TEST_NAME} websockets)
endif(LWS_LINK_TESTAPPS_DYNAMIC)
@@ -793,7 +788,7 @@ endif()
@@ -807,7 +802,7 @@ endif()
set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
# Export targets (This is used for other CMake projects to easily find the libraries and include files).
@ -118,7 +120,7 @@ index ff9a24e..962df28 100644
FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
export(PACKAGE libwebsockets)
@@ -829,7 +824,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in
@@ -843,7 +838,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in
${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake
@ONLY)
@ -127,7 +129,7 @@ index ff9a24e..962df28 100644
PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
#
@@ -837,7 +832,7 @@ set_target_properties(websockets websockets_shared
@@ -851,7 +846,7 @@ set_target_properties(websockets websockets_shared
#
# Install libs and headers.
@ -136,7 +138,7 @@ index ff9a24e..962df28 100644
EXPORT LibwebsocketsTargets
LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries
ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries
@@ -906,9 +901,8 @@ message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
@@ -920,9 +915,8 @@ message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
message("---------------------------------------------------------------------")
# These will be available to parent projects including libwebsockets using add_subdirectory()
@ -148,7 +150,7 @@ index ff9a24e..962df28 100644
# This must always be last!
include(CPack)
diff --git a/cmake/LibwebsocketsConfig.cmake.in b/cmake/LibwebsocketsConfig.cmake.in
index bea82b5..6973fbf 100644
index 1111111..2222222 100644
--- a/cmake/LibwebsocketsConfig.cmake.in
+++ b/cmake/LibwebsocketsConfig.cmake.in
@@ -13,5 +13,5 @@ set(LIBWEBSOCKETS_INCLUDE_DIRS "@LWS__INCLUDE_DIRS@")
@ -158,6 +160,3 @@ index bea82b5..6973fbf 100644
-set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)
+set(LIBWEBSOCKETS_LIBRARIES websockets)
--
1.9.1

11
src/libxslt-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 5cdef88cc0bd288b4814509062234b72d27dc176 Mon Sep 17 00:00:00 2001
From: MXE
Date: Tue, 05 Jul 2016 21:12:38 +0300
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Tue, 5 Jul 2016 21:12:38 +0300
Subject: [PATCH] fix for deprecated mkdir
diff --git a/libxslt/security.c b/libxslt/security.c
index 965175f..be36f4b 100644
index 1111111..2222222 100644
--- a/libxslt/security.c
+++ b/libxslt/security.c
@@ -343,7 +343,7 @@ xsltCheckWritePath(xsltSecurityPrefsPtr sec,
@ -21,6 +21,3 @@ index 965175f..be36f4b 100644
}
xmlFree(directory);
if (ret < 0)
--
1.8.2.3

20
src/libzip-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 8aa28e38f7b753c40fa1d107d88a5e1281a09dec Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sylvain Beucler <beuc@beuc.net>
Date: Sun, 15 Jan 2017 17:25:49 +0100
Subject: [PATCH 1/2] static build fixes
Subject: [PATCH] static build fixes
diff --git a/lib/zip.h b/lib/zip.h
index 27141b3..8d85e61 100644
index 1111111..2222222 100644
--- a/lib/zip.h
+++ b/lib/zip.h
@@ -37,9 +37,9 @@
@ -22,18 +24,15 @@ index 27141b3..8d85e61 100644
# define ZIP_EXTERN __attribute__ ((visibility ("default")))
# else
# define ZIP_EXTERN
--
2.9.3
From d7b8bf5ccfbedfc10bddaa46f19c08635f1fa17f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sylvain Beucler <beuc@beuc.net>
Date: Sun, 15 Jan 2017 17:28:42 +0100
Subject: [PATCH 2/2] pkgconfig private
Subject: [PATCH] pkgconfig private
diff --git a/libzip.pc.in b/libzip.pc.in
index ef8af2d..f053510 100644
index 1111111..2222222 100644
--- a/libzip.pc.in
+++ b/libzip.pc.in
@@ -9,6 +9,7 @@ zipcmp=@prefix@/bin/zipcmp
@ -45,6 +44,3 @@ index ef8af2d..f053510 100644
Cflags: -I${includedir} -I${libincludedir}
+Requires.private: zlib
--
2.9.3

13
src/luajit-1-fixes.patch
View File

@ -2,8 +2,8 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 7f9e517a6ffb86e2392f2f6ab60fc530aacd71db Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 6 Oct 2014 00:15:00 +1100
Subject: [PATCH] detect if host cc accepts -malign-double
@ -12,10 +12,10 @@ This patch has been taken from:
http://www.freelists.org/post/luajit/detect-if-host-cc-accepts-maligndouble
diff --git a/src/Makefile b/src/Makefile
index 9551781..682260e 100644
index 1111111..2222222 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -167,6 +167,7 @@ CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS)
@@ -169,6 +169,7 @@ CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS)
LDOPTIONS= $(CCDEBUG) $(LDFLAGS)
HOST_CC= $(CC)
@ -23,7 +23,7 @@ index 9551781..682260e 100644
HOST_RM= rm -f
# If left blank, minilua is built and used. You can supply an installed
# copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua
@@ -333,7 +334,7 @@ endif
@@ -331,7 +332,7 @@ endif
ifneq ($(HOST_SYS),$(TARGET_SYS))
ifeq (Windows,$(TARGET_SYS))
@ -32,6 +32,3 @@ index 9551781..682260e 100644
else
ifeq (Linux,$(TARGET_SYS))
HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_LINUX
--
1.9.3 (Apple Git-50)

10
src/muparser-1-fixes.patch
View File

@ -3,17 +3,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Taken from:
https://github.com/beltoforion/muparser/pull/17
From d70b948b5ef9c854ed253f01303480b85a7bd8bd Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 21 Nov 2015 15:38:02 +1100
Subject: [PATCH] fix dll install directory
---
Makefile.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 157be77..005ada6 100644
index 1111111..2222222 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ BK_DEPS = @BK_DEPS@
@ -41,6 +38,3 @@ index 157be77..005ada6 100644
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_uninst_cmd))
@COND_SHARED_1@install_muParser_dll_headers:
--
2.4.9 (Apple Git-60)

21
src/ocaml-cairo-1-fixes.patch
View File

@ -2,20 +2,18 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
[master 8ae01b4] new version
4 files changed, 48 insertions(+), 58 deletions(-)
create mode 100644 META
From 8ae01b48ebab343933829d2891480d7202bbf1ae Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 17 Jun 2012 17:42:39 +0200
Subject: [PATCH] use of ocaml.m4 from ocaml-autoconf ; modifications for cross-compilation
Subject: [PATCH] use of ocaml.m4 from ocaml-autoconf ; modifications for
cross-compilation
taken from
https://bugs.freedesktop.org/show_bug.cgi?id=51994
diff --git a/META b/META
new file mode 100644
index 0000000..06060f2
index 1111111..2222222
--- /dev/null
+++ b/META
@@ -0,0 +1,17 @@
@ -38,7 +36,7 @@ index 0000000..06060f2
+)
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 6c8c4e9..dc72693 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_ARG_VAR(LABLGTKDIR,[Location of the LablGTK library])
@ -51,7 +49,7 @@ index 6c8c4e9..dc72693 100644
if test "$LABLGTKDIR" ; then
# Check for gdk-pixbuf
diff --git a/src/Makefile b/src/Makefile
index 46a62f6..ec9cf28 100644
index 1111111..2222222 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -92,10 +92,10 @@ install: all
@ -70,7 +68,7 @@ index 46a62f6..ec9cf28 100644
DOCFILES = cairo.mli cairo_bigarray.mli cairo_png.mli cairo_pdf.mli cairo_ps.mli cairo_ft.mli
ifdef LABLGTKDIR
diff --git a/support/ocaml.m4 b/support/ocaml.m4
index 9d6e910..6431281 100644
index 1111111..2222222 100644
--- a/support/ocaml.m4
+++ b/support/ocaml.m4
@@ -11,10 +11,10 @@ dnl For documentation, please read the ocaml.m4 man page.
@ -238,6 +236,3 @@ index 9d6e910..6431281 100644
])
--
1.7.9.5

49
src/ocaml-core-1-fixes.patch
View File

@ -2,17 +2,17 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 002715e4bdd4f2aacb6ce8b1b89bae734b6c36fc Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 13 Jun 2012 22:27:54 +0200
Subject: [PATCH] various patches to build an ocaml cross compiler
diff --git a/Makefile b/Makefile
index e53fd0d..0decd00 100644
index 1111111..2222222 100644
--- a/Makefile
+++ b/Makefile
@@ -289,16 +289,17 @@ install:
@@ -288,16 +288,17 @@ install:
for i in $(OTHERLIBRARIES); do \
(cd otherlibs/$$i; $(MAKE) install) || exit $$?; \
done
@ -33,7 +33,7 @@ index e53fd0d..0decd00 100644
cd asmrun; $(MAKE) install
cp ocamlopt $(BINDIR)/ocamlopt$(EXE)
cd stdlib; $(MAKE) installopt
@@ -737,7 +738,7 @@ ocamlbuild.native: ocamlopt ocamlbuild-mixed-boot
@@ -736,7 +737,7 @@ ocamlbuild.native: ocamlopt ocamlbuild-mixed-boot
ocamlbuildlib.native: ocamlopt ocamlbuild-mixed-boot
./build/ocamlbuildlib-native-only.sh
@ -44,7 +44,7 @@ index e53fd0d..0decd00 100644
diff --git a/Makefile-mingw.in b/Makefile-mingw.in
new file mode 100644
index 0000000..c3dddf6
index 1111111..2222222
--- /dev/null
+++ b/Makefile-mingw.in
@@ -0,0 +1,160 @@
@ -209,7 +209,7 @@ index 0000000..c3dddf6
+BUILD_CFLAGS=
+
diff --git a/asmrun/Makefile b/asmrun/Makefile
index d4f0c56..a535666 100644
index 1111111..2222222 100644
--- a/asmrun/Makefile
+++ b/asmrun/Makefile
@@ -26,7 +26,7 @@ COBJS=startup.o main.o fail.o roots.o globroots.o signals.o signals_asm.o \
@ -240,7 +240,7 @@ index d4f0c56..a535666 100644
clean::
diff --git a/asmrun/i386.S b/asmrun/i386.S
index e8e00a4..800247e 100644
index 1111111..2222222 100644
--- a/asmrun/i386.S
+++ b/asmrun/i386.S
@@ -76,6 +76,9 @@
@ -254,7 +254,7 @@ index e8e00a4..800247e 100644
#else
#define PROFILE_CAML
diff --git a/byterun/Makefile.common b/byterun/Makefile.common
index b519f75..2274562 100755
index 1111111..2222222 100755
--- a/byterun/Makefile.common
+++ b/byterun/Makefile.common
@@ -24,7 +24,7 @@ COMMONOBJS=\
@ -267,7 +267,7 @@ index b519f75..2274562 100755
PRIMS=\
alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
diff --git a/byterun/dynlink.c b/byterun/dynlink.c
index 5cb2ed7..b6605fa 100644
index 1111111..2222222 100644
--- a/byterun/dynlink.c
+++ b/byterun/dynlink.c
@@ -80,7 +80,12 @@ static char * parse_ld_conf(void)
@ -285,7 +285,7 @@ index 5cb2ed7..b6605fa 100644
strcpy(ldconfname, stdlib);
strcat(ldconfname, "/" LD_CONF_NAME);
diff --git a/byterun/unix.c b/byterun/unix.c
index 7d24ef4..3619e67 100644
index 1111111..2222222 100644
--- a/byterun/unix.c
+++ b/byterun/unix.c
@@ -15,6 +15,8 @@
@ -304,7 +304,7 @@ index 7d24ef4..3619e67 100644
+
+#endif /* !WIN32 */
diff --git a/byterun/win32.c b/byterun/win32.c
index f8ba9c9..82afc1c 100644
index 1111111..2222222 100644
--- a/byterun/win32.c
+++ b/byterun/win32.c
@@ -13,6 +13,8 @@
@ -369,7 +369,7 @@ index f8ba9c9..82afc1c 100644
+#endif /* WIN32 */
diff --git a/hardcode_mingw_include.patch b/hardcode_mingw_include.patch
new file mode 100644
index 0000000..571747d
index 1111111..2222222
--- /dev/null
+++ b/hardcode_mingw_include.patch
@@ -0,0 +1,24 @@
@ -398,7 +398,7 @@ index 0000000..571747d
+ and ocamlopt = ref (compiler_path "ocamlopt")
+ and output = ref "a" (* Output name for Caml part of library *)
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index c687242..ccdd937 100644
index 1111111..2222222 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -107,9 +107,11 @@ let if_mixed_dir dir =
@ -417,7 +417,7 @@ index c687242..ccdd937 100644
let threads_dir = if_mixed_dir "otherlibs/threads";;
let systhreads_dir = if_mixed_dir "otherlibs/systhreads";;
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index 74c82d3..61036c8 100644
index 1111111..2222222 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -69,6 +69,7 @@ INCLUDES_DEP=-I $(OCAMLSRCDIR)/parsing \
@ -429,7 +429,7 @@ index 74c82d3..61036c8 100644
-I $(OCAMLSRCDIR)/otherlibs/num \
-I $(OCAMLSRCDIR)/otherlibs/graph
diff --git a/otherlibs/Makefile.shared b/otherlibs/Makefile.shared
index 2c084a0..0e13022 100644
index 1111111..2222222 100644
--- a/otherlibs/Makefile.shared
+++ b/otherlibs/Makefile.shared
@@ -33,7 +33,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib
@ -463,7 +463,7 @@ index 2c084a0..0e13022 100644
lib$(CLIBNAME).$(A): $(COBJS)
$(MKLIB) -oc $(CLIBNAME) $(COBJS) $(LDOPTS)
diff --git a/otherlibs/bigarray/Makefile b/otherlibs/bigarray/Makefile
index d442edb..dc34d6d 100644
index 1111111..2222222 100644
--- a/otherlibs/bigarray/Makefile
+++ b/otherlibs/bigarray/Makefile
@@ -14,8 +14,8 @@
@ -478,7 +478,7 @@ index d442edb..dc34d6d 100644
CAMLOBJS=bigarray.cmo
HEADERS=bigarray.h
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index 502498f..7ed53df 100644
index 1111111..2222222 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -15,13 +15,13 @@
@ -526,7 +526,7 @@ index 502498f..7ed53df 100644
# See remark above: force static linking of libthreadsnat.a
threads.cmxa: $(THREAD_OBJS:.cmo=.cmx)
diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt
index dc118b7..4b53d6e 100644
index 1111111..2222222 100644
--- a/otherlibs/systhreads/Makefile.nt
+++ b/otherlibs/systhreads/Makefile.nt
@@ -21,6 +21,7 @@ CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix
@ -572,7 +572,7 @@ index dc118b7..4b53d6e 100644
cp threads.cmxs $(LIBDIR)/threads
diff --git a/otherlibs/systhreads/st_win32.h b/otherlibs/systhreads/st_win32.h
index da602b7..7e1dcb9 100644
index 1111111..2222222 100644
--- a/otherlibs/systhreads/st_win32.h
+++ b/otherlibs/systhreads/st_win32.h
@@ -17,7 +17,7 @@
@ -585,7 +585,7 @@ index da602b7..7e1dcb9 100644
#include <signal.h>
diff --git a/otherlibs/win32graph/Makefile.nt b/otherlibs/win32graph/Makefile.nt
index 62c4678..e7c6d6b 100644
index 1111111..2222222 100644
--- a/otherlibs/win32graph/Makefile.nt
+++ b/otherlibs/win32graph/Makefile.nt
@@ -18,10 +18,11 @@ COBJS=open.$(O) draw.$(O) events.$(O) dib.$(O)
@ -602,7 +602,7 @@ index 62c4678..e7c6d6b 100644
cp ../graph/graphics.ml graphics.ml
graphics.mli: ../graph/graphics.mli
diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt
index 76a1c19..c401bbb 100644
index 1111111..2222222 100644
--- a/otherlibs/win32unix/Makefile.nt
+++ b/otherlibs/win32unix/Makefile.nt
@@ -40,7 +40,6 @@ LIBNAME=unix
@ -623,7 +623,7 @@ index 76a1c19..c401bbb 100644
rm -f $(UNIX_FILES) $(UNIX_CAML_FILES)
diff --git a/utils/config.mlp b/utils/config.mlp
index cdf67d4..b905059 100644
index 1111111..2222222 100644
--- a/utils/config.mlp
+++ b/utils/config.mlp
@@ -86,11 +86,7 @@ let ext_asm = "%%EXT_ASM%%"
@ -648,6 +648,3 @@ index cdf67d4..b905059 100644
p "default_executable_name" default_executable_name;
p_bool "systhread_supported" systhread_supported;
flush oc;
--
1.7.9.5

11
src/ocaml-flexdll-1-fixes.patch
View File

@ -2,8 +2,8 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 78c4c5447fb711713ac56774f0751485b25df4bd Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sat, 23 Jun 2012 22:25:50 +0200
Subject: [PATCH] modifications for cross-compilation
@ -11,7 +11,7 @@ part of this patch is taken from
http://code.google.com/p/flexdll/issues/detail?id=2
diff --git a/Makefile b/Makefile
index 81b2214..7a15574 100644
index 1111111..2222222 100644
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,12 @@ MSVCC64 = $(MSVCC_ROOT)/amd64/cl.exe /nologo /MD -D_CRT_SECURE_NO_DEPRECATE /GS-
@ -39,7 +39,7 @@ index 81b2214..7a15574 100644
rm -f flexlink.exe
$(OCAMLOPT) -w -105 -o flexlink.exe $(LINKFLAGS) $(OBJS)
diff --git a/reloc.ml b/reloc.ml
index 1ac7e38..1187f39 100644
index 1111111..2222222 100644
--- a/reloc.ml
+++ b/reloc.ml
@@ -977,7 +977,7 @@ let setup_toolchain () =
@ -51,6 +51,3 @@ index 1ac7e38..1187f39 100644
];
default_libs :=
["-lmingw32"; "-lgcc"; "-lmoldname"; "-lmingwex"; "-lmsvcrt";
--
1.7.9.5

80
src/ocaml-lablgtk2-1-fixes.patch
View File

@ -2,23 +2,23 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 7a45f91cc0f2b0c1744b2ee725ca1999ad24a72b Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 13 Sep 2012 23:21:18 +0200
Subject: [PATCH 1/6] split configure.in in configure.ac and ocaml.m4.
Makefile.am links to src/Makefile
Subject: [PATCH] split configure.in in configure.ac and ocaml.m4. Makefile.am
links to src/Makefile
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..af437a6
index 1111111..2222222
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..3b27786
index 1111111..2222222
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,406 @@
@ -430,7 +430,7 @@ index 0000000..3b27786
+echo -e " C compiler $CC"
diff --git a/ocaml.m4 b/ocaml.m4
new file mode 100644
index 0000000..6431281
index 1111111..2222222
--- /dev/null
+++ b/ocaml.m4
@@ -0,0 +1,197 @@
@ -631,19 +631,16 @@ index 0000000..6431281
+ AC_MSG_RESULT([$OCAML_OS_TYPE])
+ AC_SUBST([OCAML_OS_TYPE])
+])
--
1.7.9.5
From 412fb361bc02b4d1d4e5e3d3f6481595fcbf83b9 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 13 Sep 2012 23:29:39 +0200
Subject: [PATCH 2/6] install = findlib-uninstall + findlib-install to remove
error if 'make install' is called a second time
Subject: [PATCH] install = findlib-uninstall + findlib-install to remove error
if 'make install' is called a second time
diff --git a/src/Makefile b/src/Makefile
index c498882..fda935e 100755
index 1111111..2222222 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,7 @@ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
@ -655,18 +652,15 @@ index c498882..fda935e 100755
uninstall: findlib-uninstall
MLLIBS = lablgtk.cma
--
1.7.9.5
From c17556b4d42274c4190a6b29aa10eef730aa4e21 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 13 Sep 2012 23:33:57 +0200
Subject: [PATCH 3/6] allows install with 'make lablgtkopt' only
Subject: [PATCH] allows install with 'make lablgtkopt' only
diff --git a/src/Makefile b/src/Makefile
index fda935e..54ae4b4 100755
index 1111111..2222222 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -391,42 +391,7 @@ old-uninstall:
@ -724,18 +718,15 @@ index fda935e..54ae4b4 100755
findlib-uninstall:
ocamlfind remove lablgtk2
--
1.7.9.5
From 19debade0cd5de6f3ea1d5771ecc627906e3c22f Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 13 Sep 2012 23:36:37 +0200
Subject: [PATCH 4/6] add prefixed ocamlfind support
Subject: [PATCH] add prefixed ocamlfind support
diff --git a/config.make.in b/config.make.in
index e689bda..0edb14a 100644
index 1111111..2222222 100644
--- a/config.make.in
+++ b/config.make.in
@@ -3,6 +3,7 @@
@ -747,7 +738,7 @@ index e689bda..0edb14a 100644
CAMLDEP=@OCAMLDEP@
OCAMLDOC=@OCAMLDOC@
diff --git a/src/Makefile b/src/Makefile
index 54ae4b4..aa09593 100755
index 1111111..2222222 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -391,12 +391,12 @@ old-uninstall:
@ -776,19 +767,16 @@ index 54ae4b4..aa09593 100755
for f in lablgladecc2$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE); \
do rm -f "$(BINDIR)"/$$f; done
--
1.7.9.5
From 8c5204c3b7db4449f66092f3bb58277bf3c4c777 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 13 Sep 2012 23:39:01 +0200
Subject: [PATCH 5/6] remove a command that is already called in uninstall,
and which fails if used as is
Subject: [PATCH] remove a command that is already called in uninstall, and
which fails if used as is
diff --git a/src/Makefile b/src/Makefile
index aa09593..e1f1c88 100755
index 1111111..2222222 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -395,7 +395,6 @@ findlib-install:
@ -799,18 +787,15 @@ index aa09593..e1f1c88 100755
$(MAKE) INSTALLDIR=`$(OCAMLFIND) query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
cp lablgtk2$(XB) "$(BINDIR)"
if test -f lablgladecc$(XE); then \
--
1.7.9.5
From d7972344ade17f341ef658c6561943bc87f2fc00 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 30 Sep 2012 17:44:48 +0200
Subject: [PATCH 6/6] use prefixed ocamlp4 tools if available
Subject: [PATCH] use prefixed ocamlp4 tools if available
diff --git a/configure.ac b/configure.ac
index 3b27786..205186a 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,7 +356,7 @@ AC_SUBST(CAMLOPT,$OCAMLOPT)
@ -823,7 +808,7 @@ index 3b27786..205186a 100644
AC_SUBST(HAVE_SVGZ)
AC_SUBST(USE_CC)
diff --git a/ocaml.m4 b/ocaml.m4
index 6431281..8dd2101 100644
index 1111111..2222222 100644
--- a/ocaml.m4
+++ b/ocaml.m4
@@ -84,7 +84,7 @@ AC_DEFUN([AC_PROG_CAMLP4],
@ -858,6 +843,3 @@ index 6431281..8dd2101 100644
])
--
1.7.9.5

11
src/ocaml-native-1-fixes.patch
View File

@ -2,15 +2,15 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 3a3ddccba8fa90a42551fb4d529c921c0aac4f63 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 3 Oct 2012 09:25:11 +0200
Subject: [PATCH] ocamlbuild : support for prefixed
ocaml{c,opt,mklib,mktop,find} tools
diff --git a/ocamlbuild/findlib.ml b/ocamlbuild/findlib.ml
index b5ef878..77454ed 100644
index 1111111..2222222 100644
--- a/ocamlbuild/findlib.ml
+++ b/ocamlbuild/findlib.ml
@@ -44,7 +44,7 @@ let report_error e =
@ -23,7 +23,7 @@ index b5ef878..77454ed 100644
type package = {
name: string;
diff --git a/ocamlbuild/options.ml b/ocamlbuild/options.ml
index 1be4b63..e7313de 100644
index 1111111..2222222 100644
--- a/ocamlbuild/options.ml
+++ b/ocamlbuild/options.ml
@@ -39,16 +39,17 @@ let use_menhir = ref false
@ -95,6 +95,3 @@ index 1be4b63..e7313de 100644
end;
let reorder x y = x := !x @ (List.concat (List.rev !y)) in
--
1.8.1.2

11
src/openal-1-fixes.patch
View File

@ -1,12 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 25b591198c896959ca5b7dc9ad3a35605c66dc63 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Guilherme Lima Bernal <dev@lbguilherme.com>
Date: Sat, 28 Mar 2015 20:52:05 +0100
Subject: [PATCH] fixes for cross-building
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0087edb..749f813 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -846,6 +846,7 @@ IF(HAVE_WINDOWS_H)
@ -55,7 +58,3 @@ index 0087edb..749f813 100644
# Add an install target here
INSTALL(TARGETS ${LIBNAME}
--
2.1.0

2
src/openmp-validation-1-fixes.patch
View File

@ -12,7 +12,7 @@ diff --git a/Makefile b/Makefile
index 1111111..2222222 100644
--- a/Makefile
+++ b/Makefile
@@ -185,14 +185,21 @@ omp_testsuite.h: ompts-c.conf c/*
@@ -184,14 +184,21 @@ omp_testsuite.h: ompts-c.conf c/*
.c.o: omp_testsuite omp_my_sleep
$(CC) $(CFLAGS) -c $<

70
src/openssl-1-fixes.patch
View File

@ -1,15 +1,17 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 81a26ea97cb0c66a21069ddb1d07d285427791e9 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 <mabrand@mabrand.nl>
Date: Wed, 8 Jan 2014 02:19:10 +0100
Subject: [PATCH 1/2] winsock2
Subject: [PATCH] winsock2
-This patch has been taken from:
-http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest
diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index 30bbcf2..ef9f336 100644
index 1111111..2222222 100644
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -68,7 +68,7 @@
@ -22,7 +24,7 @@ index 30bbcf2..ef9f336 100644
# include <sys/timeval.h>
# else
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 890e476..ca1fbfd 100644
index 1111111..2222222 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -198,7 +198,7 @@
@ -34,14 +36,11 @@ index 890e476..ca1fbfd 100644
#else
# include OPENSSL_UNISTD
#endif
--
2.9.3
From fe545f8c5ae1296dcd388c27b5e82c787c3e9f81 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tom Molesworth <tom@entitymodel.com>
Date: Wed, 8 Jan 2014 02:20:21 +0100
Subject: [PATCH 2/2] Patch OpenSSL POD docs for perl-5.16+
Subject: [PATCH] Patch OpenSSL POD docs for perl-5.16+
Stricter validation in recent Perl versions means the install
stage fails without these applied.
@ -49,10 +48,10 @@ stage fails without these applied.
Should be harmless for earlier versions of perl.
diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
index ac69804..170588b 100644
index 1111111..2222222 100644
--- a/doc/apps/cms.pod
+++ b/doc/apps/cms.pod
@@ -482,28 +482,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
@@ -483,28 +483,28 @@ with caution. For a fuller description see L<CMS_decrypt(3)|CMS_decrypt(3)>).
=over 4
@ -88,10 +87,10 @@ index ac69804..170588b 100644
the message was verified correctly but an error occurred writing out
the signers certificates.
diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index 04a83ca..728cde5 100644
index 1111111..2222222 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -312,28 +312,28 @@ remains DER.
@@ -313,28 +313,28 @@ remains DER.
=over 4
@ -127,7 +126,7 @@ index 04a83ca..728cde5 100644
the message was verified correctly but an error occurred writing out
the signers certificates.
diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod
index b754854..19037d3 100644
index 1111111..2222222 100644
--- a/doc/crypto/rand.pod
+++ b/doc/crypto/rand.pod
@@ -74,16 +74,16 @@ First up I will state the things I believe I need for a good RNG.
@ -182,7 +181,7 @@ index b754854..19037d3 100644
Given the random number output stream, it should not be possible to determine
the RNG state or the next random number.
diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
index 2bb4403..add6b0e 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_COMP_add_compression_method.pod
+++ b/doc/ssl/SSL_COMP_add_compression_method.pod
@@ -59,11 +59,11 @@ SSL_COMP_add_compression_method() may return the following values:
@ -200,7 +199,7 @@ index 2bb4403..add6b0e 100644
The operation failed. Check the error queue to find out the reason.
diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
index c660a18..86c720c 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_add_session.pod
+++ b/doc/ssl/SSL_CTX_add_session.pod
@@ -52,13 +52,13 @@ The following values are returned by all functions:
@ -220,7 +219,7 @@ index c660a18..86c720c 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
index d1d8977..449c8c9 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_load_verify_locations.pod
+++ b/doc/ssl/SSL_CTX_load_verify_locations.pod
@@ -100,13 +100,13 @@ The following return values can occur:
@ -240,7 +239,7 @@ index d1d8977..449c8c9 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
index 4965385..02aa22e 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
+++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
@@ -66,13 +66,13 @@ values:
@ -260,7 +259,7 @@ index 4965385..02aa22e 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
index 7c9e515..ea36746 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_set_session_id_context.pod
+++ b/doc/ssl/SSL_CTX_set_session_id_context.pod
@@ -64,13 +64,13 @@ return the following values:
@ -280,7 +279,7 @@ index 7c9e515..ea36746 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
index e254f96..c15f86e 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_set_ssl_version.pod
+++ b/doc/ssl/SSL_CTX_set_ssl_version.pod
@@ -42,11 +42,11 @@ and SSL_set_ssl_method():
@ -298,7 +297,7 @@ index e254f96..c15f86e 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
index 12db0da..f7b6ca3 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
@@ -83,7 +83,7 @@ Return values from the server callback are interpreted as follows:
@ -311,7 +310,7 @@ index 12db0da..f7b6ca3 100644
PSK identity was not found. An "unknown_psk_identity" alert message
will be sent and the connection setup fails.
diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
index 89ad6bd..d7f3034 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_accept.pod
+++ b/doc/ssl/SSL_accept.pod
@@ -41,18 +41,18 @@ The following return values can occur:
@ -337,7 +336,7 @@ index 89ad6bd..d7f3034 100644
The TLS/SSL handshake was not successful because a fatal error occurred either
at the protocol level or a connection failure occurred. The shutdown was
diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
index ba192bd..479f97f 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_clear.pod
+++ b/doc/ssl/SSL_clear.pod
@@ -56,12 +56,12 @@ The following return values can occur:
@ -356,7 +355,7 @@ index ba192bd..479f97f 100644
The SSL_clear() operation was successful.
diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
index 68e2b82..52c4aa9 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_connect.pod
+++ b/doc/ssl/SSL_connect.pod
@@ -41,18 +41,18 @@ The following return values can occur:
@ -382,7 +381,7 @@ index 68e2b82..52c4aa9 100644
The TLS/SSL handshake was not successful, because a fatal error occurred either
at the protocol level or a connection failure occurred. The shutdown was
diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
index 8b590c9..1ba1827 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_do_handshake.pod
+++ b/doc/ssl/SSL_do_handshake.pod
@@ -42,18 +42,18 @@ The following return values can occur:
@ -408,7 +407,7 @@ index 8b590c9..1ba1827 100644
The TLS/SSL handshake was not successful because a fatal error occurred either
at the protocol level or a connection failure occurred. The shutdown was
diff --git a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
index 165c6a5..073e99c 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
+++ b/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.pod
@@ -36,11 +36,11 @@ before the SSL index is created.
@ -426,7 +425,7 @@ index 165c6a5..073e99c 100644
An error occurred, check the error stack for a detailed error message.
diff --git a/doc/ssl/SSL_get_fd.pod b/doc/ssl/SSL_get_fd.pod
index 89260b5..1207658 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_get_fd.pod
+++ b/doc/ssl/SSL_get_fd.pod
@@ -26,12 +26,12 @@ The following return values can occur:
@ -445,7 +444,7 @@ index 89260b5..1207658 100644
The file descriptor linked to B<ssl>.
diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
index ef983c9..e99d659 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_read.pod
+++ b/doc/ssl/SSL_read.pod
@@ -81,16 +81,16 @@ The following return values can occur:
@ -469,7 +468,7 @@ index ef983c9..e99d659 100644
The read operation was not successful, because either the connection was closed,
an error occurred or action must be taken by the calling process.
diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
index b09d8a7..7f49da1 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_session_reused.pod
+++ b/doc/ssl/SSL_session_reused.pod
@@ -27,11 +27,11 @@ The following return values can occur:
@ -487,7 +486,7 @@ index b09d8a7..7f49da1 100644
A session was reused.
diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
index 1480871..bfc39ed 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_set_fd.pod
+++ b/doc/ssl/SSL_set_fd.pod
@@ -35,11 +35,11 @@ The following return values can occur:
@ -505,7 +504,7 @@ index 1480871..bfc39ed 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
index 197b521..fbdee4c 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_set_session.pod
+++ b/doc/ssl/SSL_set_session.pod
@@ -37,11 +37,11 @@ The following return values can occur:
@ -523,7 +522,7 @@ index 197b521..fbdee4c 100644
The operation succeeded.
diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod
index fe01308..879a33a 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_set_shutdown.pod
+++ b/doc/ssl/SSL_set_shutdown.pod
@@ -24,16 +24,16 @@ The shutdown state of an ssl connection is a bitmask of:
@ -547,7 +546,7 @@ index fe01308..879a33a 100644
A shutdown alert was received form the peer, either a normal "close notify"
or a fatal error.
diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
index efbff5a..56c48b2 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_shutdown.pod
+++ b/doc/ssl/SSL_shutdown.pod
@@ -92,19 +92,19 @@ The following return values can occur:
@ -574,7 +573,7 @@ index efbff5a..56c48b2 100644
The shutdown was not successful because a fatal error occurred either
at the protocol level or a connection failure occurred. It can also occur if
diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
index 4c1a7ee..e006b41 100644
index 1111111..2222222 100644
--- a/doc/ssl/SSL_write.pod
+++ b/doc/ssl/SSL_write.pod
@@ -74,12 +74,12 @@ The following return values can occur:
@ -592,6 +591,3 @@ index 4c1a7ee..e006b41 100644
The write operation was not successful, because either the connection was
closed, an error occurred or action must be taken by the calling process.
--
2.9.3

22
src/pire-1-fixes.patch
View File

@ -2,10 +2,10 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 563abb90dd28a922b5da52c8adb9a296537bbf86 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sat, 25 Jul 2015 16:39:52 +0300
Subject: [PATCH 1/2] remove custom isatty
Subject: [PATCH] remove custom isatty
Fix the following problem:
@ -20,7 +20,7 @@ inline.lpp:40:12: note: previous declaration with 'C++' linkage
make[5]: *** [inline.o] Error 1
diff --git a/pire/inline.lpp b/pire/inline.lpp
index e5f6b55..25ef388 100644
index 1111111..2222222 100644
--- a/pire/inline.lpp
+++ b/pire/inline.lpp
@@ -36,10 +36,6 @@ ystring filename = "";
@ -34,18 +34,15 @@ index e5f6b55..25ef388 100644
class Die {
public:
Die() {
--
2.3.2 (Apple Git-55)
From de14f09bb7d7a37220aefb877c378ec445837486 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 21 Sep 2015 18:41:12 +1000
Subject: [PATCH 2/2] check for target AR
Subject: [PATCH] check for target AR
diff --git a/configure.ac b/configure.ac
index e185cb9..86c5c1e 100644
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
@ -56,6 +53,3 @@ index e185cb9..86c5c1e 100644
AC_PROG_CXX
AC_PROG_CC
AC_PROG_LEX
--
2.3.2 (Apple Git-55)

11
src/plib-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 46f57c8b505104ceb1966dcc4a9b76447479a59f Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 22 Jun 2015 14:10:16 -0700
Subject: [PATCH] Fix pointer-to-integer cast for 64-bit architecture.
diff --git a/src/sl/slDSP.cxx b/src/sl/slDSP.cxx
index 933e20b..1d46ddc 100644
index 1111111..2222222 100644
--- a/src/sl/slDSP.cxx
+++ b/src/sl/slDSP.cxx
@@ -237,8 +237,8 @@ void slDSP::open ( const char *device, int _rate, int _stereo, int _bps )
@ -24,7 +24,7 @@ index 933e20b..1d46ddc 100644
wperror( result);
diff --git a/src/ssg/ssgParser.cxx b/src/ssg/ssgParser.cxx
index c006c27..cc1ea48 100644
index 1111111..2222222 100644
--- a/src/ssg/ssgParser.cxx
+++ b/src/ssg/ssgParser.cxx
@@ -263,7 +263,7 @@ void _ssgParser::expectNextToken( const char* name )
@ -36,6 +36,3 @@ index c006c27..cc1ea48 100644
onechartokenbuf_ptr [ 0 ] = *ptr;
onechartokenbuf_ptr [ 1 ] = 0;
--
2.1.4

15
src/plotmm-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From cd2b1b4a0ae81dddd3fa70c06528a7024ada7a5f Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 1 Oct 2010 12:54:06 +0200
Subject: [PATCH] SigC changed to sigc
diff --git a/plotmm/curve.h b/plotmm/curve.h
index 8d22e19..05065fc 100644
index 1111111..2222222 100644
--- a/plotmm/curve.h
+++ b/plotmm/curve.h
@@ -140,7 +140,7 @@ namespace PlotMM {
@ -22,7 +22,7 @@ index 8d22e19..05065fc 100644
protected:
virtual void init(const Glib::ustring &title);
diff --git a/plotmm/plot.cc b/plotmm/plot.cc
index 90aa5f8..6696171 100644
index 1111111..2222222 100644
--- a/plotmm/plot.cc
+++ b/plotmm/plot.cc
@@ -322,7 +322,7 @@ Plot::Plot() :
@ -58,7 +58,7 @@ index 90aa5f8..6696171 100644
return canvas_.signal_plot_mouse_move;
}
diff --git a/plotmm/plot.h b/plotmm/plot.h
index 79533a8..f522b40 100644
index 1111111..2222222 100644
--- a/plotmm/plot.h
+++ b/plotmm/plot.h
@@ -79,9 +79,9 @@ namespace PlotMM
@ -88,7 +88,7 @@ index 79533a8..f522b40 100644
void set_selection(const Rectangle &r);
Rectangle get_selection() { return select_; }
diff --git a/plotmm/scale.h b/plotmm/scale.h
index 333f456..cf8e355 100644
index 1111111..2222222 100644
--- a/plotmm/scale.h
+++ b/plotmm/scale.h
@@ -133,7 +133,7 @@ namespace PlotMM
@ -100,6 +100,3 @@ index 333f456..cf8e355 100644
protected:
virtual void on_realize();
--
1.7.1

26
src/poco-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 329b3a3ebbcd2ee03e3f0e21cd929dd54fffcac3 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:52:55 -0700
Subject: [PATCH] configure: Define POCO_STATIC when --static is requested
diff --git a/configure b/configure
index 1d93337..87f189e 100755
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -189,6 +189,7 @@ while [ "$1" != "" ] ; do
@ -18,20 +20,15 @@ index 1d93337..87f189e 100755
fi
if [ "$1" = "--shared" ] ; then
--
1.8.3.2
From 0b88c734bfae5cc4ac65de7cb903124cca62b8a5 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 17:09:19 -0700
Subject: [PATCH] Config.h: Add prototype for POCO_STATIC
---
Foundation/include/Poco/Config.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h
index c4c5b83..8d29273 100644
index 1111111..2222222 100644
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -48,6 +48,10 @@
@ -45,23 +42,18 @@ index c4c5b83..8d29273 100644
// Define to disable FPEnvironment support
// #define POCO_NO_FPENVIRONMENT
--
1.8.3.2
From b14d120b8cb65cc348b884e4d418531356dfc9b0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:27:42 -0700
Subject: [PATCH] Types.h: Fix Win64 on MinGW
---
Foundation/include/Poco/Types.h | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h
index 1b076d5..23321d9 100644
index 1111111..2222222 100644
--- a/Foundation/include/Poco/Types.h
+++ b/Foundation/include/Poco/Types.h
@@ -57,16 +57,24 @@ namespace Poco {
@@ -77,16 +77,24 @@ namespace Poco {
typedef unsigned short UInt16;
typedef signed int Int32;
typedef unsigned int UInt32;

22
src/polarssl-1-fixes.patch
View File

@ -2,15 +2,15 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0516b3ebc54e3acdf3882b218e0f30133a23fa61 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 2 Dec 2015 18:47:45 +1100
Subject: [PATCH 1/2] Security fix for CVE-2015-1182 from:
Subject: [PATCH] Security fix for CVE-2015-1182 from:
https://polarssl.org/tech-updates/security-advisories/polarssl-security-advisory-2014-04
diff --git a/library/asn1parse.c b/library/asn1parse.c
index a3a2b56..e2117bf 100644
index 1111111..2222222 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p,
@ -22,18 +22,15 @@ index a3a2b56..e2117bf 100644
cur = cur->next;
}
}
--
2.4.9 (Apple Git-60)
From e13da28ce07af59a1ee9736d41fc80e7a2861e7b Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Wed, 2 Dec 2015 18:50:21 +1100
Subject: [PATCH 2/2] fix shared lib install locations
Subject: [PATCH] fix shared lib install locations
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 33d96b4..262b463 100644
index 1111111..2222222 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -131,6 +131,8 @@ if(USE_SHARED_POLARSSL_LIBRARY)
@ -46,6 +43,3 @@ index 33d96b4..262b463 100644
+ RUNTIME DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(USE_SHARED_POLARSSL_LIBRARY)
--
2.4.9 (Apple Git-60)

37
src/postgresql-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From a92f8ef8826f38edfe010752badc5c280f5b9605 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "a@a.org" <a@a.org>
Date: Mon, 24 Oct 2011 14:02:33 +0200
Subject: [PATCH 1/4] use unix style names for openssl on mingw-cross-env
Subject: [PATCH] use unix style names for openssl on mingw-cross-env
diff --git a/configure.in b/configure.in
index 2f8bb3d..441b42b 100644
index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
@@ -926,13 +926,8 @@ fi
@ -28,18 +28,15 @@ index 2f8bb3d..441b42b 100644
fi
if test "$with_pam" = yes ; then
--
1.9.1
From 6bbf26ce1f6c0bbd6fc53db1152b1132795b2850 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "a@a.org" <a@a.org>
Date: Mon, 24 Oct 2011 14:09:38 +0200
Subject: [PATCH 2/4] do not check autoconf version
Subject: [PATCH] do not check autoconf version
diff --git a/configure.in b/configure.in
index 441b42b..1257071 100644
index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
@ -53,19 +50,16 @@ index 441b42b..1257071 100644
AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)
--
1.9.1
From e7cdd570742aa958d5b45c6971253d9a0ac8ecf4 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 1 Jul 2014 14:27:21 -0700
Subject: [PATCH 3/4] Fix shared lib install location
Subject: [PATCH] Fix shared lib install location
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 294d10f..3acdd81 100644
index 1111111..2222222 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -293,6 +293,7 @@ endif
@ -108,20 +102,16 @@ index 294d10f..3acdd81 100644
endif # not aix
else # no soname
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
--
1.9.1
From 49f1ebdd0a4523f77b889b7dfbd5d34c2e11dab1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 1 Jul 2014 14:41:44 -0700
Subject: [PATCH 4/4] Don't build shared lib on win32 if --disable-shared is
set
Subject: [PATCH] Don't build shared lib on win32 if --disable-shared is set
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 3acdd81..68084cd 100644
index 1111111..2222222 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -291,11 +291,15 @@ ifeq ($(PORTNAME), cygwin)
@ -144,6 +134,3 @@ index 3acdd81..68084cd 100644
endif
--
1.9.1

40
src/qtservice-1-fixes.patch
View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 431dd674645bbee5ea34d65aa4095f07890af088 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 <mabrand@mabrand.nl>
Date: Thu, 29 Aug 2013 09:27:08 +0200
Subject: [PATCH 1/4] qtservice: fixes for static build
Subject: [PATCH] qtservice: fixes for static build
diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
index 1e51cc1..c427a56 100644
index 1111111..2222222 100644
--- a/qtservice/buildlib/buildlib.pro
+++ b/qtservice/buildlib/buildlib.pro
@@ -5,7 +5,7 @@ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
@ -20,7 +22,7 @@ index 1e51cc1..c427a56 100644
QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSERVICE_LIBNAME}.dll
}
diff --git a/qtservice/src/qtservice.pri b/qtservice/src/qtservice.pri
index 0945298..0475e0f 100644
index 1111111..2222222 100644
--- a/qtservice/src/qtservice.pri
+++ b/qtservice/src/qtservice.pri
@@ -15,7 +15,7 @@ qtservice-uselib:!qtservice-buildlib {
@ -33,18 +35,15 @@ index 0945298..0475e0f 100644
+ qtservice-buildlib:DEFINES += QT_QTSERVICE_EXPORT
else:qtservice-uselib:DEFINES += QT_QTSERVICE_IMPORT
}
--
1.8.1.4
From 539cadf46856af75becb54b40f65f617ae6dbf1f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 29 Aug 2013 09:31:40 +0200
Subject: [PATCH 2/4] qtservice: build as static lib and generate .prl
Subject: [PATCH] qtservice: build as static lib and generate .prl
diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
index c427a56..8335202 100644
index 1111111..2222222 100644
--- a/qtservice/buildlib/buildlib.pro
+++ b/qtservice/buildlib/buildlib.pro
@@ -1,7 +1,7 @@
@ -57,18 +56,15 @@ index c427a56..8335202 100644
include(../src/qtservice.pri)
TARGET = $$QTSERVICE_LIBNAME
DESTDIR = $$QTSERVICE_LIBDIR
--
1.8.1.4
From 01626c8c0f528e6642110b15dab658ad49b8075b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 29 Aug 2013 09:44:49 +0200
Subject: [PATCH 3/4] qtservice: no debug
Subject: [PATCH] qtservice: no debug
diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
index 8335202..370156a 100644
index 1111111..2222222 100644
--- a/qtservice/buildlib/buildlib.pro
+++ b/qtservice/buildlib/buildlib.pro
@@ -1,7 +1,7 @@
@ -80,18 +76,15 @@ index 8335202..370156a 100644
include(../src/qtservice.pri)
TARGET = $$QTSERVICE_LIBNAME
DESTDIR = $$QTSERVICE_LIBDIR
--
1.8.1.4
From 005eb0eb8275b6e50c814343e7fdb3d2c99f13d5 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 29 Aug 2013 11:32:45 +0200
Subject: [PATCH 4/4] qtservice: install to Qt directory
Subject: [PATCH] qtservice: install to Qt directory
diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro
index 370156a..4180e83 100644
index 1111111..2222222 100644
--- a/qtservice/buildlib/buildlib.pro
+++ b/qtservice/buildlib/buildlib.pro
@@ -4,10 +4,11 @@ mac:CONFIG += absolute_library_soname
@ -109,6 +102,3 @@ index 370156a..4180e83 100644
+headers.path = $$[QT_INSTALL_HEADERS]
+headers.files += ../src/qtservice.h
+INSTALLS += target headers
--
1.8.1.4

6
src/sdl2-1-fixes.patch
View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Robert Norris <rob@eatenbyagrue.org>
Date: Sat, 28 Mar 2015 21:47:00 +0100
Subject: [PATCH 1/3] disable DirectInput because of missing wbemcli.h
Subject: [PATCH] disable DirectInput because of missing wbemcli.h
This patch has been taken from:
https://bugzilla.libsdl.org/show_bug.cgi?id=1739
@ -27,7 +27,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Sat, 28 Mar 2015 21:47:32 +0100
Subject: [PATCH 2/3] fix shared build, libtool
Subject: [PATCH] fix shared build, libtool
This patch is a combination of 2 patches from:
https://bugzilla.libsdl.org/show_bug.cgi?id=1431
@ -81,7 +81,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Charlemagne Lasse <charlemagnelasse@gmail.com>
Date: Mon, 6 Nov 2017 11:04:46 +0100
Subject: [PATCH 3/3] Revert "Don't use the system OpenGL headers, ever."
Subject: [PATCH] Revert "Don't use the system OpenGL headers, ever."
Bug-MXE: https://github.com/mxe/mxe/issues/1961
Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=3944

9
src/sdl_net-1-fixes.patch
View File

@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 50ebb3d0a7e28fa3e85dff386cde7a6315865e76 Mon Sep 17 00:00:00 2001
From: MXE
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 27 Feb 2012 14:41:08 +0100
Subject: [PATCH] add static dependency to .pc file
diff --git a/SDL_net.pc.in b/SDL_net.pc.in
index b68055e..3ec182b 100644
index 1111111..2222222 100644
--- a/SDL_net.pc.in
+++ b/SDL_net.pc.in
@@ -8,4 +8,5 @@ Description: net library for Simple DirectMedia Layer
@ -18,6 +18,3 @@ index b68055e..3ec182b 100644
Libs: -L${libdir} -lSDL_net
+Libs.private: -liphlpapi -lws2_32
Cflags: -I${includedir}/SDL
--
1.7.9

15
src/ucl-1-fixes.patch
View File

@ -1,6 +1,8 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 34ee29b2233764519fecf3a9c5d7ed36ad680215 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 8 Nov 2015 23:58:55 +0100
Subject: [PATCH] do not use winmm
@ -9,13 +11,9 @@ Subject: [PATCH] do not use winmm
* comment out call to timeGetTime (defined in winmm)
winmm was used only to measure performance in an example.
---
acc/acclib/uclock.ch | 2 +-
configure | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/acc/acclib/uclock.ch b/acc/acclib/uclock.ch
index d20dc9c..2de1f31 100644
index 1111111..2222222 100644
--- a/acc/acclib/uclock.ch
+++ b/acc/acclib/uclock.ch
@@ -157,7 +157,7 @@ ACCLIB_PUBLIC(void, acc_uclock_read) (acc_uclock_handle_p h, acc_uclock_p c)
@ -28,7 +26,7 @@ index d20dc9c..2de1f31 100644
struct rusage ru;
if (getrusage(RUSAGE_SELF, &ru) != 0) c->ticks.rd = 0;
diff --git a/configure b/configure
index 8f7e300..13bc5b4 100755
index 1111111..2222222 100755
--- a/configure
+++ b/configure
@@ -31409,14 +31409,6 @@ done
@ -46,6 +44,3 @@ index 8f7e300..13bc5b4 100755
--
1.7.10.4