dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1965 from tonytheodore/patch

Browse Source 
patch.mk: use numbered patch headers
pull/1984/head
Tony Theodore 7 years ago committed by GitHub
parent dc5c7f52cb c01dc95ed1
commit 9295d5ae92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
148 changed files with 4987 additions and 1280 deletions
Show Stats Download Patch File Download Diff File

50
patch.mk
Unescape View File

@ -11,7 +11,7 @@ PATCH_NAME = 1-fixes
# can't use PKG_PATCHES here, because it returns existing patches
# while export-patch creates new patch
PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$(PKG_MAKEFILES))
PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$($(1)_MAKEFILE))
define INIT_GIT
# unpack to gits/tmp/pkg
@ -46,7 +46,7 @@ define EXPORT_PATCH
echo 'Contains ad hoc patches for cross building.'; \
echo ''; \
$(call GIT_CMD,$(1)) format-patch \
--no-numbered \
--numbered \
-p \
--no-signature \
--stdout \
@ -58,21 +58,22 @@ define EXPORT_PATCH
) > '$(PATCH_BY_NAME)'
endef
init-git-%: download-only-%
_init-git-%: TIMESTAMP = patch
_init-git-%: download-only-%
$(if $(call set_is_member,$*,$(PKGS)), \
$(if $(wildcard $(call GIT_DIR,$*)), \
$(error $(call GIT_DIR,$*) already exists), \
$(call INIT_GIT,$*)), \
$(error Package $* not found))
import-patch-%:
_import-patch-%:
$(if $(call set_is_member,$*,$(PKGS)), \
$(if $(wildcard $(call GIT_DIR,$*)), \
$(call IMPORT_PATCH,$*,$(call PATCH_BY_NAME,$*,$(PATCH_NAME))), \
$(error $(call GIT_DIR,$*) does not exist)), \
$(error Package $* not found))
import-all-patches-%:
_import-all-patches-%:
$(if $(call set_is_member,$*,$(PKGS)), \
$(if $(wildcard $(call GIT_DIR,$*)), \
$(foreach PKG_PATCH,$(call PKG_PATCHES,$*), \
@ -80,9 +81,46 @@ import-all-patches-%:
$(error $(call GIT_DIR,$*) does not exist)), \
$(error Package $* not found))
export-patch-%:
_export-patch-%:
$(if $(call set_is_member,$*,$(PKGS)), \
$(if $(wildcard $(call GIT_DIR,$*)), \
$(call EXPORT_PATCH,$*,$(PATCH_NAME)), \
$(error $(call GIT_DIR,$*) does not exist)), \
$(error Package $* not found))
# use .SECONDARY: when refreshing all patches if you don't
# want to unpack everything every time
#.SECONDARY:
init-git-%: $(PREFIX)/installed/patch/init-git-% ;
import-patch-%: $(PREFIX)/installed/patch/import-patch-% ;
import-all-patches-%: $(PREFIX)/installed/patch/import-all-patches-% ;
export-patch-%: $(PREFIX)/installed/patch/export-patch-% ;
refresh-patch-%: $(PREFIX)/installed/patch/refresh-patch-% ;
$(PREFIX)/installed/patch/refresh-patch-%:
@rm -rf $(PWD)/tmp-patch/$*
@$(MAKE) -f '$(MAKEFILE)' init-git-$* GITS_DIR=$(PWD)/tmp-patch/$*
@$(MAKE) -f '$(MAKEFILE)' import-patch-$* GITS_DIR=$(PWD)/tmp-patch/$*
@$(MAKE) -f '$(MAKEFILE)' export-patch-$* GITS_DIR=$(PWD)/tmp-patch/$*
@# darwin sometimes chokes deleting large git repos
@rm -rf $(PWD)/tmp-patch/$* || sleep 5; rm -rf $(PWD)/tmp-patch/$*
+@mkdir -p '$(dir $@)'
@touch '$@'
$(PREFIX)/installed/patch/%:
@echo '[$*]'
@[ -d '$(LOG_DIR)/patch' ] || mkdir -p '$(LOG_DIR)/patch'
@(time $(MAKE) -f '$(MAKEFILE)' _$*) &> '$(LOG_DIR)/patch/$*'
+@mkdir -p '$(dir $@)'
@touch '$@'
PATCH_FORMAT_PATCHES := $(shell find $(MXE_PLUGIN_DIRS) plugins -name "*-$(PATCH_NAME).patch")
PATCH_FORMAT_PKGS := $(sort $(subst -$(PATCH_NAME),,$(basename $(notdir $(PATCH_FORMAT_PATCHES)))))
PATCH_FORMAT_DIRS := $(sort $(basename $(dir $(PATCH_FORMAT_PATCHES))))
.PHONY: refresh-patches
refresh-patches:
@$(MAKE) -f '$(MAKEFILE)' -j '$(JOBS)'\
$(addprefix refresh-patch-,$(PATCH_FORMAT_PKGS)) \
MXE_PLUGIN_DIRS='$(PATCH_FORMAT_DIRS)'

10
plugins/apps/clementine-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Tue, 31 Jan 2017 22:15:13 +0300
Subject: [PATCH] fix build
Subject: [PATCH 1/4] fix build
diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
@ -134,13 +134,12 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Thu, 16 Mar 2017 14:54:55 +0300
Subject: [PATCH] core/database: configure fts3 tokenizer support
Subject: [PATCH 2/4] core/database: configure fts3 tokenizer support
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
@ -170,13 +169,12 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Krzysztof Sobiecki <sobkas@gmail.com>
Date: Sun, 9 Jul 2017 19:05:14 +0200
Subject: [PATCH] Fix build in src/ui/
Subject: [PATCH 3/4] Fix build in src/ui/
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
@ -194,7 +192,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Mon, 24 Jul 2017 20:49:21 +0300
Subject: [PATCH] fix qtsparkle headers
Subject: [PATCH 4/4] fix qtsparkle headers
diff --git a/src/main.cpp b/src/main.cpp

7
plugins/apps/clementine_qt4-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Sat, 5 Nov 2016 02:19:37 +0300
Subject: [PATCH] fix clementine
Subject: [PATCH 1/2] fix clementine
diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
@ -80,20 +80,19 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Thu, 16 Mar 2017 14:54:55 +0300
Subject: [PATCH] core/database: configure fts3 tokenizer support
Subject: [PATCH 2/2] core/database: configure fts3 tokenizer support
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

6
plugins/apps/qbittorrent-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 30 Aug 2015 00:28:50 +0200
Subject: [PATCH] do not check qmake existence
Subject: [PATCH 1/3] do not check qmake existence
Fix ./configure error:
@ -57,7 +57,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 May 2016 23:35:25 +0200
Subject: [PATCH] link with boost_random and boost_chrono
Subject: [PATCH 2/3] link with boost_random and boost_chrono
libtorrent-rasterbar 1.1.0 uses them
@ -85,7 +85,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 30 May 2016 00:09:20 +0200
Subject: [PATCH] disable BOOST_ASIO_SEPARATE_COMPILATION
Subject: [PATCH 3/3] disable BOOST_ASIO_SEPARATE_COMPILATION
After upgrading libtorrent-rasterbar to 1.1.0, qbittorrent fails to link
main executable with undefined symbols in boost_asio:

16
plugins/apps/wrk-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 20 Mar 2016 16:36:20 +0100
Subject: [PATCH] rename conflicting constants
Subject: [PATCH 1/8] rename conflicting constants
diff --git a/src/net.c b/src/net.c
@ -174,7 +174,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 20 Mar 2016 21:34:38 +0100
Subject: [PATCH] rename zcalloc (conflict with zlib)
Subject: [PATCH 2/8] rename zcalloc (conflict with zlib)
diff --git a/src/stats.c b/src/stats.c
@ -251,7 +251,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 22 Mar 2016 23:04:35 +0100
Subject: [PATCH] allow to specify EXTRA_CFLAGS and EXTRA_LIBS
Subject: [PATCH 3/8] allow to specify EXTRA_CFLAGS and EXTRA_LIBS
diff --git a/Makefile b/Makefile
@ -270,7 +270,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 22 Mar 2016 23:05:26 +0100
Subject: [PATCH] reorder -lssl and -lcrypto
Subject: [PATCH 4/8] reorder -lssl and -lcrypto
See http://stackoverflow.com/a/27136346
@ -289,7 +289,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 22 Mar 2016 23:14:32 +0100
Subject: [PATCH] option to use external installation of LuaJIT
Subject: [PATCH 5/8] option to use external installation of LuaJIT
LUA_PATH is provided to avoid changing directory to LuaJIT's tree.
@ -336,7 +336,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 22 Mar 2016 23:21:51 +0100
Subject: [PATCH] embed bytecode via header instead of object file
Subject: [PATCH 6/8] embed bytecode via header instead of object file
Embedding via object file requires -Wl,-E which doesn't work on MinGW.
Embedding via header is more portable.
@ -427,7 +427,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 22 Mar 2016 23:28:09 +0100
Subject: [PATCH] use send/recv for sockets instead of write/read
Subject: [PATCH 7/8] use send/recv for sockets instead of write/read
write/read returns Bad file descriptor for sockets in MinGW.
@ -456,7 +456,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 23 Mar 2016 22:48:52 +0100
Subject: [PATCH] compatibility with MinGW
Subject: [PATCH 8/8] compatibility with MinGW
diff --git a/Makefile b/Makefile

2
plugins/go/go-native-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 17 Nov 2016 00:22:19 +0100
Subject: [PATCH] cmd/link: support new 386/amd64 relocations
Subject: [PATCH 1/1] cmd/link: support new 386/amd64 relocations
It is needed to fix build on Debian 8 Stretch.
See https://github.com/golang/go/issues/13896

22
plugins/luarocks/lua-rapidjson-1-fixes.patch
Unescape 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
---
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
---
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

4
plugins/luarocks/luarocks-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 10 Oct 2015 17:45:24 +0100
Subject: [PATCH] platform MXE
Subject: [PATCH 1/1] platform MXE
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
@ -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,

4
plugins/luarocks/luv-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 25 Apr 2016 02:31:37 +0200
Subject: [PATCH] add rockspec from upstream
Subject: [PATCH 1/2] add rockspec from upstream
diff --git a/luv-1.9.0-1.rockspec b/luv-1.9.0-1.rockspec
@ -52,7 +52,7 @@ index 1111111..2222222
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 25 Apr 2016 02:25:47 +0200
Subject: [PATCH] use external libuv
Subject: [PATCH 2/2] use external libuv
diff --git a/luv-1.9.0-1.rockspec b/luv-1.9.0-1.rockspec

14
src/agg-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

20
src/aspell-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 21:13:24 +1100
Subject: [PATCH] add pthreads option
Subject: [PATCH 01/10] add pthreads option
diff --git a/configure.ac b/configure.ac
@ -43,7 +43,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:10:22 +1100
Subject: [PATCH] use namespace mingw
Subject: [PATCH 02/10] use namespace mingw
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0001-use-namespace.mingw.patch?h=mingw-w64-aspell
@ -72,7 +72,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:14:27 +1100
Subject: [PATCH] printf mingw
Subject: [PATCH 03/10] printf mingw
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0002-printf.mingw.patch?h=mingw-w64-aspell
@ -123,7 +123,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:15:48 +1100
Subject: [PATCH] no-undefined mingw
Subject: [PATCH 04/10] no-undefined mingw
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0003-no-undefined-on.mingw.patch?h=mingw-w64-aspell
@ -145,7 +145,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:16:41 +1100
Subject: [PATCH] reloc mingw
Subject: [PATCH 05/10] reloc mingw
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0004-reloc.mingw.patch?h=mingw-w64-aspell
@ -281,7 +281,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:17:30 +1100
Subject: [PATCH] w32 home
Subject: [PATCH 06/10] w32 home
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0005-w32-home.all.patch?h=mingw-w64-aspell
@ -316,7 +316,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:18:24 +1100
Subject: [PATCH] abort mingw
Subject: [PATCH 07/10] abort mingw
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0006-abort.mingw.patch?h=mingw-w64-aspell
@ -561,7 +561,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 31 Jan 2016 20:19:16 +1100
Subject: [PATCH] fix including langinfo
Subject: [PATCH 08/10] fix including langinfo
taken from:
https://aur.archlinux.org/cgit/aur.git/plain/0007-fix-including-langinfo.patch?h=mingw-w64-aspell
@ -583,7 +583,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 2 Feb 2016 15:46:07 +1100
Subject: [PATCH] add dlopen option
Subject: [PATCH 09/10] add dlopen option
diff --git a/configure.ac b/configure.ac
@ -636,7 +636,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <kevina@gnu.org>
Date: Thu, 29 Dec 2016 00:50:31 -0500
Subject: [PATCH] Compile Fixes for GCC 7.
Subject: [PATCH 10/10] Compile Fixes for GCC 7.
Closes #519.

14
src/aubio-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 5 Jan 2016 21:28:06 -0500
Subject: [PATCH] wscript: check HAVE_AV* from ctx.env
Subject: [PATCH 1/7] wscript: check HAVE_AV* from ctx.env
From https://github.com/aubio/aubio/commit/eb6899125ac83900710180c02b94bc593a1426d2
@ -26,7 +26,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:47:01 -0500
Subject: [PATCH] wscript: check more variables from ctx.env
Subject: [PATCH 2/7] wscript: check more variables from ctx.env
diff --git a/wscript b/wscript
@ -52,7 +52,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 22:48:20 -0500
Subject: [PATCH] wscript: fftw3 support requires pthreads
Subject: [PATCH 3/7] wscript: fftw3 support requires pthreads
diff --git a/wscript b/wscript
@ -74,7 +74,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 22:18:21 -0500
Subject: [PATCH] wscript: Install static library
Subject: [PATCH 4/7] wscript: Install static library
diff --git a/src/wscript_build b/src/wscript_build
@ -93,7 +93,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:15:37 -0500
Subject: [PATCH] Add options for enabling shared and/or static libraries
Subject: [PATCH 5/7] Add options for enabling shared and/or static libraries
diff --git a/src/wscript_build b/src/wscript_build
@ -153,7 +153,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:25:46 -0500
Subject: [PATCH] Add static deps to pkgconfig file
Subject: [PATCH 6/7] Add static deps to pkgconfig file
diff --git a/aubio.pc.in b/aubio.pc.in
@ -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 7/7] disable tests and examples
diff --git a/wscript b/wscript

