various packages: refresh patches

brings patches into common format to reduce noise in diffs

4 files changed, 10 insertions, 23 deletions

diff --git a/plugins/apps/clementine-1-fixes.patch b/plugins/apps/clementine-1-fixes.patch
index 77f6f58..58560c2 100644
--- a/plugins/apps/clementine-1-fixes.patch
+++ b/plugins/apps/clementine-1-fixes.patch
@@ -140,7 +140,6 @@ Original patch by Arfrever
 This fixes https://github.com/clementine-player/Clementine/issues/5297
 https://github.com/clementine-player/Clementine/pull/5669
 
-
 diff --git a/src/core/database.cpp b/src/core/database.cpp
 index 1111111..2222222 100644
 --- a/src/core/database.cpp
@@ -176,7 +175,6 @@ It looks like there is a problem with build of src/ui/appearancesettingspage.cpp
 It might fix it.
 https://github.com/clementine-player/Clementine/pull/5784
 
-
 diff --git a/src/ui/appearancesettingspage.cpp b/src/ui/appearancesettingspage.cpp
 index 1111111..2222222 100644
 --- a/src/ui/appearancesettingspage.cpp
diff --git a/plugins/apps/clementine_qt4-1-fixes.patch b/plugins/apps/clementine_qt4-1-fixes.patch
index 1039896..99e9216 100644
--- a/plugins/apps/clementine_qt4-1-fixes.patch
+++ b/plugins/apps/clementine_qt4-1-fixes.patch
@@ -86,14 +86,13 @@ Original patch by Arfrever
 This fixes https://github.com/clementine-player/Clementine/issues/5297
 https://github.com/clementine-player/Clementine/pull/5669
 
-
 diff --git a/src/core/database.cpp b/src/core/database.cpp
 index 1111111..2222222 100644
 --- a/src/core/database.cpp
 +++ b/src/core/database.cpp
 @@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() {
    StaticInit();
-
+ 
    {
 +
 +#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
diff --git a/plugins/luarocks/lua-rapidjson-1-fixes.patch b/plugins/luarocks/lua-rapidjson-1-fixes.patch
index b509c2f..a946d27 100644
--- a/plugins/luarocks/lua-rapidjson-1-fixes.patch
+++ b/plugins/luarocks/lua-rapidjson-1-fixes.patch
@@ -1,16 +1,15 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-From dbedfa6c3b350b6cb2c13d17790a17129ce28721 Mon Sep 17 00:00:00 2001
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 11 Oct 2015 22:47:50 +0200
-Subject: [PATCH 1/2] use Unix file functions on MinGW
+Subject: [PATCH] use Unix file functions on MinGW
 
----
- src/rapidjson.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/rapidjson.cpp b/src/rapidjson.cpp
-index 3b5b129..955009f 100644
+index 1111111..2222222 100644
 --- a/src/rapidjson.cpp
 +++ b/src/rapidjson.cpp
 @@ -54,7 +54,7 @@ static void setfuncs(lua_State* L, const luaL_Reg *funcs)
@@ -31,21 +30,15 @@ index 3b5b129..955009f 100644
  	fopen_s(&fp, filename, "wb");
  #else
  	fp = fopen(filename, "w");
--- 
-1.7.10.4
-
 
-From ad7426ad156f90dcf2b051fe125900caf5b8b2da Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 11 Oct 2015 22:48:26 +0200
-Subject: [PATCH 2/2] link with Lua libraries on MinGW and MXE
+Subject: [PATCH] link with Lua libraries on MinGW and MXE
 
----
- rapidjson-0.2.2-1.rockspec |   15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/rapidjson-0.2.2-1.rockspec b/rapidjson-0.2.2-1.rockspec
-index 9efe7e1..6ad9188 100644
+index 1111111..2222222 100644
 --- a/rapidjson-0.2.2-1.rockspec
 +++ b/rapidjson-0.2.2-1.rockspec
 @@ -27,6 +27,13 @@ dependencies = {
@@ -76,6 +69,3 @@ index 9efe7e1..6ad9188 100644
 +    mxe = link,
    }
  }
--- 
-1.7.10.4
-
diff --git a/plugins/luarocks/luarocks-1-fixes.patch b/plugins/luarocks/luarocks-1-fixes.patch
index 1d6d28f..a345f1b 100644
--- a/plugins/luarocks/luarocks-1-fixes.patch
+++ b/plugins/luarocks/luarocks-1-fixes.patch
@@ -25,7 +25,7 @@ diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
 index 1111111..2222222 100644
 --- a/src/luarocks/cfg.lua
 +++ b/src/luarocks/cfg.lua
-@@ -137,6 +140,7 @@ local platform_order = {
+@@ -137,6 +137,7 @@ local platform_order = {
     linux = 7,
     macosx = 8,
     cygwin = 9,