Fixed patch failing

6 files changed, 217 insertions, 183 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b81802715939..7c07ab2131bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = path-of-building-community-git
 	pkgdesc = An offline build planner for Path of Exile using PoBFrontend, LocalIdentity's fork
-	pkgver = 2.1.0.r4249.59.514
+	pkgver = 2.4.0.r4597.59.517
 	pkgrel = 1
 	url = https://github.com/PathOfBuildingCommunity/PathOfBuilding
 	arch = x86_64
@@ -26,7 +26,8 @@ pkgbase = path-of-building-community-git
 	source = PathOfBuilding.sh
 	source = lzip-linux.patch
 	source = PathOfBuilding-force-disable-devmode.patch
-	source = PathOfBuilding-lua51.patch
+	source = PathOfBuilding-lua51-bit.patch
+	source = PathOfBuilding-lua51-bom.patch
 	source = PathOfBuilding-logo.svg
 	source = PathOfBuilding-logo.png
 	source = PathOfBuildingCommunity.desktop
@@ -37,10 +38,10 @@ pkgbase = path-of-building-community-git
 	sha256sums = db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11
 	sha256sums = 9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd
 	sha256sums = cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935
-	sha256sums = d108da236c224524ed6941c091428bac0733cd36398bf89af6054f703d9b71ae
+	sha256sums = 5b98c9c8fc28def0c068958d1b61e3d1dd7fb21844bdb4c8fddedf91eb193896
+	sha256sums = 48488682fb33acd513eebc8933435749f7626df87ced4bdf89ee803de83a317d
 	sha256sums = 2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194
 	sha256sums = a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc
 	sha256sums = 079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64
 
 pkgname = path-of-building-community-git
-
diff --git a/.gitignore b/.gitignore
index f4e048bb752d..0d89a326da3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,8 @@
 !PathOfBuilding-force-disable-devmode.patch
 !PathOfBuilding-logo.png
 !PathOfBuilding-logo.svg
-!PathOfBuilding-lua51.patch
+!PathOfBuilding-lua51-bit.patch
+!PathOfBuilding-lua51-bom.patch
 !PathOfBuilding.sh
 !PathOfBuildingCommunity.desktop
 !lzip-linux.patch
diff --git a/PKGBUILD b/PKGBUILD
index 9b758d14c2d3..0072855ccf79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="An offline build planner for Path of Exile using PoBFrontend, LocalIden
 arch=('x86_64')
 url='https://github.com/PathOfBuildingCommunity/PathOfBuilding'
 license=('MIT')
-pkgver=2.1.0.r4249.59.514
+pkgver=2.4.0.r4597.59.517
 
 depends=('zlib' 'qt5-base' 'lua51' 'lua51-bitop' 'libgl' 'curl' 'ttf-liberation' 'ttf-bitstream-vera')
 makedepends=('meson' 'ninja' 'unzip' 'rsync' 'git')
