Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package konversation for openSUSE:Factory
checked in at 2021-06-19 23:02:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/konversation (Old)
and /work/SRC/openSUSE:Factory/.konversation.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konversation"
Sat Jun 19 23:02:49 2021 rev:67 rq:900419 version:21.04.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/konversation/konversation.changes
2021-06-12 20:07:04.836827316 +0200
+++ /work/SRC/openSUSE:Factory/.konversation.new.2625/konversation.changes
2021-06-19 23:03:22.723702614 +0200
@@ -1,0 +2,9 @@
+Wed Jun 16 14:46:09 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Reference libera.chat:
+ * 0001-Minimal-changes-to-use-libera.chat.patch
+ * 0002-appdata-reference-Libera-fix-the-wording.patch
+ * 0003-Replace-Freenode-with-Libera.patch
+ * 0001-Bulk-search-replace-to-mention-Libera-in-localized-f.patch
+
+-------------------------------------------------------------------
New:
----
0001-Bulk-search-replace-to-mention-Libera-in-localized-f.patch
0001-Minimal-changes-to-use-libera.chat.patch
0002-appdata-reference-Libera-fix-the-wording.patch
0003-Replace-Freenode-with-Libera.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ konversation.spec ++++++
--- /var/tmp/diff_new_pack.EkZiJX/_old 2021-06-19 23:03:23.155703281 +0200
+++ /var/tmp/diff_new_pack.EkZiJX/_new 2021-06-19 23:03:23.159703287 +0200
@@ -34,8 +34,13 @@
%endif
# PATCH-FIX-OPENSUSE
Patch0: 0001-Use-qdbus-qt5-on-openSUSE.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Minimal-changes-to-use-libera.chat.patch
+Patch2: 0002-appdata-reference-Libera-fix-the-wording.patch
+Patch3: 0003-Replace-Freenode-with-Libera.patch
+# PATCH-FIX-OPENSUSE -- Mention libera in localized files
+Patch4: 0001-Bulk-search-replace-to-mention-Libera-in-localized-f.patch
BuildRequires: extra-cmake-modules
-BuildRequires: libqca-qt5-devel
BuildRequires: cmake(KF5Archive) >= %{kf5_version}
BuildRequires: cmake(KF5Bookmarks) >= %{kf5_version}
BuildRequires: cmake(KF5Config) >= %{kf5_version}
@@ -60,6 +65,7 @@
BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version}
BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version}
BuildRequires: cmake(Phonon4Qt5)
+BuildRequires: cmake(Qca-qt5)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Widgets)
++++++ 0001-Bulk-search-replace-to-mention-Libera-in-localized-f.patch ++++++
++++ 2529 lines (skipped)
++++++ 0001-Minimal-changes-to-use-libera.chat.patch ++++++
>From 87ea3e07b939fecc0d2e1d86d8320e7113ab3fa0 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.tosc...@tiscali.it>
Date: Wed, 16 Jun 2021 01:10:10 +0200
Subject: [PATCH 1/3] Minimal changes to use libera.chat
Change the reference to libera in non-translatable strings first,
so that this patch can be easily cherry-picked and backported.
CCBUG: 437589
---
README | 2 +-
src/config/preferences.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 1009c751..02b51c49 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
Konversation website: https://konversation.kde.org/
Konversation wiki: https://userbase.kde.org/Konversation
Bug tracker: https://bugs.kde.org/
-IRC channel: #konversation on chat.freenode.net
+IRC channel: #konversation on irc.libera.chat
diff --git a/src/config/preferences.cpp b/src/config/preferences.cpp
index 48d94673..8a28caa7 100644
--- a/src/config/preferences.cpp
+++ b/src/config/preferences.cpp
@@ -57,9 +57,9 @@ Preferences::Preferences()
mIdentity->setNicknameList(nickList);
Konversation::ServerGroupSettingsPtr serverGroup(new
Konversation::ServerGroupSettings);
- serverGroup->setName(QStringLiteral("freenode"));
+ serverGroup->setName(QStringLiteral("libera"));
Konversation::ServerSettings server;
- server.setHost(QStringLiteral("chat.freenode.net"));
+ server.setHost(QStringLiteral("irc.libera.chat"));
server.setPort(6697);
server.setSSLEnabled(true);
serverGroup->addServer(server);
--
2.32.0
++++++ 0002-appdata-reference-Libera-fix-the-wording.patch ++++++
>From f07e8e05e4b5f0fbaca7772aef84101855c79c24 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.tosc...@tiscali.it>
Date: Wed, 16 Jun 2021 01:18:48 +0200
Subject: [PATCH 2/3] appdata: reference Libera, fix the wording
The description seemed to imply basically all distributions
are on a specific network, which is not the case.
CCBUG: 437589
---
data/org.kde.konversation.appdata.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/data/org.kde.konversation.appdata.xml
b/data/org.kde.konversation.appdata.xml
index 8ef253e8..e9c8005d 100644
--- a/data/org.kde.konversation.appdata.xml
+++ b/data/org.kde.konversation.appdata.xml
@@ -78,9 +78,8 @@
<summary xml:lang="zh-TW">IRC ???????????????</summary>
<description>
<p>
- Konversation is an IRC client which gives you speedy access to Freenode
network's channels,
- where you will find support for most distributions. Its defaults are
such that it needs no
- configuration other than telling it the name of your distribution
channel, to get started.
+ Konversation is an IRC client which gives you speedy access to Libera
network's channels,
+ where you can find the KDE IRC channels.
</p>
<p xml:lang="ar">???????????????? ???? ???????? ??????????????? ??????????
???????? ???????? ?????? ?????????? ???????? ?????????????????? ?????? ????????
???????????? ???????????? ????????????????????. ???????????????????????? ??????
???????????? ???????? ???? ?????????? ?????? ???????? ???????? ??????
?????????? ?????? ???????? ???????????????????? ?????? ?????? ????????
????????????????.</p>
<p xml:lang="ca">El Konversation ??s un client d'IRC que d??na acc??s
r??pid als canals de la xarxa Freenode, a on trobareu ajuda per a la majoria de
les distribucions. De manera predeterminada, per a comen??ar no necessita m??s
configuraci?? que indicar el nom del canal de la distribuci??.</p>
--
2.32.0
++++++ 0003-Replace-Freenode-with-Libera.patch ++++++
>From 50248112a9cfc535da93a28ed8f9d1b992cc4439 Mon Sep 17 00:00:00 2001
From: Christian Christiansen <christian.l.christian...@gmail.com>
Date: Tue, 25 May 2021 18:47:58 +1000
Subject: [PATCH 3/3] Replace Freenode with Libera
KDE has moved to Libera.Chat. Make Libera.Chat the default network.
Update the documentation to reflect this move too.
BUG:437589
---
doc/index.docbook | 8 ++++----
src/application.h | 2 +-
src/irc/servergroupdialogui.ui | 2 +-
src/irc/serverlistdialogui.ui | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/index.docbook b/doc/index.docbook
index ddb2e9e8..e240a0fb 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -190,7 +190,7 @@ Further information like a FAQ and tips and tricks you find
in the
<ulink url="https://userbase.kde.org/Konversation";>&konversation; UserBase
page</ulink>.
</para>
-<para>Developers for &konversation; can often be contacted via &irc; at
<ulink url="irc://chat.freenode.net/konversation">irc.freenode.net channel
#konversation</ulink>.
+<para>Developers for &konversation; can often be contacted via &irc; at
<ulink url="irc://irc.libera.chat/konversation">irc.libera.chat channel
#konversation</ulink>.
</para>
</chapter>
@@ -238,7 +238,7 @@ to a chat room) or just engage in private
conversations.</para>
only connect to one of the servers in the network to be connected to the entire
&irc; network. Once connected, &konversation; will automatically join the
<guilabel>Channels</guilabel> shown. When &konversation; is started for the
first time, the
-<userinput><replaceable>Freenode</replaceable></userinput> network
+<userinput><replaceable>Libera</replaceable></userinput> network
and <userinput><replaceable>#kde</replaceable></userinput> channel are already
entered for you. Click on a network to select it.</para></callout>
<callout arearefs="pt-first-serverlist-2"><para>Click here to define a new
<guilabel>Network</guilabel>, including the server
to connect to, and the <guilabel>Channels</guilabel> to automatically join
once connected. See <link linkend="serverlist">Defining new networks,
servers, and auto join channels</link> for more information.</para></callout>
@@ -553,7 +553,7 @@ lists your existing defined &irc;
<guilabel>Network</guilabel>s, listed by group
An &irc; network is a collection of cooperating servers. When you connect
to any server in a network, you have access to all the channels of the network.
Examples of &irc; networks are
-<userinput><replaceable>Freenode</replaceable></userinput> and
+<userinput><replaceable>Libera</replaceable></userinput> and
<userinput><replaceable>Undernet</replaceable></userinput>.
</para>
@@ -650,7 +650,7 @@ button to add a new Identity or edit an existing one. The
<guilabel>Identity</guilabel> will identify you and determine
your &i18n-nickname; when you connect to the network.</para></callout>
<callout arearefs="pt-addnetwork-3"><para>Optional. This command will be sent
to the server after connecting. Example: <userinput>/msg NickServ IDENTIFY
-<replaceable>konvirocks</replaceable></userinput>. This example is for the
freenode network, which requires users to register their &i18n-nickname;
+<replaceable>konvirocks</replaceable></userinput>. This example is for the
Libera network, which requires users to register their &i18n-nickname;
with a password and login when connecting.
<userinput><replaceable>konvirocks</replaceable></userinput>
is the password for the &i18n-nickname; given in <guilabel>Identity</guilabel>.
You may enter more than one command by separating them with
semicolons.</para></callout>
diff --git a/src/application.h b/src/application.h
index 821d4f8a..f727916c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -100,7 +100,7 @@ class Application : public QApplication
/** Tries to find a nickinfo for a given ircnick on a given ircserver.
* @param ircnick The case-insensitive ircnick of the person you want
to find. e.g. "johnflux"
- * @param serverOrGroup The case-insensitive server name (e.g.
"irc.kde.org") or server group name (e.g. "freenode"), or null to search all
servers
+ * @param serverOrGroup The case-insensitive server name (e.g.
"irc.kde.org") or server group name (e.g. "libera"), or null to search all
servers
* @return A nickinfo for this user and server if one is found.
*/
NickInfoPtr getNickInfo(const QString &ircnick, const QString
&serverOrGroup);
diff --git a/src/irc/servergroupdialogui.ui b/src/irc/servergroupdialogui.ui
index 4aba886d..71dd7c53 100644
--- a/src/irc/servergroupdialogui.ui
+++ b/src/irc/servergroupdialogui.ui
@@ -91,7 +91,7 @@
<item row="3" column="1" colspan="2">
<widget class="KLineEdit" name="m_commandEdit">
<property name="whatsThis">
- <string><qt>Optional. This command will be sent to the server
after connecting. Example: <b>/msg NickServ IDENTIFY
<i>konvirocks</i></b>. This example is for the freenode
network, which requires users to register their nickname with a password and
login when connecting. <i>konvirocks</i> is the password for the
nickname given in Identity. You may enter more than one command by separating
them with semicolons.</qt></string>
+ <string><qt>Optional. This command will be sent to the server
after connecting. Example: <b>/msg NickServ IDENTIFY
<i>konvirocks</i></b>. This example is for the Libera
network, which requires users to register their nickname with a password and
login when connecting. <i>konvirocks</i> is the password for the
nickname given in Identity. You may enter more than one command by separating
them with semicolons.</qt></string>
</property>
</widget>
</item>
diff --git a/src/irc/serverlistdialogui.ui b/src/irc/serverlistdialogui.ui
index 2f803191..14b1eb55 100644
--- a/src/irc/serverlistdialogui.ui
+++ b/src/irc/serverlistdialogui.ui
@@ -83,7 +83,7 @@
<bool>true</bool>
</property>
<property name="whatsThis">
- <string>This shows the list of configured IRC networks. An IRC network
is a collection of cooperating servers. You need only connect to one of the
servers in the network to be connected to the entire IRC network. Once
connected, Konversation will automatically join the channels shown. When
Konversation is started for the first time, the Freenode network and the
<i>#kde</i> channel are already entered for you.</string>
+ <string>This shows the list of configured IRC networks. An IRC network
is a collection of cooperating servers. You need only connect to one of the
servers in the network to be connected to the entire IRC network. Once
connected, Konversation will automatically join the channels shown. When
Konversation is started for the first time, the Libera network and the
<i>#kde</i> channel are already entered for you.</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
--
2.32.0
