gentoo resync : 14.07.2018

4 files changed, 60 insertions, 3 deletions

diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
index 54c90bd7520e..2ca4bd6aedbb 100644
--- a/dev-util/qdevicemonitor/Manifest
+++ b/dev-util/qdevicemonitor/Manifest
@@ -1,4 +1,6 @@
+AUX qdevicemonitor-1.0.1-crash-after-fresh-install.patch 925 BLAKE2B 6c187d5698e6c91045c02e8b643f20fa67e5a41d10807f588339f1fd516234180d07f89b45fa22d2a0bc389c1bed53e0d49a8615a91452973ae2aecbbb30dd7a SHA512 c30026bb388038aeb357498ca1c74ec20f2837a0b6bbbb1cf959fc0645189751ecb6e2b8fd736ebb13ff664af5469ec4e96f2240ea17af8714da44fd7c317916
+AUX qdevicemonitor-1.0.1-qt-5.11.patch 677 BLAKE2B c9a1d69980f83745332ac39f1f6577e911198dc8f438b7ad8ac3d8c93bca8051ebcffcf7262c987b1835e975887cb96606409afca04e5485e2dfc300f14281b8 SHA512 cbdce48375b9e89c176507994746275c2193df0d51b62d5dd2772059a4fea5f360fd00d4176f84274ee2fe31189f418aacac82f124659dec8c348bce6199b408
 DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55
-EBUILD qdevicemonitor-1.0.1.ebuild 919 BLAKE2B a0eee1acf84a3ba82e76b3a42a315352da8bdcb25e6f078a4ead7e90c9829efc3eb0da08f4657b5bb569161b910f1fc6e8ab1d584817e62bd2564396bfbb6466 SHA512 6f82903b9aefcef70c88766a5907e1dd14ec1bbdd9163eec724b8c6cb6c23e2ab0375796f443c73fd1944d1dbb0782c8c2a32a426a07becaefe06e38e0423f70
+EBUILD qdevicemonitor-1.0.1-r1.ebuild 1019 BLAKE2B f1a64869a9e5e5989779f824c88fd1aa7d38a3d4aff75ebf16379df1645f545009843900f27de30b432c69225a52cacdcbb143a382beba6f27644dcb2aa91a9a SHA512 de87fe281cd5099e6ad8fa0fdef8c3914362122a6dddc47441428217fc8023d5d9ef9b336db978464131f8ca2567967ed84860b3547874b9c2af0e8e2914e61b
 EBUILD qdevicemonitor-9999.ebuild 919 BLAKE2B a0eee1acf84a3ba82e76b3a42a315352da8bdcb25e6f078a4ead7e90c9829efc3eb0da08f4657b5bb569161b910f1fc6e8ab1d584817e62bd2564396bfbb6466 SHA512 6f82903b9aefcef70c88766a5907e1dd14ec1bbdd9163eec724b8c6cb6c23e2ab0375796f443c73fd1944d1dbb0782c8c2a32a426a07becaefe06e38e0423f70
 MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch
new file mode 100644
index 000000000000..00c4dc1cdf3f
--- /dev/null
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch
@@ -0,0 +1,26 @@
+From 079bc4cf3a59a98c429b1db21fcf3f88c19d2bb5 Mon Sep 17 00:00:00 2001
+From: Alexander Lopatin <alopatindev@gmail.com>
+Date: Fri, 13 Jul 2018 18:37:42 +0300
+Subject: [PATCH] fix crash that happens after fresh installation
+
+---
+ qdevicemonitor/devices/DeviceFacade.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qdevicemonitor/devices/DeviceFacade.cpp b/qdevicemonitor/devices/DeviceFacade.cpp
+index ced04b3..6df67eb 100644
+--- a/qdevicemonitor/devices/DeviceFacade.cpp
++++ b/qdevicemonitor/devices/DeviceFacade.cpp
+@@ -151,8 +151,8 @@ void DeviceFacade::loadSettings(const QSettings& s)
+     if (darkTheme.isValid())
+     {
+         m_darkTheme = darkTheme.toBool();
+-        m_colorTheme = ColorTheme::create(m_darkTheme);
+     }
++    m_colorTheme = ColorTheme::create(m_darkTheme);
+ 
+     const QVariant clearAndroidLog = s.value("clearAndroidLog");
+     if (clearAndroidLog.isValid())
+-- 
+2.16.4
+
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch
new file mode 100644
index 000000000000..47d9a017f7a9
--- /dev/null
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch
@@ -0,0 +1,24 @@
+From 5da5c11ff84cc293b5db3a0d7ba09c62b3db94a8 Mon Sep 17 00:00:00 2001
+From: Alexander Lopatin <alopatindev@gmail.com>
+Date: Fri, 13 Jul 2018 18:30:21 +0300
+Subject: [PATCH] fix Qt 5.11 specific issue https://bugs.gentoo.org/660932
+
+---
+ qdevicemonitor/ui/MainWindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp
+index c1bf263..fc22b4d 100644
+--- a/qdevicemonitor/ui/MainWindow.cpp
++++ b/qdevicemonitor/ui/MainWindow.cpp
+@@ -31,6 +31,7 @@
+ #include <QProcess>
+ #include <QSettings>
+ #include <QStringList>
++#include <QTabBar>
+ #include <QtCore/QStringBuilder>
+ 
+ #if defined(Q_OS_WIN32)
+-- 
+2.16.4
+
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild
index c055bb2fca97..1b9b31c6c9dd 100644
--- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1.ebuild
+++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
 HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
@@ -27,6 +27,11 @@ RDEPEND="
 	app-pda/usbmuxd"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-crash-after-fresh-install.patch
+)
+
 src_configure() {
 	cd "${PN}" || die
 	export VERSION_WITH_BUILD_NUMBER="${PV}"