[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/

[Markus Meier]

commit:     c90c94e0fedbd69314d87830e3b75905f5d030f8
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 18:29:53 2023 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 18:29:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90c94e0

media-gfx/hugin: version bump and wxGTK 3.2 update for bug #917630

Signed-off-by: Markus Meier <maekke <AT> gentoo.org>

 media-gfx/hugin/Manifest                             |  1 +
 .../{hugin-9999.ebuild => hugin-2023.0.0.ebuild}     | 20 +++++++++-----------
 media-gfx/hugin/hugin-9999.ebuild                    |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f845f64e758e..9cbac297857f 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1 +1,2 @@
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B 
ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be
 SHA512 
752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
+DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 
5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89
 SHA512 
f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-2023.0.0.ebuild
similarity index 82%
copy from media-gfx/hugin/hugin-9999.ebuild
copy to media-gfx/hugin/hugin-2023.0.0.ebuild
index f73101d06bae..934bab607e9c 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-2023.0.0.ebuild
@@ -3,20 +3,18 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{9..12} )
 
-inherit mercurial python-single-r1 wxwidgets cmake xdg
+inherit python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net";
-SRC_URI=""
-EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin";
-EHG_PROJECT="${PN}-${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru 
sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
@@ -65,6 +63,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+       sed -i \
+               -e "/COMMAND.*GZIP/d" \
+               -e "s/\.gz//g" \
+               "${S}"/doc/CMakeLists.txt || die
        cmake_src_prepare
 }
 
@@ -72,10 +74,6 @@ src_configure() {
        local mycmakeargs=(
                -DBUILD_HSI=$(usex python)
                -DENABLE_LAPACK=$(usex lapack)
-               # Temporary workaround for bug #833443. Can be dropped when
-               # we switch to wxgtk-3.2, but complications for that remain
-               # w/ egl+wayland.
-               -DUSE_GDKBACKEND_X11=on
        )
        cmake_src_configure
 }

diff --git a/media-gfx/hugin/hugin-9999.ebuild 
b/media-gfx/hugin/hugin-9999.ebuild
index f73101d06bae..06c2a45cde7f 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg