diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | fix_qt5.5_build.patch | 53 | ||||
| -rw-r--r-- | fix_ssl_check.patch | 11 |
4 files changed, 5 insertions, 75 deletions
@@ -1,3 +1,5 @@ +# Generated by mksrcinfo v8 +# Thu May 5 03:55:09 UTC 2016 pkgbase = quassel-light pkgdesc = Next-generation distributed IRC client (minimal dependencies) pkgver = 0.12.2 @@ -10,13 +12,10 @@ pkgbase = quassel-light source = http://quassel-irc.org/pub/quassel-0.12.2.tar.bz2 source = quassel.service source = quassel.conf - source = fix_ssl_check.patch - source = fix_qt5.5_build.patch sha256sums = 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897 sha256sums = 828aaf27696ffe2aa4b80755a09bdf264f644d9539366981697a73bb23340d7b sha256sums = f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8 - sha256sums = c62f50511322c6cd27b10b4c3d92d0c04262454467b95f1a84064f784c47ba7b - sha256sums = a92914a26fe3f6601da7cfd26fb6a6fe6a0ba6c0bd91ac9416765974127365f6 + sha256sums = f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8 pkgname = quassel-client-light pkgdesc = Next-generation distributed IRC client - client only (minimal dependencies) @@ -15,19 +15,14 @@ license=('GPL') makedepends=('cmake') source=(http://quassel-irc.org/pub/${_pkgbase}-$pkgver.tar.bz2 ${_pkgbase}.service - ${_pkgbase}.conf - fix_ssl_check.patch - fix_qt5.5_build.patch) + ${_pkgbase}.conf) sha256sums=('6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897' '828aaf27696ffe2aa4b80755a09bdf264f644d9539366981697a73bb23340d7b' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8' - 'c62f50511322c6cd27b10b4c3d92d0c04262454467b95f1a84064f784c47ba7b' - 'a92914a26fe3f6601da7cfd26fb6a6fe6a0ba6c0bd91ac9416765974127365f6') + 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') prepare() { cd ${_pkgbase}-$pkgver - patch -p1 -i ../../fix_ssl_check.patch - patch -p1 -i ../../fix_qt5.5_build.patch } build() { diff --git a/fix_qt5.5_build.patch b/fix_qt5.5_build.patch deleted file mode 100644 index 3bf8989e5d86..000000000000 --- a/fix_qt5.5_build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001 -From: Armin K <krejzi@email.com> -Date: Sat, 2 May 2015 23:04:53 +0200 -Subject: [PATCH] Fix build with Qt-5.5 - -http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c ---- - 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 f599803..fd47bc0 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 02eb3c0..79204b4 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.4.0 - diff --git a/fix_ssl_check.patch b/fix_ssl_check.patch deleted file mode 100644 index 106ad43a8b36..000000000000 --- a/fix_ssl_check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -484,6 +484,8 @@ - # 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_POSITION_INDEPENDENT_CODE) -+set(CMAKE_REQUIRED_FLAGS "-fPIC") - check_cxx_source_compiles(" - #include \"qglobal.h\" - #if defined QT_NO_OPENSSL || defined QT_NO_SSL |