From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E5F61584F2 for ; Tue, 18 Mar 2025 19:23:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 079883432B8 for ; Tue, 18 Mar 2025 19:23:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6352E1103C8; Tue, 18 Mar 2025 19:23:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5992B1103C8 for ; Tue, 18 Mar 2025 19:23:22 +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 1188B34326E for ; Tue, 18 Mar 2025 19:23:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 627EE283B for ; Tue, 18 Mar 2025 19:23:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742325751.7a71f8186fffc22dbcda9bd7c4943fb33a78d628.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/Manifest media-gfx/gimp/gimp-3.0.0.ebuild media-gfx/gimp/gimp-9999.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7a71f8186fffc22dbcda9bd7c4943fb33a78d628 X-VCS-Branch: master Date: Tue, 18 Mar 2025 19:23:20 +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: effc2e16-a26e-4232-89bd-ff60d09edf90 X-Archives-Hash: 4218a4b5e8947d0b8f08cdbc197166b5 commit: 7a71f8186fffc22dbcda9bd7c4943fb33a78d628 Author: Sergey Torokhov yandex ru> AuthorDate: Tue Mar 18 19:01:00 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 18 19:22:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a71f818 media-gfx/gimp: 3.0.0 version bump QA warning is presented: QA Notice: Package triggers severe warnings which indicate that it │ may exhibit random runtime failures. │ extensions/goat-exercises/goat-exercise-vala.p/goat-exercise-vala.c:303:24: warning: assignment to ‘GtkBox *’ {aka ‘struct _GtkBox *’} from incompatible pointer type ‘GtkWidget *’ {aka ‘struct _GtkWidget *’} [-Wincompatible-pointer-types] Still affected "fails test "gimp:app / core" TIMEOUT" issue (936290) Remove workaround with renaming to zzz-gimp.desktop (#679220) Bug: https://bugs.gentoo.org/936290 Closes: https://bugs.gentoo.org/679220 Bug: https://bugs.gentoo.org/947607 Bug: https://bugs.gentoo.org/769350 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Sam James gentoo.org> media-gfx/gimp/Manifest | 1 + .../gimp/{gimp-9999.ebuild => gimp-3.0.0.ebuild} | 19 ++++++------------- media-gfx/gimp/gimp-9999.ebuild | 4 ---- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index dd827da81ebc..7ef064ac7e0b 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -2,3 +2,4 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccf DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623e4444e35675db5fe7e40c8820fe71dd SHA512 c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6 DIST gimp-3.0.0-RC3.tar.xz 27043600 BLAKE2B 6dd3a64ab8a7ec3481fdc2c4d7aeeb34546fbd493f9f6663f154f8ff47616190df0fa3719ea17debde56ed9f32120b6d03d4acf45b9e98740fd2ebc11c429878 SHA512 f6da664aadc312cdfac248fb1d3d8eb681aff50b8b0dee6f5c23cfa768eb4899386f470d19e797d0b1ee24746c88c7c12b609c3dc091acd2a625baf0b028285f +DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B fe33a4f59850791867111d8c775ce74f083c75f789243ea8f622137ebae045f0c21b12d2b288e97ca611e68d4cb219d05825b082cf2594742ebbbd277ac9d2a8 SHA512 bb75b68054cda06a3fd6e9278fc535914cd1ea4af27d82c8f5e3480233ff4b8f6d6c479ffcd868c4fa3f1980aee741d7cf992273b09d1e862ae2b84164d038a3 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-3.0.0.ebuild similarity index 90% copy from media-gfx/gimp/gimp-9999.ebuild copy to media-gfx/gimp/gimp-3.0.0.ebuild index d3f55c7cdc88..93de4f4da202 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-3.0.0.ebuild @@ -7,13 +7,15 @@ LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{10..13} ) VALA_USE_DEPEND=vapigen -inherit git-r3 lua-single flag-o-matic meson python-single-r1 toolchain-funcs vala xdg +inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" -EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git" +SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz" + LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" +KEYWORDS="~amd64" IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" @@ -42,10 +44,10 @@ COMMON_DEPEND=" dev-libs/libxslt >=gnome-base/librsvg-2.57.3:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-9999[introspection,lcms,vala?] + >=media-libs/babl-0.1.112[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-9999[cairo,introspection,lcms,vala?] + >=media-libs/gegl-0.4.56:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.13.1:2 @@ -122,11 +124,6 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup use lua && lua-single_pkg_setup - - if has_version ">=media-libs/babl-9999" || has_version ">=media-libs/gegl-9999"; then - ewarn "Please make sure to rebuid media-libs/babl-9999 and media-libs/gegl-9999 packages" - ewarn "before building media-gfx/gimp-9999 to have their latest master branch versions." - fi } src_prepare() { @@ -240,10 +237,6 @@ src_install() { python_optimize - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${D}" -name '*.la' -type f -delete || die # Create symlinks for Gimp exec in /usr/bin diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index d3f55c7cdc88..0f04ed813692 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -240,10 +240,6 @@ src_install() { python_optimize - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${D}" -name '*.la' -type f -delete || die # Create symlinks for Gimp exec in /usr/bin