[arch-commits] Commit in openrct2/repos/community-x86_64 (3 files)

[Massimiliano Torromeo]

    Date: Wednesday, June 16, 2021 @ 15:43:05
  Author: mtorromeo
Revision: 964297

archrelease: copy trunk to community-x86_64

Added:
  openrct2/repos/community-x86_64/PKGBUILD
    (from rev 964296, openrct2/trunk/PKGBUILD)
  openrct2/repos/community-x86_64/googletest-fix-maybe-uninitialized.patch
    (from rev 964296, openrct2/trunk/googletest-fix-maybe-uninitialized.patch)
Deleted:
  openrct2/repos/community-x86_64/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |  100 +++++++++++++++--------------
 googletest-fix-maybe-uninitialized.patch |   21 ++++++
 2 files changed, 75 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-16 15:42:59 UTC (rev 964296)
+++ PKGBUILD	2021-06-16 15:43:05 UTC (rev 964297)
@@ -1,46 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: Graham Edgecombe <graham at grahamedgecombe.com>
-
-pkgname=openrct2
-pkgver=0.3.3
-pkgrel=3
-pkgdesc='Open source re-implementation of Roller Coaster Tycoon 2 (requires full
-         copy of the game)'
-arch=('x86_64')
-url='https://openrct2.io'
-license=('GPL3')
-depends=('hicolor-icon-theme' 'sdl2' 'curl' 'speexdsp' 'fontconfig'
-         'libpng' 'openssl' 'libzip' 'icu' 'duktape' 'benchmark')
-makedepends=('cmake' 'nlohmann-json')
-optdepends=('zenity: System dialog box support (GNOME/GTK)'
-            'kdialog: System dialog box support (KDE)'
-            'alsa-lib: ALSA audio driver'
-            'libpulse: PulseAudio audio driver')
-source=($pkgname-$pkgver.tar.gz::https://github.com/OpenRCT2/OpenRCT2/archive/v$pkgver.tar.gz)
-sha256sums=('71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2')
-
-build() {
-  cd "$srcdir/OpenRCT2-$pkgver"
-
-  mkdir -p build
-  cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSTATIC=off -DWITH_TESTS=on -DCMAKE_INSTALL_LIBDIR=/usr/lib ..
-  make all g2
-}
-
-check() {
-  cd "$srcdir/OpenRCT2-$pkgver"
-
-  mkdir -p build
-  make test
-}
-
-package() {
-  cd "$srcdir/OpenRCT2-$pkgver/build"
-
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir/usr/lib/libopenrct2.a"
-  rmdir "$pkgdir/usr/lib"
-}

Copied: openrct2/repos/community-x86_64/PKGBUILD (from rev 964296, openrct2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-16 15:43:05 UTC (rev 964297)
@@ -0,0 +1,54 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Graham Edgecombe <graham at grahamedgecombe.com>
+
+pkgname=openrct2
+pkgver=0.3.3
+pkgrel=4
+pkgdesc='Open source re-implementation of Roller Coaster Tycoon 2 (requires full
+         copy of the game)'
+arch=('x86_64')
+url='https://openrct2.io'
+license=('GPL3')
+depends=('hicolor-icon-theme' 'sdl2' 'curl' 'speexdsp' 'fontconfig'
+         'libpng' 'openssl' 'libzip' 'icu' 'duktape' 'benchmark')
+makedepends=('cmake' 'nlohmann-json')
+optdepends=('zenity: System dialog box support (GNOME/GTK)'
+            'kdialog: System dialog box support (KDE)'
+            'alsa-lib: ALSA audio driver'
+            'libpulse: PulseAudio audio driver')
+source=($pkgname-$pkgver.tar.gz::https://github.com/OpenRCT2/OpenRCT2/archive/v$pkgver.tar.gz
+        googletest-fix-maybe-uninitialized.patch)
+sha256sums=('71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2'
+            '6c4becab25ec1824883a4c1946d4aa4b45534b9a6199b782db7879b78178ff84')
+
+prepare() {
+  cd "$srcdir/OpenRCT2-$pkgver"
+  mkdir build
+
+  # add cmake command to patch googletest with https://github.com/google/googletest/pull/3024
+  sed '/URL https:\/\/github.com\/google\/googletest/ a PATCH_COMMAND patch -p1 -i ../../../../../googletest-fix-maybe-uninitialized.patch' -i test/tests/CMakeLists.txt
+}
+
+build() {
+  cd "$srcdir/OpenRCT2-$pkgver/build"
+
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSTATIC=off -DWITH_TESTS=on -DCMAKE_INSTALL_LIBDIR=/usr/lib ..
+  make all g2
+}
+
+check() {
+  cd "$srcdir/OpenRCT2-$pkgver"
+
+  mkdir -p build
+  make test
+}
+
+package() {
+  cd "$srcdir/OpenRCT2-$pkgver/build"
+
+  make DESTDIR="$pkgdir" install
+
+  rm "$pkgdir/usr/lib/libopenrct2.a"
+  rmdir "$pkgdir/usr/lib"
+}

Copied: openrct2/repos/community-x86_64/googletest-fix-maybe-uninitialized.patch (from rev 964296, openrct2/trunk/googletest-fix-maybe-uninitialized.patch)
===================================================================
--- googletest-fix-maybe-uninitialized.patch	                        (rev 0)
+++ googletest-fix-maybe-uninitialized.patch	2021-06-16 15:43:05 UTC (rev 964297)
@@ -0,0 +1,21 @@
+diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
+index fca1035..d9ac1e6 100644
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -996,14 +996,14 @@ static int ExecDeathTestChildMain(void* child_arg) {
+ // correct answer.
+ void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_;
+ void StackLowerThanAddress(const void* ptr, bool* result) {
+-  int dummy;
++  int dummy = 0;
+   *result = (&dummy < ptr);
+ }
+ 
+ // Make sure AddressSanitizer does not tamper with the stack here.
+ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+ bool StackGrowsDown() {
+-  int dummy;
++  int dummy = 0;
+   bool result;
+   StackLowerThanAddress(&dummy, &result);
+   return result;