Accepting request 344470 from home:vbabka:branches:KDE:Extra

Fixes upstream issue http://bugs.quassel-irc.org/issues/1369 where parted channels are rejoined after reconnecting.

OBS-URL: https://build.opensuse.org/request/show/344470
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=37

Fix-rejoining-parted-channels.patch

@@ -0,0 +1,62 @@
+From d43034ec11b0b9a10d3b30113eca04cc82608258 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Mon, 19 Oct 2015 21:30:28 +0200
+Subject: [PATCH] Correct capitalization of networkid column name
+References: http://bugs.quassel-irc.org/issues/1369
+References:: https://github.com/heftig/quassel/commit/d43034ec11b0b9a10d3b30113eca04cc82608258
+Upstream: submitted
+
+Fixes http://bugs.quassel-irc.org/issues/1369
+(Keeps rejoining to channels I've left)
+
+The issue apparently occurs only with Qt5.
+
+---
+ src/core/postgresqlstorage.cpp | 4 ++--
+ src/core/sqlitestorage.cpp     | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
+index b16f4b0..65460df 100644
+--- a/src/core/postgresqlstorage.cpp
++++ b/src/core/postgresqlstorage.cpp
+@@ -944,7 +944,7 @@ void PostgreSqlStorage::setChannelPersistent(UserId user, const NetworkId &netwo
+     QSqlQuery query(logDb());
+     query.prepare(queryString("update_buffer_persistent_channel"));
+     query.bindValue(":userid", user.toInt());
+-    query.bindValue(":networkId", networkId.toInt());
++    query.bindValue(":networkid", networkId.toInt());
+     query.bindValue(":buffercname", channel.toLower());
+     query.bindValue(":joined", isJoined);
+     safeExec(query);
+@@ -957,7 +957,7 @@ void PostgreSqlStorage::setPersistentChannelKey(UserId user, const NetworkId &ne
+     QSqlQuery query(logDb());
+     query.prepare(queryString("update_buffer_set_channel_key"));
+     query.bindValue(":userid", user.toInt());
+-    query.bindValue(":networkId", networkId.toInt());
++    query.bindValue(":networkid", networkId.toInt());
+     query.bindValue(":buffercname", channel.toLower());
+     query.bindValue(":key", key);
+     safeExec(query);
+diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
+index 46e2c70..354b340 100644
+--- a/src/core/sqlitestorage.cpp
++++ b/src/core/sqlitestorage.cpp
+@@ -968,7 +968,7 @@ void SqliteStorage::setChannelPersistent(UserId user, const NetworkId &networkId
+         QSqlQuery query(db);
+         query.prepare(queryString("update_buffer_persistent_channel"));
+         query.bindValue(":userid", user.toInt());
+-        query.bindValue(":networkId", networkId.toInt());
++        query.bindValue(":networkid", networkId.toInt());
+         query.bindValue(":buffercname", channel.toLower());
+         query.bindValue(":joined", isJoined ? 1 : 0);
+ 
+@@ -990,7 +990,7 @@ void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networ
+         QSqlQuery query(db);
+         query.prepare(queryString("update_buffer_set_channel_key"));
+         query.bindValue(":userid", user.toInt());
+-        query.bindValue(":networkId", networkId.toInt());
++        query.bindValue(":networkid", networkId.toInt());
+         query.bindValue(":buffercname", channel.toLower());
+         query.bindValue(":key", key);
+ 

quassel.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Nov 15 12:16:24 UTC 2015 - vbabka@suse.com
+
+- Add Fix-rejoining-parted-channels.patch: Fixes upstream issue
+  http://bugs.quassel-irc.org/issues/1369 where parted channels
+  are rejoined after reconnecting.
+
 -------------------------------------------------------------------
 Fri Oct  9 19:29:36 UTC 2015 - hrvoje.senjan@gmail.com
 

quassel.spec

@@ -33,6 +33,8 @@ Source5:        quassel-rpmlintrc
 Patch0:         quassel-set-required-libs-and-flags.patch
 # PATCH-FIX-UPSTREAM Fix-build-with-Qt-5.5.patch
 Patch1:         Fix-build-with-Qt-5.5.patch
+# PATCH-FIX-UPSTREAM Fix-rejoining-parted-channels.patch
+Patch2:         Fix-rejoining-parted-channels.patch
 BuildRequires:  cmake >= 2.8.10
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -160,6 +162,7 @@ This contains common parts shared by %{name} and %{name}-client
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')