gentoo resync : 13.11.2021

4 files changed, 70 insertions, 5 deletions

diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 2a48e5c17c5d..0c3618ce80e1 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,3 +1,5 @@
+AUX kdbg-3.0.1-fix-rare-memleak.patch 1113 BLAKE2B 8bb235a47294c2d9d541dafcceedad3038db795aa869b6ca940a51da50d300db1e1d3735171e7e91c5eb43d21167dd3e8b2be50590689a8886e4b9d8f1eff626 SHA512 1caff1850cf21d09b46cc19ea8caf80066b2501901db044328bad64b89559759207629237d602146d214389055b780c180e100d8ee642b3d165da94a99f633fc
+AUX kdbg-3.0.1-usable-trace.patch 808 BLAKE2B 8286f826354d8b9035f2b4cef753206074d72e3a8aa1c5fd1888052f22a8725696e1f2326dc0a202d5ec3ad9675fff199e78daac14a69ea29eb5108ad945e7ea SHA512 71f2feb9ca41f75e78a5d689d1e76d7de0d48d03d54250f94beab03553a93eaa7f9302f6e6fe4dec670e211ad7b591e5abef4800bfad57711119ab0e343b203d
 DIST kdbg-3.0.1.tar.gz 431143 BLAKE2B 869bf9765650b2a4a2330f99303b51f599df764848ff18442c8c6813421fece2671e5e78a0e8c66a59bd77f06a7f02677ec08a49fb9a28874b92b0f84bf8f74f SHA512 9f3e0073bf37e56fa8ad0c3ae5f0be80331d8963b564ff376aee40c3ccebab5b5a482c31f110fd0f4dd14f9614cff31102d8edf62ffb33f4ae361d24346543ea
-EBUILD kdbg-3.0.1.ebuild 1012 BLAKE2B d9a32758cb10b088b6ef32918f2f916f28dc229fd5ebc7e3a92ac61c7114c0b2b775858c1b8d7fd40b730bfd9c390e2c0670eb932ec409b383457c603ba8aac1 SHA512 690819b49a08c5412e5292cd929a4fbc8d4b6521d0fa5af4f2ff13b4e8a85739acf32b9ecc6f9d476b539c885020e07fc1ed5d0605cb538e5f285943019d19f2
+EBUILD kdbg-3.0.1-r1.ebuild 1107 BLAKE2B 739f32b8ec849e1be12246bfbab3738e24a0a5ba23cdb96a7ac816b2b4bb1a2e0319ac50e2b1b3fa45aa3c46a70dc98a3df5c6b52a1413f3ef65ab980aaa3d48 SHA512 90fca25efdcf4470983ef5ca7c678a926f56520cfc6ce8e3c409158854b38e825c962245a035722b73904a51df639fc529a25238f196527e4a2716e82811555a
 MISC metadata.xml 372 BLAKE2B f633a86dc35ba0a596d161b7789f01b22b32c4f501c9a5b68701ad352555956a433dadbf8856c1fdb0f331abb39fc89caee0cf2da6cf295095be993b24d1f414 SHA512 9f19dcf19b03626e2263f3bfccc611e6013da09b97de69a6673c5e79b9f1c1b3622d540d6e49bff59ced02f632ccc4b8734950690c4363556fa622edb3e576d9
diff --git a/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch b/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
new file mode 100644
index 000000000000..44a2b33623f4
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
@@ -0,0 +1,35 @@
+From 0feb0986f220126177084badf67813ccdbaa996c Mon Sep 17 00:00:00 2001
+From: Daniels Umanovskis <daniels@umanovskis.se>
+Date: Fri, 13 Mar 2020 13:48:19 +0100
+Subject: [PATCH] Fix a rare memory leak in the register display window
+
+---
+ kdbg/regwnd.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kdbg/regwnd.cpp b/kdbg/regwnd.cpp
+index edb0e55..93008f9 100644
+--- a/kdbg/regwnd.cpp
++++ b/kdbg/regwnd.cpp
+@@ -274,11 +274,12 @@ static char* toRaw(const QString& hex, uint& length)
+     static bool littleendian=(*testChar==1);
+ 
+     length=((hex.length()-2)%2)+((hex.length()-2)/2);
++    if (hex.length()<=2) return 0;
++
+     char* data=new char[length];
+ 
+     if (littleendian) {
+ 	uint j=0;
+-	if (hex.length()<=2) return 0;
+ 	for (int i=hex.length()-1; i>=2; ) {
+ 	    if (j%2==0)
+ 		data[j/2]=hexCharToDigit(hex[i].toLatin1());
+@@ -288,7 +289,6 @@ static char* toRaw(const QString& hex, uint& length)
+ 	}
+     } else { // big endian
+ 	uint j=0;
+-	if (hex.length()<=2) return 0;
+ 	for (int i=2; i<hex.length(); ) {
+ 	    if (j%2==0)
+ 		data[j/2]=hexCharToDigit(hex[i].toLatin1())<<4;
diff --git a/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch b/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch
new file mode 100644
index 000000000000..8336d2d53255
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch
@@ -0,0 +1,23 @@
+From 8f2add1046c2d23294496bc0bc7c00d18c6aa0a2 Mon Sep 17 00:00:00 2001
+From: Daniels Umanovskis <daniels@umanovskis.se>
+Date: Fri, 13 Mar 2020 16:23:02 +0100
+Subject: [PATCH] Change output for a trace so that trace is actually usable
+ again
+
+---
+ kdbg/debugger.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdbg/debugger.cpp b/kdbg/debugger.cpp
+index 3751e4c..7d43eb9 100644
+--- a/kdbg/debugger.cpp
++++ b/kdbg/debugger.cpp
+@@ -2225,7 +2225,7 @@ void KDebugger::slotValueEdited(VarTree* expr, const QString& text)
+ 
+     ExprWnd* wnd = static_cast<ExprWnd*>(expr->treeWidget());
+     TRACE(QString().sprintf("Changing %s to ",
+-			    wnd->name()) + text);
++			    wnd->exprList().join(" ")) + text);
+ 
+     // determine the lvalue to edit
+     QString lvalue = expr->computeExpr();
diff --git a/dev-util/kdbg/kdbg-3.0.1.ebuild b/dev-util/kdbg/kdbg-3.0.1-r1.ebuild
index a6909362f272..eb20f7aa1bdb 100644
--- a/dev-util/kdbg/kdbg-3.0.1.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.85.0
+QTMIN=5.15.2
 inherit ecm
 
 DESCRIPTION="Graphical debugger interface"
@@ -33,6 +33,11 @@ RDEPEND="${DEPEND}
 	sys-devel/gdb
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-rare-memleak.patch
+	"${FILESDIR}"/${P}-usable-trace.patch
+)
+
 src_prepare() {
 	# allow documentation to be handled by eclass
 	mv kdbg/doc . || die