commit: 5b60343d2fd6009b5d91251c91a91414c7cdf6bf Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 25 10:14:01 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 25 10:25:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b60343d
sci-geosciences/qgis: add 3.28.9, fix build with >=exiv2-0.28 Minor 9999 syncing. Closes: https://bugs.gentoo.org/906470 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-geosciences/qgis/Manifest | 1 + .../qgis/files/qgis-3.28.9-exiv2-0.28.patch | 41 ++++++++++++++++++++++ .../qgis/{qgis-9999.ebuild => qgis-3.28.9.ebuild} | 22 ++++++------ sci-geosciences/qgis/qgis-9999.ebuild | 8 ++--- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 5bd5fba6dce6..2a47cdc347cd 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,2 +1,3 @@ DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336 +DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b SHA512 d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch new file mode 100644 index 000000000000..b41ba70003c1 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch @@ -0,0 +1,41 @@ +From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <aro...@archlinux.org> +Date: Sun, 9 Jul 2023 10:01:49 +0200 +Subject: [PATCH] Fix build with exiv2 0.28 + +(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94) +--- + src/core/raster/qgsexiftools.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp +index 1fbd6a84a8c..f64e07e9165 100644 +--- a/src/core/raster/qgsexiftools.cpp ++++ b/src/core/raster/qgsexiftools.cpp +@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it + case Exiv2::signedLong: + case Exiv2::unsignedLongLong: + case Exiv2::signedLongLong: ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ val = QVariant::fromValue( it->toUint32() ); ++#else + val = QVariant::fromValue( it->toLong() ); ++#endif + break; + + case Exiv2::tiffDouble: +@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it + case Exiv2::signedByte: + case Exiv2::tiffIfd: + case Exiv2::tiffIfd8: ++#if EXIV2_TEST_VERSION (0, 28, 0) ++ val = QVariant::fromValue( static_cast< int >( it->toUint32() ) ); ++#else + val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); ++#endif + break; + + case Exiv2::date: +-- +2.41.0 + diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.28.9.ebuild similarity index 96% copy from sci-geosciences/qgis/qgis-9999.ebuild copy to sci-geosciences/qgis/qgis-3.28.9.ebuild index ff95ee431f21..9150ce1f55e8 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-3.28.9.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) @@ -53,16 +53,16 @@ COMMON_DEPEND=" dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= - sys-libs/zlib >=sci-libs/proj-4.9.3:= + sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) @@ -83,18 +83,13 @@ COMMON_DEPEND=" ${PYTHON_DEPS} >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - dev-python/httplib2[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ') @@ -104,16 +99,15 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 - python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " -BDEPEND=" - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex + doc? ( app-doc/doxygen ) test? ( $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_USEDEP},testlib] @@ -123,6 +117,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # 3.34.0; bug 906470 + src_prepare() { cmake_src_prepare # Tests want to be run inside a git repo @@ -148,7 +144,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF + -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON @@ -219,6 +215,8 @@ src_configure() { use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging + # bugs 612956, 648726 addpredict /dev/dri/renderD128 addpredict /dev/dri/renderD129 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index ff95ee431f21..a2d3bae6931f 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -53,16 +53,16 @@ COMMON_DEPEND=" dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= - sys-libs/zlib >=sci-libs/proj-4.9.3:= + sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) @@ -104,13 +104,11 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 - python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " -BDEPEND=" - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex
