Diff qtlocation-5.15.10-r1 with a qtlocation-6.5.2-r1

/usr/portage/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild 2023-10-09 14:52:30.412368373 +0300
1
# Copyright 1999-2023 Gentoo Authors
1
# Copyright 2021-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
5 5

  
6
if [[ ${PV} != *9999* ]]; then
7
	QT5_KDEPATCHSET_REV=1
8
	MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920
9
	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
10
fi
11

  
12
inherit qt5-build
6
inherit qt6-build
13 7

  
14
DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
15
[[ ${QT5_BUILD_TYPE} == release ]] &&
16
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"
8
DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
17 9

  
18
IUSE=""
10
if [[ ${QT6_BUILD_TYPE} == release ]]; then
11
	KEYWORDS="amd64"
12
fi
19 13

  
20 14
RDEPEND="
21
	dev-libs/icu:=
22
	=dev-qt/qtcore-${QT5_PV}*
23
	=dev-qt/qtdeclarative-${QT5_PV}*
24
	=dev-qt/qtgui-${QT5_PV}*
25
	=dev-qt/qtnetwork-${QT5_PV}*
26
	=dev-qt/qtpositioning-${QT5_PV}*[qml]
27
	=dev-qt/qtsql-${QT5_PV}*
28
	sys-libs/zlib
29
"
30
DEPEND="${RDEPEND}
31
	=dev-qt/qtconcurrent-${QT5_PV}*
15
	~dev-qt/qtbase-${PV}:6[network]
16
	~dev-qt/qtdeclarative-${PV}:6
17
	~dev-qt/qtpositioning-${PV}:6[qml(+)]
32 18
"
19
DEPEND="${RDEPEND}"
33 20

  
34
QT5_TARGET_SUBDIRS=(
35
	src/3rdparty/clipper
36
	src/3rdparty/poly2tri
37
	src/3rdparty/clip2tri
38
	src/3rdparty/mapbox-gl-native
39
	src/location
40
	src/imports/location
41
	src/imports/locationlabs
42
	src/plugins/geoservices
21
CMAKE_SKIP_TESTS=(
22
	# ignores QML_IMPORT_PATH (unlike other tests) and looks in
23
	# the missing builddir/qml, skip rather than work around
24
	tst_declarative_ui
43 25
)
44 26

  
45
if [[ ${QT5_BUILD_TYPE} == release ]]; then
46
src_prepare() {
47
	rm -rf src/3rdparty/mapbox-gl-native/* || die
48
	mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die
49
	qt5-build_src_prepare
50
}
51
fi
27
PATCHES=(
28
	"${FILESDIR}"/${P}-missing-memory.patch
29
)
30

  
31
src_install() {
32
	qt6-build_src_install
52 33

  
53
src_configure() {
54
	# src/plugins/geoservices requires files that are only generated when
55
	# qmake is run in the root directory. Bug 633776.
56
	qt5_configure_oos_quirk qtlocation-config.pri src/location
57
	qt5-build_src_configure
34
	if use test; then
35
		local delete=( # sigh
36
			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake
37
			"${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake
38
			"${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake
39
			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so
40
			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so
41
			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so
42
			"${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so
43
			"${D}${QT6_QMLDIR}"/QtLocation/Test
44
		)
45
		# using -f given not tracking which tests may be skipped or not
46
		rm -rf -- "${delete[@]}" || die
47
	fi
58 48
}
Thank you!