various packages: run `make refresh-patches` with numbering

patch.mk

@@ -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 \

plugins/apps/clementine-1-fixes.patch

@@ -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,7 +134,7 @@ 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
@@ -169,7 +169,7 @@ 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.
@@ -192,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

plugins/apps/clementine_qt4-1-fixes.patch

@@ -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,7 +80,7 @@ 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

plugins/apps/qbittorrent-1-fixes.patch

@@ -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:

plugins/apps/wrk-1-fixes.patch

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

plugins/go/go-native-1-fixes.patch

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

plugins/luarocks/lua-rapidjson-1-fixes.patch

@@ -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, 11 Oct 2015 22:47:50 +0200
-Subject: [PATCH] use Unix file functions on MinGW
+Subject: [PATCH 1/2] use Unix file functions on MinGW
 
 
 diff --git a/src/rapidjson.cpp b/src/rapidjson.cpp
@@ -34,7 +34,7 @@ index 1111111..2222222 100644
 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] link with Lua libraries on MinGW and MXE
+Subject: [PATCH 2/2] link with Lua libraries on MinGW and MXE
 
 
 diff --git a/rapidjson-0.2.2-1.rockspec b/rapidjson-0.2.2-1.rockspec

plugins/luarocks/luarocks-1-fixes.patch

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

plugins/luarocks/luv-1-fixes.patch

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

src/agg-1-fixes.patch

@@ -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: Tue, 12 Jun 2012 17:05:49 +0200
-Subject: [PATCH] automake 1.12 compatibility fix
+Subject: [PATCH 1/1] automake 1.12 compatibility fix
 
 
 diff --git a/configure.in b/configure.in

src/aspell-1-fixes.patch

@@ -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.
 

src/aubio-1-fixes.patch

@@ -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] disable tests and examples
+Subject: [PATCH 7/7] disable tests and examples
 
 
 diff --git a/wscript b/wscript

src/binutils-1-fixes.patch

@@ -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/

src/boost-1-fixes.patch

@@ -5,7 +5,7 @@ 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
 

src/bzip2-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 20:31:24 +1100
-Subject: [PATCH] fixes
+Subject: [PATCH 1/1] fixes
 
 
 diff --git a/bzip2.c b/bzip2.c

src/cegui-1-fixes.patch

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

src/cgal-1-fixes.patch

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

src/cmake-1-fixes.patch

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

src/coin-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 20:43:52 +1100
-Subject: [PATCH] fixes
+Subject: [PATCH 1/2] fixes
 
 This patch has been taken from: https://bitbucket.org/msys2/coin/commits/69e9990b05cee506f5fa16c6edad02a7808bc610/raw/
 
@@ -4021,7 +4021,7 @@ index 1111111..2222222
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Sat, 18 Nov 2017 20:45:31 +1100
-Subject: [PATCH] gcc 4.7 fixes
+Subject: [PATCH 2/2] gcc 4.7 fixes
 
 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

src/cpp-netlib-1-fixes.patch

@@ -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: 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

src/cryptopp-1-fixes.patch

@@ -5,8 +5,8 @@ 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:50:55 +1100
-Subject: [PATCH] Fix broken Makefile, add relevant object files and don't use
+Subject: [PATCH 1/1] Fix broken Makefile, add relevant object files and don't
- -DCRYPTOPP_EXPORTS
+ use -DCRYPTOPP_EXPORTS
 
 
 diff --git a/GNUmakefile b/GNUmakefile

src/dbus-1-fixes.patch

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

src/dcmtk-1-fixes.patch

@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 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)

src/devil-1-fixes.patch

@@ -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,7 +55,7 @@ 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

src/djvulibre-1-fixes.patch

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

src/file-1-fixes.patch

@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Christos Zoulas <christos@zoulas.com>
 Date: Sat, 18 Nov 2017 22:17:57 +1100
-Subject: [PATCH] PR/466: Windows fixes.
+Subject: [PATCH 1/1] PR/466: Windows fixes.
 
 From https://github.com/file/file/commit/d5f2c28536f1645e3da25fa3f8da5a0a45404dc4.
 

src/flann-1-fixes.patch

