PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

0ad: rebuild for libsodium-1.0.19_1

Browse Source
This commit is contained in:
Duncaen 2023-12-16 19:50:37 +01:00
parent 6c73aa0254
commit 55aef591ee
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srcpkgs/0ad/files/rust-target.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -352,7 +352,7 @@
return None
- rustc_target = find_candidate(candidates)
+ rustc_target = os.environ["RUST_TARGET"]
if rustc_target is None:
die("Don't know how to translate {} for rustc".format(

5
srcpkgs/0ad/patches/python-3.11.patch
View File

@ -2,7 +2,7 @@ Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
=================================================================== ===================================================================
--- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh --- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh +++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
@@ -2,6 +2,21 @@ @@ -2,6 +2,24 @@
# Apply patches if needed # Apply patches if needed
# This script gets called from build.sh. # This script gets called from build.sh.
@ -20,6 +20,9 @@ Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
+ +
+git am --keep-cr ../1654457-virtualenv.patch +git am --keep-cr ../1654457-virtualenv.patch
+git am --keep-cr ../python-3.11.patch +git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
+
+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
+ +
# SM78 fails to create virtual envs on macs with python > 3.7 # SM78 fails to create virtual envs on macs with python > 3.7
# Unfortunately, 3.7 is mostly unavailable on ARM macs. # Unfortunately, 3.7 is mostly unavailable on ARM macs.

6
srcpkgs/0ad/template
View File

@ -1,9 +1,10 @@
# Template file for '0ad' # Template file for '0ad'
pkgname=0ad pkgname=0ad
version=0.0.26 version=0.0.26
revision=8 revision=9
archs="x86_64* i686* aarch64* armv7l* ppc64le*" archs="x86_64* i686* aarch64* armv7l* ppc64le*"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel" nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
@ -37,6 +38,7 @@ post_patch() {
libraries/source/nvtt/src/src/nvcore/CMakeLists.txt libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
fi fi
cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/ cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
libraries/source/spidermonkey/ libraries/source/spidermonkey/
} }