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 91480158094 for ; Mon, 11 Jul 2022 22:50:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6490E0A91; Mon, 11 Jul 2022 22:50:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A4C2E0A91 for ; Mon, 11 Jul 2022 22:50:12 +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 C771D3410AA for ; Mon, 11 Jul 2022 22:50:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 878D252F for ; Mon, 11 Jul 2022 22:50:09 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1657579681.351005d4ebc1faf738ddb202eb70d4490429e97f.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-9999.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 351005d4ebc1faf738ddb202eb70d4490429e97f X-VCS-Branch: master Date: Mon, 11 Jul 2022 22:50:09 +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: 22d965fa-e900-4160-9b95-5dd9ad0386b0 X-Archives-Hash: c14cb6be94c4660b4693d0a9aa9c751b commit: 351005d4ebc1faf738ddb202eb70d4490429e97f Author: Sergey Torokhov yandex ru> AuthorDate: Mon Jul 11 22:20:18 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Mon Jul 11 22:48:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351005d4 media-gfx/gimp: 9999, disable appdata-test Closes: https://bugs.gentoo.org/843386 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/26355 Signed-off-by: John Helmert III gentoo.org> media-gfx/gimp/gimp-9999.ebuild | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index fb1d82ee5c19..0f655ffb58a9 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{8..10} ) GNOME2_EAUTORECONF=yes -VALA_MIN_API_VERSION="0.44" +VALA_MIN_API_VERSION="0.50" VALA_USE_DEPEND=vapigen inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx @@ -39,7 +39,7 @@ COMMON_DEPEND=" dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.90[introspection,lcms,vala?] + >=media-libs/babl-0.1.92[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] @@ -111,11 +111,6 @@ BDEPEND="virtual/pkgconfig" DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) - pkg_setup() { use lua && lua-single_pkg_setup @@ -125,6 +120,8 @@ pkg_setup() { } src_prepare() { +# sed -i -e '/validate/s:${GIMP_TESTING:--no-net ${GIMP_TESTING:' desktop/test-appdata.sh.in || die # Bug 685210 (and duplicate 691070) + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 @@ -165,10 +162,10 @@ src_configure() { --disable-check-update --enable-mp - --with-appdata-test --with-bug-report-url=https://bugs.gentoo.org/ --with-pdbgen --with-xmc + --without-appdata-test --without-libbacktrace --without-webkit --without-xvfb-run