use luajit

4 files changed, 8 insertions, 222 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c07ab2131bc..3921067621bc 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.4.0.r4597.59.517
+	pkgver = 2.13.0.r5255.60.517
 	pkgrel = 1
 	url = https://github.com/PathOfBuildingCommunity/PathOfBuilding
 	arch = x86_64
@@ -12,22 +12,19 @@ pkgbase = path-of-building-community-git
 	makedepends = git
 	depends = zlib
 	depends = qt5-base
-	depends = lua51
-	depends = lua51-bitop
+	depends = luajit
 	depends = libgl
 	depends = curl
 	depends = ttf-liberation
 	depends = ttf-bitstream-vera
 	noextract = PathOfBuilding-runtime-src.zip
 	source = git+https://github.com/PathOfBuildingCommunity/PathOfBuilding
-	source = git+https://gitlab.com/bcareil/pobfrontend.git
+	source = git+https://gitlab.com/bcareil/pobfrontend.git#branch=luajit
 	source = git+https://github.com/Lua-cURL/Lua-cURLv3
 	source = https://github.com/Openarl/PathOfBuilding/files/1167199/PathOfBuilding-runtime-src.zip
 	source = PathOfBuilding.sh
 	source = lzip-linux.patch
 	source = PathOfBuilding-force-disable-devmode.patch
-	source = PathOfBuilding-lua51-bit.patch
-	source = PathOfBuilding-lua51-bom.patch
 	source = PathOfBuilding-logo.svg
 	source = PathOfBuilding-logo.png
 	source = PathOfBuildingCommunity.desktop
@@ -38,8 +35,6 @@ pkgbase = path-of-building-community-git
 	sha256sums = db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11
 	sha256sums = 9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd
 	sha256sums = cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935
-	sha256sums = 5b98c9c8fc28def0c068958d1b61e3d1dd7fb21844bdb4c8fddedf91eb193896
-	sha256sums = 48488682fb33acd513eebc8933435749f7626df87ced4bdf89ee803de83a317d
 	sha256sums = 2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194
 	sha256sums = a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc
 	sha256sums = 079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64
diff --git a/PKGBUILD b/PKGBUILD
index 0072855ccf79..d328cdd3f02a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,19 @@ 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.4.0.r4597.59.517
+pkgver=2.13.0.r5255.60.517
 
-depends=('zlib' 'qt5-base' 'lua51' 'lua51-bitop' 'libgl' 'curl' 'ttf-liberation' 'ttf-bitstream-vera')
+depends=('zlib' 'qt5-base' 'luajit' 'libgl' 'curl' 'ttf-liberation' 'ttf-bitstream-vera')
 makedepends=('meson' 'ninja' 'unzip' 'rsync' 'git')
 
 source=(
 	'git+https://github.com/PathOfBuildingCommunity/PathOfBuilding'
-	'git+https://gitlab.com/bcareil/pobfrontend.git'
+	'git+https://gitlab.com/bcareil/pobfrontend.git#branch=luajit'
 	'git+https://github.com/Lua-cURL/Lua-cURLv3'
 	'https://github.com/Openarl/PathOfBuilding/files/1167199/PathOfBuilding-runtime-src.zip'
 	'PathOfBuilding.sh'
 	'lzip-linux.patch'
 	'PathOfBuilding-force-disable-devmode.patch'
-	'PathOfBuilding-lua51-bit.patch'
-	'PathOfBuilding-lua51-bom.patch'
 	'PathOfBuilding-logo.svg'
 	'PathOfBuilding-logo.png'
 	'PathOfBuildingCommunity.desktop'
@@ -33,8 +31,6 @@ sha256sums=(
 	'db9eec714bf9d1c52b1ccd7adc9e720519585becf7f9a1f18cca1888d3e1cc11'
 	'9dbc8802b74ceed78f1a6ba1d5b90251f5ae7f9a8cf5497426e4a35001112fcd'
 	'cd46475a1bc62240e03abb6b385b0c9b0b911ad828219fd31f98f7742807f935'
-    '5b98c9c8fc28def0c068958d1b61e3d1dd7fb21844bdb4c8fddedf91eb193896'
-	'48488682fb33acd513eebc8933435749f7626df87ced4bdf89ee803de83a317d'
 	'2467d10c7b5e201e337ba334a829e293a07027251bcda2b1f39774a62e8ff194'
 	'a64198061f60168ec07df33c37948e343eced7eeafe574cc20bdcf3a1d480cbc'
 	'079eff1a5e74cb6d776723f7c3d36349e426edaa332a8177ff8f5e78af56cf64'
@@ -53,9 +49,7 @@ prepare() {
 	(cd "${srcdir}/PathOfBuilding-runtime-src/LZip" && patch -p1 <"${srcdir}/lzip-linux.patch")
 	# 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-bit.patch" \
-		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-lua51-bom.patch" \
+		&& patch --no-backup-if-mismatch -p1 <"${srcdir}/PathOfBuilding-force-disable-devmode.patch"
 	)
 }
 
@@ -82,7 +76,7 @@ build() {
 			-lz
 		)
 	# build lcurl.so
-	(cd "${srcdir}/Lua-cURLv3" && make LUA_IMPL=lua51)
+	(cd "${srcdir}/Lua-cURLv3" && make LUA_IMPL=luajit)
 	# build pobfrontend
 	(cd "${srcdir}/pobfrontend" && meson -Dbuildtype=release build \
 		&& cd build && ninja && strip ./pobfrontend)
diff --git a/PathOfBuilding-lua51-bit.patch b/PathOfBuilding-lua51-bit.patch
deleted file mode 100644
index 81559a3afb33..000000000000
--- a/PathOfBuilding-lua51-bit.patch
+++ /dev/null
@@ -1,13 +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 --git a/PathOfBuilding-lua51-bom.patch b/PathOfBuilding-lua51-bom.patch
deleted file mode 100644
index 983322a1762d..000000000000
--- a/PathOfBuilding-lua51-bom.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-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