@@ -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, 10 Aug 2014 19:35:55 -0700
-Subject: [PATCH] Disable targets
+Subject: [PATCH 1/3] Disable targets
 
 Disable examples, test, and documentation in the CMakeLists.txt file.
 (The file unfortunately does not provide switches for this purpose.)
@@ -33,7 +33,7 @@ index 1111111..2222222 100644
 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] Fix gcc compile flags
+Subject: [PATCH 2/3] Fix gcc compile flags
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 
@@ -61,7 +61,8 @@ index 1111111..2222222 100644
 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] Use BUILD_SHARED_LIBS to control which kind of libs to build
+Subject: [PATCH 3/3] Use BUILD_SHARED_LIBS to control which kind of libs to
+ build
 
 Also removes the Linux-only --whole-archive trick, and CUDA libs.
 

src/fontconfig-1-fixes.patch

@@ -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, 5 Jul 2016 21:56:34 +0300
-Subject: [PATCH] fix mktemp_s
+Subject: [PATCH 1/1] fix mktemp_s
 
 
 diff --git a/configure.ac b/configure.ac

src/freeglut-1-fixes.patch

@@ -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.

src/freeimage-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 22:27:54 +1100
-Subject: [PATCH] include string.h for memset
+Subject: [PATCH 1/4] include string.h for memset
 
 taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504
 
@@ -28,7 +28,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Sat, 18 Nov 2017 22:28:39 +1100
-Subject: [PATCH] mingw-w64 fixes
+Subject: [PATCH 2/4] mingw-w64 fixes
 
 
 diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: fiesh <weiss@wsoptics.de>
 Date: Sat, 18 Nov 2017 22:29:10 +1100
-Subject: [PATCH] fix freeimage build
+Subject: [PATCH 3/4] fix freeimage build
 
 Add the FREEIMAGE_LIB define in order to keep the build process from
 defining dllspec specifications. Remove -fPIC to fix a warning.
@@ -79,7 +79,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Pek <tehnick-8@mail.ru>
 Date: Sat, 18 Nov 2017 22:29:57 +1100
-Subject: [PATCH] fix build with GCC >= 6.x
+Subject: [PATCH 4/4] fix build with GCC >= 6.x
 
 
 diff --git a/Makefile.mingw b/Makefile.mingw

src/freexl-1-fixes.patch

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

src/fribidi-1-fixes.patch

@@ -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: 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

src/gcc-1-fixes.patch

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

src/gdal-1-fixes.patch

@@ -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.
 
@@ -74,7 +74,7 @@ index 1111111..2222222 100644
 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

src/gdk-pixbuf-1-fixes.patch

@@ -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: Fri, 24 Sep 2010 23:31:24 +0200
-Subject: [PATCH] s,DllMain,static _disabled_DllMain,
+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
@@ -31,7 +31,7 @@ index 1111111..2222222 100644
 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] add libtiff to required.private in .pc
+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
@@ -51,7 +51,7 @@ index 1111111..2222222 100644
 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] allow static
+Subject: [PATCH 3/3] allow static
 
 
 diff --git a/configure.ac b/configure.ac

src/geos-1-fixes.patch

@@ -5,8 +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: Mon, 7 Aug 2017 15:24:32 +0200
-Subject: [PATCH] Always link as static (based on the previous patch by Timothy
+Subject: [PATCH 1/1] Always link as static (based on the previous patch by
- Gu)
+ Timothy Gu)
 
 
 diff --git a/tools/geos-config.in b/tools/geos-config.in

src/ghostscript-1-fixes.patch

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

src/glib-1-fixes.patch

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

src/gnutls-1-fixes.patch

@@ -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,7 +73,7 @@ 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

src/gsoap-1-fixes.patch

@@ -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
+Subject: [PATCH 3/3] workaround for building on newer OSX, can be removed in
- update.
+ next update.
 
 similar to https://github.com/unbit/uwsgi/pull/966
 

src/gst-plugins-bad-1-fixes.patch

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

src/gtk2-1-fixes.patch

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

src/gtk3-1-fixes.patch

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

src/gtkglarea-1-fixes.patch

@@ -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, 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

src/gtkglext-1-fixes.patch

@@ -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, 1 Oct 2010 14:43:15 +0200
-Subject: [PATCH] remove pangox dependency
+Subject: [PATCH 1/4] remove pangox dependency
 
 
 diff --git a/configure.in b/configure.in
@@ -33,7 +33,7 @@ index 1111111..2222222 100644
 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] use correct glib mkenums patch
+Subject: [PATCH 2/4] use correct glib mkenums patch
 
 This patch has been taken from:
 https://bugzilla.gnome.org/show_bug.cgi?id=618599
@@ -86,7 +86,7 @@ index 1111111..2222222 100644
 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] don't use deprecated functions
+Subject: [PATCH 3/4] don't use deprecated functions
 
 This patch has been taken from:
 https://bugzilla.gnome.org/show_bug.cgi?id=618601
@@ -173,7 +173,7 @@ index 1111111..2222222 100644
 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] removed import declarations
+Subject: [PATCH 4/4] removed import declarations
 
 
 diff --git a/gdk/gdkgldefs.h b/gdk/gdkgldefs.h

src/gtkglextmm-1-fixes.patch

@@ -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: 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 --git a/gdkglext/gdkmm/gl/Makefile.in b/gdkglext/gdkmm/gl/Makefile.in

src/guile-1-fixes.patch

@@ -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, 10 Oct 2014 15:10:32 +1100
-Subject: [PATCH] original patch fixes
+Subject: [PATCH 1/2] original patch fixes
 
 
 diff --git a/guile-readline/configure b/guile-readline/configure
@@ -38,7 +38,7 @@ index 1111111..2222222 100644
 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] fix mingw-w64 build
+Subject: [PATCH 2/2] fix mingw-w64 build
 
 
 diff --git a/libguile/posix.c b/libguile/posix.c

src/harfbuzz-1-fixes.patch

@@ -5,7 +5,7 @@ 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

src/hdf-eos2-1-fixes.patch

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

src/hdf-eos5-1-fixes.patch

@@ -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.

src/hyperscan-1-fixes.patch

@@ -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, 25 Aug 2016 10:28:30 +0200
-Subject: [PATCH] update preprocessor conditions
+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

src/icu4c-1-fixes.patch

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

src/itk-1-fixes.patch

@@ -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.
 

src/itpp-1-fixes.patch

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

src/jack-1-fixes.patch

@@ -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],
 

src/jpeg-1-fixes.patch

@@ -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: 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

src/lcms-1-fixes.patch

@@ -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, 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
 
 
 diff --git a/lcms2.pc.in b/lcms2.pc.in

src/lcms1-1-fixes.patch

@@ -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, 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

src/lensfun-1-fixes.patch

@@ -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.
 

src/libarchive-1-fixes.patch

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

src/libbs2b-1-fixes.patch

@@ -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: Sun, 31 Aug 2014 13:57:14 -0700
-Subject: [PATCH] build: Modernize
+Subject: [PATCH 1/2] build: Modernize
 
 dist-lzma was removed in automake 1.11.2.
 
@@ -35,7 +35,7 @@ index 1111111..2222222 100644
 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] Make libsndfile optional
+Subject: [PATCH 2/2] Make libsndfile optional
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 

src/libcaca-1-fixes.patch

@@ -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: Sat, 2 Aug 2014 15:12:50 -0700
-Subject: [PATCH] Fix Windows build for ncurses and slang
+Subject: [PATCH 1/3] Fix Windows build for ncurses and slang
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 
@@ -77,7 +77,7 @@ index 1111111..2222222 100644
 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] Fix pkg-config file and caca-config script
+Subject: [PATCH 2/3] Fix pkg-config file and caca-config script
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 
@@ -109,7 +109,7 @@ index 1111111..2222222 100644
 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] Fix freeglut detection on Windows
+Subject: [PATCH 3/3] Fix freeglut detection on Windows
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 

src/libcddb-1-fixes.patch

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

src/libdnet-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 20:58:20 +1100
-Subject: [PATCH] fixes
+Subject: [PATCH 1/1] fixes
 
 Patch taken from http://sourceforge.net/mailarchive/message.php?msg_id=27995461
 

src/libepoxy-1-fixes.patch

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

src/libevent-1-fixes.patch