3
src/binutils-1-fixes.patch
Unescape View File

@ -5,7 +5,8 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@debian.org>
Date: Sat, 15 Jul 2017 00:09:40 +1000
Subject: [PATCH] Allow the PE timestamp to be specified with SOURCE_DATE_EPOCH
Subject: [PATCH 1/1] Allow the PE timestamp to be specified with
SOURCE_DATE_EPOCH
Taken from:
https://sources.debian.net/patches/binutils-mingw-w64/7.4/specify-timestamp.patch/

13
src/boost-1-fixes.patch
Unescape View File

@ -1,13 +1,15 @@
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
Subject: [PATCH] Fix {make,jump}_fcontext visibility with mingw
Subject: [PATCH 1/1] 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\""

30
src/bzip2-1-fixes.patch
Unescape View File

@ -1,8 +1,17 @@
This file is part of MXE. See LICENSE.md for licensing information.
diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
--- bzip2-1.0.6.orig/bzip2.c 2010-09-11 01:04:53.000000000 +0200
+++ bzip2-1.0.6/bzip2.c 2013-01-30 16:24:00.170396872 +0100
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:31:24 +1100
Subject: [PATCH 1/1] fixes
diff --git a/bzip2.c b/bzip2.c
index 1111111..2222222 100644
--- a/bzip2.c
+++ b/bzip2.c
@@ -128,7 +128,7 @@
#if BZ_LCCWIN32
# include <io.h>
@ -12,10 +21,11 @@ diff -uNr bzip2-1.0.6.orig/bzip2.c bzip2-1.0.6/bzip2.c
# define NORETURN /**/
# define PATH_SEP '\\'
diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
--- bzip2-1.0.6.orig/bzlib.h 2010-09-11 01:08:42.000000000 +0200
+++ bzip2-1.0.6/bzlib.h 2013-01-30 16:22:10.514401460 +0100
@@ -75,7 +75,7 @@
diff --git a/bzlib.h b/bzlib.h
index 1111111..2222222 100644
--- a/bzlib.h
+++ b/bzlib.h
@@ -75,7 +75,7 @@ typedef
#include <stdio.h>
#endif
@ -24,7 +34,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
# include <windows.h>
# ifdef small
/* windows.h define small to char */
@@ -116,7 +116,7 @@
@@ -116,7 +116,7 @@ BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
bz_stream *strm,
int verbosity,
@ -33,7 +43,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
);
BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
@@ -140,7 +140,7 @@
@@ -140,7 +140,7 @@ BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
int* bzerror,
FILE* f,
int verbosity,
@ -42,7 +52,7 @@ diff -uNr bzip2-1.0.6.orig/bzlib.h bzip2-1.0.6/bzlib.h
void* unused,
int nUnused
);
@@ -216,7 +216,7 @@
@@ -216,7 +216,7 @@ BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
unsigned int* destLen,
char* source,
unsigned int sourceLen,

