summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-11-25 17:34:42 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-11-25 18:51:46 +0100
commite779eb650d176c23748bacf0499fb68a78d2bde6 (patch)
treeedaba68dde7322cfb99a70a4c92b9dd8b275fb3a /net-irc/konversation/files
parentdev-util/pkgconf: drop obsolete blockers (diff)
downloadgentoo-e779eb650d176c23748bacf0499fb68a78d2bde6.tar.gz
gentoo-e779eb650d176c23748bacf0499fb68a78d2bde6.tar.bz2
gentoo-e779eb650d176c23748bacf0499fb68a78d2bde6.zip
net-irc/konversation: Drop 1.7.5-r2
Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-irc/konversation/files')
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch81
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch25
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch51
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch37
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-missing-header.patch23
-rw-r--r--net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch31
6 files changed, 0 insertions, 248 deletions
diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
deleted file mode 100644
index 74fd23e58d3c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 17:41:33 +0100
-Subject: Port to QElapsedTimer; remove unused default constructor
-
-Tested by printing out the value of age(), works like before.
----
- src/irc/ircqueue.cpp | 8 ++++++++
- src/irc/ircqueue.h | 18 +++++++-----------
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
-index 1101623..3cc33a5 100644
---- a/src/irc/ircqueue.cpp
-+++ b/src/irc/ircqueue.cpp
-@@ -19,6 +19,14 @@
-
- #include "server.h"
-
-+IRCMessage::IRCMessage(const QString &str)
-+ : s(str) //, codec(QTextCodec::codecForName("utf8"))
-+{
-+ t.start();
-+}
-+
-+////
-+
- int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
- {
- if (!isValid())
-diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
-index 3f7f0c8..7a91776 100644
---- a/src/irc/ircqueue.h
-+++ b/src/irc/ircqueue.h
-@@ -19,6 +19,7 @@
- #include <QObject>
- #include <QList>
- #include <QTime>
-+#include <QElapsedTimer>
-
- class QTimer;
- class Server;
-@@ -34,29 +35,24 @@ class Server;
- */
- struct IRCMessage
- {
-- IRCMessage() : t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
-- {} ///< this constructor required for QValueList, do not use
--
- /**
- Make a new IRCMessage with timestamp of QTime::currentTime().
-
- Note the constructor takes a QString, not a const QString& or a QString *. If you want to modify the
- contained text, put it back with setText.
- */
-- IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
-- {}
-+ IRCMessage(const QString &str);
-
-- QString text() { return s; }
-- int age() { return t.elapsed(); }
-- QTime time() { return t; }
-- void setText(QString text) { s=text; }
-+ QString text() const { return s; }
-+ int age() const { return t.elapsed(); } // in milliseconds
-+ void setText(const QString &text) { s=text; }
- private:
- QString s;
-- QTime t;
-+ QElapsedTimer t;
-
- //FIXME wire this up
- //QTextCodec* codec;
-- //operator const char * () const { return codec->fromUnicode(text()); }
-+ //operator QByteArray () const { return codec->fromUnicode(text()); }
-
- };
-
---
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
deleted file mode 100644
index f351dd00134f..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Sun, 23 Sep 2018 08:29:43 +0200
-Subject: Fix regex for cap ack
-
-Seems to have worked despite being broken
----
- src/irc/inputfilter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
-index fbd268b..45d4f88 100644
---- a/src/irc/inputfilter.cpp
-+++ b/src/irc/inputfilter.cpp
-@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
-
- foreach(const QString& capability, capabilities)
- {
-- int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
-+ int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
- QString modifierString = capability.left(nameStart);
- QString name = capability.mid(nameStart);
-
---
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
deleted file mode 100644
index 2c36f69aa99c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 13:14:26 +0200
-Subject: Adapt the code to KBookmarkMenu-5.69 changes
-
-Test Plan:
-Bookmarks menu still works, and the bookmark actions still show in the
-shortcuts editor dialog.
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Subscribers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D28911
----
- src/bookmarkhandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
-index 5a70591..74b51ff 100644
---- a/src/bookmarkhandler.cpp
-+++ b/src/bookmarkhandler.cpp
-@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
- #include "connectionmanager.h"
- #include "viewer/viewcontainer.h"
-
-+#include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkMenu>
-+#include <QMenu>
- #include <QStandardPaths>
-
-
-@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
- manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
- manager->setUpdate( true );
-
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
- m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection());
-+#else
-+ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
-+ m_mainWindow->actionCollection()->addActions(menu->actions());
-+#endif
- }
-
- KonviBookmarkHandler::~KonviBookmarkHandler()
---
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
deleted file mode 100644
index cf93b3b66def..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 12:56:34 +0100
-Subject: Port away from deprecated KWindowSystem API (with ifdefs)
-
----
- src/application.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/application.cpp b/src/application.cpp
-index 4667c24..538624b 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -50,6 +50,7 @@
- #include <KTextEdit>
- #include <KSharedConfig>
- #include <KStartupInfo>
-+#include <kwindowsystem_version.h>
-
- using namespace Konversation;
-
-@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments)
-
- newInstance(m_commandLineParser);
-
-+#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
- KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
-+#else
-+ mainWindow->setAttribute(Qt::WA_NativeWindow, true);
-+ KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
-+#endif
- mainWindow->show();
- mainWindow->raise();
- }
---
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
deleted file mode 100644
index 1ff14b81ec58..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:14:32 +0200
-Subject: Fix build with Qt 5.13
-
----
- src/irc/outputfilter.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
-index f9e6253..45d11fb 100644
---- a/src/irc/outputfilter.cpp
-+++ b/src/irc/outputfilter.cpp
-@@ -32,6 +32,7 @@
-
- #include <QStringList>
- #include <QFile>
-+#include <QMetaMethod>
- #include <QRegExp>
- #include <QTextCodec>
- #include <QByteArray>
---
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
deleted file mode 100644
index a17c0a432314..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:34:49 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing header)
-
-Test Plan: Build succeeds with Qt 5.15.0_beta4
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Differential Revision: https://phabricator.kde.org/D29038
----
- src/viewer/viewtree.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
-index eeee8fb4..04ec4e54 100644
---- a/src/viewer/viewtree.cpp
-+++ b/src/viewer/viewtree.cpp
-@@ -21,6 +21,7 @@
- #include <QFontDatabase>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QItemSelectionModel>
- #include <QStyleHints>
- #include <QToolTip>
---
-2.26.1
-