summaryrefslogtreecommitdiff
path: root/dev-util/meld
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/Manifest8
-rw-r--r--dev-util/meld/files/meld-3.22.2-py3.13.patch33
-rw-r--r--dev-util/meld/meld-3.22.0-r2.ebuild2
-rw-r--r--dev-util/meld/meld-3.22.1.ebuild2
-rw-r--r--dev-util/meld/meld-3.22.2-r1.ebuild78
-rw-r--r--dev-util/meld/meld-3.22.2.ebuild5
6 files changed, 121 insertions, 7 deletions
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 31318c766765..03280709b8fd 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,9 @@
+AUX meld-3.22.2-py3.13.patch 1119 BLAKE2B 037386c5ae418b211b56d0d9f580f2eabe70280e2e9c778a19c3e5591c64ae2ec44ac3f0667e4899632f0cc9806abc252042586c21723a99b405d59f39136315 SHA512 e2792df3112c5e720714f98e3f6f0b351d53afd68a1ba27f9677fbce3dcaca922b697c0438191c1ead99a710e1b3a0ebb2d9ff101a665b9e1a3d7ab6ea439051
DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
DIST meld-3.22.1.tar.xz 675984 BLAKE2B 47ad8cc0b3f55e2ab8066bd811a925eb12446d041b26220d56a11eedc727042357c8bbec26a5b9f1a9e220357753968acbc43dd257fe48013a3fcf7ef4243364 SHA512 7cb4c64a8134d02ee629c5459d5361c8ee1b1fb80efb02b9f3d2c577ecb69dca2ff66b90affb479682b7fceda41c60717ef859d93e3b93070a84901ae772b2cd
DIST meld-3.22.2.tar.xz 676376 BLAKE2B 5e592e378ac2c942dd98df6d9ac4f9af7a1eee552af1691aade2e0f453a5ddf649ca09c38191b2c2ffdb7b6fa165012b4d8372e9e99c33052f612e2ab8ca8670 SHA512 fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284
-EBUILD meld-3.22.0-r2.ebuild 1640 BLAKE2B be686d99841994654a0c1da88027b6928adef68e3aba076eaeeae1df5dddeefa99f1f9377111f36637c5bbfd4d63cb1b658f8792e52160f8c94276175b281866 SHA512 3c4abb8bd65e9bde7cbb93ce3b4d26bbf188bfc9bc0971c2e4ea1b834f5b405a27ce5e4fea7a76c25269d0f1699fbf74bddac4093d9f2a1be23deb485989cb3e
-EBUILD meld-3.22.1.ebuild 1642 BLAKE2B 8cf753779a1554c3361dcd7af529fc9b632b8595febe141d9c5831107bb4bbb68d5fae3a4aa0695806d31b17d5b11b2fa52a93083b00a259ba9e1c57a3818fbd SHA512 5c01e26b508165e2b4c4ced41171e8bbb3591a7bb8ee1ef9fc527eba2dbd92459332c1c7b90deec13ad391217523d4346f18eb447ca74d6f112af155bb6b061b
-EBUILD meld-3.22.2.ebuild 1642 BLAKE2B 8cf753779a1554c3361dcd7af529fc9b632b8595febe141d9c5831107bb4bbb68d5fae3a4aa0695806d31b17d5b11b2fa52a93083b00a259ba9e1c57a3818fbd SHA512 5c01e26b508165e2b4c4ced41171e8bbb3591a7bb8ee1ef9fc527eba2dbd92459332c1c7b90deec13ad391217523d4346f18eb447ca74d6f112af155bb6b061b
+EBUILD meld-3.22.0-r2.ebuild 1634 BLAKE2B 6afc6de6ab3e4d77b54e31df56499075c99b441dd11e64c2fad6364a30e708cd991354049459c6b0aa6a897efe86f3f24f499dc8860bcebdbaf5d823d874490c SHA512 c31a520fd62e7acef6552d39a83eaff1c393e74e73bb0497f8f4b2c6cc63a226c94fafde068e5202a619b3d5169a073c61f4be7a592b42a4af2c0325738e20a2
+EBUILD meld-3.22.1.ebuild 1636 BLAKE2B fac8143352238568e67a0de52a257b09503f37c45edd07ef234bfa7727138940b976e04218c62be61ca7a33a878dd94729ae31a8e5d39554e7884a0a69640b20 SHA512 b017c5b3830759336231afefef360a363f683865f298902002ec7251004951f54de2e3898ab6f0ced14726269bea53427e59ce5cba2e6521a44e991ae426dbad
+EBUILD meld-3.22.2-r1.ebuild 1690 BLAKE2B 68527ea07ddb78a463e9c5a565f7fff1886d9febc7ad6360c1b9c56270425d3a9910bd2fd658de9116062b61822e52392e81914401bd03fb5606a0c51b92d63f SHA512 e075b2072d0edb765a5fb2c6e72436d88b8ec3018c5f55870c859f4a3d1f53cc6e766cdb61de3364b3a36ad6dd7e07ab1f13f779ffd0b075f312daa60f7f4fe7
+EBUILD meld-3.22.2.ebuild 1696 BLAKE2B b0ea2edab600b7554b9ee007190c1069131840a0266f8205d0fd0b7e7c4717c6657eeaba72fea1efe777a305c2e53557c744d004541980c61e85c128273d266e SHA512 04371106de7cfb1de93b70eb349a9d519e00b2c692b8d3266f8027c28d47f7112ea2a61bd6487c207c1a912a821d323227a0809fb36ba677ce35f78ce6637d04
MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89
diff --git a/dev-util/meld/files/meld-3.22.2-py3.13.patch b/dev-util/meld/files/meld-3.22.2-py3.13.patch
new file mode 100644
index 000000000000..b49499f63ce2
--- /dev/null
+++ b/dev-util/meld/files/meld-3.22.2-py3.13.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/941526
+https://gitlab.gnome.org/GNOME/meld/-/issues/873
+https://gitlab.gnome.org/GNOME/meld/-/commit/aa817dce6bb0667fc6ef38163c213803dc8b37b3
+
+From aa817dce6bb0667fc6ef38163c213803dc8b37b3 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Fri, 29 Sep 2023 04:23:22 -0400
+Subject: [PATCH] Don't use deprecated pipes module
+
+Only `pipes.quote()` was being used in Meld, and that symbol in
+pipes is just an import of `shlex.quote()` anyway. Switch to calling
+`shlex.quote()` directly, since pipes will be removed in Python 3.13.
+--- a/meld/melddoc.py
++++ b/meld/melddoc.py
+@@ -17,7 +17,6 @@
+ import enum
+ import logging
+ import os
+-import pipes
+ import shlex
+ import string
+ import subprocess
+@@ -45,7 +44,7 @@ def make_custom_editor_command(path: str, line: int = 0) -> Sequence[str]:
+ log.error("Unsupported fields found")
+ return [custom_command, path]
+ else:
+- cmd = custom_command.format(file=pipes.quote(path), line=line)
++ cmd = custom_command.format(file=shlex.quote(path), line=line)
+ return shlex.split(cmd)
+
+
+--
+GitLab
diff --git a/dev-util/meld/meld-3.22.0-r2.ebuild b/dev-util/meld/meld-3.22.0-r2.ebuild
index 0bf443a41182..3affaa81f67f 100644
--- a/dev-util/meld/meld-3.22.0-r2.ebuild
+++ b/dev-util/meld/meld-3.22.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meld/meld-3.22.1.ebuild b/dev-util/meld/meld-3.22.1.ebuild
index 48ffb7c894f2..3b8c870b02ef 100644
--- a/dev-util/meld/meld-3.22.1.ebuild
+++ b/dev-util/meld/meld-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meld/meld-3.22.2-r1.ebuild b/dev-util/meld/meld-3.22.2-r1.ebuild
new file mode 100644
index 000000000000..f9be686638ec
--- /dev/null
+++ b/dev-util/meld/meld-3.22.2-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=x11-libs/gtk+-3.20:3[introspection]
+ >=dev-libs/glib-2.48:2
+ >=x11-libs/gtksourceview-4.0.0:4[introspection]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.30:3[cairo,${PYTHON_USEDEP}]
+ ')
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/pango-1.34[introspection]
+ x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-util/desktop-file-utils
+ dev-libs/appstream-glib
+ )
+"
+BDEPEND="
+ dev-util/intltool
+ dev-util/itstool
+ sys-devel/gettext
+ $(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
+"
+# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
+# but it's mainly needed for debian and derivatives - seems the fallback
+# works fine, as we aren't a special_case, just an annoying warning.
+
+PATCHES=(
+ "${FILESDIR}"/meld-3.22.2-py3.13.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dprofile=''
+ -Dbyte-compile=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ python_optimize
+ python_fix_shebang "${ED}"/usr/bin/meld
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/meld/meld-3.22.2.ebuild b/dev-util/meld/meld-3.22.2.ebuild
index 48ffb7c894f2..be87de18466d 100644
--- a/dev-util/meld/meld-3.22.2.ebuild
+++ b/dev-util/meld/meld-3.22.2.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+# py3.13: https://gitlab.gnome.org/GNOME/meld/-/issues/873
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit gnome.org gnome2-utils meson python-single-r1 xdg
@@ -12,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:14:03 +0000