4
src/cegui-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 3 Aug 2016 03:19:48 +1000
Subject: [PATCH] cegui: separate shared and static builds
Subject: [PATCH 1/2] cegui: separate shared and static builds
minimal workaround till correctly implemented upstream:
https://bitbucket.org/cegui/cegui/issues/1132/libxml2-based-xml-parser-fails-to#comment-29553011
@ -92,7 +92,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 4 Aug 2016 13:30:13 +1000
Subject: [PATCH] use cegui_target_link_libraries for minizip
Subject: [PATCH 2/2] use cegui_target_link_libraries for minizip
diff --git a/cegui/src/CMakeLists.txt b/cegui/src/CMakeLists.txt

2
src/cgal-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 26 Jul 2017 18:34:16 +1000
Subject: [PATCH] link examples with boost libraries
Subject: [PATCH 1/1] link examples with boost libraries
diff --git a/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake b/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake

6
src/cmake-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Fri, 12 Aug 2016 02:01:20 +1000
Subject: [PATCH] fix windres invocation options
Subject: [PATCH 1/3] fix windres invocation options
windres doesn't recognise various gcc flags like -mms-bitfields,
-fopenmp, -mthreads etc. (basically not `-D` or `-I`)
@ -21,7 +21,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 25 Jul 2017 20:34:56 +1000
Subject: [PATCH] add option to disable -isystem
Subject: [PATCH 2/3] add option to disable -isystem
taken from (not accepted):
https://gitlab.kitware.com/cmake/cmake/merge_requests/895
@ -47,7 +47,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 15 Aug 2017 15:25:06 +1000
Subject: [PATCH] add CPACK_NSIS_EXECUTABLE variable
Subject: [PATCH 3/3] add CPACK_NSIS_EXECUTABLE variable
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx

3908
src/coin-1-fixes.patch
View File

File diff suppressed because it is too large Load Diff

15
src/coin-2-gcc-4.7.patch
Unescape View File

@ -1,15 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
This patch was taken from Gentoo:
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch?id=17d7c853393ff83e3422e48e9ad2810f23889bbf
--- coin3-3.1.3.orig/include/Inventor/SbBasic.h
+++ coin3-3.1.3/include/Inventor/SbBasic.h
@@ -24,6 +24,7 @@
*
\**************************************************************************/
+#include <Inventor/C/errors/debugerror.h>
#include <Inventor/C/basic.h>
/* ********************************************************************** */

11
src/cpp-netlib-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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)

18
src/cryptopp-1-fixes.patch
Unescape View File

@ -1,11 +1,19 @@
This file is part of MXE. See LICENSE.md for licensing information.
Fix broken Makefile, add relevant object files and don't use -DCRYPTOPP_EXPORTS
Contains ad hoc patches for cross building.
diff -ur a/GNUmakefile b/GNUmakefile
--- a/GNUmakefile 2015-11-22 22:17:59.000000000 +0100
+++ b/GNUmakefile 2015-11-29 13:04:15.587252779 +0100
@@ -255,8 +255,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:50:55 +1100
Subject: [PATCH 1/1] Fix broken Makefile, add relevant object files and don't
use -DCRYPTOPP_EXPORTS
diff --git a/GNUmakefile b/GNUmakefile
index 1111111..2222222 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -255,8 +255,7 @@ TESTOBJS := bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o dat
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
# List cryptlib.cpp first in an attempt to tame C++ static initialization problems

2
src/dbus-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Mon, 3 Jul 2017 01:55:45 +0200
Subject: [PATCH] Avoid multiple definitions of DllMain in static builds
Subject: [PATCH 1/1] Avoid multiple definitions of DllMain in static builds
diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c

69
src/dcmtk-1-fixes.patch
Unescape 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 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
Subject: [PATCH 1/1] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
compiler) quiet.
(cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258)
@ -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

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

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Christian Weigel <christian.weigel@idmt.fraunhofer.de>
Date: Fri, 17 Feb 2017 10:07:48 +0100
Subject: [PATCH] fix static build of ilu and ilut
Subject: [PATCH 1/2] fix static build of ilu and ilut
taken from https://github.com/DentonW/DevIL/pull/59
@ -55,12 +55,11 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 20 Jul 2017 16:34:51 +1000
Subject: [PATCH] fix resource paths
Subject: [PATCH 2/2] 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

6
src/djvulibre-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sun, 24 Jul 2016 09:33:22 +0200
Subject: [PATCH] define XXX_EXPORT symbols
Subject: [PATCH 1/3] define XXX_EXPORT symbols
diff --git a/libdjvu/Makefile.am b/libdjvu/Makefile.am
@ -25,7 +25,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sun, 24 Jul 2016 09:36:49 +0200
Subject: [PATCH] disable unknown pragma warnings
Subject: [PATCH 2/3] disable unknown pragma warnings
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
@ -52,7 +52,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sat, 1 Jul 2017 01:26:10 +0200
Subject: [PATCH] enable static library builds
Subject: [PATCH 3/3] enable static library builds
diff --git a/libdjvu/DjVuGlobal.h b/libdjvu/DjVuGlobal.h

22
src/file-1-fixes.patch
Unescape View File

