1 |
commit: e0c9976e13d4c193d2c849f5fc051ec64f35ca39 |
2 |
Author: Alexander Lopatin <alopatindev <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jul 14 11:49:25 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 14 13:13:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c9976e |
7 |
|
8 |
dev-util/qdevicemonitor: fix Qt 5.11 specific issue and crash |
9 |
|
10 |
Closes: https://bugs.gentoo.org/660932 |
11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/9213 |
13 |
|
14 |
...cemonitor-1.0.1-crash-after-fresh-install.patch | 26 +++++++++++ |
15 |
.../files/qdevicemonitor-1.0.1-qt-5.11.patch | 24 ++++++++++ |
16 |
.../qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild | 51 ++++++++++++++++++++++ |
17 |
3 files changed, 101 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..00c4dc1cdf3 |
22 |
--- /dev/null |
23 |
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-crash-after-fresh-install.patch |
24 |
@@ -0,0 +1,26 @@ |
25 |
+From 079bc4cf3a59a98c429b1db21fcf3f88c19d2bb5 Mon Sep 17 00:00:00 2001 |
26 |
+From: Alexander Lopatin <alopatindev@×××××.com> |
27 |
+Date: Fri, 13 Jul 2018 18:37:42 +0300 |
28 |
+Subject: [PATCH] fix crash that happens after fresh installation |
29 |
+ |
30 |
+--- |
31 |
+ qdevicemonitor/devices/DeviceFacade.cpp | 2 +- |
32 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/qdevicemonitor/devices/DeviceFacade.cpp b/qdevicemonitor/devices/DeviceFacade.cpp |
35 |
+index ced04b3..6df67eb 100644 |
36 |
+--- a/qdevicemonitor/devices/DeviceFacade.cpp |
37 |
++++ b/qdevicemonitor/devices/DeviceFacade.cpp |
38 |
+@@ -151,8 +151,8 @@ void DeviceFacade::loadSettings(const QSettings& s) |
39 |
+ if (darkTheme.isValid()) |
40 |
+ { |
41 |
+ m_darkTheme = darkTheme.toBool(); |
42 |
+- m_colorTheme = ColorTheme::create(m_darkTheme); |
43 |
+ } |
44 |
++ m_colorTheme = ColorTheme::create(m_darkTheme); |
45 |
+ |
46 |
+ const QVariant clearAndroidLog = s.value("clearAndroidLog"); |
47 |
+ if (clearAndroidLog.isValid()) |
48 |
+-- |
49 |
+2.16.4 |
50 |
+ |
51 |
|
52 |
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 |
53 |
new file mode 100644 |
54 |
index 00000000000..47d9a017f7a |
55 |
--- /dev/null |
56 |
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-qt-5.11.patch |
57 |
@@ -0,0 +1,24 @@ |
58 |
+From 5da5c11ff84cc293b5db3a0d7ba09c62b3db94a8 Mon Sep 17 00:00:00 2001 |
59 |
+From: Alexander Lopatin <alopatindev@×××××.com> |
60 |
+Date: Fri, 13 Jul 2018 18:30:21 +0300 |
61 |
+Subject: [PATCH] fix Qt 5.11 specific issue https://bugs.gentoo.org/660932 |
62 |
+ |
63 |
+--- |
64 |
+ qdevicemonitor/ui/MainWindow.cpp | 1 + |
65 |
+ 1 file changed, 1 insertion(+) |
66 |
+ |
67 |
+diff --git a/qdevicemonitor/ui/MainWindow.cpp b/qdevicemonitor/ui/MainWindow.cpp |
68 |
+index c1bf263..fc22b4d 100644 |
69 |
+--- a/qdevicemonitor/ui/MainWindow.cpp |
70 |
++++ b/qdevicemonitor/ui/MainWindow.cpp |
71 |
+@@ -31,6 +31,7 @@ |
72 |
+ #include <QProcess> |
73 |
+ #include <QSettings> |
74 |
+ #include <QStringList> |
75 |
++#include <QTabBar> |
76 |
+ #include <QtCore/QStringBuilder> |
77 |
+ |
78 |
+ #if defined(Q_OS_WIN32) |
79 |
+-- |
80 |
+2.16.4 |
81 |
+ |
82 |
|
83 |
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000000..8e27034f9ef |
86 |
--- /dev/null |
87 |
+++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r1.ebuild |
88 |
@@ -0,0 +1,51 @@ |
89 |
+# Copyright 1999-2018 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+ |
92 |
+EAPI="6" |
93 |
+ |
94 |
+inherit eutils qmake-utils |
95 |
+ |
96 |
+DESCRIPTION="Crossplatform log viewer for Android, iOS and text files" |
97 |
+HOMEPAGE="https://github.com/alopatindev/qdevicemonitor" |
98 |
+ |
99 |
+if [[ ${PV} == "9999" ]] ; then |
100 |
+ inherit git-r3 |
101 |
+ EGIT_REPO_URI="https://github.com/alopatindev/${PN}" |
102 |
+else |
103 |
+ SRC_URI="https://github.com/alopatindev/qdevicemonitor/archive/${PV}.tar.gz -> ${P}.tar.gz" |
104 |
+ KEYWORDS="~amd64 ~x86" |
105 |
+fi |
106 |
+ |
107 |
+LICENSE="GPL-3" |
108 |
+SLOT="0" |
109 |
+IUSE="" |
110 |
+ |
111 |
+RDEPEND=" |
112 |
+ dev-qt/qtcore:5 |
113 |
+ dev-qt/qtgui:5 |
114 |
+ dev-util/android-tools |
115 |
+ app-pda/usbmuxd" |
116 |
+DEPEND="${RDEPEND}" |
117 |
+ |
118 |
+PATCHES=( |
119 |
+ "${FILESDIR}"/${P}-qt-5.11.patch |
120 |
+ "${FILESDIR}"/${P}-crash-after-fresh-install.patch |
121 |
+) |
122 |
+ |
123 |
+src_configure() { |
124 |
+ cd "${PN}" || die |
125 |
+ export VERSION_WITH_BUILD_NUMBER="${PV}" |
126 |
+ eqmake5 |
127 |
+} |
128 |
+ |
129 |
+src_compile() { |
130 |
+ cd "${PN}" || die |
131 |
+ emake |
132 |
+} |
133 |
+ |
134 |
+src_install() { |
135 |
+ dobin "${PN}/${PN}" |
136 |
+ dodoc README.md |
137 |
+ newicon -s scalable "icons/app_icon.svg" "${PN}.svg" |
138 |
+ domenu "icons/${PN}.desktop" |
139 |
+} |