[arch-commits] Commit in 0ad/trunk (D4669.diff PKGBUILD)

[Sven-Hendrik Haase]

    Date: Saturday, September 10, 2022 @ 04:55:15
  Author: svenstaro
Revision: 1298765

upgpkg: 0ad a25.b-9: Try to fix FS#75534

Added:
  0ad/trunk/D4669.diff
Modified:
  0ad/trunk/PKGBUILD

------------+
 D4669.diff |   13 +++++++++++++
 PKGBUILD   |    9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

Added: D4669.diff
===================================================================
--- D4669.diff	                        (rev 0)
+++ D4669.diff	2022-09-10 04:55:15 UTC (rev 1298765)
@@ -0,0 +1,13 @@
+Index: source/lib/sysdep/os/linux/lcpu.cpp
+===================================================================
+--- source/lib/sysdep/os/linux/lcpu.cpp
++++ source/lib/sysdep/os/linux/lcpu.cpp
+@@ -48,7 +48,7 @@
+ 		else
+ #endif
+ 		{
+-			long res = sysconf(_SC_NPROCESSORS_CONF);
++			long res = sysconf(_SC_NPROCESSORS_ONLN);
+ 			ENSURE(res != -1);
+ 			numProcessors = (size_t)res;
+ 		}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-10 04:54:21 UTC (rev 1298764)
+++ PKGBUILD	2022-09-10 04:55:15 UTC (rev 1298765)
@@ -4,7 +4,7 @@
 pkgname=0ad
 pkgver=a25.b
 _pkgver=0.0.25b-alpha
-pkgrel=8
+pkgrel=9
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('x86_64')
 url="http://play0ad.com/"
@@ -15,14 +15,17 @@
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'libsm' 'rust' 'python' 'clang')
 options=('!lto') # breaks spidermonkey linking (https://bugs.gentoo.org/746947)
 source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-         glibc-2.35.patch
-         python-3.10.patch)
+        D4669.diff
+        glibc-2.35.patch
+        python-3.10.patch)
 sha512sums=('e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4'
+            '4824b5f800dd3691b903bb1aa2c4e1ccee986c7dfe2c8d17c6fed72bbeec2032c1767a19c8ddb116f7b0f795d1c7e39de3af70aa51b3addd5a99c5cd189ccc6f'
             'e56fa4a3a43f7510dde50d5fd0ccda2f935d9ad2aac44d9af9e89109c655b605f8ef582e1188be3dc1d42b7feef0caefa0ec514776696603c237f054fd6778c9'
             '42df5eb7c4a99b31365b7f15c5bcd76c978339f2837eb8bc6ec371979429d0f0a6e31e870f6851aa40fc4859cb3e82f74821a01d04b82b486342db0fa60bf55e')
 
 prepare() {
   cd $pkgname-$_pkgver
+  patch -Np0 -i ../D4669.diff # Fix https://code.wildfiregames.com/D4669 / https://bugs.archlinux.org/task/75534
   patch -Np1 -i ../glibc-2.35.patch # https://code.wildfiregames.com/rP26536
   patch -Np1 -i ../python-3.10.patch # Fix spidermonkey build with Python 3.10
 }