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: Sun, 03 Mar 2019 20:01:58
Message-Id: 1551643297.fa12b7b7bb8b139ce5ad484d554a7fa7902d4918.pesa@gentoo
1 commit: fa12b7b7bb8b139ce5ad484d554a7fa7902d4918
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 3 20:01:37 2019 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 3 20:01:37 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa12b7b7
7
8 dev-qt/qtgui: restore QT_FREETYPE define
9
10 Bug: https://bugs.gentoo.org/678022
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
13
14 dev-qt/qtgui/qtgui-5.12.9999.ebuild | 4 ++--
15 dev-qt/qtgui/qtgui-5.13.9999.ebuild | 4 ++--
16 dev-qt/qtgui/qtgui-5.9999.ebuild | 4 ++--
17 3 files changed, 6 insertions(+), 6 deletions(-)
18
19 diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
20 index d0432526..326ef884 100644
21 --- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
22 +++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
23 @@ -43,7 +43,7 @@ RDEPEND="
24 jpeg? ( virtual/jpeg:0 )
25 libinput? (
26 dev-libs/libinput:=
27 - x11-libs/libxkbcommon
28 + >=x11-libs/libxkbcommon-0.5.0
29 )
30 png? ( media-libs/libpng:0= )
31 tslib? ( x11-libs/tslib )
32 @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=(
33 evdev:evdev:
34 evdev:mtdev:
35 :fontconfig:
36 - :system-freetype:
37 + :system-freetype:FREETYPE
38 !:no-freetype:
39 !gif:no-gif:
40 gles2::OPENGL_ES
41
42 diff --git a/dev-qt/qtgui/qtgui-5.13.9999.ebuild b/dev-qt/qtgui/qtgui-5.13.9999.ebuild
43 index d0432526..326ef884 100644
44 --- a/dev-qt/qtgui/qtgui-5.13.9999.ebuild
45 +++ b/dev-qt/qtgui/qtgui-5.13.9999.ebuild
46 @@ -43,7 +43,7 @@ RDEPEND="
47 jpeg? ( virtual/jpeg:0 )
48 libinput? (
49 dev-libs/libinput:=
50 - x11-libs/libxkbcommon
51 + >=x11-libs/libxkbcommon-0.5.0
52 )
53 png? ( media-libs/libpng:0= )
54 tslib? ( x11-libs/tslib )
55 @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=(
56 evdev:evdev:
57 evdev:mtdev:
58 :fontconfig:
59 - :system-freetype:
60 + :system-freetype:FREETYPE
61 !:no-freetype:
62 !gif:no-gif:
63 gles2::OPENGL_ES
64
65 diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
66 index d0432526..326ef884 100644
67 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild
68 +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
69 @@ -43,7 +43,7 @@ RDEPEND="
70 jpeg? ( virtual/jpeg:0 )
71 libinput? (
72 dev-libs/libinput:=
73 - x11-libs/libxkbcommon
74 + >=x11-libs/libxkbcommon-0.5.0
75 )
76 png? ( media-libs/libpng:0= )
77 tslib? ( x11-libs/tslib )
78 @@ -91,7 +91,7 @@ QT5_GENTOO_CONFIG=(
79 evdev:evdev:
80 evdev:mtdev:
81 :fontconfig:
82 - :system-freetype:
83 + :system-freetype:FREETYPE
84 !:no-freetype:
85 !gif:no-gif:
86 gles2::OPENGL_ES