[arch-commits] Commit in gtest/trunk (PKGBUILD gtest-1.8.1-libversion.patch)

[Levente Polyak]

    Date: Monday, October 1, 2018 @ 16:11:49
  Author: anthraxx
Revision: 388897

upgpkg: gtest 1.8.1-3 (fix soname patch FS#60216)

Modified:
  gtest/trunk/PKGBUILD
  gtest/trunk/gtest-1.8.1-libversion.patch

------------------------------+
 PKGBUILD                     |    9 +++++----
 gtest-1.8.1-libversion.patch |    8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-01 15:58:45 UTC (rev 388896)
+++ PKGBUILD	2018-10-01 16:11:49 UTC (rev 388897)
@@ -8,7 +8,7 @@
 pkgbase=gtest
 pkgname=('gtest' 'gmock')
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Google Test - C++ testing utility'
 url='https://github.com/google/googletest'
 arch=('x86_64')
@@ -19,14 +19,15 @@
         gtest-1.8.1-libversion.patch
         gtest-1.8.1-null-pointer.patch)
 sha512sums=('e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7'
-            'fd53e4a703c39cf4f1bc2eec2fac6c567e583d5e5a2ab4b52700ead77caf4f4903c4d32b8b25b983c5f650fc2b1e835fdf124b04a971705f42a707a42b34a99e'
+            'e9bd9d65f6e54f71be0026b84c6543a71f9e3d5c0da92eb7f01df3f5937871eff2b8177e3680fec8d733888327eda5f5f3caaf88a3263ada542cdd2b42475ac5'
             'afa75f975d8aed453c901245dae753939958d8b72e3e5c52995efe7980f44de4fd1ea08f1b0a4cc927443d858de0a1fe34a919512ce05ae443bfb9600b08f029')
 
 prepare() {
   cd ${_srcname}
-
+  cp ../gtest-1.8.1-libversion.patch gtest-1.8.1-libversion.patch
+  sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-1.8.1-libversion.patch
   # https://src.fedoraproject.org/rpms/gtest/tree/master
-  patch -Np1 -i ../gtest-1.8.1-libversion.patch
+  patch -Np1 -i gtest-1.8.1-libversion.patch
   patch -Np1 -i ../gtest-1.8.1-null-pointer.patch
 
   find . -name '*.py' -exec sed -i '1s|python$|&2|g' {} +

Modified: gtest-1.8.1-libversion.patch
===================================================================
--- gtest-1.8.1-libversion.patch	2018-10-01 15:58:45 UTC (rev 388896)
+++ gtest-1.8.1-libversion.patch	2018-10-01 16:11:49 UTC (rev 388897)
@@ -6,10 +6,10 @@
  else()
    cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
    target_link_libraries(gmock PUBLIC gtest)
-+  set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
++  set_target_properties(gmock PROPERTIES VERSION __GOOGLETEST_VERSION__)
    cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
    target_link_libraries(gmock_main PUBLIC gmock)
-+  set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
++  set_target_properties(gmock_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
  endif()
  # If the CMake version supports it, attach header directory information
  # to the targets for when we are part of a parent build (ie being pulled
@@ -21,9 +21,9 @@
  # are used for other targets, to ensure that gtest can be compiled by a user
  # aggressive about warnings.
  cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
++set_target_properties(gtest PROPERTIES VERSION __GOOGLETEST_VERSION__)
  cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
++set_target_properties(gtest_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
  # If the CMake version supports it, attach header directory information
  # to the targets for when we are part of a parent build (ie being pulled
  # in via add_subdirectory() rather than being a standalone build).