gentoo auto-resync : 11:08:2024 - 11:06:01

3 files changed, 138 insertions, 2 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 5cc1d815261e..df6bbf1f14b4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,7 @@
 AUX kdiff3-1.11.2-fix-fp-exception.patch 2064 BLAKE2B 9525e31fd81697c8da767c494578294a38d5cf0926e6e3e0cfd391f18cb845d89840279270bb89d87e13a8f75ab36081f0480b49ede4043aa3be13a9391fd63d SHA512 b8d8f946879b461e4a7a40e49118a0499af9b494c9706d56dca8a1d471a2ba297c40fb20b4eeb03c1216c8470883677a66f3eabc1d234f961047174bc32b47ef
+AUX kdiff3-1.11.2-unknown-error.patch 4244 BLAKE2B 2710908ba06f54970eb069ab718776ce7401fe67d669ffb2f2c776a45ffddc2742f7aa357e467d06db6f1accf112447ba6ee699b4f7902a121b2a5e721e363c2 SHA512 dcba1787f99429584541e7c72e727cafbee88a652b98f7b349fc6deb74eb0b9f8f7fa49a1b0bcf972573164fa058a35ef6ffefd53c0396f12e911ee2a21b8abd
 DIST kdiff3-1.11.1.tar.xz 1140680 BLAKE2B 4a3e2f3300a4d8ebe390e3e7ad6392b26cdac919bfa80d2b24e145536a763cca924c8a811826972a92215da7c297662b805c60ce0ee5a57816a3549c059a8353 SHA512 5f481a3cd67e80db939eb795618a635bda2c08875eb826c3a1b6487b631374c48ab9b8a546d9b9504c1bcbc0ed9072f16452d6ef9fe181ce6850f741ced710ce
 DIST kdiff3-1.11.2.tar.xz 1141676 BLAKE2B 53ceb67ed232a2af81705d977ab691305a6a8a0fafce23d56601e7e24787a4cd81b044448251acefdb43a1ac142f53c1864fb64bd236d03a80105bbb8541805e SHA512 7318bbc867a369a656e78a9a5530a4329d176cdf170ff43278a8f9b9d821950c17f5a41266a0756bb84322ed78eb6d9d21f587968fedb7432656ec4f65c367cf
 EBUILD kdiff3-1.11.1.ebuild 1100 BLAKE2B f44c591b2a725f1ef0e8bd8d453e4dfa6972d82791176983675598ddf5e6aea99848891f988d083a9e8d332b5dbdbc8114eacfe19f8fff6c9be79e61dfcd89e7 SHA512 d36b2688a5cbfbedca20d95f65f88c7f5f5688de382f27bb5677568caa28f4c205d1d60ac92739346594df6f3f4c47062260bfd7e67ed8cbd0d7158e87d702d2
-EBUILD kdiff3-1.11.2-r1.ebuild 1176 BLAKE2B 2de1382b608f34302f4674bb20ee87733d780063ccb27e545ef61cb816cbe796698e801ef26b846e9161ef39ef316c65649c2a8e85413d1a2f3f7b9236254240 SHA512 0c56e83140d2d0e1e1e4a4c53aef10d9d1838b28f9fc54fc90304bdfdb4588ae3832d768f9a498d940e769597567cca636629e8ef5b38b31859b5fd53f3cba18
+EBUILD kdiff3-1.11.2-r2.ebuild 1234 BLAKE2B 6c093c71a5bede8e3cbac164f986d92d39327c0cbb4ca9bcfcd87323dbf879650a260183f9411d852f45c446e25da5aa7af2e2c694d5ff7f80aa84b739ebd196 SHA512 b0a63665bd6e530ef87705722b91378d256e686d44dc13e7e9d57708b25c2a1c1c35d9b34ab3f287aa9a4ef76abac0caf1064b95c75e11de213c7780931a365e
 MISC metadata.xml 485 BLAKE2B fe3046c156af8000d379a96799587d89307e2664be0698ba9b847483f42031994707d16187740d9528a1d5ab26276802ae44218b820f949a35f3caef58223210 SHA512 f8c55957fdd76bf1019a3f543705bb4118deea1673d2fd1dab94528869f4ae65d34f81493f59bd4de40b02a64f9cacd054d7e576167fd8d18346b06e4bda5065
