* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2023-12-25 11:43 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-12-25 11:43 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2022-09-14 9:18 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 9:18 UTC (permalink / raw
To: gentoo-commits
commit: a5abf6a3da6f8e3c71eaf00d3c182e1db9843d13
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 09:17:40 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 09:18:15 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5abf6a3
dev-libs/grantlee: Rebase grantlee-{9999 => 5.3.0}-slot.patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...e-9999-slot.patch => grantlee-5.3.0-slot.patch} | 30 ++++++++++------------
dev-libs/grantlee/grantlee-9999.ebuild | 14 +++++-----
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
similarity index 78%
rename from dev-libs/grantlee/files/grantlee-9999-slot.patch
rename to dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
index 9490df2327..896290499d 100644
--- a/dev-libs/grantlee/files/grantlee-9999-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
@@ -1,31 +1,28 @@
-From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001
+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.
-
-Amended with target_include_directories fix by jospezial.
-
---
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 5058481..3ef29a4 100644
+index 07a192c..9049bdc 100644
--- a/templates/lib/CMakeLists.txt
+++ b/templates/lib/CMakeLists.txt
-@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND)
+@@ -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>")
- target_link_libraries(Grantlee_Templates
- PRIVATE Qt5::Qml
- )
-@@ -152,10 +153,10 @@ install(FILES
+ 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
@@ -39,18 +36,18 @@ index 5058481..3ef29a4 100644
+ DESTINATION include/grantlee5 COMPONENT Templates
)
diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 2c5a96f..c42d32a 100644
+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>")
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
- target_link_libraries(Grantlee_TextDocument
- PUBLIC Qt5::Gui
-@@ -59,10 +60,10 @@ install(FILES
+ 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
@@ -64,4 +61,5 @@ index 2c5a96f..c42d32a 100644
+ DESTINATION include/grantlee5 COMPONENT TextDocument
)
--
-2.24.0
+2.37.3
+
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index 26b6932c53..133c2a70f0 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -15,10 +15,8 @@ SLOT="5"
KEYWORDS=""
IUSE="debug doc test"
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
- test? ( dev-qt/linguist-tools:5 )
-"
+RESTRICT="!test? ( test )"
+
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
@@ -27,12 +25,14 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
"
-
-RESTRICT="!test? ( test )"
+BDEPEND="
+ doc? ( app-doc/doxygen[dot] )
+ test? ( dev-qt/linguist-tools:5 )
+"
PATCHES=(
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
- "${FILESDIR}/${P}-slot.patch"
+ "${FILESDIR}/${PN}-5.3.0-slot.patch" # TODO: Qt5 specific
)
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2019-12-21 23:52 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-12-21 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 09e7eb596ec6441fc7a523809e3dad3f09b5be50
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 23:19:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 "$<INSTALL_INTERFACE:include/grantlee5>")
++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/grantlee5>")
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
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2019-11-30 11:20 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-11-30 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 2d4aa530256e8a86df9357042ea6608e4b0d11e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 11:05:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 11:20:00 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d4aa530
dev-libs/grantlee: Rebase patch on top of master
Closes: https://bugs.gentoo.org/701534
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 --------------
dev-libs/grantlee/files/grantlee-9999-slot.patch | 65 +++++++++++++++++++++++
dev-libs/grantlee/grantlee-9999.ebuild | 2 +-
3 files changed, 66 insertions(+), 40 deletions(-)
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
deleted file mode 100644
index 5b0d61d5c1..0000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Install headers to a custom location to permit slotting with Qt4 version.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1324566..f98d5da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
- set( BIN_INSTALL_DIR bin )
--set( INCLUDE_INSTALL_DIR include )
-+set( INCLUDE_INSTALL_DIR include/grantlee5 )
- set( DATA_INSTALL_DIR share/apps )
-
- # set up RPATH/install_name_dir
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index dad2ef8..434d163 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -107,6 +107,7 @@ if (Qt5Script_FOUND)
-
- target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
- target_link_libraries(Grantlee_Templates
- LINK_PRIVATE Qt5::Script
- )
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 557d262..d2dbaa1 100644
---- a/textdocument/lib/CMakeLists.txt
-+++ b/textdocument/lib/CMakeLists.txt
-@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
- )
- endforeach()
- endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-
- target_link_libraries(Grantlee_TextDocument
- LINK_PUBLIC Qt5::Gui
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch
new file mode 100644
index 0000000000..546d623ef7
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch
@@ -0,0 +1,65 @@
+From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 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 5058481..3ef29a4 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND)
+
+ target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
+ target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
+ target_link_libraries(Grantlee_Templates
+ PRIVATE Qt5::Qml
+ )
+@@ -152,10 +153,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 2c5a96f..c42d32a 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_INSTALL_DIR}>")
+
+ target_link_libraries(Grantlee_TextDocument
+ PUBLIC Qt5::Gui
+@@ -59,10 +60,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.24.0
+
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index 84f512cd9d..3db5604c37 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -32,7 +32,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
- "${FILESDIR}/${PN}-5.1.0-slot.patch"
+ "${FILESDIR}/${P}-slot.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2013-08-01 23:15 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2013-08-01 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 1e8b3745e75ca7343abe44447ca997e849455a9d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 1 23:15:23 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug 1 23:15:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1e8b3745
[dev-libs/grantlee] Remove failing patch, seems upstreamed.
Package-Manager: portage-2.2.0_alpha191
---
.../files/grantlee-0.1.9-qt-test-optional.patch | 46 ----------------------
dev-libs/grantlee/grantlee-9999.ebuild | 1 -
2 files changed, 47 deletions(-)
diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
deleted file mode 100644
index 6af42cb..0000000
--- a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 22 Mar 2012 11:37:57 +0100
-Subject: [PATCH] Search only for qt-test if test build option is enabled.
-
-Build fails on systems were no qt-test is installed and the build option
-for tests is disabled. See downstream bug report
-https://bugs.gentoo.org/show_bug.cgi?id=409131.
----
- templates/CMakeLists.txt | 6 +++++-
- textdocument/CMakeLists.txt | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
-index 0594cc3..eec0f12 100644
---- a/templates/CMakeLists.txt
-+++ b/templates/CMakeLists.txt
-@@ -1,5 +1,9 @@
-
--find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+if (BUILD_TESTS)
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+else (BUILD_TESTS)
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
-+endif (BUILD_TESTS)
-
- include(${Grantlee_USE_FILE})
-
-diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
-index d456663..8fa2892 100644
---- a/textdocument/CMakeLists.txt
-+++ b/textdocument/CMakeLists.txt
-@@ -1,5 +1,9 @@
-
--find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest)
-+if (BUILD_TESTS)
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+else (BUILD_TESTS)
-+ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
-+endif (BUILD_TESTS)
-
- include(${QT_USE_FILE})
-
---
-1.7.9.4
-
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index e23a573..19ff89f 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="${COMMON_DEPEND}"
DOCS=(AUTHORS CHANGELOG GOALS README)
PATCHES=(
- "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch"
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2013-03-09 11:29 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2013-03-09 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 169db0409eb5a4836efc88419fa07775cb01cc92
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 11:31:17 2013 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 11:31:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=169db040
[dev-libs/grantlee] Do not make linker warnings fatal, fixes bug 430968
Package-Manager: portage-2.2.0_alpha166
---
.../files/grantlee-0.3.0-nonfatal-warnings.patch | 14 ++++++++++++++
dev-libs/grantlee/grantlee-9999.ebuild | 5 ++++-
2 files changed, 18 insertions(+), 1 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
new file mode 100644
index 0000000..a25f52b
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
@@ -0,0 +1,14 @@
+diff -ruN grantlee-0.3.0.orig/CMakeLists.txt grantlee-0.3.0/CMakeLists.txt
+--- grantlee-0.3.0.orig/CMakeLists.txt 2012-11-01 21:14:18.000000000 +0100
++++ grantlee-0.3.0/CMakeLists.txt 2013-03-09 12:25:56.498096399 +0100
+@@ -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/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index e5f42f3..d9c7791 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -29,7 +29,10 @@ RDEPEND="${COMMON_DEPEND}"
DOCS=(AUTHORS CHANGELOG GOALS README)
-PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch"
+ "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
+)
src_configure() {
mycmakeargs=(
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/
@ 2012-03-22 11:44 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2012-03-22 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 0b0410fb8b691311e324a89aff9cb647c4123969
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 11:49:17 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 11:49:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b0410fb
[dev-libs/grantlee] Fix build if qt-test is not installed and add missing dep on qt-test, fixes bug 409131.
(Portage version: 2.2.0_alpha93/git/Linux i686, unsigned Manifest commit)
---
.../files/grantlee-0.1.9-qt-test-optional.patch | 46 ++++++++++++++++++++
dev-libs/grantlee/grantlee-0.2.0.ebuild | 3 +
dev-libs/grantlee/grantlee-9999.ebuild | 3 +
3 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
new file mode 100644
index 0000000..6af42cb
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
@@ -0,0 +1,46 @@
+From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 22 Mar 2012 11:37:57 +0100
+Subject: [PATCH] Search only for qt-test if test build option is enabled.
+
+Build fails on systems were no qt-test is installed and the build option
+for tests is disabled. See downstream bug report
+https://bugs.gentoo.org/show_bug.cgi?id=409131.
+---
+ templates/CMakeLists.txt | 6 +++++-
+ textdocument/CMakeLists.txt | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
+index 0594cc3..eec0f12 100644
+--- a/templates/CMakeLists.txt
++++ b/templates/CMakeLists.txt
+@@ -1,5 +1,9 @@
+
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++if (BUILD_TESTS)
++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++else (BUILD_TESTS)
++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
++endif (BUILD_TESTS)
+
+ include(${Grantlee_USE_FILE})
+
+diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
+index d456663..8fa2892 100644
+--- a/textdocument/CMakeLists.txt
++++ b/textdocument/CMakeLists.txt
+@@ -1,5 +1,9 @@
+
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest)
++if (BUILD_TESTS)
++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++else (BUILD_TESTS)
++ find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
++endif (BUILD_TESTS)
+
+ include(${QT_USE_FILE})
+
+--
+1.7.9.4
+
diff --git a/dev-libs/grantlee/grantlee-0.2.0.ebuild b/dev-libs/grantlee/grantlee-0.2.0.ebuild
index 3c93aef..8fc5cbb 100644
--- a/dev-libs/grantlee/grantlee-0.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-0.2.0.ebuild
@@ -23,6 +23,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+ test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 )
"
RDEPEND="${COMMON_DEPEND}"
@@ -31,6 +32,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
# Some tests fail
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" )
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use_build test TESTS)
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index ad22812..6f3de7d 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -23,11 +23,14 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+ test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 )
"
RDEPEND="${COMMON_DEPEND}"
DOCS=(AUTHORS CHANGELOG GOALS README)
+PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" )
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use_build test TESTS)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-12-25 11:43 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-25 11:43 [gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-09-14 9:18 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox