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, 28 Jun 2014 02:37:19
Message-Id: 1403922861.3b3ebe0c5b6f594c149d90ced1914d7be74e6b0d.pesa@gentoo
1 commit: 3b3ebe0c5b6f594c149d90ced1914d7be74e6b0d
2 Author: Jean-Yves Faye <jean-yves.faye <AT> c-s <DOT> fr>
3 AuthorDate: Wed Jun 25 18:20:48 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 28 02:34:21 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3b3ebe0c
7
8 [dev-qt/qtgui:5] Fix QCONFIG_DEFINE with USE="opengl".
9
10 Fixes bug #515080
11
12 ---
13 dev-qt/qtgui/qtgui-5.3.1.ebuild | 2 +-
14 dev-qt/qtgui/qtgui-5.3.9999.ebuild | 2 +-
15 dev-qt/qtgui/qtgui-5.9999.ebuild | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18 diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
19 index caee2ec..626cd2a 100644
20 --- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
21 +++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
22 @@ -98,7 +98,7 @@ pkg_setup() {
23 $(use evdev || echo QT_NO_EVDEV)
24 $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
25 $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
26 - $(use opengl || echo QT_NO_OPENGL)
27 + $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
28 $(use png || echo QT_NO_IMAGEFORMAT_PNG)
29 )
30
31
32 diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
33 index caee2ec..626cd2a 100644
34 --- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
35 +++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
36 @@ -98,7 +98,7 @@ pkg_setup() {
37 $(use evdev || echo QT_NO_EVDEV)
38 $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
39 $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
40 - $(use opengl || echo QT_NO_OPENGL)
41 + $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
42 $(use png || echo QT_NO_IMAGEFORMAT_PNG)
43 )
44
45
46 diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
47 index 77ecbf8..683b505 100644
48 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild
49 +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
50 @@ -99,7 +99,7 @@ pkg_setup() {
51 $(use evdev || echo QT_NO_EVDEV)
52 $(use gles2 && echo QT_OPENGL_ES QT_OPENGL_ES_2)
53 $(use jpeg || echo QT_NO_IMAGEFORMAT_JPEG)
54 - $(use opengl || echo QT_NO_OPENGL)
55 + $(use opengl && echo QT_OPENGL || echo QT_NO_OPENGL)
56 $(use png || echo QT_NO_IMAGEFORMAT_PNG)
57 )