From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E495D158015 for ; Thu, 21 Dec 2023 18:30:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1235C2BC013; Thu, 21 Dec 2023 18:30:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB9902BC013 for ; Thu, 21 Dec 2023 18:30:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1560342F94 for ; Thu, 21 Dec 2023 18:30:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C4D9ACA for ; Thu, 21 Dec 2023 18:30:04 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <1703183393.c90c94e0fedbd69314d87830e3b75905f5d030f8.maekke@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hugin/Manifest media-gfx/hugin/hugin-2023.0.0.ebuild media-gfx/hugin/hugin-9999.ebuild X-VCS-Directories: media-gfx/hugin/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: c90c94e0fedbd69314d87830e3b75905f5d030f8 X-VCS-Branch: master Date: Thu, 21 Dec 2023 18:30:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f74c6a4-7213-412b-98f6-9cb7f4eca517 X-Archives-Hash: 85d9c76be1437a7675aa9dd2339cc136 commit: c90c94e0fedbd69314d87830e3b75905f5d030f8 Author: Markus Meier gentoo org> AuthorDate: Thu Dec 21 18:29:53 2023 +0000 Commit: Markus Meier gentoo 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 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