@@ -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: Thu, 25 Apr 2013 18:17:52 +1000
-Subject: [PATCH] fix obsolete AM_CONFIG_HEADER
+Subject: [PATCH 1/2] fix obsolete AM_CONFIG_HEADER
 
 
 diff --git a/configure.in b/configure.in
@@ -25,7 +25,7 @@ index 1111111..2222222 100644
 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] remove broken test specification
+Subject: [PATCH 2/2] remove broken test specification
 
 
 diff --git a/test/Makefile.am b/test/Makefile.am

src/libgcrypt-1-fixes.patch

@@ -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, 4 Dec 2014 15:07:43 +1100
-Subject: [PATCH] fix for mingw cross building
+Subject: [PATCH 1/3] fix for mingw cross building
 
 Taken from:
 https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
@@ -128,7 +128,7 @@ index 1111111..2222222 100644
 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] Don't call git to determine the revision.
+Subject: [PATCH 2/3] Don't call git to determine the revision.
 
 
 diff --git a/configure.ac b/configure.ac
@@ -155,7 +155,7 @@ index 1111111..2222222 100644
 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] configure.ac: no serial-tests if automake < 1.12
+Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
 
 Earlier versions of automake complain if they get a configuration
 parameter which they don't understand.  The error is:

src/libgda-1-fixes.patch

@@ -5,7 +5,7 @@ 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.

src/libgeotiff-1-fixes.patch

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

src/libglade-1-fixes.patch

@@ -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, 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
 
 

src/libgsf-1-fixes.patch

@@ -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 23:34:26 +0200
-Subject: [PATCH] s,DllMain,static _disabled_DllMain,
+Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
 
 
 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c

src/libical-1-fixes.patch

@@ -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:
 

src/libidn-1-fixes.patch

@@ -5,7 +5,7 @@ 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] fix Libs.private
+Subject: [PATCH 1/4] fix Libs.private
 
 
 diff --git a/libidn.pc.in b/libidn.pc.in
@@ -23,7 +23,7 @@ index 1111111..2222222 100644
 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] Update intprops.h for gcc-7 compatibility
+Subject: [PATCH 2/4] Update intprops.h for gcc-7 compatibility
 
 (cherry picked from commit 230930b3bc3e431b819eb45420cb42475d83ca93)
 
@@ -349,7 +349,7 @@ index 1111111..2222222 100644
 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] Increase value for -Wframe-larger-than (gcc-7)
+Subject: [PATCH 3/4] Increase value for -Wframe-larger-than (gcc-7)
 
 (cherry picked from commit a6fcdb4f953e40ea162a9104cac034bce01706af)
 
@@ -370,7 +370,7 @@ index 1111111..2222222 100644
 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] Fix -Wformat warnings
+Subject: [PATCH 4/4] Fix -Wformat warnings
 
 (cherry picked from commit 7148adf34dae30345c2e4d9d437838a45ba6f6e8)
 

src/libieee1284-1-fixes.patch

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

src/libircclient-1-fixes.patch

@@ -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: Tue, 8 Oct 2013 22:37:07 +0200
-Subject: [PATCH] use the proper WIN32 define
+Subject: [PATCH 1/2] use the proper WIN32 define
 
 
 diff --git a/include/libircclient.h b/include/libircclient.h
@@ -25,7 +25,7 @@ index 1111111..2222222 100644
 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] fix missing header
+Subject: [PATCH 2/2] fix missing header
 
 
 diff --git a/include/libircclient.h b/include/libircclient.h

src/libjpeg-turbo-1-fixes.patch

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

src/liblastfm-1-fixes.patch

@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 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
 
 

src/liblaxjson-1-fixes.patch

@@ -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: 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

src/libmicrohttpd-1-fixes.patch

@@ -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, 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

src/libmms-1-fixes.patch

@@ -5,8 +5,8 @@ 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
+Subject: [PATCH 1/3] Remove "Requires: glib-2.0" since libmms no longer
- GLib.
+ depends on GLib.
 
 https://sourceforge.net/p/libmms/code/ci/b9bbe17c08e5dcbe3ce841e6bed52ce8d8b10f9e/
 
@@ -28,7 +28,7 @@ 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/
 