diff --git a/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch b/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch
new file mode 100644
index 000000000000..22c1ec341f7a
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-1.11.2-unknown-error.patch
@@ -0,0 +1,132 @@
+From dbc690d7c5ae8e1917b214e14f21fedd4200c314 Mon Sep 17 00:00:00 2001
+From: Michael Reeves <reeves.87@gmail.com>
+Date: Fri, 9 Aug 2024 22:36:39 -0400
+Subject: [PATCH] Move SourceData init to constructor for KDiff3App
+
+BUG: 486782
+FIXED-IN: 1.11.3
+---
+ src/kdiff3.cpp       | 33 +++++++++++++++++----------------
+ src/kdiff3.h         |  8 ++++++--
+ src/kdiff3_shell.cpp |  4 ++--
+ 3 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
+index a36fb6037..562e1dc8a 100644
+--- a/src/kdiff3.cpp
++++ b/src/kdiff3.cpp
+@@ -113,13 +113,28 @@ bool KDiff3App::isDirComparison() const
+ /*
+     Don't call completeInit from here it will be called in KDiff3Shell as needed.
+ */
+-KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Shell* pKDiff3Shell):
++KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Shell* pKDiff3Shell, const FileNames& names):
+     QMainWindow(pParent)
+ {
+     setWindowFlags(Qt::Widget);
+     setObjectName(name);
+     m_pKDiff3Shell = pKDiff3Shell;
+ 
++    //Get SourceData objects intalized as soon as possiable or wierd errors can happen on startup.
++    if(!names.fn1.isEmpty())
++    {
++        m_sd1->setFilename(names.fn1);
++        m_bDirCompare = m_sd1->isDir();
++    }
++    if(!names.fn2.isEmpty())
++    {
++        m_sd2->setFilename(names.fn2);
++    }
++    if(!names.fn3.isEmpty())
++    {
++        m_sd3->setFilename(names.fn3);
++    }
++
+     m_pCentralWidget = new QWidget(this);
+     QVBoxLayout* pCentralLayout = new QVBoxLayout(m_pCentralWidget);
+     pCentralLayout->setContentsMargins(0, 0, 0, 0);
+@@ -440,25 +455,11 @@ void KDiff3App::doFileCompare()
+     mainInit(m_totalDiffStatus);
+ }
+ 
+-void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QString& fn3)
++void KDiff3App::completeInit()
+ {
+     bool openError = false;
+     bool bSuccess = true;
+ 
+-    if(!fn1.isEmpty())
+-    {
+-        m_sd1->setFilename(fn1);
+-        m_bDirCompare = m_sd1->isDir();
+-    }
+-    if(!fn2.isEmpty())
+-    {
+-        m_sd2->setFilename(fn2);
+-    }
+-    if(!fn3.isEmpty())
+-    {
+-        m_sd3->setFilename(fn3);
+-    }
+-
+     //Should not fail ever.
+     assert(m_bDirCompare == m_sd1->isDir());
+     if(m_bDirCompare != m_sd2->isDir() || (!m_sd3->isEmpty() && m_bDirCompare != m_sd3->isDir()))
+diff --git a/src/kdiff3.h b/src/kdiff3.h
+index f27276a42..328be6700 100644
+--- a/src/kdiff3.h
++++ b/src/kdiff3.h
+@@ -101,6 +101,10 @@ class ReversibleScrollBar : public QScrollBar
+     void valueChanged2(qint32);
+ };
+ 
++struct FileNames {
++    const QString& fn1, fn2, fn3;
++};
++
+ /*
+   InitFlag
+ */
+@@ -124,7 +128,7 @@ class KDiff3App: public QMainWindow
+   public:
+     /** constructor of KDiff3App, calls all init functions to create the application.
+      */
+-    KDiff3App(QWidget* parent, const QString& name, KDiff3Shell* pKDiff3Shell);
++    KDiff3App(QWidget* parent, const QString& name, KDiff3Shell* pKDiff3Shell, const FileNames& names);
+     ~KDiff3App() override;
+ 
+     /** initializes the KActions of the application */
+@@ -141,7 +145,7 @@ class KDiff3App: public QMainWindow
+     void readOptions(KSharedConfigPtr);
+ 
+     // Finish initialisation
+-    void completeInit(const QString& fn1 = QString(), const QString& fn2 = QString(), const QString& fn3 = QString());
++    void completeInit();
+     //Restore goementry and showMainWindow
+     void showMainWindow();
+ 
+diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
+index 190c03163..1bb0048f7 100644
+--- a/src/kdiff3_shell.cpp
++++ b/src/kdiff3_shell.cpp
+@@ -26,7 +26,7 @@
+ 
+ KDiff3Shell::KDiff3Shell(const QString& fn1, const QString& fn2, const QString& fn3)
+ {
+-    m_widget = new KDiff3App(this, u8"KDiff3Part", this);
++    m_widget = new KDiff3App(this, u8"KDiff3Part", this, {fn1, fn2, fn3});
+     assert(m_widget);
+     setStandardToolBarMenuEnabled(true);
+ 
+@@ -36,7 +36,7 @@ KDiff3Shell::KDiff3Shell(const QString& fn1, const QString& fn2, const QString&
+ 
+     setCentralWidget(m_widget);
+ 
+-    m_widget->completeInit(fn1, fn2, fn3);
++    m_widget->completeInit();
+     chk_connect_a(m_widget, &KDiff3App::createNewInstance, this, &KDiff3Shell::slotNewInstance);
+ 
+     // apply the saved mainwindow settings, if any, and ask the mainwindow
+-- 
+GitLab
+
diff --git a/kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
index 35a32af7049c..1c589f8dc211 100644
--- a/kde-misc/kdiff3/kdiff3-1.11.2-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.11.2-r2.ebuild
@@ -38,7 +38,10 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/diffutils
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-fp-exception.patch" ) # KDE-bug 487338
+PATCHES=(
+	"${FILESDIR}/${P}-fix-fp-exception.patch" # KDE-bug 487338
+	"${FILESDIR}/${P}-unknown-error.patch" # KDE-bug 486782
+)
 
 src_configure() {
 	local mycmakeargs=(