1 |
commit: 0131b6cc91387f1b06b13bcabfb9c404688d507e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 15 14:11:14 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 15 14:12:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0131b6cc |
7 |
|
8 |
dev-qt/qtcore: 5.15.2-r14 version bump at KDE f4ac0b55 |
9 |
|
10 |
Marc Mutz (1): |
11 |
QTzTimeZonePrivate: fix UB (data race on m_icu) |
12 |
|
13 |
Volker Hilsheimer (1): |
14 |
Don't access QObject::objectName during QThread start |
15 |
|
16 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
dev-qt/qtcore/Manifest | 1 + |
20 |
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 104 +++++++++++++++++++++++++++++++++ |
21 |
2 files changed, 105 insertions(+) |
22 |
|
23 |
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest |
24 |
index 4f0dd80dbe1f..5e69125c6d40 100644 |
25 |
--- a/dev-qt/qtcore/Manifest |
26 |
+++ b/dev-qt/qtcore/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 |
29 |
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc |
30 |
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa |
31 |
|
32 |
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild |
33 |
new file mode 100644 |
34 |
index 000000000000..363ceb67039c |
35 |
--- /dev/null |
36 |
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild |
37 |
@@ -0,0 +1,104 @@ |
38 |
+# Copyright 1999-2022 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=8 |
42 |
+ |
43 |
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c |
44 |
+QT5_MODULE="qtbase" |
45 |
+inherit linux-info qt5-build |
46 |
+ |
47 |
+DESCRIPTION="Cross-platform application development framework" |
48 |
+SLOT=5/${QT5_PV} |
49 |
+ |
50 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
51 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" |
52 |
+fi |
53 |
+ |
54 |
+IUSE="icu old-kernel systemd" |
55 |
+ |
56 |
+DEPEND=" |
57 |
+ dev-libs/double-conversion:= |
58 |
+ dev-libs/glib:2 |
59 |
+ dev-libs/libpcre2[pcre16,unicode] |
60 |
+ sys-libs/zlib:= |
61 |
+ icu? ( dev-libs/icu:= ) |
62 |
+ !icu? ( virtual/libiconv ) |
63 |
+ systemd? ( sys-apps/systemd:= ) |
64 |
+" |
65 |
+RDEPEND="${DEPEND} |
66 |
+ >=dev-qt/qtchooser-66-r1 |
67 |
+" |
68 |
+ |
69 |
+QT5_TARGET_SUBDIRS=( |
70 |
+ src/tools/bootstrap |
71 |
+ src/tools/moc |
72 |
+ src/tools/rcc |
73 |
+ src/corelib |
74 |
+ src/tools/qlalr |
75 |
+ doc |
76 |
+) |
77 |
+ |
78 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
79 |
+ !:network |
80 |
+ !:sql |
81 |
+ !:testlib |
82 |
+ !:xml |
83 |
+) |
84 |
+ |
85 |
+PATCHES=( |
86 |
+ "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 |
87 |
+ "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914 |
88 |
+) |
89 |
+ |
90 |
+pkg_pretend() { |
91 |
+ use kernel_linux || return |
92 |
+ get_running_version |
93 |
+ if kernel_is -lt 4 11 && ! use old-kernel; then |
94 |
+ ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" |
95 |
+ ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" |
96 |
+ fi |
97 |
+} |
98 |
+ |
99 |
+src_prepare() { |
100 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
101 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die |
102 |
+ |
103 |
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382 |
104 |
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die |
105 |
+ |
106 |
+ qt5-build_src_prepare |
107 |
+} |
108 |
+ |
109 |
+src_configure() { |
110 |
+ local myconf=( |
111 |
+ $(qt_use icu) |
112 |
+ $(qt_use !icu iconv) |
113 |
+ $(qt_use systemd journald) |
114 |
+ ) |
115 |
+ use old-kernel && myconf+=( |
116 |
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994 |
117 |
+ -no-feature-getentropy # needs Linux 3.17, bug 669994 |
118 |
+ -no-feature-statx # needs Linux 4.11, bug 672856 |
119 |
+ ) |
120 |
+ qt5-build_src_configure |
121 |
+} |
122 |
+ |
123 |
+src_install() { |
124 |
+ qt5-build_src_install |
125 |
+ |
126 |
+ local flags=( |
127 |
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG |
128 |
+ OPENGL OPENSSL SSL WIDGETS |
129 |
+ ) |
130 |
+ |
131 |
+ for flag in ${flags[@]}; do |
132 |
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
133 |
+ |
134 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
135 |
+ # undef QT_NO_${flag} |
136 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
137 |
+ # define QT_NO_${flag} |
138 |
+ #endif |
139 |
+ _EOF_ |
140 |
+ done |
141 |
+} |