@ -1,15 +1,16 @@
This file is part of MXE. See LICENSE.md for licensing information.
From https://github.com/file/file/commit/d5f2c28536f1645e3da25fa3f8da5a0a45404dc4.
Contains ad hoc patches for cross building.
From 4e654ecfd1ca6535540b7d33dcd66051b9b62def Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 27 Jul 2015 00:14:29 -0400
Subject: [PATCH] PR/466: Windows fixes.
Date: Sat, 18 Nov 2017 22:17:57 +1100
Subject: [PATCH 1/1] PR/466: Windows fixes.
From https://github.com/file/file/commit/d5f2c28536f1645e3da25fa3f8da5a0a45404dc4.
diff --git a/src/file.h b/src/file.h
index 1b4ef6f..00d2abe 100644
index 1111111..2222222 100644
--- a/src/file.h
+++ b/src/file.h
@@ -44,9 +44,11 @@
@ -25,7 +26,7 @@ index 1b4ef6f..00d2abe 100644
#include <stdio.h> /* Include that here, to make sure __P gets defined */
diff --git a/src/gmtime_r.c b/src/gmtime_r.c
index 963dfee..7e27ed6 100644
index 1111111..2222222 100644
--- a/src/gmtime_r.c
+++ b/src/gmtime_r.c
@@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: gmtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $")
@ -38,7 +39,7 @@ index 963dfee..7e27ed6 100644
struct tm *tmp = gmtime(t);
if (tmp == NULL)
diff --git a/src/localtime_r.c b/src/localtime_r.c
index 69d78d9..35c3b40 100644
index 1111111..2222222 100644
--- a/src/localtime_r.c
+++ b/src/localtime_r.c
@@ -9,7 +9,7 @@ FILE_RCSID("@(#)$File: localtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $")
@ -51,7 +52,7 @@ index 69d78d9..35c3b40 100644
struct tm *tmp = localtime(t);
if (tmp == NULL)
diff --git a/src/magic.c b/src/magic.c
index bc8c344..59b7e45 100644
index 1111111..2222222 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -137,6 +137,14 @@ _w32_get_magic_relative_to(char **hmagicpath, HINSTANCE module)
@ -70,7 +71,7 @@ index bc8c344..59b7e45 100644
if (sp > 3 && stricmp(&dllpath[sp - 3], "bin") == 0) {
_w32_append_path(hmagicpath,
diff --git a/src/readelf.c b/src/readelf.c
index bc6e7f6..ab36d26 100644
index 1111111..2222222 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -1054,9 +1054,11 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
@ -98,6 +99,3 @@ index bc6e7f6..ab36d26 100644
file_badread(ms);
free(nbuf);
return -1;
--
1.9.1

25
src/flann-1-fixes.patch
Unescape View File

@ -1,7 +1,9 @@
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
@ -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,11 +29,8 @@ 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
@ -39,7 +38,7 @@ Subject: [PATCH 2/3] 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,11 +57,8 @@ 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
@ -73,7 +69,7 @@ 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 +213,3 @@ index 78a204a..7e6e353 100644
endif()
install (
--
1.9.1

17
src/fontconfig-1-fixes.patch
Unescape 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
Subject: [PATCH] fix mktemp_s
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 1/1] 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

4
src/freeglut-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 18 Jun 2016 16:24:52 +0300
Subject: [PATCH] Back compatibility with older freeglut packages in MXE
Subject: [PATCH 1/2] Back compatibility with older freeglut packages in MXE
diff --git a/CMakeLists.txt b/CMakeLists.txt
@ -75,7 +75,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 14 Jul 2016 19:15:17 +0300
Subject: [PATCH] add glu to requirements in .pc file
Subject: [PATCH 2/2] add glu to requirements in .pc file
glu.pc is generated by mxe-conf and it adds -lglu32 to linker flags.
libglu32.a defines gluUnProject and other symbols used by users of GLU.

2
src/freexl-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ 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, 2 Oct 2017 15:32:20 +0200
Subject: [PATCH] Add static dependency to .pc file
Subject: [PATCH 1/1] Add static dependency to .pc file
diff --git a/freexl.pc.in b/freexl.pc.in

13
src/fribidi-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

4
src/gcc-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 2 Feb 2017 02:05:50 +1100
Subject: [PATCH] allow native cpu detection when building with clang
Subject: [PATCH 1/2] allow native cpu detection when building with clang
function was disabled for non-gcc5 in:
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@ -29,7 +29,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 25 Sep 2017 23:49:58 +0000
Subject: [PATCH] Fix 81037 by adjutng headers
Subject: [PATCH 2/2] Fix 81037 by adjutng headers
taken from:
https://github.com/gcc-mirror/gcc/commit/8e49ac832c6ef83afa52e59f0e7e0e6151f5bd3d

8
src/gdal-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ 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: Tue, 29 Aug 2017 16:31:09 +0200
Subject: [PATCH] Detect spatialite more effectively than just checking for
Subject: [PATCH 1/2] Detect spatialite more effectively than just checking for
headers in the system paths. PostgreSQL detection requires -lpthread when
building statically.
@ -23,7 +23,7 @@ index 1111111..2222222 100644
if test "${HAVE_PG}" = "yes" ; then
LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
@@ -3532,16 +3544,21 @@ AC_ARG_WITH(spatialite-soname,
@@ -3544,16 +3544,21 @@ AC_ARG_WITH(spatialite-soname,
HAVE_SPATIALITE=no
SPATIALITE_AMALGAMATION=no
@ -71,9 +71,11 @@ index 1111111..2222222 100644
AC_CHECK_LIB([geos_c],
[GEOSversion],
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Tue, 26 Sep 2017 14:56:19 +0200
Subject: [PATCH] Use the new proj dll version number for the latest proj.
Subject: [PATCH 2/2] Use the new proj dll version number for the latest proj.
diff --git a/ogr/ogrct.cpp b/ogr/ogrct.cpp
index 1111111..2222222 100644

25
src/gdk-pixbuf-1-fixes.patch
Unescape 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,
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
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
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
Unescape 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 1/1] 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

19
src/ghostscript-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 16 Jul 2016 13:01:59 +0200
Subject: [PATCH] apply mingw-build.patch from MINGW-packages
Subject: [PATCH 1/5] apply mingw-build.patch from MINGW-packages
Source: https://git.io/vKz1V
@ -648,7 +648,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 16 Jul 2016 13:05:54 +0200
Subject: [PATCH] import patch libspectre.patch from MINGW-packages
Subject: [PATCH 2/5] import patch libspectre.patch from MINGW-packages
Source: https://git.io/vKz18
@ -668,7 +668,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 16 Jul 2016 13:13:22 +0200
Subject: [PATCH] import patch ghostscript-sys-zlib.patch from MINGW-packages
Subject: [PATCH 3/5] import patch ghostscript-sys-zlib.patch from
MINGW-packages
Source: https://git.io/vKz1D
@ -689,7 +690,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Sat, 16 Jul 2016 13:15:57 +0200
Subject: [PATCH] further changes for MXE
Subject: [PATCH 4/5] further changes for MXE
diff --git a/Makefile.in b/Makefile.in
@ -1289,10 +1290,11 @@ index 1111111..2222222 100644
EXEEXT=".exe"
;;
esac
@@ -2543,6 +2535,36 @@ fi
@@ -2542,6 +2534,36 @@ fi
AC_SUBST(EXEEXT)
dnl --------------------------------------------------
+dnl --------------------------------------------------
+dnl AUX and cross compiling
+dnl --------------------------------------------------
+EXEEXTAUX="$EXEEXT"
@ -1322,10 +1324,9 @@ index 1111111..2222222 100644
+AC_SUBST(EXEEXTAUX)
+AC_SUBST(CROSS_COMPILING)
+
+dnl --------------------------------------------------
dnl --------------------------------------------------
dnl Do substitutions
dnl --------------------------------------------------
SRCDIR="$srcdir"
diff --git a/ijs/ijs_exec_unix.c b/ijs/ijs_exec_unix.c
index 1111111..2222222 100644
--- a/ijs/ijs_exec_unix.c
@ -1369,7 +1370,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 19 Jul 2016 23:58:16 +0300
Subject: [PATCH] fix noncontribmakefiles if srcdir!=dstdir
Subject: [PATCH 5/5] fix noncontribmakefiles if srcdir!=dstdir
See https://github.com/mxe/mxe/pull/1382#issuecomment-233653542

16
src/glib-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH] fix tool paths
Subject: [PATCH 1/8] fix tool paths
diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
@ -29,7 +29,7 @@ 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:25:01 +0200
Subject: [PATCH] Avoid DllMain symbol conflict when linking statically
Subject: [PATCH 2/8] Avoid DllMain symbol conflict when linking statically
Adjusted by Boris Nagaev on 29-Jan-2017 to fix
https://gist.github.com/starius/f4fc85939352cb50122ba29e0f5b140d
@ -103,7 +103,7 @@ 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:27:22 +0200
Subject: [PATCH] Allow building without inotify support
Subject: [PATCH 3/8] Allow building without inotify support
diff --git a/configure.ac b/configure.ac
@ -131,7 +131,7 @@ 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:28:14 +0200
Subject: [PATCH] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
Subject: [PATCH 4/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
Backported from upstream
@ -152,7 +152,7 @@ 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:06 +0200
Subject: [PATCH] Link with dnsapi
Subject: [PATCH 5/8] Link with dnsapi
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
@ -171,7 +171,7 @@ 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
Subject: [PATCH 6/8] Ensure globals are initialized even when DllMain is not
being run
@ -548,7 +548,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gerardo Ballabio <gerardo.ballabio@gmail.com>
Date: Sun, 16 Aug 2015 13:18:24 +0200
Subject: [PATCH] Remove an annoying runtime warning
Subject: [PATCH 7/8] Remove an annoying runtime warning
that pops up when using GtkApplication in Gtk+ 3 programs.
@ -576,7 +576,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: aquiles2k <aj@elane2k.com>
Date: Wed, 6 Apr 2016 22:39:53 +0300
Subject: [PATCH] fix error "won't overwrite defined macro" on OSX
Subject: [PATCH 8/8] fix error "won't overwrite defined macro" on OSX
See https://github.com/mxe/mxe/issues/1281

10
src/gnutls-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 4 Feb 2013 16:11:12 +0100
Subject: [PATCH] add missing private lib to pc file
Subject: [PATCH 1/4] add missing private lib to pc file
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
@ -24,7 +24,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Nov 2014 08:56:48 +0100
Subject: [PATCH] windows build fix: ws2tcpip.h supplies inet_ntop
Subject: [PATCH 2/4] windows build fix: ws2tcpip.h supplies inet_ntop
Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
@ -53,7 +53,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 2 May 2017 23:52:16 +0200
Subject: [PATCH] gnutls.pc: hardcode -lunistring -liconv
Subject: [PATCH 3/4] gnutls.pc: hardcode -lunistring -liconv
See https://github.com/mxe/mxe/issues/1753#issuecomment-298772548
@ -73,14 +73,14 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 7 May 2017 20:17:13 +0200
Subject: [PATCH] let gnutls configure detect libidn2
Subject: [PATCH 4/4] let gnutls configure detect libidn2
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

8
src/gsoap-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 23 Oct 2011 21:36:53 +0200
Subject: [PATCH] support static linking to ntlm
Subject: [PATCH 1/3] support static linking to ntlm
diff --git a/configure b/configure
@ -27,7 +27,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Oct 2011 11:17:13 +0200
Subject: [PATCH] ntlm support in .pc files
Subject: [PATCH 2/3] ntlm support in .pc files
diff --git a/gsoap++.pc.in b/gsoap++.pc.in
@ -94,8 +94,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 1 Feb 2017 12:32:00 +1100
Subject: [PATCH] workaround for building on newer OSX, can be removed in next
update.
Subject: [PATCH 3/3] workaround for building on newer OSX, can be removed in
next update.
similar to https://github.com/unbit/uwsgi/pull/966

2
src/gst-plugins-bad-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 30 Dec 2016 19:59:12 +0100
Subject: [PATCH] fix neon headers location
Subject: [PATCH 1/1] fix neon headers location
See https://github.com/mxe/mxe/issues/1619

20
src/gtk2-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:43:43 +0200
Subject: [PATCH] s,DllMain,static _disabled_DllMain,
Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
@ -38,7 +38,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:46:20 +0200
Subject: [PATCH] s,__declspec(dllimport),,
Subject: [PATCH 02/10] s,__declspec(dllimport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -97,7 +97,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 15:03:28 +0200
Subject: [PATCH] s,__declspec(dllexport),,
Subject: [PATCH 03/10] s,__declspec(dllexport),,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@ -156,7 +156,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:17:22 +0200
Subject: [PATCH] fix gtk+-2.0.pc.in
Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
@ -174,7 +174,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:48:31 +0200
Subject: [PATCH] disable gtkbuiltincache
Subject: [PATCH 05/10] disable gtkbuiltincache
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
@ -194,7 +194,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:49:50 +0200
Subject: [PATCH] disable test-inline-pixbufs.h
Subject: [PATCH 06/10] disable test-inline-pixbufs.h
diff --git a/demos/Makefile.in b/demos/Makefile.in
@ -214,7 +214,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:51:04 +0200
Subject: [PATCH] permit static building
Subject: [PATCH 07/10] permit static building
diff --git a/configure b/configure
@ -312,7 +312,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:53:18 +0200
Subject: [PATCH] no -Wl
Subject: [PATCH 08/10] no -Wl
diff --git a/configure b/configure
@ -332,7 +332,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 14:54:15 +0200
Subject: [PATCH] gio not gio-unix
Subject: [PATCH 09/10] gio not gio-unix
diff --git a/configure b/configure
@ -355,7 +355,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 24 Sep 2010 15:30:49 +0200
Subject: [PATCH] removed duplicate _gtk_marshal_OBJECT__VOID()
Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
diff --git a/perf/marshalers.c b/perf/marshalers.c

8
src/gtk3-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 21:47:39 +0100
Subject: [PATCH] These were adapted from the gtk2 patchset.
Subject: [PATCH 1/4] These were adapted from the gtk2 patchset.
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
@ -49,7 +49,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 21:50:48 +0100
Subject: [PATCH] Not sure what happens when this line is commented out
Subject: [PATCH 2/4] Not sure what happens when this line is commented out
diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
@ -67,7 +67,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 29 Jan 2017 22:50:45 +0100
Subject: [PATCH] disable gtk-update-icon-cache
Subject: [PATCH 3/4] disable gtk-update-icon-cache
The error: https://gist.github.com/b3030a43a325ee7646a2bda2864465b5
@ -99,7 +99,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gerardo Ballabio <gerardo.ballabio@gmail.com>
Date: Fri, 10 Nov 2017 08:22:39 +1100
Subject: [PATCH] restore built-in icons from 3.12
Subject: [PATCH 4/4] restore built-in icons from 3.12
http://lists.nongnu.org/archive/html/mingw-cross-env-list/2017-11/msg00000.html

13
src/gtkglarea-1-fixes.patch
Unescape 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 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
Subject: [PATCH 1/1] deactivates dll build which is not supported by mxe, and
introduce option --disable-shared to handle it.
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

40
src/gtkglext-1-fixes.patch
Unescape 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
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,12 +29,9 @@ 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
@ -42,7 +39,7 @@ 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,12 +82,9 @@ 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
@ -98,7 +92,7 @@ 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
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

24
src/gtkglextmm-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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 \

20
src/guile-1-fixes.patch
Unescape 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
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
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)

4
src/harfbuzz-1-fixes.patch
Unescape View File

@ -1,9 +1,11 @@
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
Subject: [PATCH] fix *.pc file for harfbuzz-icu
Subject: [PATCH 1/1] fix *.pc file for harfbuzz-icu
diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in

2
src/hdf-eos2-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Thu, 3 Mar 2016 17:13:29 +0100
Subject: [PATCH] Remove AC_TRY_RUN to fix cross compiling.
Subject: [PATCH 1/1] Remove AC_TRY_RUN to fix cross compiling.
diff --git a/configure.ac b/configure.ac

4
src/hdf-eos5-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Fri, 27 May 2016 17:39:23 +0200
Subject: [PATCH] fixes
Subject: [PATCH 1/2] fixes
diff --git a/configure.ac b/configure.ac
@ -129,7 +129,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Fri, 27 May 2016 17:49:30 +0200
Subject: [PATCH] Fix compilation without SZIP.
Subject: [PATCH 2/2] Fix compilation without SZIP.
A wrongly placed #endif causes a missing symbol 'HE5_EHHEisHE5' when
compiling without szip. Bug & fix reported upstream.

8
src/hyperscan-1-fixes.patch
Unescape View File

@ -4,8 +4,8 @@ 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
Subject: [PATCH] update preprocessor conditions
Date: Thu, 25 Aug 2016 10:28:30 +0200
Subject: [PATCH 1/3] update preprocessor conditions
Add macro NATIVE_WIN32 = Windows && !MinGW.
Replace _WIN32 with NATIVE_WIN32 where it failed.
@ -327,7 +327,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 18 May 2016 07:38:29 +0200
Subject: [PATCH] cmake: replace WIN32 with WIN32 AND NOT MINGW
Subject: [PATCH 2/3] cmake: replace WIN32 with WIN32 AND NOT MINGW
diff --git a/CMakeLists.txt b/CMakeLists.txt
@ -391,7 +391,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 18 May 2016 07:55:44 +0200
Subject: [PATCH] add compile flag "-posix" to fix printf %llu
Subject: [PATCH 3/3] add compile flag "-posix" to fix printf %llu
See https://lists.nongnu.org/archive/html/mingw-cross-env-list/2013-04/msg00024.html
The similar problem occurred in examples/simplegrep.c

11
src/icu4c-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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@

4
src/itk-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Wed, 2 Dec 2015 15:00:54 +0100
Subject: [PATCH] fix shared build
Subject: [PATCH 1/2] fix shared build
diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/socketxx/socket++/CMakeLists.txt
@ -39,7 +39,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 24 Oct 2016 02:01:07 +0300
Subject: [PATCH] disable try-run
Subject: [PATCH 2/2] disable try-run
It is impossible to run while cross-compiling.

2
src/itpp-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 1 Nov 2017 19:30:10 +1100
Subject: [PATCH] install pc files etc. on mingw
Subject: [PATCH 1/1] install pc files etc. on mingw
diff --git a/itpp/CMakeLists.txt b/itpp/CMakeLists.txt

10
src/jack-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Harry Nakos <xnakos@gmail.com>
Date: Tue, 16 Jun 2015 21:55:31 +0300
Subject: [PATCH] Patch wscript to link to FLAC, vorbis, vorbisenc, and ogg
Subject: [PATCH 1/5] Patch wscript to link to FLAC, vorbis, vorbisenc, and ogg
libraries
... which libsndfile is dependent on, since libsndfile will most probably
@ -39,7 +39,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 31 Aug 2015 23:39:35 +0200
Subject: [PATCH] disable SIGQUIT and SIGHUP
Subject: [PATCH 2/5] disable SIGQUIT and SIGHUP
Windows doesn't have them.
@ -76,7 +76,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 1 Sep 2015 22:59:47 +0200
Subject: [PATCH] link transport.c -lreadline and -ltermcap
Subject: [PATCH 3/5] link transport.c -lreadline and -ltermcap
Fixed error:
@ -119,7 +119,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 1 Sep 2015 22:23:51 +0200
Subject: [PATCH] install jack libs to lib/jack/ instead of lib/
Subject: [PATCH 4/5] install jack libs to lib/jack/ instead of lib/
Some Jack library names collide with other libraries,
namely portaudio.
@ -189,7 +189,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 1 Jan 2016 15:21:46 +0300
Subject: [PATCH] waf: disable function causing pickling errors
Subject: [PATCH 5/5] waf: disable function causing pickling errors
According to Debian patch of py3cairo which also uses waf [1],

11
src/jpeg-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

12
src/lcms-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

11
src/lcms1-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

6
src/lensfun-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 21 Oct 2014 18:24:56 -0700
Subject: [PATCH] build system: Detect POSIX regex lib more properly
Subject: [PATCH 1/3] build system: Detect POSIX regex lib more properly
Previously, if the regex lib has to be linked separately, as in the case
of MinGW/libgnurx, it is not detected properly, and build fails for shared
@ -171,7 +171,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 21 Oct 2014 18:36:15 -0700
Subject: [PATCH] Only install glib DLL on MSVC
Subject: [PATCH 2/3] Only install glib DLL on MSVC
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
@ -192,7 +192,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 21 Oct 2014 18:54:03 -0700
Subject: [PATCH] pkgconfig: Explicitly depend on libstdc++
Subject: [PATCH 3/3] pkgconfig: Explicitly depend on libstdc++
Fixes MinGW static.

4
src/libarchive-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Tue, 14 Feb 2012 12:40:24 +0100
Subject: [PATCH] fix pkg-config
Subject: [PATCH 1/2] fix pkg-config
diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
@ -22,7 +22,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 13 Aug 2017 14:38:47 +1000
Subject: [PATCH] libarchive.pc.in: add Cflags.private for static linking
Subject: [PATCH 2/2] libarchive.pc.in: add Cflags.private for static linking
taken from:
https://github.com/libarchive/libarchive/pull/934

20
src/libbs2b-1-fixes.patch
Unescape View File

@ -1,6 +1,8 @@
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
@ -10,7 +12,7 @@ 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
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

27
src/libcaca-1-fixes.patch
Unescape View File

@ -1,6 +1,8 @@
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
@ -8,7 +10,7 @@ Subject: [PATCH 1/3] 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,11 +73,8 @@ 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
@ -83,7 +82,7 @@ Subject: [PATCH 2/3] 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,11 +105,8 @@ 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
@ -118,7 +114,7 @@ Subject: [PATCH 3/3] 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

8
src/libcddb-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Norbert Schlia <nschlia@oblivion-software.de>
Date: Mon, 12 Dec 2016 08:48:17 +0100
Subject: [PATCH] Newer versions winioctl.h contain a #define SEARCH_ALL ..
Subject: [PATCH 1/4] Newer versions winioctl.h contain a #define SEARCH_ALL ..
which collides with the enum in cddb_conn.h.
@ -28,7 +28,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Norbert Schlia <nschlia@oblivion-software.de>
Date: Mon, 12 Dec 2016 08:50:10 +0100
Subject: [PATCH] configure falsely detects an alarm() function available,
Subject: [PATCH 2/4] configure falsely detects an alarm() function available,
causing compile errors.
@ -49,7 +49,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Norbert Schlia <nschlia@oblivion-software.de>
Date: Mon, 12 Dec 2016 08:51:37 +0100
Subject: [PATCH] libccdb crashes in strlen() under windows because s =
Subject: [PATCH 3/4] libccdb crashes in strlen() under windows because s =
getenv("HOME"); returns NULL
@ -75,7 +75,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 16 Dec 2016 03:55:31 +0100
Subject: [PATCH] pc: add private libs -lgnurx -lregex -lws2_32
Subject: [PATCH 4/4] pc: add private libs -lgnurx -lregex -lws2_32
diff --git a/libcddb.pc.in b/libcddb.pc.in

12
src/libdnet-1-fixes.patch
Unescape View File

@ -1,5 +1,12 @@
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: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 20:58:20 +1100
Subject: [PATCH 1/1] fixes
Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch
@ -7,7 +14,7 @@ allows libdnet to use this ssize_t instead of defining its
own which causes build failure. Applies to libdnet 1.11.
diff --git a/include/dnet/os.h b/include/dnet/os.h
index c12c7b2..9e8bdd2 100644
index 1111111..2222222 100644
--- a/include/dnet/os.h
+++ b/include/dnet/os.h
@@ -23,8 +23,10 @@
@ -21,6 +28,3 @@ index c12c7b2..9e8bdd2 100644
#else
# include <sys/param.h>
# include <sys/types.h>
--
1.7.6

2
src/libepoxy-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 31 Jan 2017 02:03:55 +0100
Subject: [PATCH] fix EPOXY_IMPORTEXPORT for static targets
Subject: [PATCH 1/1] fix EPOXY_IMPORTEXPORT for static targets
Based on https://github.com/mxe/mxe/issues/1647#issuecomment-275967915

20
src/libevent-1-fixes.patch
Unescape 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
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
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

29
src/libgcrypt-1-fixes.patch
Unescape 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 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
@ -11,7 +11,7 @@ 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.
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,11 +151,8 @@ 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
@ -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

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

@ -5,12 +5,11 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Vivien Malerba <malerba@gnome-db.org>
Date: Sun, 22 Feb 2015 21:41:46 +0100
Subject: [PATCH] Misc. demos/ corrections
Subject: [PATCH 1/1] 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

2
src/libgeotiff-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ 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: Tue, 1 Aug 2017 10:20:44 +0200
Subject: [PATCH] Patch template definitions
Subject: [PATCH 1/1] Patch template definitions
diff --git a/configure.ac b/configure.ac

11
src/libglade-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

11
src/libgsf-1-fixes.patch
Unescape 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,
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

4
src/libical-1-fixes.patch
Unescape View File

@ -5,7 +5,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, 13 Apr 2016 20:54:43 +0300
Subject: [PATCH] fix definitions of gmtime/gmtime_r
Subject: [PATCH 1/2] fix definitions of gmtime/gmtime_r
Fix the following error:
config.h:508:37: error: expected initializer before '?' token
@ -43,7 +43,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 14 Apr 2016 01:33:47 +0300
Subject: [PATCH] test, examples: fix linking with static library
Subject: [PATCH 2/2] test, examples: fix linking with static library
Fix errors like the following:

60
src/libidn-1-fixes.patch
Unescape 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
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,11 +19,8 @@ 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
@ -29,7 +28,7 @@ Subject: [PATCH 2/4] 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,11 +345,8 @@ 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)
@ -358,7 +354,7 @@ Subject: [PATCH 3/4] 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,11 +366,8 @@ 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
@ -382,7 +375,7 @@ Subject: [PATCH 4/4] 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

11
src/libieee1284-1-fixes.patch
Unescape View File

@ -5,7 +5,8 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <daniel-gl@gmx.net>
Date: Sun, 3 Jan 2016 05:48:59 +0100
Subject: [PATCH] make configure determine if basetsd.h is needed for ssize_t
Subject: [PATCH 1/5] make configure determine if basetsd.h is needed for
ssize_t
The result is hardcoded in ieee1284.h.
Duplicate logic in detect.h is replaced by including that file.
@ -77,7 +78,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <daniel-gl@gmx.net>
Date: Sun, 20 Sep 2015 19:14:18 +0200
Subject: [PATCH] persuade libtool build a DLL on windows
Subject: [PATCH 2/5] persuade libtool build a DLL on windows
diff --git a/Makefile.am b/Makefile.am
@ -97,7 +98,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <daniel-gl@gmx.net>
Date: Sun, 20 Sep 2015 19:15:15 +0200
Subject: [PATCH] search for windows.h
Subject: [PATCH 3/5] search for windows.h
instead of relying on the __CYGWIN__ macro
@ -180,7 +181,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <daniel-gl@gmx.net>
Date: Sat, 19 Sep 2015 01:39:15 +0200
Subject: [PATCH] check Windows version before allowing IO access
Subject: [PATCH 4/5] check Windows version before allowing IO access
diff --git a/src/detect.c b/src/detect.c
@ -217,7 +218,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <daniel-gl@gmx.net>
Date: Mon, 4 Jan 2016 00:49:41 +0100
Subject: [PATCH] add pkg-config metadata file
Subject: [PATCH 5/5] add pkg-config metadata file
diff --git a/Makefile.am b/Makefile.am

14
src/libircclient-1-fixes.patch
Unescape 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
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
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

5
src/libjpeg-turbo-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

9
src/liblastfm-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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}

11
src/liblaxjson-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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)

11
src/libmicrohttpd-1-fixes.patch
Unescape 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
Subject: [PATCH 1/1] 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

10
src/libmms-1-fixes.patch
Unescape View File

@ -5,8 +5,9 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Lindgren <john.lindgren@aol.com>
Date: Thu, 29 May 2014 22:42:53 -0400
Subject: [PATCH] Remove "Requires: glib-2.0" since libmms no longer depends on
GLib.
Subject: [PATCH 1/3] Remove "Requires: glib-2.0" since libmms no longer
depends on GLib.
https://sourceforge.net/p/libmms/code/ci/b9bbe17c08e5dcbe3ce841e6bed52ce8d8b10f9e/
diff --git a/pkgconfig/libmms.pc.in b/pkgconfig/libmms.pc.in
@ -27,7 +28,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Lindgren <john.lindgren@tds.net>
Date: Thu, 19 Nov 2015 13:39:27 +0100
Subject: [PATCH] Fix build if strndup() is missing
Subject: [PATCH 2/3] Fix build if strndup() is missing
https://sourceforge.net/p/libmms/code/ci/67d54003b8075b8ea8102bc4a808df4543ab113a/
diff --git a/configure.in b/configure.in
@ -91,7 +93,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Sun, 5 Mar 2017 00:31:24 +0300
Subject: [PATCH] fix pc
Subject: [PATCH 3/3] fix pc
diff --git a/pkgconfig/libmms.pc.in b/pkgconfig/libmms.pc.in

25
src/libmysqlclient-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:34:47 +0100
Subject: [PATCH] use comp_err tool built in native build
Subject: [PATCH 01/11] use comp_err tool built in native build
See http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
@ -47,7 +47,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:53:33 +0100
Subject: [PATCH] fix extra qualification 'Handshake::'
Subject: [PATCH 02/11] fix extra qualification 'Handshake::'
Compilation error.
@ -68,7 +68,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 22:59:18 +0100
Subject: [PATCH] fix case in headers and libs (should be lowercase)
Subject: [PATCH 03/11] fix case in headers and libs (should be lowercase)
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
@ -127,7 +127,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:01:35 +0100
Subject: [PATCH] define missing types
Subject: [PATCH 04/11] define missing types
We do not use types CERT_NAME_BLOB and CRYPT_HASH_BLOB,
though they are used in mprapi.h. And are not defined!
@ -150,7 +150,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:04:23 +0100
Subject: [PATCH] macro NATIVE_WIN32 for stuff we don't have here
Subject: [PATCH 05/11] macro NATIVE_WIN32 for stuff we don't have here
Macro NATIVE_WIN32 is undefined in MXE. It is used instead of _WIN32
in #ifdef's where working variant is Unix and not Win32:
@ -261,7 +261,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 13:30:53 +1100
Subject: [PATCH] fix shared lib names
Subject: [PATCH 06/11] fix shared lib names
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@ -299,7 +299,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 19:36:35 +1100
Subject: [PATCH] allow install of mysql_config
Subject: [PATCH 07/11] allow install of mysql_config
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@ -319,7 +319,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 11 Nov 2015 07:44:44 +0000
Subject: [PATCH] add 'static' to some inline functions
Subject: [PATCH 08/11] add 'static' to some inline functions
Fix https://gist.github.com/starius/71d5f276d62e58f36d2f
See also http://stackoverflow.com/a/8502046
@ -350,7 +350,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 16 Dec 2015 17:39:28 +0100
Subject: [PATCH] fix CMake error if dir contains special regex char
Subject: [PATCH 09/11] fix CMake error if dir contains special regex char
See https://github.com/mxe/mxe/issues/1030
@ -374,8 +374,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 13 Nov 2015 10:22:12 -0500
Subject: [PATCH] For Windows, check if POSIX thread model or win32 thread
model is being used.
Subject: [PATCH 10/11] For Windows, check if POSIX thread model or win32
thread model is being used.
diff --git a/configure.cmake b/configure.cmake
@ -454,7 +454,8 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 8 Feb 2017 11:51:42 +1100
Subject: [PATCH] only define localtime_r and gmtime_r when pthreads isn't used
Subject: [PATCH 11/11] only define localtime_r and gmtime_r when pthreads
isn't used
diff --git a/include/my_global.h b/include/my_global.h

4
src/liboil-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Tue, 20 Jul 2010 14:05:26 -0700
Subject: [PATCH] x86: Fix cpuid function on x86-64
Subject: [PATCH 1/2] x86: Fix cpuid function on x86-64
Taken from:
http://cgit.freedesktop.org/liboil/commit/?id=705916007fba0a845229a02dc6474cb523eff150
@ -43,7 +43,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 9 Jan 2016 11:21:30 +1100
Subject: [PATCH] Win64 Support
Subject: [PATCH 2/2] Win64 Support
Taken from:
https://bugs.freedesktop.org/show_bug.cgi?id=26651

4
src/libotr-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 16 Mar 2017 04:09:42 +0100
Subject: [PATCH] fix out-of-tree build
Subject: [PATCH 1/2] fix out-of-tree build
Fix the error:
libotr-4.1.1/toolkit/otr_parse.c:26:19: fatal error: proto.h:
@ -25,7 +25,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 16 Mar 2017 06:09:50 +0100
Subject: [PATCH] .pc: add -fstack-protector-all and private libs
Subject: [PATCH 2/2] .pc: add -fstack-protector-all and private libs
The flags taken from the build log.

2
src/libqrencode-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 31 Oct 2017 16:56:24 +1100
Subject: [PATCH] install *.dll to bin
Subject: [PATCH 1/1] install *.dll to bin
taken from:
https://github.com/fukuchi/libqrencode/issues/112

37
src/librsvg-1-fixes.patch
Unescape 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
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,11 +21,8 @@ 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
@ -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 3/3] 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

