[arch-commits] Commit in openrct2/trunk (2 files)

[Massimiliano Torromeo]

    Date: Wednesday, June 16, 2021 @ 15:42:59
  Author: mtorromeo
Revision: 964296

upgpkg: openrct2 0.3.3-4: rebuild for benchmark-1.5.5

Added:
  openrct2/trunk/googletest-fix-maybe-uninitialized.patch
Modified:
  openrct2/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   20 ++++++++++++++------
 googletest-fix-maybe-uninitialized.patch |   21 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-16 15:42:33 UTC (rev 964295)
+++ PKGBUILD	2021-06-16 15:42:59 UTC (rev 964296)
@@ -3,7 +3,7 @@
 
 pkgname=openrct2
 pkgver=0.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Open source re-implementation of Roller Coaster Tycoon 2 (requires full
          copy of the game)'
 arch=('x86_64')
@@ -16,14 +16,22 @@
             '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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/OpenRCT2/OpenRCT2/archive/v$pkgver.tar.gz
+        googletest-fix-maybe-uninitialized.patch)
+sha256sums=('71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2'
+            '6c4becab25ec1824883a4c1946d4aa4b45534b9a6199b782db7879b78178ff84')
 
-build() {
+prepare() {
   cd "$srcdir/OpenRCT2-$pkgver"
+  mkdir build
 
-  mkdir -p build
-  cd 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

Added: googletest-fix-maybe-uninitialized.patch
===================================================================
--- googletest-fix-maybe-uninitialized.patch	                        (rev 0)
+++ googletest-fix-maybe-uninitialized.patch	2021-06-16 15:42:59 UTC (rev 964296)
@@ -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;