summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-11-18 13:44:43 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-11-19 00:29:22 (GMT)
commit1b1b9c9a9a15737e83cfc0aee65e21d8385ef832 (patch)
treefbf43c3a8ef9c8072c2eedd4d5f68e3af30d656b /plugins
parent99b8d3306133b4e18e57a9fa1cd30c7b09f93046 (diff)
downloadmxe-1b1b9c9a9a15737e83cfc0aee65e21d8385ef832.zip
mxe-1b1b9c9a9a15737e83cfc0aee65e21d8385ef832.tar.gz
mxe-1b1b9c9a9a15737e83cfc0aee65e21d8385ef832.tar.bz2
various packages: run `make refresh-patches` with numbering
Diffstat (limited to 'plugins')
-rw-r--r--plugins/apps/clementine-1-fixes.patch8
-rw-r--r--plugins/apps/clementine_qt4-1-fixes.patch4
-rw-r--r--plugins/apps/qbittorrent-1-fixes.patch6
-rw-r--r--plugins/apps/wrk-1-fixes.patch16
-rw-r--r--plugins/go/go-native-1-fixes.patch2
-rw-r--r--plugins/luarocks/lua-rapidjson-1-fixes.patch4
-rw-r--r--plugins/luarocks/luarocks-1-fixes.patch2
-rw-r--r--plugins/luarocks/luv-1-fixes.patch4
8 files changed, 23 insertions, 23 deletions
diff --git a/plugins/apps/clementine-1-fixes.patch b/plugins/apps/clementine-1-fixes.patch
index 58560c2..3301237 100644
--- a/plugins/apps/clementine-1-fixes.patch
+++ b/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
diff --git a/plugins/apps/clementine_qt4-1-fixes.patch b/plugins/apps/clementine_qt4-1-fixes.patch
index 99e9216..048397c 100644
--- a/plugins/apps/clementine_qt4-1-fixes.patch
+++ b/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
diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch
index 422ac79..a3046cb 100644
--- a/plugins/apps/qbittorrent-1-fixes.patch
+++ b/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:
diff --git a/plugins/apps/wrk-1-fixes.patch b/plugins/apps/wrk-1-fixes.patch
index 7e6134f..6541083 100644
--- a/plugins/apps/wrk-1-fixes.patch
+++ b/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
diff --git a/plugins/go/go-native-1-fixes.patch b/plugins/go/go-native-1-fixes.patch
index 5421bcf..a957e2b 100644
--- a/plugins/go/go-native-1-fixes.patch
+++ b/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
diff --git a/plugins/luarocks/lua-rapidjson-1-fixes.patch b/plugins/luarocks/lua-rapidjson-1-fixes.patch
index a946d27..c1407ce 100644
--- a/plugins/luarocks/lua-rapidjson-1-fixes.patch
+++ b/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
diff --git a/plugins/luarocks/luarocks-1-fixes.patch b/plugins/luarocks/luarocks-1-fixes.patch
index a345f1b..668c9df 100644
--- a/plugins/luarocks/luarocks-1-fixes.patch
+++ b/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
diff --git a/plugins/luarocks/luv-1-fixes.patch b/plugins/luarocks/luv-1-fixes.patch
index cf46fa2..20dd763 100644
--- a/plugins/luarocks/luv-1-fixes.patch
+++ b/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