mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt/qtcore: Drop 5.15.4
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,6 +1,3 @@
|
||||
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
|
||||
DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
|
||||
DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0 SHA512 f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
|
||||
DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
|
||||
DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
|
||||
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
# Use link option -pthread instead of -lpthread
|
||||
|
||||
# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
|
||||
# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
|
||||
# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state"
|
||||
|
||||
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
|
||||
index 544cc227..add969be 100644
|
||||
--- a/mkspecs/common/linux.conf
|
||||
+++ b/mkspecs/common/linux.conf
|
||||
@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL = -lEGL
|
||||
QMAKE_LIBS_OPENGL = -lGL
|
||||
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
|
||||
QMAKE_LIBS_OPENVG = -lOpenVG
|
||||
-QMAKE_LIBS_THREAD = -lpthread
|
||||
+QMAKE_LIBS_THREAD = -pthread
|
||||
QMAKE_LIBS_VULKAN =
|
||||
|
||||
QMAKE_INCDIR_WAYLAND =
|
||||
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
|
||||
index 9b5d19d4..da028fb2 100644
|
||||
--- a/src/corelib/configure.json
|
||||
+++ b/src/corelib/configure.json
|
||||
@@ -355,7 +355,7 @@
|
||||
"std::future<int> f = std::async([]() { return 42; });",
|
||||
"(void)f.get();"
|
||||
],
|
||||
- "qmake": "unix:LIBS += -lpthread"
|
||||
+ "qmake": "unix:LIBS += -pthread"
|
||||
}
|
||||
},
|
||||
"cxx11_random": {
|
||||
@@ -466,7 +466,7 @@
|
||||
"shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
|
||||
"shm_unlink(\"test\");"
|
||||
],
|
||||
- "qmake": "linux: LIBS += -lpthread -lrt"
|
||||
+ "qmake": "linux: LIBS += -pthread -lrt"
|
||||
}
|
||||
},
|
||||
"linkat": {
|
||||
@@ -1,121 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT5_KDEPATCHSET_REV=2
|
||||
QT5_MODULE="qtbase"
|
||||
inherit linux-info flag-o-matic qt5-build
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
SLOT=5/${QT5_PV}
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
|
||||
fi
|
||||
|
||||
IUSE="icu old-kernel systemd"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/double-conversion:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/libpcre2[pcre16,unicode]
|
||||
sys-libs/zlib:=
|
||||
icu? ( dev-libs/icu:= )
|
||||
!icu? ( virtual/libiconv )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/corelib
|
||||
src/tools/qlalr
|
||||
doc
|
||||
)
|
||||
|
||||
QT5_GENTOO_PRIVATE_CONFIG=(
|
||||
!:network
|
||||
!:sql
|
||||
!:testlib
|
||||
!:xml
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
use kernel_linux || return
|
||||
get_running_version
|
||||
if kernel_is -lt 4 11 && ! use old-kernel; then
|
||||
ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
|
||||
ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# don't add -O3 to CXXFLAGS, bug 549140
|
||||
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
|
||||
|
||||
# fix missing qt_version_tag symbol w/ LTO, bug 674382
|
||||
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
|
||||
|
||||
# Broken with FORTIFY_SOURCE=3
|
||||
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
|
||||
# to unset F_S first, then explicitly set 2, to negate any default
|
||||
# and anything set by the user if they're choosing 3 (or if they've
|
||||
# modified GCC to set 3).
|
||||
#
|
||||
# Refs:
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
|
||||
# https://bugreports.qt.io/browse/QTBUG-103782
|
||||
# bug #847145
|
||||
if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
|
||||
# We can't unconditionally do this b/c we fortify needs
|
||||
# some level of optimisation.
|
||||
filter-flags -D_FORTIFY_SOURCE=3
|
||||
# (Qt doesn't seem to respect CPPFLAGS?)
|
||||
append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
|
||||
fi
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(qt_use icu)
|
||||
$(qt_use !icu iconv)
|
||||
$(qt_use systemd journald)
|
||||
)
|
||||
use old-kernel && myconf+=(
|
||||
-no-feature-renameat2 # needs Linux 3.16, bug 669994
|
||||
-no-feature-getentropy # needs Linux 3.17, bug 669994
|
||||
-no-feature-statx # needs Linux 4.11, bug 672856
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
qt5_symlink_binary_to_path qmake 5
|
||||
|
||||
local flags=(
|
||||
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
|
||||
OPENGL OPENSSL SSL WIDGETS
|
||||
)
|
||||
|
||||
for flag in ${flags[@]}; do
|
||||
cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
|
||||
|
||||
#if defined(QT_NO_${flag}) && defined(QT_${flag})
|
||||
# undef QT_NO_${flag}
|
||||
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
|
||||
# define QT_NO_${flag}
|
||||
#endif
|
||||
_EOF_
|
||||
done
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT5_KDEPATCHSET_REV=3
|
||||
QT5_MODULE="qtbase"
|
||||
inherit linux-info flag-o-matic qt5-build
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
SLOT=5/${QT5_PV}
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
|
||||
fi
|
||||
|
||||
IUSE="icu old-kernel systemd"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/double-conversion:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/libpcre2[pcre16,unicode]
|
||||
sys-libs/zlib:=
|
||||
icu? ( dev-libs/icu:= )
|
||||
!icu? ( virtual/libiconv )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/corelib
|
||||
src/tools/qlalr
|
||||
doc
|
||||
)
|
||||
|
||||
QT5_GENTOO_PRIVATE_CONFIG=(
|
||||
!:network
|
||||
!:sql
|
||||
!:testlib
|
||||
!:xml
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
use kernel_linux || return
|
||||
get_running_version
|
||||
if kernel_is -lt 4 11 && ! use old-kernel; then
|
||||
ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
|
||||
ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# don't add -O3 to CXXFLAGS, bug 549140
|
||||
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
|
||||
|
||||
# fix missing qt_version_tag symbol w/ LTO, bug 674382
|
||||
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
|
||||
|
||||
# Broken with FORTIFY_SOURCE=3
|
||||
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
|
||||
# to unset F_S first, then explicitly set 2, to negate any default
|
||||
# and anything set by the user if they're choosing 3 (or if they've
|
||||
# modified GCC to set 3).
|
||||
#
|
||||
# Refs:
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
|
||||
# https://bugreports.qt.io/browse/QTBUG-103782
|
||||
# bug #847145
|
||||
if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
|
||||
# We can't unconditionally do this b/c we fortify needs
|
||||
# some level of optimisation.
|
||||
filter-flags -D_FORTIFY_SOURCE=3
|
||||
# (Qt doesn't seem to respect CPPFLAGS?)
|
||||
append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
|
||||
fi
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(qt_use icu)
|
||||
$(qt_use !icu iconv)
|
||||
$(qt_use systemd journald)
|
||||
)
|
||||
use old-kernel && myconf+=(
|
||||
-no-feature-renameat2 # needs Linux 3.16, bug 669994
|
||||
-no-feature-getentropy # needs Linux 3.17, bug 669994
|
||||
-no-feature-statx # needs Linux 4.11, bug 672856
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
qt5_symlink_binary_to_path qmake 5
|
||||
|
||||
local flags=(
|
||||
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
|
||||
OPENGL OPENSSL SSL WIDGETS
|
||||
)
|
||||
|
||||
for flag in ${flags[@]}; do
|
||||
cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
|
||||
|
||||
#if defined(QT_NO_${flag}) && defined(QT_${flag})
|
||||
# undef QT_NO_${flag}
|
||||
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
|
||||
# define QT_NO_${flag}
|
||||
#endif
|
||||
_EOF_
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user