2
src/libshout-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 30 Nov 2015 17:19:26 +0100
Subject: [PATCH] Fix: test arpa/inet.h presence before using it
Subject: [PATCH 1/1] Fix: test arpa/inet.h presence before using it
Fix: test arpa/inet.h presence before using it

2
src/libsoup-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pavel Vatagin <pavelvat@gmail.com>
Date: Sat, 18 Feb 2017 20:26:34 +0300
Subject: [PATCH] fix build
Subject: [PATCH 1/1] fix build
diff --git a/Makefile.am b/Makefile.am

3
src/libspatialindex-1-fixes.patch
Unescape 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 1/1] Remove explicit header check - mingw does not ship with
this header.
diff --git a/configure.ac b/configure.ac

4
src/libspectre-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Thu, 21 Jul 2016 12:00:00 +0200
Subject: [PATCH] add PKG_CHECK_MODULES macro to configure.ac
Subject: [PATCH 1/2] add PKG_CHECK_MODULES macro to configure.ac
diff --git a/configure.ac b/configure.ac
@ -32,7 +32,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Thu, 21 Jul 2016 12:00:00 +0200
Subject: [PATCH] enable out-of-tree builds
Subject: [PATCH 2/2] enable out-of-tree builds
diff --git a/libspectre/Makefile.am b/libspectre/Makefile.am

