gentoo auto-resync : 23:02:2024 - 17:40:32

2 files changed, 69 insertions, 29 deletions

diff --git a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
new file mode 100644
index 000000000000..0d2944e30830
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
@@ -0,0 +1,69 @@
+From da4659a9d9c30b6d89875f328cca88758ef568c6 Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Wed, 17 Jan 2024 20:58:27 -0800
+Subject: [PATCH] Fix build with Qt5 and WANT_DCC_VIDEO
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+```
+src/modules/dcc/DccVideoWindow.cpp: In member function ‘virtual const QString& DccVideoWindow::target()’:
+src/modules/dcc/DccVideoWindow.cpp:660:40: error: cannot convert ‘QString’ to ‘QString*’ in assignment
+```
+---
+ src/modules/dcc/DccVideoWindow.cpp | 14 ++------------
+ src/modules/dcc/DccVideoWindow.h   |  2 +-
+ 2 files changed, 3 insertions(+), 13 deletions(-)
+
+diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
+index 7f4f66ea42..7cf8058fe8 100644
+--- a/src/modules/dcc/DccVideoWindow.cpp
++++ b/src/modules/dcc/DccVideoWindow.cpp
+@@ -396,7 +396,6 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name)
+ {
+ 	m_pDescriptor = dcc;
+ 	m_pSlaveThread = nullptr;
+-	m_pszTarget = nullptr;
+ 
+ 	m_pButtonBox = new KviTalHBox(this);
+ 
+@@ -557,12 +556,6 @@ DccVideoWindow::~DccVideoWindow()
+ 	}
+ 
+ 	KviThreadManager::killPendingEvents(this);
+-
+-	if(m_pszTarget)
+-	{
+-		delete m_pszTarget;
+-		m_pszTarget = nullptr;
+-	}
+ }
+ 
+ void DccVideoWindow::resizeEvent(QResizeEvent *)
+@@ -654,11 +647,8 @@ void DccVideoWindow::connectionInProgress()
+ const QString & DccVideoWindow::target()
+ {
+ 	// This may change on the fly...
+-	if(!m_pszTarget)
+-		m_pszTarget = new QString();
+-
+-	m_pszTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data());
+-	return *m_pszTarget;
++	m_szTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data());
++	return m_szTarget;
+ }
+ 
+ void DccVideoWindow::getBaseLogFileName(QString & buffer)
+diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
+index 98bb622f5b..d0f957ea3e 100644
+--- a/src/modules/dcc/DccVideoWindow.h
++++ b/src/modules/dcc/DccVideoWindow.h
+@@ -129,7 +129,7 @@ class DccVideoWindow : public DccWindow
+ 	QGridLayout * m_pLayout;
+ 	QTimer m_Timer;
+ 	QLabel * m_pVideoLabel[3];
+-	QString * m_pszTarget;
++	QString m_szTarget;
+ 	DccVideoThread * m_pSlaveThread;
+ 	QByteArray m_tmpTextDataOut;
+ 	QString m_szLocalNick;
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch b/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch
deleted file mode 100644
index 2127dcc3f1ce..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit b4405b0c3dbd00c31d20597360249966bfd627c9
-Author: Alexey Sokolov <sokolov@google.com>
-Date:   Sat May 27 12:46:34 2023 +0100
-
-    Fix includes, QProcess is used not only without KDE
-    
-    https://bugs.gentoo.org/906940
-
-diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
-index 2abab2c10..842d3fa3f 100644
---- a/src/modules/system/libkvisystem.cpp
-+++ b/src/modules/system/libkvisystem.cpp
-@@ -50,12 +50,13 @@
- #endif
- 
- #ifdef COMPILE_KDE_SUPPORT
--#include <KToolInvocation> // invokeTerminal() for system.runcmd
--#else                      // tools we need to work around the absence of
-+// invokeTerminal() for system.runcmd
-+// tools we need to work around the absence of
-+#include <KToolInvocation>
-+#endif
- // invokeTerminal()
- #include <QProcess>
- #include <QStringList>
--#endif
- 
- PluginManager * g_pPluginManager;
-