[Slackbuilds-users] 0001-games-OpenRA-updated-for-version-20210321.patch
khronosschoty
khronosschoty at posteo.org
Thu Feb 24 03:39:51 UTC 2022
Okay,
So using the shbang to invoke unshare was a bad idea and poorly tested.
So I fixed the shabang and just put unshare where its needed. Now
everything should work as intended.
-------------- next part --------------
From 98b7f1d873e889f4282e6b27ed243ff0db5054f0 Mon Sep 17 00:00:00 2001
From: khronosschoty <khronosschoty at posteo.org>
Date: Wed, 23 Feb 2022 17:00:35 -0800
Subject: [PATCH 1/1] games/OpenRA: updated for version 20210321
---
games/OpenRA/OpenRA.SlackBuild | 30 +++++++++++++----------
games/OpenRA/OpenRA.info | 16 ++++++------
games/OpenRA/fetch-thirdparty-deps.sh.new | 18 --------------
3 files changed, 25 insertions(+), 39 deletions(-)
delete mode 100644 games/OpenRA/fetch-thirdparty-deps.sh.new
diff --git a/games/OpenRA/OpenRA.SlackBuild b/games/OpenRA/OpenRA.SlackBuild
index 060cdd3e65c..889f3407afa 100644
--- a/games/OpenRA/OpenRA.SlackBuild
+++ b/games/OpenRA/OpenRA.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for OpenRA
-# Copyright 2017 Vasily Sora USA
+# Copyright 2017,2022 Vasily Sora USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=OpenRA
-VERSION=${VERSION:-20190314}
+VERSION=${VERSION:-20210321}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -49,6 +49,10 @@ fi
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+HOME=$TMP/$PRGNAM-release-$VERSION-source
+DOTNET_CLI_TELEMETRY_OPTOUT=1
+export HOME DOTNET_CLI_TELEMETRY_OPTOUT
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -71,15 +75,15 @@ rm -rf $TMP/$PRGNAM-release-$VERSION-source
mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM-release-$VERSION-source
cd $TMP/$PRGNAM-release-$VERSION-source
tar xvf $CWD/$PRGNAM-release-$VERSION-source.tar.bz2
-cp $CWD/fetch-thirdparty-deps.sh.new thirdparty/fetch-thirdparty-deps.sh
-cp $CWD/download.tar.gz thirdparty
-mkdir thirdparty/download/
-cp $CWD/GeoLite2-Country.mmdb.gz thirdparty/download/
-rm thirdparty/fetch-geoip-db.sh
-touch thirdparty/fetch-geoip-db.sh
-echo "#!/bin/sh" >> thirdparty/fetch-geoip-db.sh
-echo 'echo "success"' >> thirdparty/fetch-geoip-db.sh
-chmod +x thirdparty/fetch-geoip-db.sh
+tar -xzvf $CWD/openra-deps.tar.gz
+cp $CWD/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP .
+rm fetch-geoip.sh
+touch fetch-geoip.sh
+echo "#!/bin/sh" >> fetch-geoip.sh
+echo 'echo "success"' >> fetch-geoip.sh
+chmod +x fetch-geoip.sh
+
+sed -i 's/msbuild/dotnet\ msbuild/g' ./Makefile ./packaging/functions.sh
chown -R root:root .
find -L . \
@@ -88,10 +92,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-make dependencies
-make all
+unshare -n make all TARGETPLATFORM=unix-generic RUNTIME=mono MSBUILD='dotnet msbuild -verbosity:m -nologo'
make prefix=/usr mandir=/usr/man bindir=/usr/games libdir=/usr/lib${LIBDIRSUFFIX} install DESTDIR=$PKG
make prefix=/usr mandir=/usr/man bindir=/usr/games libdir=/usr/lib${LIBDIRSUFFIX} install-linux-shortcuts DESTDIR=$PKG
+make prefix=/usr mandir=/usr/man bindir=/usr/games libdir=/usr/lib${LIBDIRSUFFIX} install-linux-appdata DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/games/OpenRA/OpenRA.info b/games/OpenRA/OpenRA.info
index ef12bb2ec9a..4a9b84b8bb4 100644
--- a/games/OpenRA/OpenRA.info
+++ b/games/OpenRA/OpenRA.info
@@ -1,14 +1,14 @@
PRGNAM="OpenRA"
-VERSION="20190314"
+VERSION="20210321"
HOMEPAGE="http://www.openra.net/"
-DOWNLOAD="https://github.com/OpenRA/OpenRA/releases/download/release-20190314/OpenRA-release-20190314-source.tar.bz2 \
- http://repo.khronosschoty.org/Slackware/stuff/OpenRA/20190314/download.tar.gz \
- http://repo.khronosschoty.org/Slackware/stuff/OpenRA/20190314/GeoLite2-Country.mmdb.gz"
-MD5SUM="4ea1ba7d309bf0482979b5337677d2a3 \
- e890273530c23cb8571a729d2aced59d \
- 3639895811efb10ad54bf6b40980224e"
+DOWNLOAD="https://github.com/OpenRA/OpenRA/releases/download/release-20210321/OpenRA-release-20210321-source.tar.bz2 \
+ http://repo.schotynet.org/sources/openra/openra-deps.tar.gz \
+ http://repo.schotynet.org/sources/openra/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP"
+MD5SUM="38593fbcdda629561d8c0bc8ac1af402 \
+ 26b1855341dc15787c7b54945050095d \
+ ef52f92818ebc942ca98108e92a0b802"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lua mono"
+REQUIRES="lua mono dotnet-sdk-6.0"
MAINTAINER="khronosschoty"
EMAIL="khronosschoty at posteo.org"
diff --git a/games/OpenRA/fetch-thirdparty-deps.sh.new b/games/OpenRA/fetch-thirdparty-deps.sh.new
deleted file mode 100644
index c0f9ae9b5d7..00000000000
--- a/games/OpenRA/fetch-thirdparty-deps.sh.new
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-####
-# This file must stay /bin/sh and POSIX compliant for BSD portability.
-# Copy-paste the entire script into http://shellcheck.net to check.
-####
-
-# Die on any error for Travis CI to automatically retry:
-set -e
-
-download_dir="${0%/*}/download"
-
-mkdir -p "${download_dir}"
-cd "${download_dir}"
-cd ..
-
-tar -xvf download.tar.gz
-
--
2.35.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 870 bytes
Desc: not available
URL: <http://lists.slackbuilds.org/pipermail/slackbuilds-users/attachments/20220224/6b0982a2/attachment.asc>
More information about the SlackBuilds-users
mailing list