From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
Date: Mon, 25 Dec 2023 11:43:31 +0000 (UTC) [thread overview]
Message-ID: <1703504464.cf66454be3b2c2b5cdba95fe7ff1289afc088fe2.asturm@gentoo> (raw)
commit: cf66454be3b2c2b5cdba95fe7ff1289afc088fe2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 11:41:04 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 11:41:04 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf66454b
dev-libs/grantlee: treeclean
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/grantlee-0.3.0-nonfatal-warnings.patch | 17 ------
dev-libs/grantlee/files/grantlee-5.3.0-slot.patch | 65 ----------------------
dev-libs/grantlee/grantlee-9999.ebuild | 61 --------------------
dev-libs/grantlee/metadata.xml | 11 ----
4 files changed, 154 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-5.3.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
deleted file mode 100644
index 444274b099..0000000000
--- a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f9dda5f8a81c18c59eabcea515084253c284803a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 30 Nov 2019 11:55:33 +0100
-Subject: [PATCH] Install headers to a custom location to permit slotting
-
-That was previously necessary with Qt4 version, let's keep it while
-Qt6 is around the corner.
----
- templates/lib/CMakeLists.txt | 5 +++--
- textdocument/lib/CMakeLists.txt | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index 07a192c..9049bdc 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND OR Qt6Qml_FOUND)
-
- target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
- if (GRANTLEE_BUILD_WITH_QT6)
- target_link_libraries(Grantlee_Templates
- PRIVATE Qt6::Qml
-@@ -164,10 +165,10 @@ install(FILES
- token.h
- util.h
- variable.h
-- DESTINATION include/grantlee COMPONENT Templates
-+ DESTINATION include/grantlee5/grantlee COMPONENT Templates
- )
-
- install(FILES
- grantlee_templates.h
-- DESTINATION include COMPONENT Templates
-+ DESTINATION include/grantlee5 COMPONENT Templates
- )
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index a472267..8134d83 100644
---- a/textdocument/lib/CMakeLists.txt
-+++ b/textdocument/lib/CMakeLists.txt
-@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
- )
- endforeach()
- endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>")
-
- if (GRANTLEE_BUILD_WITH_QT6)
- target_link_libraries(Grantlee_TextDocument
-@@ -65,10 +66,10 @@ install(FILES
- texthtmlbuilder.h
- mediawikimarkupbuilder.h
- ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h
-- DESTINATION include/grantlee COMPONENT TextDocument
-+ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument
- )
-
- install(FILES
- grantlee_textdocument.h
-- DESTINATION include COMPONENT TextDocument
-+ DESTINATION include/grantlee5 COMPONENT TextDocument
- )
---
-2.37.3
-
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
deleted file mode 100644
index c3cc527ae4..0000000000
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-DESCRIPTION="C++ string template engine based on the Django template system"
-HOMEPAGE="https://github.com/steveire/grantlee"
-EGIT_REPO_URI=( "https://github.com/steveire/${PN}" )
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS=""
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
- test? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
- "${FILESDIR}/${PN}-5.3.0-slot.patch" # TODO: Qt5 specific
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGRANTLEE_BUILD_WITH_QT6=OFF
- -DBUILD_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- use doc && cmake_src_compile docs
-}
-
-src_test() {
- local -x QT_QPA_PLATFORM="offscreen"
- cmake_src_test
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}/apidox/" )
-
- cmake_src_install
-}
diff --git a/dev-libs/grantlee/metadata.xml b/dev-libs/grantlee/metadata.xml
deleted file mode 100644
index 11bde0988c..0000000000
--- a/dev-libs/grantlee/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">steveire/grantlee</remote-id>
- </upstream>
-</pkgmetadata>
next reply other threads:[~2023-12-25 11:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-25 11:43 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-14 9:18 [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/ Andreas Sturmlechner
2019-12-21 23:52 Andreas Sturmlechner
2019-11-30 11:20 Andreas Sturmlechner
2013-08-01 23:15 Johannes Huber
2013-03-09 11:29 Andreas Hüttel
2012-03-22 11:44 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1703504464.cf66454be3b2c2b5cdba95fe7ff1289afc088fe2.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox