diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 43 | ||||
| -rw-r--r-- | libloot-0.14.10.patch | 34 | ||||
| -rw-r--r-- | loot-0.14.6.patch | 26 |
5 files changed, 27 insertions, 93 deletions
@@ -1,6 +1,6 @@ pkgbase = loot pkgdesc = A load order optimisation tool for the Elder Scrolls (Morrowind and later) and Fallout (3 and later) games. - pkgver = 0.14.6 + pkgver = 0.16.0 pkgrel = 1 url = https://loot.github.io arch = x86_64 @@ -24,14 +24,10 @@ pkgbase = loot depends = libxrandr depends = libxss depends = libxtst - source = loot-0.14.6.tar.gz::https://github.com/loot/loot/archive/0.14.6.tar.gz - source = libloot-0.14.10.tar.gz::https://github.com/loot/libloot/archive/0.14.10.tar.gz - source = local://libloot-0.14.10.patch - source = local://loot-0.14.6.patch - sha256sums = 04eeedfd99282bcedd23f571f1174aaeac457504c5811e49f7e00c8c9db51908 - sha256sums = be8ed5e7555bd3187aeb7f32c2eefdf7e327f070d986842224e03a9447feda22 - sha256sums = 398a12144bec5405824b870e65b75077fd140ae7a95afd7ca21589e08af82146 - sha256sums = 41e0ec231caf417f79bd895677b71d27d56af33bced919a34e93474bbde357f8 + source = loot-0.16.0.tar.gz::https://github.com/loot/loot/archive/0.16.0.tar.gz + source = libloot-0.16.2.tar.gz::https://github.com/loot/libloot/archive/0.16.2.tar.gz + sha256sums = b501d73e9bc00e86dc6d14b8c5f5b96effaa7c7dca654e1768c6eabdd36b887d + sha256sums = 13d815ab3aaf90c58135932d7fa5f40e44c190ab63e756f0a953ee44800ed197 pkgname = loot diff --git a/.gitignore b/.gitignore index 72e8ffc0db8a..05c6d4d4c97b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ * +!.gitignore +!.SRCINFO +!PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: John Troxler <firstname dot lastname at gmail dot com> pkgname=loot -pkgver=0.14.6 -_pkglibver=0.14.10 +# Remove spotify hax on next version bump! +pkgver=0.16.0 +_pkglibver=0.16.2 pkgrel=1 pkgdesc="A load order optimisation tool for the Elder Scrolls (Morrowind and later) and Fallout (3 and later) games." arch=('x86_64') @@ -12,43 +13,38 @@ depends=('boost-libs' 'http-parser' 'libssh2' 'alsa-lib' 'nss' 'pango' 'atk' 'li makedepends=('git' 'cmake' 'rust' 'cbindgen' 'yarn' 'boost') source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz" "lib$pkgname-$_pkglibver.tar.gz::https://github.com/$pkgname/lib$pkgname/archive/$_pkglibver.tar.gz" - "local://lib$pkgname-$_pkglibver.patch" - "local://$pkgname-$pkgver.patch") -sha256sums=('04eeedfd99282bcedd23f571f1174aaeac457504c5811e49f7e00c8c9db51908' - 'be8ed5e7555bd3187aeb7f32c2eefdf7e327f070d986842224e03a9447feda22' - '398a12144bec5405824b870e65b75077fd140ae7a95afd7ca21589e08af82146' - '41e0ec231caf417f79bd895677b71d27d56af33bced919a34e93474bbde357f8') +) +sha256sums=('b501d73e9bc00e86dc6d14b8c5f5b96effaa7c7dca654e1768c6eabdd36b887d' + '13d815ab3aaf90c58135932d7fa5f40e44c190ab63e756f0a953ee44800ed197' +) -prepare() { - # libloot - cd "$srcdir/lib$pkgname-$_pkglibver" - patch -p1 <"$srcdir/lib$pkgname-$_pkglibver.patch" - - # loot - cd "$srcdir/$pkgname-$pkgver" - patch -p1 <"$srcdir/$pkgname-$pkgver.patch" - - yarn install -} +#prepare() { +# yarn install +#} build() { # libloot cd "$srcdir/lib$pkgname-$_pkglibver" - mkdir build + yarn install + mkdir -p build cd build cmake .. -DCMAKE_SKIP_RPATH=TRUE make loot - mkdir pkg + mkdir -p pkg cp lib$pkgname.so ./pkg/ cp -r ../include/ ./pkg/ tar -zcf lib$pkgname-$_pkglibver.tar.gz ./pkg/ # loot cd "$srcdir/$pkgname-$pkgver" - mkdir build + yarn install + # Spotify Hax because of domain change + sed -i s,opensource.spotify.com/cefbuilds,cef-builds.spotifycdn.com,g CMakeLists.txt + mkdir -p build cd build - cmake .. -DLIBLOOT_URL="$srcdir/lib$pkgname-$_pkglibver/build/lib$pkgname-$_pkglibver.tar.gz" -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE -DCMAKE_INSTALL_RPATH="/opt/$pkgname" + cmake .. -DLIBLOOT_URL="$srcdir/lib$pkgname-$_pkglibver/build/lib$pkgname-$_pkglibver.tar.gz" \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE -DCMAKE_INSTALL_RPATH="/opt/$pkgname" make LOOT } @@ -63,7 +59,6 @@ package() { install -Dm644 -t "$pkgdir/opt/$pkgname" \ "$_builddir/icudtl.dat" \ "$_builddir/external/src/cef/Resources/cef_extensions.pak" \ - "$_builddir/natives_blob.bin" \ "$_builddir/snapshot_blob.bin" \ "$_builddir/v8_context_snapshot.bin" \ "$_builddir/cef.pak" \ diff --git a/libloot-0.14.10.patch b/libloot-0.14.10.patch deleted file mode 100644 index 9c01fafd1b9a..000000000000 --- a/libloot-0.14.10.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -aru a/src/api/game/load_order_handler.h b/src/api/game/load_order_handler.h ---- a/src/api/game/load_order_handler.h 2019-10-21 16:34:59.069308937 -0400 -+++ b/src/api/game/load_order_handler.h 2019-10-21 16:30:11.742569749 -0400 -@@ -29,6 +29,7 @@ - #include <list> - #include <string> - #include <unordered_set> -+#include <vector> - - #include <libloadorder.hpp> - -diff -aru a/src/api/helpers/text.cpp b/src/api/helpers/text.cpp ---- a/src/api/helpers/text.cpp 2019-10-21 16:36:52.762753869 -0400 -+++ b/src/api/helpers/text.cpp 2019-10-21 16:37:24.112790799 -0400 -@@ -152,8 +152,8 @@ - "One of the filenames to compare was invalid."); - } - #else -- auto unicodeLhs = UnicodeString::fromUTF8(lhs); -- auto unicodeRhs = UnicodeString::fromUTF8(rhs); -+ auto unicodeLhs = icu::UnicodeString::fromUTF8(lhs); -+ auto unicodeRhs = icu::UnicodeString::fromUTF8(rhs); - return unicodeLhs.caseCompare(unicodeRhs, U_FOLD_CASE_DEFAULT); - #endif - } -@@ -165,7 +165,7 @@ - return FromWinWide(wideString); - #else - std::string normalizedFilename; -- UnicodeString::fromUTF8(filename) -+ icu::UnicodeString::fromUTF8(filename) - .foldCase(U_FOLD_CASE_DEFAULT) - .toUTF8String(normalizedFilename); - return normalizedFilename; diff --git a/loot-0.14.6.patch b/loot-0.14.6.patch deleted file mode 100644 index e1fa89075175..000000000000 --- a/loot-0.14.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -aru a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-10-21 21:47:49.376729092 -0400 -+++ b/CMakeLists.txt 2019-10-22 01:57:36.572070650 -0400 -@@ -40,7 +40,7 @@ - # External Projects - ############################## - --set (Boost_USE_STATIC_LIBS ON) -+set (Boost_USE_STATIC_LIBS OFF) - set (Boost_USE_MULTITHREADED ON) - - IF (MSVC) -diff -aru a/src/gui/helpers.cpp b/src/gui/helpers.cpp ---- a/src/gui/helpers.cpp 2019-10-21 17:38:30.913050954 -0400 -+++ b/src/gui/helpers.cpp 2019-10-21 17:38:17.576261366 -0400 -@@ -148,8 +148,8 @@ - "One of the filenames to compare was invalid."); - } - #else -- auto unicodeLhs = UnicodeString::fromUTF8(lhs); -- auto unicodeRhs = UnicodeString::fromUTF8(rhs); -+ auto unicodeLhs = icu::UnicodeString::fromUTF8(lhs); -+ auto unicodeRhs = icu::UnicodeString::fromUTF8(rhs); - return unicodeLhs.caseCompare(unicodeRhs, U_FOLD_CASE_DEFAULT); - #endif - } |