1 |
commit: 05d5b6242244efacef4fc316eb8e8f9fd8957eaa |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 27 23:08:10 2015 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 27 23:18:32 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d5b624 |
7 |
|
8 |
dev-qt/qtwidgets: backport patch to fix vlc video output |
9 |
|
10 |
Gentoo-Bug: 563458 |
11 |
|
12 |
Package-Manager: portage-2.2.26 |
13 |
|
14 |
.../files/qtwidgets-5.5.1-vlc-video-output.patch | 39 ++++++++++++++++++ |
15 |
dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild | 47 ++++++++++++++++++++++ |
16 |
2 files changed, 86 insertions(+) |
17 |
|
18 |
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch b/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch |
19 |
new file mode 100644 |
20 |
index 0000000..a340c13 |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.5.1-vlc-video-output.patch |
23 |
@@ -0,0 +1,39 @@ |
24 |
+From 0f68f8920573cdce1729a285a92ac8582df32841 Mon Sep 17 00:00:00 2001 |
25 |
+From: Ulf Hermann <ulf.hermann@××××××××××××.com> |
26 |
+Date: Tue, 27 Oct 2015 15:25:42 +0100 |
27 |
+Subject: QtWidgets: Do hide/show via WA_OutsideWSRange for native widgets |
28 |
+MIME-Version: 1.0 |
29 |
+Content-Type: text/plain; charset=UTF-8 |
30 |
+Content-Transfer-Encoding: 8bit |
31 |
+ |
32 |
+If a native widget has a width or height of 0 we don't have to |
33 |
+invalidate its backing store as that is done by the window |
34 |
+system. Certain applications rely on ... interesting ... behavior |
35 |
+of certain window systems in this case. |
36 |
+ |
37 |
+Task-number: QTBUG-48321 |
38 |
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c |
39 |
+Reviewed-by: Dmitry Shachnev <mitya57@×××××.com> |
40 |
+Reviewed-by: Alexander Volkov <a.volkov@×××××××××.ru> |
41 |
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@×××××.com> |
42 |
+Reviewed-by: Paul Olav Tvete <paul.tvete@××××××××××××.com> |
43 |
+--- |
44 |
+ src/widgets/kernel/qwidget.cpp | 2 +- |
45 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
46 |
+ |
47 |
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp |
48 |
+index 7734715..4286130 100644 |
49 |
+--- a/src/widgets/kernel/qwidget.cpp |
50 |
++++ b/src/widgets/kernel/qwidget.cpp |
51 |
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) |
52 |
+ |
53 |
+ bool needsShow = false; |
54 |
+ |
55 |
+- if (q->isWindow()) { |
56 |
++ if (q->isWindow() || q->windowHandle()) { |
57 |
+ if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) { |
58 |
+ q->setAttribute(Qt::WA_OutsideWSRange, true); |
59 |
+ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) |
60 |
+-- |
61 |
+2.6.3 |
62 |
+ |
63 |
|
64 |
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild |
65 |
new file mode 100644 |
66 |
index 0000000..84895e4 |
67 |
--- /dev/null |
68 |
+++ b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild |
69 |
@@ -0,0 +1,47 @@ |
70 |
+# Copyright 1999-2015 Gentoo Foundation |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+# $Id$ |
73 |
+ |
74 |
+EAPI=5 |
75 |
+QT5_MODULE="qtbase" |
76 |
+inherit qt5-build |
77 |
+ |
78 |
+DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework" |
79 |
+ |
80 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
81 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" |
82 |
+fi |
83 |
+ |
84 |
+# keep IUSE defaults in sync with qtgui |
85 |
+IUSE="gles2 gtkstyle +png +xcb" |
86 |
+ |
87 |
+DEPEND=" |
88 |
+ ~dev-qt/qtcore-${PV} |
89 |
+ ~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?] |
90 |
+" |
91 |
+RDEPEND="${DEPEND}" |
92 |
+ |
93 |
+PATCHES=( |
94 |
+ "${FILESDIR}/${P}-vlc-video-output.patch" # bug 563458 |
95 |
+) |
96 |
+ |
97 |
+QT5_TARGET_SUBDIRS=( |
98 |
+ src/tools/uic |
99 |
+ src/widgets |
100 |
+) |
101 |
+ |
102 |
+QT5_GENTOO_CONFIG=( |
103 |
+ !:no-widgets: |
104 |
+) |
105 |
+ |
106 |
+src_configure() { |
107 |
+ local myconf=( |
108 |
+ $(qt_use gtkstyle) |
109 |
+ -opengl $(usex gles2 es2 desktop) |
110 |
+ $(qt_use png libpng system) |
111 |
+ $(qt_use xcb xcb system) |
112 |
+ $(qt_use xcb xkbcommon system) |
113 |
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) |
114 |
+ ) |
115 |
+ qt5-build_src_configure |
116 |
+} |