From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 611C8138334 for ; Sat, 21 Dec 2019 23:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 624D1E0934; Sat, 21 Dec 2019 23:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35370E0934 for ; Sat, 21 Dec 2019 23:52:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 710CD34D6B8 for ; Sat, 21 Dec 2019 23:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF513778 for ; Sat, 21 Dec 2019 23:52:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1576972207.09e7eb596ec6441fc7a523809e3dad3f09b5be50.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/ X-VCS-Repository: proj/kde X-VCS-Files: dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch dev-libs/grantlee/files/grantlee-9999-slot.patch dev-libs/grantlee/grantlee-9999.ebuild X-VCS-Directories: dev-libs/grantlee/files/ dev-libs/grantlee/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 09e7eb596ec6441fc7a523809e3dad3f09b5be50 X-VCS-Branch: master Date: Sat, 21 Dec 2019 23:52:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b8e95f12-6c48-4b24-9e66-16600c94937b X-Archives-Hash: e37b4c3d5c86fda64962620221cb4e22 commit: 09e7eb596ec6441fc7a523809e3dad3f09b5be50 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 21 23:19:22 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 21 23:50:07 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=09e7eb59 dev-libs/grantlee: Use ecm.eclass, set ECM_TEST=true Drop obsolete patch. Fix ${P}-slot.patch. Upstream commits: 852c7d6f675094c1babeb27418af0de3a45cd449 57273ec2bce439eb2feed3b20789862ae343862d 603b40ec6d8e3e6d46a054405646fad64eed2b3e 65e7e4372333be8e74b67d7a2b167f7fe2bb19b4 9bc7a24d1393c1e1c23315fd7321dbc9249cf2a3 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/grantlee-0.3.0-nonfatal-warnings.patch | 17 --------- dev-libs/grantlee/files/grantlee-9999-slot.patch | 18 ++++----- dev-libs/grantlee/grantlee-9999.ebuild | 44 +++++++--------------- 3 files changed, 22 insertions(+), 57 deletions(-) diff --git a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch deleted file mode 100644 index b35dc46586..0000000000 --- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch +++ /dev/null @@ -1,17 +0,0 @@ -Do not make linker warnings fatal. - -Gentoo-bug: 430968 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,8 +62,8 @@ - endif() - - if (NOT APPLE) -- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") -- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") -+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") -+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") - endif () - - if (NOT MINGW) diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch index 9490df2327..b761a66320 100644 --- a/dev-libs/grantlee/files/grantlee-9999-slot.patch +++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch @@ -21,7 +21,7 @@ index 5058481..3ef29a4 100644 target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) -+ target_include_directories(Grantlee_Templates INTERFACE "$") ++ target_include_directories(Grantlee_Templates INTERFACE "$") target_link_libraries(Grantlee_Templates PRIVATE Qt5::Qml ) @@ -29,14 +29,14 @@ index 5058481..3ef29a4 100644 token.h util.h variable.h -- DESTINATION include/grantlee COMPONENT Templates -+ DESTINATION include/grantlee5/grantlee COMPONENT Templates +- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee COMPONENT Templates ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5/grantlee COMPONENT Templates ) install(FILES grantlee_templates.h -- DESTINATION include COMPONENT Templates -+ DESTINATION include/grantlee5 COMPONENT Templates +- DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Templates ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5 COMPONENT Templates ) diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt index 2c5a96f..c42d32a 100644 @@ -54,14 +54,14 @@ index 2c5a96f..c42d32a 100644 texthtmlbuilder.h mediawikimarkupbuilder.h ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h -- DESTINATION include/grantlee COMPONENT TextDocument -+ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument +- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee COMPONENT TextDocument ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5/grantlee COMPONENT TextDocument ) install(FILES grantlee_textdocument.h -- DESTINATION include COMPONENT TextDocument -+ DESTINATION include/grantlee5 COMPONENT TextDocument +- DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT TextDocument ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/grantlee5 COMPONENT TextDocument ) -- 2.24.0 diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index 966a35c877..cb19bfbf32 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -3,8 +3,11 @@ EAPI=7 +ECM_TEST="true" +KFMIN=5.65.0 +QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit kde.org cmake virtualx +inherit kde.org ecm DESCRIPTION="C++ string template engine based on the Django template system" HOMEPAGE="https://github.com/steveire/grantlee" @@ -12,48 +15,27 @@ HOMEPAGE="https://github.com/steveire/grantlee" LICENSE="LGPL-2.1+" SLOT="5" KEYWORDS="" -IUSE="debug doc test" +IUSE="doc" BDEPEND=" doc? ( app-doc/doxygen[dot] ) - test? ( dev-qt/linguist-tools:5 ) + test? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) " RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 " -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -RESTRICT+=" !test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" - "${FILESDIR}/${P}-slot.patch" -) +DEPEND="${RDEPEND}" -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} +PATCHES=( "${FILESDIR}/${P}-slot.patch" ) src_compile() { - cmake_src_compile - + ecm_src_compile use doc && cmake_src_compile docs } -src_test() { - virtx cmake_src_test -} - src_install() { use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/") - - cmake_src_install + ecm_src_install }