1 |
commit: 07a1746b6e393fe9674f3c350cd3468c8b66df85 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 30 15:59:00 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 30 16:09:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a1746b |
7 |
|
8 |
dev-qt/qtcore: Add 5.15.4 QT5_KDEPATCHSET_REV=2 |
9 |
|
10 |
See also: |
11 |
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/153 |
12 |
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/155 |
13 |
|
14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
dev-qt/qtcore/Manifest | 1 + |
18 |
dev-qt/qtcore/qtcore-5.15.4-r2.ebuild | 121 ++++++++++++++++++++++++++++++++++ |
19 |
2 files changed, 122 insertions(+) |
20 |
|
21 |
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest |
22 |
index 876cb884f820..00973c551288 100644 |
23 |
--- a/dev-qt/qtcore/Manifest |
24 |
+++ b/dev-qt/qtcore/Manifest |
25 |
@@ -1,4 +1,5 @@ |
26 |
DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c |
27 |
DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 |
28 |
+DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c |
29 |
DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 |
30 |
DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 |
31 |
|
32 |
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild |
33 |
new file mode 100644 |
34 |
index 000000000000..799954faa0fa |
35 |
--- /dev/null |
36 |
+++ b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild |
37 |
@@ -0,0 +1,121 @@ |
38 |
+# Copyright 1999-2022 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=8 |
42 |
+ |
43 |
+QT5_KDEPATCHSET_REV=2 |
44 |
+QT5_MODULE="qtbase" |
45 |
+inherit linux-info flag-o-matic 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 ~loong ~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 |
+ |
67 |
+QT5_TARGET_SUBDIRS=( |
68 |
+ src/tools/bootstrap |
69 |
+ src/tools/moc |
70 |
+ src/tools/rcc |
71 |
+ src/corelib |
72 |
+ src/tools/qlalr |
73 |
+ doc |
74 |
+) |
75 |
+ |
76 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
77 |
+ !:network |
78 |
+ !:sql |
79 |
+ !:testlib |
80 |
+ !:xml |
81 |
+) |
82 |
+ |
83 |
+PATCHES=( |
84 |
+ "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470 |
85 |
+) |
86 |
+ |
87 |
+pkg_pretend() { |
88 |
+ use kernel_linux || return |
89 |
+ get_running_version |
90 |
+ if kernel_is -lt 4 11 && ! use old-kernel; then |
91 |
+ ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for" |
92 |
+ ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856" |
93 |
+ fi |
94 |
+} |
95 |
+ |
96 |
+src_prepare() { |
97 |
+ # don't add -O3 to CXXFLAGS, bug 549140 |
98 |
+ sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die |
99 |
+ |
100 |
+ # fix missing qt_version_tag symbol w/ LTO, bug 674382 |
101 |
+ sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die |
102 |
+ |
103 |
+ # Broken with FORTIFY_SOURCE=3 |
104 |
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need |
105 |
+ # to unset F_S first, then explicitly set 2, to negate any default |
106 |
+ # and anything set by the user if they're choosing 3 (or if they've |
107 |
+ # modified GCC to set 3). |
108 |
+ # |
109 |
+ # Refs: |
110 |
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078 |
111 |
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709 |
112 |
+ # https://bugreports.qt.io/browse/QTBUG-103782 |
113 |
+ # bug #847145 |
114 |
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then |
115 |
+ # We can't unconditionally do this b/c we fortify needs |
116 |
+ # some level of optimisation. |
117 |
+ filter-flags -D_FORTIFY_SOURCE=3 |
118 |
+ # (Qt doesn't seem to respect CPPFLAGS?) |
119 |
+ append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 |
120 |
+ fi |
121 |
+ |
122 |
+ qt5-build_src_prepare |
123 |
+} |
124 |
+ |
125 |
+src_configure() { |
126 |
+ local myconf=( |
127 |
+ $(qt_use icu) |
128 |
+ $(qt_use !icu iconv) |
129 |
+ $(qt_use systemd journald) |
130 |
+ ) |
131 |
+ use old-kernel && myconf+=( |
132 |
+ -no-feature-renameat2 # needs Linux 3.16, bug 669994 |
133 |
+ -no-feature-getentropy # needs Linux 3.17, bug 669994 |
134 |
+ -no-feature-statx # needs Linux 4.11, bug 672856 |
135 |
+ ) |
136 |
+ qt5-build_src_configure |
137 |
+} |
138 |
+ |
139 |
+src_install() { |
140 |
+ qt5-build_src_install |
141 |
+ qt5_symlink_binary_to_path qmake 5 |
142 |
+ |
143 |
+ local flags=( |
144 |
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG |
145 |
+ OPENGL OPENSSL SSL WIDGETS |
146 |
+ ) |
147 |
+ |
148 |
+ for flag in ${flags[@]}; do |
149 |
+ cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
150 |
+ |
151 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
152 |
+ # undef QT_NO_${flag} |
153 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
154 |
+ # define QT_NO_${flag} |
155 |
+ #endif |
156 |
+ _EOF_ |
157 |
+ done |
158 |
+} |