Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
Date: Sat, 15 Apr 2017 04:46:25
Message-Id: 1492231224.13bd21aa255a68991c0dca5a2787e7973682bca0.pesa@gentoo
1 commit: 13bd21aa255a68991c0dca5a2787e7973682bca0
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 15 16:14:37 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 15 04:40:24 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=13bd21aa
7
8 dev-qt/qtgui: Stop passing -xrender to configure on {5,5.8}.9999
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11
12 dev-qt/qtgui/qtgui-5.8.9999.ebuild | 6 ++----
13 dev-qt/qtgui/qtgui-5.9999.ebuild | 6 ++----
14 2 files changed, 4 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-qt/qtgui/qtgui-5.8.9999.ebuild b/dev-qt/qtgui/qtgui-5.8.9999.ebuild
17 index 93dcfd12..b328d687 100644
18 --- a/dev-qt/qtgui/qtgui-5.8.9999.ebuild
19 +++ b/dev-qt/qtgui/qtgui-5.8.9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -55,7 +55,6 @@ RDEPEND="
27 x11-libs/libSM
28 x11-libs/libX11
29 >=x11-libs/libXi-1.7.4
30 - x11-libs/libXrender
31 >=x11-libs/libxcb-1.10:=[xkb]
32 >=x11-libs/libxkbcommon-0.4.1[X]
33 x11-libs/xcb-util-image
34 @@ -118,7 +117,6 @@ QT5_GENTOO_CONFIG=(
35 xcb:xcb-xlib:
36 xcb:xinput2:
37 xcb::XKB
38 - xcb:xrender
39 )
40
41 src_prepare() {
42 @@ -160,7 +158,7 @@ src_configure() {
43 $(qt_use udev libudev)
44 $(qt_use xcb xcb system)
45 $(qt_use xcb xkbcommon-x11 system)
46 - $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
47 + $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
48 )
49 qt5-build_src_configure
50 }
51
52 diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
53 index 93dcfd12..b328d687 100644
54 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild
55 +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
56 @@ -1,4 +1,4 @@
57 -# Copyright 1999-2016 Gentoo Foundation
58 +# Copyright 1999-2017 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI=6
62 @@ -55,7 +55,6 @@ RDEPEND="
63 x11-libs/libSM
64 x11-libs/libX11
65 >=x11-libs/libXi-1.7.4
66 - x11-libs/libXrender
67 >=x11-libs/libxcb-1.10:=[xkb]
68 >=x11-libs/libxkbcommon-0.4.1[X]
69 x11-libs/xcb-util-image
70 @@ -118,7 +117,6 @@ QT5_GENTOO_CONFIG=(
71 xcb:xcb-xlib:
72 xcb:xinput2:
73 xcb::XKB
74 - xcb:xrender
75 )
76
77 src_prepare() {
78 @@ -160,7 +158,7 @@ src_configure() {
79 $(qt_use udev libudev)
80 $(qt_use xcb xcb system)
81 $(qt_use xcb xkbcommon-x11 system)
82 - $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
83 + $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
84 )
85 qt5-build_src_configure
86 }