Accepting request 359128 from home:javierllorente:branches:KDE:Extra
Updated spec to require snorenotify-qt5-devel >= 0.7 OBS-URL: https://build.opensuse.org/request/show/359128 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=43
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
b0f3bc9130
commit
0071e58fec
@ -1,22 +0,0 @@
|
||||
From 476aaa050f26d6a31494631d172724409e4c569b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Konstantin=20Bl=C3=A4si?= <kblaesi@gmail.com>
|
||||
Date: Wed, 21 Oct 2015 03:26:02 +0200
|
||||
Subject: [PATCH] Fixes a crash of the core when executing "/op *" in a query.
|
||||
|
||||
---
|
||||
src/core/coreuserinputhandler.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
|
||||
index 7887a92..73aac48 100644
|
||||
--- a/src/core/coreuserinputhandler.cpp
|
||||
+++ b/src/core/coreuserinputhandler.cpp
|
||||
@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& add
|
||||
if (!isNumber || maxModes == 0) maxModes = 1;
|
||||
|
||||
QStringList nickList;
|
||||
- if (nicks == "*") { // All users in channel
|
||||
+ if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
|
||||
const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
|
||||
foreach(IrcUser *user, users) {
|
||||
if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
|
||||
@ -1,54 +0,0 @@
|
||||
From 103a8b3c31f75e4958581162392deaf70ffebf95 Mon Sep 17 00:00:00 2001
|
||||
From: Armin K <krejzi@email.com>
|
||||
Date: Sat, 2 May 2015 23:04:53 +0200
|
||||
Subject: [PATCH 1/1] Fix build with Qt-5.5
|
||||
|
||||
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
|
||||
(cherry picked from commit 078477395aaec1edee90922037ebc8a36b072d90)
|
||||
---
|
||||
src/client/treemodel.cpp | 5 ++---
|
||||
src/common/peer.h | 1 +
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
|
||||
index f599803d7dc93e7810170b01e4c875d9d2ba864d..fd47bc04991e8ef86d8bdbd32bf19551a849df67 100644
|
||||
--- a/src/client/treemodel.cpp
|
||||
+++ b/src/client/treemodel.cpp
|
||||
@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
|
||||
ChildStatus cs = _childStatus;
|
||||
#ifndef QT_NO_DEBUG
|
||||
QModelIndex parent = indexByItem(parentItem);
|
||||
-#endif
|
||||
Q_ASSERT(cs.parent == parent);
|
||||
Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
|
||||
-
|
||||
+#endif
|
||||
_aboutToRemoveOrInsert = false;
|
||||
for (int i = cs.start; i <= cs.end; i++) {
|
||||
connectItem(parentItem->child(i));
|
||||
@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
|
||||
#ifndef QT_NO_DEBUG
|
||||
ChildStatus cs = _childStatus;
|
||||
QModelIndex parent = indexByItem(parentItem);
|
||||
-#endif
|
||||
Q_ASSERT(cs.parent == parent);
|
||||
Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
|
||||
+#endif
|
||||
_aboutToRemoveOrInsert = false;
|
||||
|
||||
endRemoveRows();
|
||||
diff --git a/src/common/peer.h b/src/common/peer.h
|
||||
index 02eb3c0cde3813bb20ee4a4f1d783262b0800fae..79204b4f9996a33b2e4cf312ef1eed2f7e1c3caf 100644
|
||||
--- a/src/common/peer.h
|
||||
+++ b/src/common/peer.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#define PEER_H
|
||||
|
||||
#include <QAbstractSocket>
|
||||
+#include <QDataStream>
|
||||
#include <QPointer>
|
||||
|
||||
#include "authhandler.h"
|
||||
--
|
||||
2.6.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
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);
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897
|
||||
size 3681838
|
||||
3
quassel-0.12.3.tar.bz2
Normal file
3
quassel-0.12.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434
|
||||
size 3687078
|
||||
@ -1,13 +1,13 @@
|
||||
Index: quassel-0.12.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- quassel-0.12.2.orig/CMakeLists.txt
|
||||
+++ quassel-0.12.2/CMakeLists.txt
|
||||
@@ -484,6 +484,8 @@ endif()
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2c29af4..c3a7992 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -427,6 +427,8 @@ endif()
|
||||
# a small test program checking the defines. This works for both Qt4 and Qt5.
|
||||
cmake_push_check_state(RESET)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
|
||||
+set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
|
||||
+set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
|
||||
+set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES})
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
|
||||
check_cxx_source_compiles("
|
||||
#include \"qglobal.h\"
|
||||
#if defined QT_NO_OPENSSL || defined QT_NO_SSL
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 16:44:56 UTC 2016 - javier@opensuse.org
|
||||
|
||||
- Update to 0.12.3
|
||||
* Fix activity filters when selecting buffers in custom ChatViews
|
||||
* Fix default shortcuts when integrated with KDE Frameworks
|
||||
* Introduce support for Appveyor CI (automated Windows builds)
|
||||
* Support SnoreNotify 0.7
|
||||
* Various cleanups and performance improvements
|
||||
* Various build system fixes
|
||||
* Channel keys are again remembered between syncs
|
||||
* Support for Qt 5.5
|
||||
* Network (re)connection fixes
|
||||
* Fix possible message loss when running multiple core users on a psql database
|
||||
* Command line option for specifying SSL certificates and keys
|
||||
* Many smaller fixes
|
||||
- Rebased quassel-set-required-libs-and-flags.patch
|
||||
- Removed patches that have been merged upstream
|
||||
* CVE-2015-8547.patch
|
||||
* Fix-build-with-Qt-5.5.patch
|
||||
* Fix-rejoining-parted-channels.patch
|
||||
- Updated spec:
|
||||
* main.cpp no longer contains __DATE__/__TIME__
|
||||
* CMakeLists now requires snorenotify-qt5-devel >= 0.7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 7 10:04:26 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
|
||||
17
quassel.spec
17
quassel.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: quassel
|
||||
Version: 0.12.2
|
||||
Version: 0.12.3
|
||||
Release: 0
|
||||
Summary: Modern, cross-platform, distributed IRC client
|
||||
License: GPL-2.0 or GPL-3.0
|
||||
@ -31,12 +31,6 @@ Source4: %{name}.SuSEfirewall2
|
||||
Source5: quassel-rpmlintrc
|
||||
# PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function
|
||||
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
|
||||
# PATCH-FIX-UPSTREAM: fix CVE-2015-8547
|
||||
Patch3: CVE-2015-8547.patch
|
||||
BuildRequires: cmake >= 2.8.10
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
@ -50,7 +44,7 @@ BuildRequires: knotifyconfig-devel
|
||||
BuildRequires: ktextwidgets-devel
|
||||
BuildRequires: kxmlgui-devel
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: snorenotify-qt5-devel
|
||||
BuildRequires: snorenotify-qt5-devel >= 0.7
|
||||
BuildRequires: systemd
|
||||
BuildRequires: pkgconfig(Qt5CLucene)
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
|
||||
@ -181,15 +175,12 @@ This contains common parts shared by %{name} and %{name}-client
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/main.cpp src/common/quassel.cpp
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/quassel.cpp
|
||||
FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
|
||||
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp src/common/quassel.cpp
|
||||
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/quassel.cpp
|
||||
|
||||
%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=ON
|
||||
make %{?_smp_mflags}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user