Date: Sunday, August 7, 2016 @ 23:40:14 Author: anthraxx Revision: 185971
upgpkg: gtest 1.7.0-5 (fix pkgconfig gen for subprojects FS#50305) Added: gtest/trunk/gtest.pc.in Modified: gtest/trunk/PKGBUILD gtest/trunk/pkgconfig.patch -----------------+ PKGBUILD | 16 +++++++++++----- gtest.pc.in | 9 +++++++++ pkgconfig.patch | 28 ---------------------------- 3 files changed, 20 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-07 21:23:14 UTC (rev 185970) +++ PKGBUILD 2016-08-07 23:40:14 UTC (rev 185971) @@ -6,7 +6,7 @@ pkgname=gtest pkgver=1.7.0 -pkgrel=4 +pkgrel=5 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)" arch=('i686' 'x86_64') url="http://code.google.com/p/googletest/" @@ -14,14 +14,17 @@ depends=('gcc-libs' 'sh') makedepends=('python2' 'cmake') source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip - pkgconfig.patch) + pkgconfig.patch + gtest.pc.in) sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07' - 'e39e62960566408f4c011e630b7c4dc8f9de5da3f7b5ac01ef0214712eff9c9283d6f6b19b375c806d7ed3f056258b3096c51855134766d609989d40f80f3bc7') + '7e9ad4cd470eaab7ed5fb1cce1d5721d40fc03a62b0c895b8f9657679ffa43f91b99800bb1e02a6c5c2d0a72e94bb8ea008aa6e74fdb1460b1326a84da5e9f91' + '4760a6e039eaeb6c3b917cfac173e4738a5d4675b89b84ad91b0260b7f4386ce3561529c0b7d1f8c3792beb3c8535470372b196585ec4468739a17fa314637e0') prepare() { cd "$srcdir/$pkgname-$pkgver" + cp "${srcdir}/gtest.pc.in" . + sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in patch -p1 < "${srcdir}/pkgconfig.patch" - sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in mkdir build } @@ -48,8 +51,11 @@ install -Dm 644 include/gtest/internal/*.h -t "$pkgdir"/usr/include/gtest/internal install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname install -Dm 644 fused-src/gtest/* -t "$pkgdir"/usr/src/gtest/src + install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake + + # undo pkg-config patch so subprojects including this don't try to generate it + patch -Rp1 < "${srcdir}/pkgconfig.patch" install -Dm 644 CMakeLists.txt -t "$pkgdir"/usr/src/gtest - install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake } # vim:set ts=2 sw=2 et: Added: gtest.pc.in =================================================================== --- gtest.pc.in (rev 0) +++ gtest.pc.in 2016-08-07 23:40:14 UTC (rev 185971) @@ -0,0 +1,9 @@ +Name: libgtest +Description: Google's framework for writing C++ tests on a variety of platforms +Version: 0.0.0 + +prefix=@CMAKE_INSTALL_PREFIX@ +includedir=${prefix}/include +libdir=${prefix}/lib +Cflags:-I${includedir}/gtest +Libs: -L${libdir} -lgtest -lgtest_main Modified: pkgconfig.patch =================================================================== --- pkgconfig.patch 2016-08-07 21:23:14 UTC (rev 185970) +++ pkgconfig.patch 2016-08-07 23:40:14 UTC (rev 185971) @@ -1,16 +1,3 @@ -From d4b25ce723812faf78d8ee038b7cbed00cbba682 Mon Sep 17 00:00:00 2001 -From: Rodrigo Caimi <ca...@datacom.ind.br> -Date: Tue, 7 Oct 2014 15:37:10 -0300 -Subject: [PATCH] CMakeLists, gtest.pc.in: Add pkg-config support to gtest - 1.7.0 - -Signed-off-by: Rodrigo Caimi <ca...@datacom.ind.br> ---- - CMakeLists.txt | 6 ++++++ - gtest.pc.in | 9 +++++++++ - 2 files changed, 15 insertions(+) - create mode 100644 gtest.pc.in - diff --git a/CMakeLists.txt b/CMakeLists.txt index 281c4c2..e4354a8 100644 --- a/CMakeLists.txt @@ -36,20 +23,5 @@ ######################################################################## # # Samples on how to link user tests with gtest or gtest_main. -diff --git a/gtest.pc.in b/gtest.pc.in -new file mode 100644 -index 0000000..57b1049 ---- /dev/null -+++ b/gtest.pc.in -@@ -0,0 +1,9 @@ -+Name: libgtest -+Description: Google's framework for writing C++ tests on a variety of platforms -+Version: 0.0.0 -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=${prefix}/include -+libdir=${prefix}/lib -+Cflags:-I${includedir}/gtest -+Libs: -L${libdir} -lgtest -lgtest_main -- 1.9.1