1 |
commit: 7abcc55e604347bca806cdc702f1b2316d8b2a47 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 12 20:54:55 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 13 00:55:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abcc55e |
7 |
|
8 |
dev-qt/qtcore: Drop bogus QT_NO_XRENDER from gentoo-qconfig.h |
9 |
|
10 |
Fixes missing shadow around Qt context menus. Upstream dropped xrender |
11 |
option long ago. |
12 |
|
13 |
Upstream commit d37c353dc0f2ae5bb803fe9e5752eff846246439 |
14 |
|
15 |
Reported-by: <giovanni.santoni72 <AT> gmail.com> |
16 |
Thanks-to: Lukas Turek <8an <AT> praha12.net> |
17 |
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org> |
18 |
Bug: https://bugs.gentoo.org/648300 |
19 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
20 |
|
21 |
dev-qt/qtcore/qtcore-5.11.1-r1.ebuild | 75 +++++++++++++++++++++++++++++++++++ |
22 |
dev-qt/qtcore/qtcore-5.9.6-r1.ebuild | 75 +++++++++++++++++++++++++++++++++++ |
23 |
2 files changed, 150 insertions(+) |
24 |
|
25 |
diff --git a/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..c3da14471f4 |
28 |
--- /dev/null |
29 |
+++ b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild |
30 |
@@ -0,0 +1,75 @@ |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=6 |
35 |
+QT5_MODULE="qtbase" |
36 |
+inherit qt5-build |
37 |
+ |
38 |
+DESCRIPTION="Cross-platform application development framework" |
39 |
+ |
40 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
41 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
42 |
+fi |
43 |
+ |
44 |
+IUSE="icu systemd" |
45 |
+ |
46 |
+DEPEND=" |
47 |
+ dev-libs/double-conversion:= |
48 |
+ dev-libs/glib:2 |
49 |
+ dev-libs/libpcre2[pcre16,unicode] |
50 |
+ sys-libs/zlib |
51 |
+ icu? ( dev-libs/icu:= ) |
52 |
+ !icu? ( virtual/libiconv ) |
53 |
+ systemd? ( sys-apps/systemd:= ) |
54 |
+" |
55 |
+RDEPEND="${DEPEND} |
56 |
+ !<dev-qt/qtcore-4.8.7-r4:4 |
57 |
+" |
58 |
+ |
59 |
+QT5_TARGET_SUBDIRS=( |
60 |
+ src/tools/bootstrap |
61 |
+ src/tools/moc |
62 |
+ src/tools/rcc |
63 |
+ src/tools/qfloat16-tables |
64 |
+ src/corelib |
65 |
+ src/tools/qlalr |
66 |
+ doc |
67 |
+) |
68 |
+ |
69 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
70 |
+ !:network |
71 |
+ !:sql |
72 |
+ !:testlib |
73 |
+ !:xml |
74 |
+) |
75 |
+ |
76 |
+src_configure() { |
77 |
+ local myconf=( |
78 |
+ $(qt_use icu) |
79 |
+ $(qt_use !icu iconv) |
80 |
+ $(qt_use systemd journald) |
81 |
+ ) |
82 |
+ qt5-build_src_configure |
83 |
+} |
84 |
+ |
85 |
+src_install() { |
86 |
+ qt5-build_src_install |
87 |
+ |
88 |
+ local flags=( |
89 |
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
90 |
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
91 |
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS |
92 |
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB |
93 |
+ ) |
94 |
+ |
95 |
+ for flag in ${flags[@]}; do |
96 |
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
97 |
+ |
98 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
99 |
+ # undef QT_NO_${flag} |
100 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
101 |
+ # define QT_NO_${flag} |
102 |
+ #endif |
103 |
+ _EOF_ |
104 |
+ done |
105 |
+} |
106 |
|
107 |
diff --git a/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild b/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild |
108 |
new file mode 100644 |
109 |
index 00000000000..c3da14471f4 |
110 |
--- /dev/null |
111 |
+++ b/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild |
112 |
@@ -0,0 +1,75 @@ |
113 |
+# Copyright 1999-2018 Gentoo Foundation |
114 |
+# Distributed under the terms of the GNU General Public License v2 |
115 |
+ |
116 |
+EAPI=6 |
117 |
+QT5_MODULE="qtbase" |
118 |
+inherit qt5-build |
119 |
+ |
120 |
+DESCRIPTION="Cross-platform application development framework" |
121 |
+ |
122 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
123 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
124 |
+fi |
125 |
+ |
126 |
+IUSE="icu systemd" |
127 |
+ |
128 |
+DEPEND=" |
129 |
+ dev-libs/double-conversion:= |
130 |
+ dev-libs/glib:2 |
131 |
+ dev-libs/libpcre2[pcre16,unicode] |
132 |
+ sys-libs/zlib |
133 |
+ icu? ( dev-libs/icu:= ) |
134 |
+ !icu? ( virtual/libiconv ) |
135 |
+ systemd? ( sys-apps/systemd:= ) |
136 |
+" |
137 |
+RDEPEND="${DEPEND} |
138 |
+ !<dev-qt/qtcore-4.8.7-r4:4 |
139 |
+" |
140 |
+ |
141 |
+QT5_TARGET_SUBDIRS=( |
142 |
+ src/tools/bootstrap |
143 |
+ src/tools/moc |
144 |
+ src/tools/rcc |
145 |
+ src/tools/qfloat16-tables |
146 |
+ src/corelib |
147 |
+ src/tools/qlalr |
148 |
+ doc |
149 |
+) |
150 |
+ |
151 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
152 |
+ !:network |
153 |
+ !:sql |
154 |
+ !:testlib |
155 |
+ !:xml |
156 |
+) |
157 |
+ |
158 |
+src_configure() { |
159 |
+ local myconf=( |
160 |
+ $(qt_use icu) |
161 |
+ $(qt_use !icu iconv) |
162 |
+ $(qt_use systemd journald) |
163 |
+ ) |
164 |
+ qt5-build_src_configure |
165 |
+} |
166 |
+ |
167 |
+src_install() { |
168 |
+ qt5-build_src_install |
169 |
+ |
170 |
+ local flags=( |
171 |
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
172 |
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
173 |
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS |
174 |
+ XCURSOR XFIXES XKB XRANDR XSYNC ZLIB |
175 |
+ ) |
176 |
+ |
177 |
+ for flag in ${flags[@]}; do |
178 |
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
179 |
+ |
180 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
181 |
+ # undef QT_NO_${flag} |
182 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
183 |
+ # define QT_NO_${flag} |
184 |
+ #endif |
185 |
+ _EOF_ |
186 |
+ done |
187 |
+} |