@@ -93,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

src/libmysqlclient-1-fixes.patch

@@ -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
+Subject: [PATCH 10/11] For Windows, check if POSIX thread model or win32
- model is being used.
+ 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

src/liboil-1-fixes.patch

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

src/libotr-1-fixes.patch

@@ -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.
 

src/libqrencode-1-fixes.patch

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

src/librsvg-1-fixes.patch

@@ -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: Mon, 27 Sep 2010 12:00:52 +0200
-Subject: [PATCH] fix .pc requirements
+Subject: [PATCH 1/3] fix .pc requirements
 
 
 diff --git a/librsvg.pc.in b/librsvg.pc.in
@@ -25,7 +25,7 @@ index 1111111..2222222 100644
 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] rsvg-base.c: Have realpath() Work On Windows
+Subject: [PATCH 2/3] rsvg-base.c: Have realpath() Work On Windows
 
 Use _fullpath() on Windows to do the job for realpath() as realpath() does
 not exist on Windows.
@@ -60,7 +60,7 @@ index 1111111..2222222 100644
 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] Disable checking gio-unix-2.0 and disable rsvg_convert
+Subject: [PATCH 3/3] Disable checking gio-unix-2.0 and disable rsvg_convert
  program
 
 rsvg_convert uses Unix features.

src/libshout-1-fixes.patch

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

src/libsoup-1-fixes.patch

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

src/libspatialindex-1-fixes.patch

@@ -5,8 +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
+Subject: [PATCH 1/1] Remove explicit header check - mingw does not ship with
- header.
+ this header.
 
 
 diff --git a/configure.ac b/configure.ac

src/libspectre-1-fixes.patch

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

src/libssh-1-fixes.patch

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

src/libssh2-1-fixes.patch

@@ -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, 2 Sep 2012 00:55:28 +0200
-Subject: [PATCH] include gpg-error with gcrypt for static linking
+Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
  (mxe-specific)
 
 Git rid of the extra -lgcrypt here since we have to pass the
@@ -28,7 +28,7 @@ index 1111111..2222222 100644
 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] fix yes/no in lib path
+Subject: [PATCH 2/2] fix yes/no in lib path
 
 
 diff --git a/acinclude.m4 b/acinclude.m4

src/libtorrent-rasterbar-1-fixes.patch

@@ -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:

src/libvpx-1-fixes.patch

@@ -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, 5 Sep 2013 14:25:31 -0700
-Subject: [PATCH] Linking as test is not good for cross compiling
+Subject: [PATCH 1/2] Linking as test is not good for cross compiling
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 
@@ -27,7 +27,7 @@ index 1111111..2222222 100755
 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] Fix /bin/bash
+Subject: [PATCH 2/2] Fix /bin/bash
 
 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 

src/libwebp-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 21:36:24 +1100
-Subject: [PATCH] fixes
+Subject: [PATCH 1/1] fixes
 
 
 diff --git a/src/dec/webp.c b/src/dec/webp.c

src/libwebsockets-1-fixes.patch

@@ -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: 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>
 

src/libxml2-1-fixes.patch

@@ -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: Sat, 18 Nov 2017 22:36:56 +1100
-Subject: [PATCH] .pc requires.private liblzma
+Subject: [PATCH 1/1] .pc requires.private liblzma
 
 
 diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in

src/libxslt-1-fixes.patch

@@ -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, 5 Jul 2016 21:12:38 +0300
-Subject: [PATCH] fix for deprecated mkdir
+Subject: [PATCH 1/1] fix for deprecated mkdir
 
 
 diff --git a/libxslt/security.c b/libxslt/security.c

src/libzip-1-fixes.patch

@@ -5,7 +5,7 @@ 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] static build fixes
+Subject: [PATCH 1/2] static build fixes
 
 
 diff --git a/lib/zip.h b/lib/zip.h
@@ -28,7 +28,7 @@ index 1111111..2222222 100644
 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] pkgconfig private
+Subject: [PATCH 2/2] pkgconfig private
 
 
 diff --git a/libzip.pc.in b/libzip.pc.in

src/lua-1-fixes.patch

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

src/luajit-1-fixes.patch

@@ -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: 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: