diff options
| author | Deposite Pirate | 2019-10-22 11:37:01 +0200 |
|---|---|---|
| committer | Deposite Pirate | 2019-10-22 11:37:01 +0200 |
| commit | 64e0b8f4e9ac9ed33b426fe8f9616370f0f717d0 (patch) | |
| tree | f2de310a0ebf659b607a7e77f440580e31796981 /devilutionx-git | |
| parent | 0d21776a6fe4f5239acc872539c458791f58e6e8 (diff) | |
* Hackfix linking against libsodium.
modified: devilutionx-git/.SRCINFO
modified: devilutionx-git/PKGBUILD
new file: devilutionx-git/devilutionx-linkfix.patch
Diffstat (limited to 'devilutionx-git')
| -rw-r--r-- | devilutionx-git/.SRCINFO | 8 | ||||
| -rw-r--r-- | devilutionx-git/PKGBUILD | 15 | ||||
| -rw-r--r-- | devilutionx-git/devilutionx-linkfix.patch | 12 |
3 files changed, 29 insertions, 6 deletions
diff --git a/devilutionx-git/.SRCINFO b/devilutionx-git/.SRCINFO index b8434fb..ddca956 100644 --- a/devilutionx-git/.SRCINFO +++ b/devilutionx-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = devilutionx-git pkgdesc = Diablo devolved for linux (git version) - pkgver = 0.4.0.r127.ge6f4e216 - pkgrel = 3 + pkgver = 0.5.0.r84.g1df595c1 + pkgrel = 1 url = https://github.com/diasurgical/devilutionX install = devilutionx.install arch = i686 @@ -12,15 +12,17 @@ pkgbase = devilutionx-git depends = sdl2_mixer depends = sdl2_ttf depends = libsodium - provides = devilutionx=0.4.0.r127.ge6f4e216 + provides = devilutionx=0.5.0.r84.g1df595c1 source = devilutionx::git+https://github.com/diasurgical/devilutionX.git source = LICENSE::https://raw.githubusercontent.com/diasurgical/devilutionX/master/LICENSE source = diablo.desktop source = diablo_1_icon_by_mulek169.png + source = devilutionx-linkfix.patch sha256sums = SKIP sha256sums = 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd sha256sums = 1f0b591e2b5d14e69864967c056458a2d845da989b3c4ba251c7a89d49cd9c81 sha256sums = f569210a4217a5e7aa29366376554ffaeae84bdbe278b5335fd3cb37e1d0f82d + sha256sums = edc7b17425739f4117bc159b9f071968122025674039c153463696aba73e0c5c pkgname = devilutionx-git diff --git a/devilutionx-git/PKGBUILD b/devilutionx-git/PKGBUILD index f303daa..05b103f 100644 --- a/devilutionx-git/PKGBUILD +++ b/devilutionx-git/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=devilutionx pkgname=devilutionx-git -pkgver=0.4.0.r127.ge6f4e216 -pkgrel=3 +pkgver=0.5.0.r84.g1df595c1 +pkgrel=1 pkgdesc="Diablo devolved for linux (git version)" arch=('i686' 'x86_64') url="https://github.com/diasurgical/devilutionX" @@ -19,11 +19,13 @@ source=( LICENSE::https://raw.githubusercontent.com/diasurgical/devilutionX/master/LICENSE diablo.desktop diablo_1_icon_by_mulek169.png + devilutionx-linkfix.patch ) sha256sums=('SKIP' '88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd' '1f0b591e2b5d14e69864967c056458a2d845da989b3c4ba251c7a89d49cd9c81' - 'f569210a4217a5e7aa29366376554ffaeae84bdbe278b5335fd3cb37e1d0f82d') + 'f569210a4217a5e7aa29366376554ffaeae84bdbe278b5335fd3cb37e1d0f82d' + 'edc7b17425739f4117bc159b9f071968122025674039c153463696aba73e0c5c') pkgver() { cd "${_pkgname}" @@ -33,6 +35,13 @@ pkgver() { ) } +prepare() { + cd "${_pkgname}" + + # Fix linking to libsodium + patch -p1 -i "${srcdir}/${_pkgname}-linkfix.patch" +} + build() { cd "${_pkgname}" rm -rf build64 diff --git a/devilutionx-git/devilutionx-linkfix.patch b/devilutionx-git/devilutionx-linkfix.patch new file mode 100644 index 0000000..660ffa8 --- /dev/null +++ b/devilutionx-git/devilutionx-linkfix.patch @@ -0,0 +1,12 @@ +diff -r -u -N devilutionx/CMakeLists.txt devilutionx-linkfix/CMakeLists.txt +--- devilutionx/CMakeLists.txt 2019-10-22 11:25:24.826458542 +0200 ++++ devilutionx-linkfix/CMakeLists.txt 2019-10-22 11:26:03.370009857 +0200 +@@ -77,7 +77,7 @@ + endif()
+
+ if(DIST OR DINGUX)
+- set(sodium_USE_STATIC_LIBS ON)
++ set(sodium_USE_STATIC_LIBS OFF)
+ endif()
+
+ set(CMAKE_CXX_STANDARD 11)
|