4
src/libssh-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 29 Oct 2017 00:11:28 +1100
Subject: [PATCH] add option to disable shared libs
Subject: [PATCH 1/2] add option to disable shared libs
Taken from:
https://www.libssh.org/archive/libssh/2017-10/0000012.html
@ -66,7 +66,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 29 Oct 2017 00:45:55 +1100
Subject: [PATCH] add indentation for shared lib hunks
Subject: [PATCH 2/2] add indentation for shared lib hunks
Taken from:
https://www.libssh.org/archive/libssh/2017-10/0000012.html

18
src/libssh2-1-fixes.patch
Unescape View File

@ -1,4 +1,8 @@
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
@ -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
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

2
src/libtorrent-rasterbar-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 30 May 2016 00:10:30 +0200
Subject: [PATCH] disable BOOST_ASIO_SEPARATE_COMPILATION
Subject: [PATCH 1/1] disable BOOST_ASIO_SEPARATE_COMPILATION
After upgrading libtorrent-rasterbar to 1.1.0, qbittorrent fails to link
main executable with undefined symbols in boost_asio:

22
src/libvpx-1-fixes.patch
Unescape 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
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,11 +23,8 @@ 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
@ -38,7 +32,7 @@ Subject: [PATCH 2/2] 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

8
src/libwebp-1-fixes.patch
Unescape View File