@@ -19,7 +19,8 @@ source=(
 	'PathOfBuilding.sh'
 	'lzip-linux.patch'
 	'PathOfBuilding-force-disable-devmode.patch'
-	'PathOfBuilding-lua51.patch'
+	'PathOfBuilding-lua51-bit.patch'
+	'PathOfBuilding-lua51-bom.patch'
 	'PathOfBuilding-logo.svg'
 	'PathOfBuilding-logo.png'
 	'PathOfBuildingCommunity.desktop'
@@ -32,7 +33,8 @@ sha256sums=(
 	'db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11'
 	'9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd'
 	'cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935'
-	'd108da236c224524ed6941c091428bac0733cd36398bf89af6054f703d9b71ae'
+    '5b98c9c8fc28def0c068958d1b61e3d1dd7fb21844bdb4c8fddedf91eb193896'
+	'48488682fb33acd513eebc8933435749f7626df87ced4bdf89ee803de83a317d'
 	'2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194'
 	'a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc'
 	'079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64'
@@ -52,7 +54,8 @@ prepare() {
 	# disable devmode
 	(cd "${srcdir}/PathOfBuilding" \
 		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-force-disable-devmode.patch" \
-		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-lua51.patch" \
+		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-lua51-bit.patch" \
+		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-lua51-bom.patch" \
 	)
 }
 
diff --git a/PathOfBuilding-lua51-bit.patch b/PathOfBuilding-lua51-bit.patch
new file mode 100644
index 000000000000..81559a3afb33
--- /dev/null
+++ b/PathOfBuilding-lua51-bit.patch
@@ -0,0 +1,13 @@
+diff -ru a/src/Modules/Common.lua b/src/Modules/Common.lua
+--- a/src/Modules/Common.lua	2021-02-06 15:09:21.799784281 +0100
++++ b/src/Modules/Common.lua	2021-02-06 11:37:28.998539560 +0100
+@@ -3,6 +3,9 @@
+ -- Module: Common
+ -- Libraries, functions and classes used by various modules.
+ --
++
++bit = require("bit")
++
+ local pairs = pairs
+ local ipairs = ipairs
+ local type = type
diff --git a/PathOfBuilding-lua51-bom.patch b/PathOfBuilding-lua51-bom.patch
new file mode 100644
index 000000000000..983322a1762d
--- /dev/null
+++ b/PathOfBuilding-lua51-bom.patch
@@ -0,0 +1,190 @@
+diff --git a/src/Data/Uniques/Special/New.lua b/src/Data/Uniques/Special/New.lua
+index 8074416d..3edbf83e 100644
+--- a/src/Data/Uniques/Special/New.lua
++++ b/src/Data/Uniques/Special/New.lua
+@@ -1,4 +1,4 @@
+---
++--
+ -- Upcoming uniques will live here until their mods/rolls are finalised
+ --
+ 
+diff --git a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
+index 5d46c578..0ccec2c9 100644
+--- a/src/Data/Uniques/amulet.lua
++++ b/src/Data/Uniques/amulet.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Amulet
+diff --git a/src/Data/Uniques/axe.lua b/src/Data/Uniques/axe.lua
+index 01a6c586..831b3608 100644
+--- a/src/Data/Uniques/axe.lua
++++ b/src/Data/Uniques/axe.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: One Handed Axe
+diff --git a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
+index 6435d772..4646d65b 100644
+--- a/src/Data/Uniques/belt.lua
++++ b/src/Data/Uniques/belt.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Belt
+diff --git a/src/Data/Uniques/body.lua b/src/Data/Uniques/body.lua
+index 1df0a7eb..e85709bb 100644
+--- a/src/Data/Uniques/body.lua
++++ b/src/Data/Uniques/body.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Body: Armour
+diff --git a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua
+index 8327e7b7..1e057a2a 100644
+--- a/src/Data/Uniques/boots.lua
++++ b/src/Data/Uniques/boots.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Boots: Armour
+diff --git a/src/Data/Uniques/bow.lua b/src/Data/Uniques/bow.lua
+index 788b19ef..944136ad 100644
+--- a/src/Data/Uniques/bow.lua
++++ b/src/Data/Uniques/bow.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Bow
+diff --git a/src/Data/Uniques/claw.lua b/src/Data/Uniques/claw.lua
+index 978884e2..a7d8fc1c 100644
+--- a/src/Data/Uniques/claw.lua
++++ b/src/Data/Uniques/claw.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Claw
+diff --git a/src/Data/Uniques/dagger.lua b/src/Data/Uniques/dagger.lua
+index ab6a15ad..e876ec8b 100644
+--- a/src/Data/Uniques/dagger.lua
++++ b/src/Data/Uniques/dagger.lua
+@@ -1,4 +1,4 @@
+-	-- Item data (c) Grinding Gear Games
++	-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Dagger
+diff --git a/src/Data/Uniques/fishing.lua b/src/Data/Uniques/fishing.lua
+index 23920e8d..708d46d9 100644
+--- a/src/Data/Uniques/fishing.lua
++++ b/src/Data/Uniques/fishing.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Fishing Rod
+diff --git a/src/Data/Uniques/flask.lua b/src/Data/Uniques/flask.lua
+index f51beee3..3feecaf6 100644
+--- a/src/Data/Uniques/flask.lua
++++ b/src/Data/Uniques/flask.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Flask: Life
+diff --git a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua
+index 52dc9862..3e916b6b 100644
+--- a/src/Data/Uniques/gloves.lua
++++ b/src/Data/Uniques/gloves.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Gloves: Armour
+diff --git a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua
+index 1e123521..737384d9 100644
+--- a/src/Data/Uniques/helmet.lua
++++ b/src/Data/Uniques/helmet.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ return {
+ -- Helmet: Armour
+ [[
+diff --git a/src/Data/Uniques/mace.lua b/src/Data/Uniques/mace.lua
+index aaa0a0b0..12e8b8f3 100644
+--- a/src/Data/Uniques/mace.lua
++++ b/src/Data/Uniques/mace.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: One Handed Mace
+diff --git a/src/Data/Uniques/quiver.lua b/src/Data/Uniques/quiver.lua
+index 6c35e00d..9b4f6c4d 100644
+--- a/src/Data/Uniques/quiver.lua
++++ b/src/Data/Uniques/quiver.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Quiver
+diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
+index 93a3514f..4da3560d 100644
+--- a/src/Data/Uniques/ring.lua
++++ b/src/Data/Uniques/ring.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Ring
+diff --git a/src/Data/Uniques/shield.lua b/src/Data/Uniques/shield.lua
+index 0fd00047..54861c3a 100644
+--- a/src/Data/Uniques/shield.lua
++++ b/src/Data/Uniques/shield.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Shield: Armour
+diff --git a/src/Data/Uniques/staff.lua b/src/Data/Uniques/staff.lua
+index c715a87b..b2560387 100644
+--- a/src/Data/Uniques/staff.lua
++++ b/src/Data/Uniques/staff.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Staff
+diff --git a/src/Data/Uniques/wand.lua b/src/Data/Uniques/wand.lua
+index abc1ecee..db47a675 100644
+--- a/src/Data/Uniques/wand.lua
++++ b/src/Data/Uniques/wand.lua
+@@ -1,4 +1,4 @@
+--- Item data (c) Grinding Gear Games
++-- Item data (c) Grinding Gear Games
+ 
+ return {
+ -- Weapon: Wand
diff --git a/PathOfBuilding-lua51.patch b/PathOfBuilding-lua51.patch
deleted file mode 100644
index deb37748d1cd..000000000000
--- a/PathOfBuilding-lua51.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -ru a/src/Modules/Common.lua b/src/Modules/Common.lua
---- a/src/Modules/Common.lua	2021-02-06 15:09:21.799784281 +0100
-+++ b/src/Modules/Common.lua	2021-02-06 11:37:28.998539560 +0100
-@@ -3,6 +3,9 @@
- -- Module: Common
- -- Libraries, functions and classes used by various modules.
- --
-+
-+bit = require("bit")
-+
- local pairs = pairs
- local ipairs = ipairs
- local type = type
-diff -ru a/src/Data/New.lua b/src/Data/New.lua
---- a/src/Data/Uniques/Special/New.lua	2021-02-06 15:09:21.709829157 +0100
-+++ b/src/Data/Uniques/Special/New.lua	2021-02-06 11:37:28.858609368 +0100
-@@ -1,3 +1,3 @@
----
-+--
- -- Upcoming uniques will live here until their mods/rolls are finalised
- --
-diff -ru a/src/Data/Uniques/amulet.lua b/src/Data/Uniques/amulet.lua
---- a/src/Data/Uniques/amulet.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/amulet.lua	2021-02-06 11:37:28.858609368 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Amulet
-diff -ru a/src/Data/Uniques/axe.lua b/src/Data/Uniques/axe.lua
---- a/src/Data/Uniques/axe.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/axe.lua	2021-02-06 11:37:28.851946025 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: One Handed Axe
-diff -ru a/src/Data/Uniques/belt.lua b/src/Data/Uniques/belt.lua
---- a/src/Data/Uniques/belt.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/belt.lua	2021-02-06 11:37:28.855277696 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Belt
-diff -ru a/src/Data/Uniques/body.lua b/src/Data/Uniques/body.lua
---- a/src/Data/Uniques/body.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/body.lua	2021-02-06 11:37:28.851946025 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Body: Armour
-diff -ru a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua
---- a/src/Data/Uniques/boots.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/boots.lua	2021-02-06 11:37:28.851946025 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Boots: Armour
-diff -ru a/src/Data/Uniques/bow.lua b/src/Data/Uniques/bow.lua
---- a/src/Data/Uniques/bow.lua	2021-02-06 15:09:21.776462582 +0100
-+++ b/src/Data/Uniques/bow.lua	2021-02-06 11:37:28.848614354 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: Bow
-diff -ru a/src/Data/Uniques/claw.lua b/src/Data/Uniques/claw.lua
---- a/src/Data/Uniques/claw.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/claw.lua	2021-02-06 11:37:28.848614354 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: Claw
-diff -ru a/src/Data/Uniques/dagger.lua b/src/Data/Uniques/dagger.lua
---- a/src/Data/Uniques/dagger.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/dagger.lua	2021-02-06 11:37:28.848614354 +0100
-@@ -1,4 +1,4 @@
--	-- Item data (c) Grinding Gear Games
-+	-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: Dagger
-diff -ru a/src/Data/Uniques/flask.lua b/src/Data/Uniques/flask.lua
---- a/src/Data/Uniques/flask.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/flask.lua	2021-02-06 11:37:28.855277696 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Flask: Life
-diff -ru a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua
---- a/src/Data/Uniques/gloves.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/gloves.lua	2021-02-06 11:37:28.855277696 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Gloves: Armour
-diff -ru a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua
---- a/src/Data/Uniques/helmet.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/helmet.lua	2021-02-06 11:37:28.855277696 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Helmet: Armour
-diff -ru a/src/Data/Uniques/mace.lua b/src/Data/Uniques/mace.lua
---- a/src/Data/Uniques/mace.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/mace.lua	2021-02-06 11:37:28.848614354 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: One Handed Mace
-diff -ru a/src/Data/Uniques/quiver.lua b/src/Data/Uniques/quiver.lua
---- a/src/Data/Uniques/quiver.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/quiver.lua	2021-02-06 11:37:28.848614354 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Quiver
-diff -ru a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
---- a/src/Data/Uniques/ring.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/ring.lua	2021-02-06 11:37:28.845282683 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Ring
-diff -ru a/src/Data/Uniques/shield.lua b/src/Data/Uniques/shield.lua
---- a/src/Data/Uniques/shield.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/shield.lua	2021-02-06 11:37:28.845282683 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Shield: Armour
-diff -ru a/src/Data/Uniques/staff.lua b/src/Data/Uniques/staff.lua
---- a/src/Data/Uniques/staff.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/staff.lua	2021-02-06 11:37:28.851946025 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: Staff
-diff -ru a/src/Data/Uniques/wand.lua b/src/Data/Uniques/wand.lua
---- a/src/Data/Uniques/wand.lua	2021-02-06 15:09:21.779794253 +0100
-+++ b/src/Data/Uniques/wand.lua	2021-02-06 11:37:28.858609368 +0100
-@@ -1,4 +1,4 @@
---- Item data (c) Grinding Gear Games
-+-- Item data (c) Grinding Gear Games
- 
- return {
- -- Weapon: Wand