diff options
author | Bart Ribbers <bribbers@disroot.org> | 2020-10-08 18:47:32 +0200 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-10-09 12:45:05 +0000 |
commit | 4553304025eb07376fb0a488827b7586e11fcb9e (patch) | |
tree | ac79545b09a051b1e3624e4296d9c209425324ee | |
parent | 084bf3564060d79dfa068b67d851286ce5d5d49c (diff) |
community/konversation: upgrade to 1.7.6
-rw-r--r-- | community/konversation/0001-qt-5.15.patch | 31 | ||||
-rw-r--r-- | community/konversation/0003-missing-header.patch | 23 | ||||
-rw-r--r-- | community/konversation/APKBUILD | 14 |
3 files changed, 5 insertions, 63 deletions
diff --git a/community/konversation/0001-qt-5.15.patch b/community/konversation/0001-qt-5.15.patch deleted file mode 100644 index a17c0a43231..00000000000 --- a/community/konversation/0001-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 - diff --git a/community/konversation/0003-missing-header.patch b/community/konversation/0003-missing-header.patch deleted file mode 100644 index 1ff14b81ec5..00000000000 --- a/community/konversation/0003-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/community/konversation/APKBUILD b/community/konversation/APKBUILD index 637fbf500e3..2f3fc74e6b0 100644 --- a/community/konversation/APKBUILD +++ b/community/konversation/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=konversation -pkgver=1.7.5 -pkgrel=2 -arch="all !armhf" +pkgver=1.7.6 +pkgrel=0 +arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://konversation.kde.org/" pkgdesc="A user-friendly and fully-featured IRC client" license="GPL-2.0-or-later" @@ -35,9 +35,7 @@ makedepends=" solid-dev " source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz - 0001-qt-5.15.patch 0002-unused-kemoticons.patch - 0003-missing-header.patch " subpackages="$pkgname-doc $pkgname-lang" @@ -58,7 +56,5 @@ package() { DESTDIR="$pkgdir" cmake --build build --target install } -sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz -056a3d6c17b04734e446b623b88dfa9fd4a90133c251b427460f5c6f3f85a52ad46abe92b055e8a5eb86f433f67e4645f9999d6124d3343466b741d99c11b076 0001-qt-5.15.patch -3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df 0002-unused-kemoticons.patch -b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386 0003-missing-header.patch" +sha512sums="69c4b67a186f4242c74e2027d1faca6be7a30719287b960888751a5522da5abe24c6ada076bb097233cf0254c5cff12cc70c9a7a85875f80c0eb1637c6de6613 konversation-1.7.6.tar.xz +3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df 0002-unused-kemoticons.patch" |