@ -2,8 +2,14 @@ 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: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 21:36:24 +1100
Subject: [PATCH 1/1] fixes
diff --git a/src/dec/webp.c b/src/dec/webp.c
index 59e21a9..074f04c 100644
index 1111111..2222222 100644
--- a/src/dec/webp.c
+++ b/src/dec/webp.c
@@ -451,7 +451,7 @@ void WebPResetDecParams(WebPDecParams* const params) {

29
src/libwebsockets-1-fixes.patch
Unescape View File

@ -1,17 +1,19 @@
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
Subject: [PATCH 1/1] 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

15
src/libxml2-1-fixes.patch
Unescape View File

@ -1,13 +1,15 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 91a883b212d0ea5f1d36618362baeca2f35abb29 Mon Sep 17 00:00:00 2001
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 16 Jun 2012 19:44:21 +0200
Subject: [PATCH] .pc requires.private liblzma
Date: Sat, 18 Nov 2017 22:36:56 +1100
Subject: [PATCH 1/1] .pc requires.private liblzma
diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
index f5f5f03..21b14d1 100644
index 1111111..2222222 100644
--- a/libxml-2.0.pc.in
+++ b/libxml-2.0.pc.in
@@ -8,6 +8,7 @@ Name: libXML
@ -16,8 +18,5 @@ index f5f5f03..21b14d1 100644
Requires:
+Requires.private: liblzma
Libs: -L${libdir} -lxml2
Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
--
1.7.10.4

13
src/libxslt-1-fixes.patch
Unescape 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
Subject: [PATCH] fix for deprecated mkdir
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 1/1] 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

16
src/libzip-1-fixes.patch
Unescape 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
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
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

2
src/lua-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 4 Jan 2016 01:00:02 +0300
Subject: [PATCH] disable readline on linux, macosx and freebsd
Subject: [PATCH 1/1] disable readline on linux, macosx and freebsd
diff --git a/src/Makefile b/src/Makefile

15
src/luajit-1-fixes.patch
Unescape View File

@ -2,20 +2,20 @@ 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
Subject: [PATCH 1/1] detect if host cc accepts -malign-double
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)

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save