commit: c6cc7f210b5b3faa94e25503d8049ef6d2cc7707 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 8 11:45:24 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 11:58:04 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c6cc7f21
dev-qt/qtlocation: Drop QT5_KDEPATCHSET_REV, ship as regular patch This package continues to be the odd one out: - Rolling patchsets off kde/5.15 branch fails applying update subproject commits for mapbox-gl-native - The only patch remaining in Qt5PatchCollection at the moment has no "Pick-to: 5.15" so will be carried indefinitely - The back and forth around "mega crashy" Qt.labs.location documented in - https://invent.kde.org/qt/qt/qtlocation/-/merge_requests/4 - https://bugreports.qt.io/browse/QTBUG-101765 - https://bugreports.qt.io/browse/QTBUG-104682 - https://bugreports.qt.io/browse/QTBUG-105301 is irrelevant to our package which unconditionally builds the plugin via QT5_TARGET_SUBDIRS=src/imports/locationlabs eclass mechanism. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtlocation/qtlocation-5.15.11.9999.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtlocation/qtlocation-5.15.11.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.15.11.9999.ebuild index 0e9f034e..14a6424e 100644 --- a/dev-qt/qtlocation/qtlocation-5.15.11.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-5.15.11.9999.ebuild @@ -3,19 +3,16 @@ EAPI=8 -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - inherit qt5-build DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" -[[ ${QT5_BUILD_TYPE} == release ]] && -SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz" -IUSE="" +if [[ ${QT5_BUILD_TYPE} == release ]]; then + MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920 + SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.11-fix-appendChildNode.patch.xz"; + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi RDEPEND=" dev-libs/icu:= @@ -43,6 +40,9 @@ QT5_TARGET_SUBDIRS=( ) if [[ ${QT5_BUILD_TYPE} == release ]]; then + +PATCHES=( "${WORKDIR}/${PN}-5.15.11-fix-appendChildNode.patch" ) + src_prepare() { rm -rf src/3rdparty/mapbox-gl-native/* || die mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die
