commit: 9e3ec79f3e89bc1a83dd03bc95cf2f6f5361105a Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Sun Jun 9 17:23:47 2019 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sun Jun 9 19:36:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3ec79f
media-video/aegisub: Enable testing with >=dev-cpp/gtest-1.8.1 Updates the gtest dependency. Tests build, run, and pass without issue. Closes: https://github.com/gentoo/gentoo/pull/12230 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild | 4 ++-- .../aegisub-3.2.2_p20160518-support-system-gtest.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild index d5b623eb234..bef93fffa85 100644 --- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild +++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig test? ( - ~dev-cpp/gtest-1.7.0 + >=dev-cpp/gtest-1.8.1 dev-lua/busted dev-lua/luarocks ) diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch index 8209ac5ec7c..7e3fac2acd8 100644 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch +++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch @@ -24,13 +24,13 @@ index 8c30c1d..c5bf049 100644 GTEST_ROOT ?= $(TOP)vendor/googletest GTEST_FILE := ${GTEST_ROOT}/src/gtest-all +GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include -+GTEST_CXXFLAGS := $(CFLAGS_PTHREAD) +GTEST_LIBS := $(LIBS_PTHREAD) +else -+GTEST_CPPFLAGS := $(shell gtest-config --cppflags) -+GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) -+GTEST_LIBS := $(shell gtest-config --libs) ++GTEST_CPPFLAGS := $(shell pkg-config --cflags-only-I gtest) ++GTEST_LIBS := $(shell pkg-config --libs gtest) +endif ++ ++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD) run_PCH := $(d)support/tests_pre.h run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \
