[packages/elektra] - added system-gtest patch to avoid gtest downloading

[qboosh]

commit dad55a17d63f09cd3d1650ac2151f4eb93daee6f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 7 06:23:53 2022 +0200

    - added system-gtest patch to avoid gtest downloading

 elektra-system-gtest.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 elektra.spec               |  3 +++
 2 files changed, 56 insertions(+)
---
diff --git a/elektra.spec b/elektra.spec
index 1b030cb..754324c 100644
--- a/elektra.spec
+++ b/elektra.spec
@@ -40,6 +40,7 @@ Patch2:		disable-broken-tests.patch
 Patch3:		gcc11.patch
 Patch4:		%{name}-gpgme.patch
 Patch5:		%{name}-jni.patch
+Patch6:		%{name}-system-gtest.patch
 URL:		https://www.libelektra.org/
 %if %{with qt}
 BuildRequires:	Qt5Core-devel >= 5.3
@@ -534,6 +535,7 @@ Wiązanie języka Ruby dla Elektry.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' $(grep -l '/usr/bin/env bash' -r scripts)
 %{__sed} -i -e '1s,/usr/bin/env sh,/bin/sh,' scripts/check-env-dep
@@ -549,6 +551,7 @@ cd build
 %cmake .. \
 	-DBINDINGS="INTERCEPT;cpp;io_uv%{?with_glib:;glib;io_glib%{?with_gsettings:;gsettings}%{?with_lua:;gi_lua}%{?with_python3:;gi_python}}%{?with_java_mvn:;jna}%{?with_lua:;swig_lua}%{?with_python2:;swig_python2}%{?with_python3:;swig_python}%{?with_ruby:;swig_ruby}" \
 	%{!?with_full:-DBUILD_FULL=OFF} \
+	-DENABLE_TESTING=FALSE \
 	-DINSTALL_TESTING=FALSE \
 	%{?with_glib:-DIS_GLIB_ADDED=ON} \
 	-DPLUGINS=ALL \
diff --git a/elektra-system-gtest.patch b/elektra-system-gtest.patch
new file mode 100644
index 0000000..5ccbc9f
--- /dev/null
+++ b/elektra-system-gtest.patch
@@ -0,0 +1,53 @@
+--- elektra-0.8.26/tests/CMakeLists.txt.orig	2019-02-26 12:45:46.000000000 +0100
++++ elektra-0.8.26/tests/CMakeLists.txt	2022-07-06 20:43:06.457706947 +0200
+@@ -12,38 +12,8 @@ include (LibAddMacros)
+ 
+ if (ENABLE_TESTING)
+ 
+-	include (FindGTest)
++	find_package (GTest)
+ 
+-	if (DEFINED GOOGLETEST_ROOT)
+-		set (googletest_SOURCE_DIR "${GOOGLETEST_ROOT}")
+-		set (googletest_BINARY_DIR "${CMAKE_BINARY_DIR}/gtest")
+-	else (DEFINED GOOGLETEST_ROOT)
+-		include (DownloadProject)
+-		if (CMAKE_VERSION VERSION_LESS 3.2)
+-			set (UPDATE_DISCONNECTED_IF_AVAILABLE "")
+-		else ()
+-			set (UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1")
+-		endif ()
+-
+-		download_project (PROJ googletest
+-				  GIT_REPOSITORY https://github.com/google/googletest.git
+-				  GIT_TAG release-1.8.1
+-				  QUIET
+-				  ${UPDATE_DISCONNECTED_IF_AVAILABLE})
+-	endif (DEFINED GOOGLETEST_ROOT)
+-
+-	# Prevent GoogleTest from overriding our compiler/linker options when building with Visual Studio
+-	set (gtest_force_shared_crt
+-	     ON
+-	     CACHE BOOL
+-		   ""
+-	     FORCE)
+-
+-	add_subdirectory (${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+-
+-	set_property (TARGET gtest
+-		      PROPERTY COMPILE_FLAGS
+-			       "-Wno-undef")
+ endif (ENABLE_TESTING)
+ 
+ # don't call add_headers in a loop
+--- elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake.orig	2019-02-26 12:45:46.000000000 +0100
++++ elektra-0.8.26/cmake/Modules/LibAddPlugin.cmake	2022-07-06 21:58:10.920432262 +0200
+@@ -183,7 +183,7 @@ function (add_plugintest testname)
+ 		target_link_elektra (${testexename} elektra-kdb elektra-plugin ${ARG_LINK_ELEKTRA} ${ARG_TEST_LINK_ELEKTRA})
+ 
+ 		if (ARG_CPP)
+-			target_link_libraries (${testexename} gtest_main)
++			target_link_libraries (${testexename} gtest_main gtest)
+ 		endif (ARG_CPP)
+ 
+ 		set_additional_compile_definitions (${testname})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/elektra.git/commitdiff/dad55a17d63f09cd3d1650ac2151f4eb93daee6f