summaryrefslogtreecommitdiff
path: root/net-irc/konversation
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-23 04:19:44 +0000
commitc5283d322accc6097afec74eab24550829788bab (patch)
treeb99ce668128d82a026eaa31461643f9173f9b77b /net-irc/konversation
parent5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff)
gentoo resync : 23.03.2018
Diffstat (limited to 'net-irc/konversation')
-rw-r--r--net-irc/konversation/Manifest3
-rw-r--r--net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch27
-rw-r--r--net-irc/konversation/konversation-1.7.4-r1.ebuild (renamed from net-irc/konversation/konversation-1.7.4.ebuild)6
3 files changed, 33 insertions, 3 deletions
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index bbc4b9c0d29e..845fbab33b3b 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,4 +1,5 @@
+AUX konversation-1.7.4-qt-5.11.patch 766 BLAKE2B 1293fcd2bc9e7936ce7d181ae4282a4a475a7203dc2114000f76286d17c0c087d3d05582298b9104550ce42639e3f19a836e01ef49111cdd99e467f0519548ca SHA512 aac2d523c42a2578ddb202e34592bbb8371eebf603a60902ba4a8dd3f4973eba41ee89ca8a85996231a94a7b5a1eaaac2f44d2bd03c38a872addcdef0161afcb
AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B 585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a
-EBUILD konversation-1.7.4.ebuild 1757 BLAKE2B 7c8d856817af536036d5b20905a3d400766177f9d3433e5385e045d957e063d197d54f3924e3019e5f37a4d6256e99f913b4a72accb0db163a0c793985a8a52c SHA512 6108c9c797e413c44bca4a3a570c820fa0184c6d7ade4c0f79671cb58ba164fd84e32a3e65ed98d8259c79827c3e5a71f25c2a50ce1dc7b68cbb6be408447d69
+EBUILD konversation-1.7.4-r1.ebuild 1806 BLAKE2B 633fbbf53552962518ba9200a7b42f9c9aac1ee82efc7578b31b5fa0b9fce17c15239e2c02606b91a2a8b6824c81341b7c275ed244bed130c0c8e7fc7aca4b8f SHA512 bd938ea0ca5df8c615319b5e3ba0b36ffb2e0283ccac6b1a2fbc6198d307350b5592d98c93418840e96f32b9e220621d5ec285750dc8459ba6cf32a8c8890b40
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
new file mode 100644
index 000000000000..46508bf20a23
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
@@ -0,0 +1,27 @@
+From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 19 Mar 2018 17:13:30 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing QTabWidget)
+
+Reviewers: #konversation
+
+Differential Revision: https://phabricator.kde.org/D11490
+---
+ src/dcc/transferdetailedinfopanel.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dcc/transferdetailedinfopanel.h b/src/dcc/transferdetailedinfopanel.h
+index e8debbc0..0e7391de 100644
+--- a/src/dcc/transferdetailedinfopanel.h
++++ b/src/dcc/transferdetailedinfopanel.h
+@@ -16,6 +16,7 @@
+ #include "ui_transferdetailedinfopanelui.h"
+ #include "ui_transferdetailedtimeinfopanelui.h"
+
++#include <QTabWidget>
+
+ class QTimer;
+
+--
+2.16.2
+
diff --git a/net-irc/konversation/konversation-1.7.4.ebuild b/net-irc/konversation/konversation-1.7.4-r1.ebuild
index bedb2f5c384a..d16bd9092d16 100644
--- a/net-irc/konversation/konversation-1.7.4.ebuild
+++ b/net-irc/konversation/konversation-1.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -47,13 +47,15 @@ DEPEND="
$(add_qt_dep qtxml)
media-libs/phonon[qt5(+)]
sys-devel/gettext
- crypt? ( app-crypt/qca:2[qt5] )
+ crypt? ( app-crypt/qca:2[qt5(+)] )
"
RDEPEND="${DEPEND}
!net-irc/konversation:4
crypt? ( app-crypt/qca:2[ssl] )
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package crypt Qca-qt5)