[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: c6550f2fd62ad0ef4e75b6140d7cd2c880e83ee6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 17 15:44:48 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 17 16:57:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6550f2f
dev-qt/qtcore: drop 5.15.12-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.12-r1.ebuild | 162 -
2 files changed, 163 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a390c6270e3f..5e79c7375530 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B
b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c
SHA512
f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b
-DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B
d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37
SHA512
f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de
DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B
f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb
SHA512
6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a
DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B
da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9
SHA512
55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
deleted file mode 100644
index 8a419f7c95fb..
--- a/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=1
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-IUSE="icu old-kernel"
-
-DEPEND="
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib:=
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
-"
-RDEPEND="${DEPEND}
- != -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 tc-enables-fortify-source ; 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
-
- # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
- qt5_syncqt_version
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- )
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 0dc05e078f1a0ae7e6c6e8dca8c8fb670a59fb5b
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 16 08:29:14 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 16 08:29:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc05e07
dev-qt/qtcore: Stabilize 5.15.12-r2 ppc64, #923848
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index a9b42a7da662..f719b5d123dc 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: d8f6139bb8b6d952def956bf0bc6d22a47ab7f9c
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 16 08:29:05 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 16 08:29:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f6139b
dev-qt/qtcore: Stabilize 5.15.12-r2 ppc, #923848
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index 5c66674697f9..a9b42a7da662 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 3211a715d3f8bc28876c0d4951a4b93592a4b45e
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 16 08:27:33 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 16 08:27:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3211a715
dev-qt/qtcore: Stabilize 5.15.12-r2 arm, #923848
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index cd3c18608ad8..c1a9369aa76f 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 647d65ce5a4e767088fd877b6e43ec71b16e0f03
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 16 08:27:45 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 16 08:27:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647d65ce
dev-qt/qtcore: Stabilize 5.15.12-r2 amd64, #923848
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index 105e37ac520c..5c66674697f9 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: c210f1b03569f139cc523a67b397bd265530
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Feb 16 08:27:39 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Feb 16 08:27:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c210f1b0
dev-qt/qtcore: Stabilize 5.15.12-r2 arm64, #923848
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index c1a9369aa76f..105e37ac520c 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: fb7cb15dc5e580c7489a6c37ee7e63a090799dae
Author: Sam James gentoo org>
AuthorDate: Tue Feb 6 22:32:12 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 22:32:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7cb15d
dev-qt/qtcore: Stabilize 5.15.12-r2 x86, #923848
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
index e87062d2038e..cd3c18608ad8 100644
--- a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: ef362b5f0b78b5c4ef27e65e9c2834c9af305324
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 5 19:42:27 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 5 20:07:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef362b5f
dev-qt/qtcore: QBitArray: correct inline keyword
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.12-r2.ebuild | 162 +
2 files changed, 163 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index bf5834e3f44a..a390c6270e3f 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B
b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c
SHA512
f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b
DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B
d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37
SHA512
f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de
+DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B
f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb
SHA512
6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a
DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B
da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9
SHA512
55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
new file mode 100644
index ..e87062d2038e
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.12-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=3
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+IUSE="icu old-kernel"
+
+DEPEND="
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2[pcre16,unicode]
+ sys-libs/zlib:=
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+"
+RDEPEND="${DEPEND}
+ != -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 tc-enables-fortify-source ; 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
+
+ # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
+ qt5_syncqt_version
+}
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use !icu iconv)
+ )
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 2455f4d30364e65eccbcfee4d8edd6bd8742cba2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 1 13:56:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 10 11:00:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2455f4d3
dev-qt/qtcore: Add wall of blockers against <${QT5_PV}
Revdeps can drop dev-qt/* dependencies on version bumps at any time, which then
may lead to Portage disregarding these dev-qt/* packages for upgrade if nothing
is left depending on them. When these packages contain Qt5 plugins it breaks
runtime hard - broken screenlocker, blank login manager, ... -, with:
`Cannot mix incompatible Qt library (5.15.10) with this library (5.15.11)`
We've had this happen with dev-qt/qtvirtualkeyboard and dev-qt/qtcharts already
and gradual porting to Qt6 ensures it will happen more often in the future.
Package groups (https://bugs.gentoo.org/918873) are not effective here as it
concerns ::installed package set.
For lack of a better mechanism from the package manager, these blockers make
sure dep calculation will take care of the necessary cleanup of dangling Qt5
packages, even if it will not improve our backtracking situation.
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.12-r1.ebuild | 162 +
1 file changed, 162 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
new file mode 100644
index ..fc74cab8e807
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.12-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=1
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+IUSE="icu old-kernel"
+
+DEPEND="
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2[pcre16,unicode]
+ sys-libs/zlib:=
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+"
+RDEPEND="${DEPEND}
+ != -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 tc-enables-fortify-source ; 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
+
+ # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
+ qt5_syncqt_version
+}
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use !icu iconv)
+ )
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: a95deee20f28d4fa11803c0941c34d2c091d0dfe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 10 09:25:44 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 10 11:00:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95deee2
dev-qt/qtcore: drop 5.15.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.12.ebuild | 119
1 file changed, 119 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.12.ebuild
b/dev-qt/qtcore/qtcore-5.15.12.ebuild
deleted file mode 100644
index a5a67b73e2a5..
--- a/dev-qt/qtcore/qtcore-5.15.12.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=1
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-IUSE="icu old-kernel"
-
-DEPEND="
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib:=
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
-"
-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
-)
-
-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 tc-enables-fortify-source ; 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
-
- # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
- qt5_syncqt_version
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- )
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 17c858530170131a10edb8ca32bed4e95fd311be
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 8 19:54:49 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 8 22:30:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c85853
dev-qt/qtcore: drop 5.15.11
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.11.ebuild | 119
2 files changed, 120 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index e879b492b398..6f575c060f09 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
-DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B
3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db
SHA512
d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d
DIST qtbase-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B
38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70
SHA512
235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26
DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B
663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161
SHA512
4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
diff --git a/dev-qt/qtcore/qtcore-5.15.11.ebuild
b/dev-qt/qtcore/qtcore-5.15.11.ebuild
deleted file mode 100644
index 36a727a07026..
--- a/dev-qt/qtcore/qtcore-5.15.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=1
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-IUSE="icu old-kernel"
-
-DEPEND="
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib:=
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
-"
-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
-)
-
-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 tc-enables-fortify-source ; 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
-
- # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
- qt5_syncqt_version
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- )
- use old-kernel &&
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: b4e1182872f5576af9b845b5e1ea05f7a6df2b17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 24 09:45:30 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 24 09:51:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e11828
dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=2
Giuseppe D'Angelo (1):
QPluginLoader: report the right load hints
Ievgenii Meshcheriakov (1):
QLibraryPrivate: Actually merge load hints
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.11-r1.ebuild | 119 +
2 files changed, 120 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 12336c23f79a..0e8eb1abcfb7 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,6 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B
1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a
SHA512
6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5
DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B
3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db
SHA512
d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d
+DIST qtbase-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B
38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70
SHA512
235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B
2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53
SHA512
94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B
663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161
SHA512
4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
diff --git a/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild
new file mode 100644
index ..6946f91771c2
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.11-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=2
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+IUSE="icu old-kernel"
+
+DEPEND="
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2[pcre16,unicode]
+ sys-libs/zlib:=
+ icu? ( dev-libs/icu:= )
+ !icu? ( virtual/libiconv )
+"
+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
+)
+
+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:
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: f85e7a1a871f49dcf0b0623a46dd7c7763be1cd5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 30 09:33:03 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 30 09:57:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85e7a1a
dev-qt/qtcore: drop 5.15.10-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 121 -
2 files changed, 122 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 45a854011c1a..1d779c3c36c0 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
-DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B
0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2
SHA512
474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B
1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a
SHA512
6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B
2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53
SHA512
94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
deleted file mode 100644
index b1e429badcfd..
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=2
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-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
-)
-
-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 tc-enables-fortify-source ; 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
-
- # workaround for a79a370c (...0090-Annotate-QMutex-...patch) adding a
header
- qt5_syncqt_version
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
-
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 802ec50310958ee4322a7cbd7a969309633bc833
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Sep 27 19:23:57 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Sep 27 19:23:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802ec503
dev-qt/qtcore: Stabilize 5.15.10-r2 ppc, #913934
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
index 8167b06d0b67..831c6c8388bf 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 65abcd9178a084938b8d164c1f517cb5bb9c176e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 6 19:00:54 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 21 19:33:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65abcd91
dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=3
David Faure (1):
QMimeDatabase: fix detection of pattern conflict in different prefixes
Edward Welbourne (1):
Clear the _X version of alongside the enum deprecator
Dmitry Shachnev (1):
Fix capitalization error in auto-generated qdbusmacros.h include
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.10-r2.ebuild | 121 +
2 files changed, 122 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 7044769a0306..45a854011c1a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B
0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2
SHA512
474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
+DIST qtbase-5.15.10-gentoo-kde-3.tar.xz 747604 BLAKE2B
1d0f0be400504ef5e6f3c9cb5284ed85bf5bbf8b83f7d631fc06fb1622ef1b9750da9bda25b05e9426f64dabdad242181789785bbcdcf25c05abb931170e142a
SHA512
6a65d717a9bfda7707c4b92bb42c9a7c4b587a31683cb911f6972bb0f149c83cdd827c25a6b0af791368f2c1b2471aab98618006d02b82ead10bd6bfe51f08f5
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B
2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53
SHA512
94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
new file mode 100644
index ..fb5373a8bff2
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.10-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=3
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+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
+)
+
+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 tc-enables-fortify-source ; 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?)
+
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 7d780c1447c7defd457029426c2c2e5e71b4c46e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 5 23:46:28 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 3 07:57:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d780c14 dev-qt/qtcore: Drop obsolete metadata Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/metadata.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 44b12b3455f2..eac86fb87ce8 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -6,8 +6,7 @@ Gentoo Qt Project - Disable syscalls not available on Linux kernels older than 3.17 - Disable syscalls not available on Linux kernels older than 4.11 + Disable syscalls not available on Linux kernels older than 4.11 Enable native journald logging support
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: c087cd6aecbcbcd9ae58a1ee9a38f28118a39503
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 16 15:27:07 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 16 16:03:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c087cd6a
dev-qt/qtcore: cleanup vulnerable 5.15.10
Bug: https://bugs.gentoo.org/911790
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.10.ebuild | 119
2 files changed, 120 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a97f9f01e88a..7044769a0306 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
-DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B
14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6
SHA512
efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B
0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2
SHA512
474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B
2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53
SHA512
94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild
b/dev-qt/qtcore/qtcore-5.15.10.ebuild
deleted file mode 100644
index 606b3929..
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=1
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-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
-)
-
-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 tc-enables-fortify-source ; then
- 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
-
- # workaround for a79a370c (...0090-Annotate-QMutex-...patch) adding a
header
- qt5_syncqt_version
-}
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use !icu iconv)
- $(qt_use systemd journald)
- )
-
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: e5b31d7dfe83b312e8db81979418cf68cb2bfc97
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 16 14:18:51 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 16 14:18:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b31d7d
dev-qt/qtcore: Stabilize 5.15.10-r1 ppc, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index d474e3a78f59..b1e429badcfd 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 667703da9eb074d0cbe1d85b6acb32931aec0013
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 16 14:18:00 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 16 14:18:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667703da
dev-qt/qtcore: Stabilize 5.15.10-r1 amd64, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index e3f8de3cbe66..d474e3a78f59 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: f102a2842b6fe6a4555a008d806e619b2ab7cac4
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 16 14:10:41 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 16 14:10:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f102a284
dev-qt/qtcore: Stabilize 5.15.10-r1 x86, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index 29449429aba8..e3f8de3cbe66 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 363eeae65f58bdef3abdb91cda8fa5c3e32ea7eb
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 16 13:48:53 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 16 13:48:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363eeae6
dev-qt/qtcore: Stabilize 5.15.10-r1 ppc64, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index 8f91c644b257..29449429aba8 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 4b013935bdf3ffcbae8db5a6315560e4ee5cd63b
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 9 04:52:38 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 9 04:52:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b013935
dev-qt/qtcore: Stabilize 5.15.10-r1 arm, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index 8153d9098fae..fdb688521711 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: e2eaa5a92874549da98dd0ed50e021ac5f52355a
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Aug 9 04:52:42 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Aug 9 04:52:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2eaa5a9
dev-qt/qtcore: Stabilize 5.15.10-r1 arm64, #911791
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index fdb688521711..8f91c644b257 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=2
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 5a84e57a1963e12919d9b843324d70b12e992bc7
Author: Sam James gentoo org>
AuthorDate: Sun Aug 6 11:41:48 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 6 11:47:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a84e57a
dev-qt/qtcore: use tc-enables-fortify-source
Better than fragile optimisation level checking.
Bug: https://bugs.gentoo.org/841770
Bug: https://bugs.gentoo.org/847145
Bug: https://bugs.gentoo.org/852974
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 5 +++--
dev-qt/qtcore/qtcore-5.15.10.ebuild| 7 +++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index f42cc15498c0..8153d9098fae 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != ** ]]; then
fi
QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -60,6 +60,7 @@ src_prepare() {
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
@@ -70,7 +71,7 @@ src_prepare() {
# 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
+ if tc-enables-fortify-source ; then
# We can't unconditionally do this b/c we fortify needs
# some level of optimisation.
filter-flags -D_FORTIFY_SOURCE=3
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild
b/dev-qt/qtcore/qtcore-5.15.10.ebuild
index 4964d74eb06f..606b3929 100644
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != ** ]]; then
fi
QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -60,6 +60,7 @@ src_prepare() {
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
@@ -70,9 +71,7 @@ src_prepare() {
# 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.
+ if tc-enables-fortify-source ; then
filter-flags -D_FORTIFY_SOURCE=3
# (Qt doesn't seem to respect CPPFLAGS?)
append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: d67ecfdb7d124b05a2af89478dd6eff099eabd0e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 5 22:38:13 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 5 23:00:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67ecfdb
dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=2
Ahmad Samir (2):
QXmlStreamReader: change fastScanName() to take a Value*
QXmlStreamReader: make fastScanName() indicate parsing status to callers
Axel Spoerl (1):
QXmlStreamReader: Raise error on unexpected tokens
Friedemann Kleint (1):
Fix typo in QXmlStreamReader error message
Marc Mutz (2):
QLogging: DRY isFatal(QtMsgType)
Make sure we don't count down past 0 QT_FATAL_CRITICALS
Volker Krause (1):
Fix Croatia's currency
See also:
https://www.qt.io/blog/security-advisory-qxmlstreamreader
https://www.qt.io/blog/security-advisory-qxmlstreamreader-1
Bug: https://bugs.gentoo.org/911790
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.10-r1.ebuild | 120 +
2 files changed, 121 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 68ae69f4da07..a97f9f01e88a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B
ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd
SHA512
1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d
DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B
14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6
SHA512
efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
+DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B
0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2
SHA512
474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B
2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53
SHA512
94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
new file mode 100644
index ..f42cc15498c0
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=2
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+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
+)
+
+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
+ #
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 5ae23ac84fd15190f01791e515fcc2e15eab5ad9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 9 20:04:59 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 9 20:17:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae23ac8
dev-qt/qtcore: drop 5.15.8-r3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 -
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 123 --
2 files changed, 124 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index f65bdbf9d40c..2acd6e73513c 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B
014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4
SHA512
910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
deleted file mode 100644
index 3b65d3d1fa82..
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-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
-)
-
-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
-
- # Leads to miscompiled qtcore, bug #865339
- tc-is-clang && append-flags -fno-stack-clash-protection
-
- qt5-build_src_prepare
-
- # workaround for 0148-Annotate-QMutex-...patch adding a header
- perl
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 97d7ec78cd77c7f16a774aa9c8aa982fa2d92048
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:33:55 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:33:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d7ec78
dev-qt/qtcore: Stabilize 5.15.8-r4 amd64, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index 82e4354cdf40..4752b953c9a7 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 4218e5ea38a1900642ee48f1d6d8b8f979491e25
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:25:36 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:25:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4218e5ea
dev-qt/qtcore: Stabilize 5.15.8-r4 ppc, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index 06cb5c927f47..82e4354cdf40 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 014796758a0faf8a9053f943353e5447116aaf02
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:25:02 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:25:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01479675
dev-qt/qtcore: Stabilize 5.15.8-r4 arm64, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index d34d251a484c..06cb5c927f47 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 2c5845c11d9c42adecf728b621ca92307cb66455
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:04:21 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:04:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5845c1
dev-qt/qtcore: Stabilize 5.15.8-r4 x86, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index 9742fd2a4ec6..d34d251a484c 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: d6ca695aa6a9c3843dca26705fc2cd72d5f41f60
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 18:54:23 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 18:54:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ca695a
dev-qt/qtcore: Stabilize 5.15.8-r4 ppc64, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index 6c3e791b7a57..9742fd2a4ec6 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: f45016b12307aca309a67b3c3070dff71887298a
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 18:52:54 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 18:52:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45016b1
dev-qt/qtcore: Stabilize 5.15.8-r4 arm, #903115
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
index 0f9acb2db2e4..6c3e791b7a57 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=6
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 82294172dab5cc554b21b6a238dfc14d8a245fb2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 26 11:35:48 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 26 11:51:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82294172
dev-qt/qtcore: QFSFileEngine: fix overflow bug when using lseek64
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 +
dev-qt/qtcore/qtcore-5.15.8-r4.ebuild | 123 ++
2 files changed, 124 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index db6cd834f163..f65bdbf9d40c 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
+DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B
014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4
SHA512
910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
new file mode 100644
index ..0f9acb2db2e4
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.8-r4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=6
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+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
+)
+
+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
+
+ # Leads to miscompiled qtcore, bug #865339
+ tc-is-clang && append-flags -fno-stack-clash-protection
+
+ qt5-build_src_prepare
+
+ # workaround for
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
commit: ba6d4805d1bede357a464619528aabe7debd6a98
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 19 13:23:02 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 19 13:23:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6d4805
dev-qt/qtcore: drop 5.15.8-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
.../files/qtcore-5.15.8-fix-crash-w-debug.patch| 41 ---
dev-qt/qtcore/qtcore-5.15.8-r1.ebuild | 122 -
3 files changed, 164 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 1ba76bb0dd29..db6cd834f163 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B
115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366
SHA512
d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
deleted file mode 100644
index 74f5ed5c4886..
--- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001
-From: Harald Sitter
-Date: Mon, 2 Jan 2023 12:38:02 +0100
-Subject: [PATCH] correctly set up ref counting in
- QThreadPool::tryStart(std::function)
-
-this function was inconsistent with the QThreadPool::tryStart(QRunnable)
-overload, where ref counting does get set up correctly. the lack of ref
-counting setup would later cause trouble because we assert the ref
-counting state all over QThreadPool. to prevent failed assertions we
-correctly set up ref counting now.
-
-this change is not applicable to Qt6 because the ref counting has
-already been removed there:
-https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670
-
-BUG: 449688
- src/corelib/thread/qthreadpool.cpp | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/corelib/thread/qthreadpool.cpp
b/src/corelib/thread/qthreadpool.cpp
-index 40cc646519..8aa06a4c8f 100644
a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function
functionToRun)
- return false;
-
- QRunnable *runnable = QRunnable::create(std::move(functionToRun));
-+Q_ASSERT(runnable->ref == 0);
-+++runnable->ref;
- if (d->tryStart(runnable))
- return true;
-+--runnable->ref;
-+Q_ASSERT(runnable->ref == 0);
- delete runnable;
- return false;
- }
---
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
deleted file mode 100644
index 75b9d56cafc0..
--- a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=3
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 773ae58f46a0aabfa867d1f2a48c96b739d9d625
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 19 12:54:38 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 19 12:54:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773ae58f
dev-qt/qtcore: Stabilize 5.15.8-r3 x86, #892704
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index ec41ec37212a..3b65d3d1fa82 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 4dd3be28d15d15baffda6b3e9e64b43180a04f55
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 19 12:54:36 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 19 12:54:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd3be28
dev-qt/qtcore: Stabilize 5.15.8-r3 ppc, #892704
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index a98f5991dab5..ec41ec37212a 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 8854c6b02890f499de32e68bf56469fe10108a2e
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 19 11:43:00 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 19 11:43:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8854c6b0
dev-qt/qtcore: Stabilize 5.15.8-r3 arm64, #892704
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 28d1432bca8e..a98f5991dab5 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 200d17610b2b1ebbec7134ccc17a70ee5b956daa
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Feb 19 11:42:55 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 19 11:42:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200d1761
dev-qt/qtcore: Stabilize 5.15.8-r3 arm, #892704
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 5824b581bd83..28d1432bca8e 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 81016c14dd5adc040ea61d6e27f1f58c0f161c9d
Author: Sam James gentoo org>
AuthorDate: Tue Feb 7 17:46:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 7 17:46:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81016c14
dev-qt/qtcore: Stabilize 5.15.8-r3 ppc64, #892704
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index a9772765ed0c..5824b581bd83 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 627f3e8b19f554a8bf500adca5bb29f80784e1ef
Author: Sam James gentoo org>
AuthorDate: Tue Feb 7 16:54:09 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 7 16:54:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627f3e8b
dev-qt/qtcore: Stabilize 5.15.8-r3 amd64, #892704
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 7e19031cbe35..a9772765ed0c 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=5
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/
commit: 957b23ec2630a603c6c00905f21529b9c4bc4653 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 5 22:37:17 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 5 22:37:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957b23ec dev-qt/qtcore: Re-add accidentally removed patch Closes: https://bugs.gentoo.org/893322 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtcore-5.15.8-fix-crash-w-debug.patch| 41 ++ 1 file changed, 41 insertions(+) diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch new file mode 100644 index ..74f5ed5c4886 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch @@ -0,0 +1,41 @@ +From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Mon, 2 Jan 2023 12:38:02 +0100 +Subject: [PATCH] correctly set up ref counting in + QThreadPool::tryStart(std::function) + +this function was inconsistent with the QThreadPool::tryStart(QRunnable) +overload, where ref counting does get set up correctly. the lack of ref +counting setup would later cause trouble because we assert the ref +counting state all over QThreadPool. to prevent failed assertions we +correctly set up ref counting now. + +this change is not applicable to Qt6 because the ref counting has +already been removed there: +https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670 + +BUG: 449688 +--- + src/corelib/thread/qthreadpool.cpp | 4 + 1 file changed, 4 insertions(+) + +diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp +index 40cc646519..8aa06a4c8f 100644 +--- a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp +@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function functionToRun) + return false; + + QRunnable *runnable = QRunnable::create(std::move(functionToRun)); ++Q_ASSERT(runnable->ref == 0); ++++runnable->ref; + if (d->tryStart(runnable)) + return true; ++--runnable->ref; ++Q_ASSERT(runnable->ref == 0); + delete runnable; + return false; + } +-- +GitLab +
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
commit: 55d36e6c00a983651970661cd37205defd8536ce
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 5 11:36:00 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 5 13:54:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55d36e6c
dev-qt/qtcore: drop 5.15.8-r2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtcore-5.15.8-fix-crash-w-debug.patch| 41 ---
dev-qt/qtcore/qtcore-5.15.8-r2.ebuild | 125 -
2 files changed, 166 deletions(-)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
deleted file mode 100644
index 74f5ed5c4886..
--- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001
-From: Harald Sitter
-Date: Mon, 2 Jan 2023 12:38:02 +0100
-Subject: [PATCH] correctly set up ref counting in
- QThreadPool::tryStart(std::function)
-
-this function was inconsistent with the QThreadPool::tryStart(QRunnable)
-overload, where ref counting does get set up correctly. the lack of ref
-counting setup would later cause trouble because we assert the ref
-counting state all over QThreadPool. to prevent failed assertions we
-correctly set up ref counting now.
-
-this change is not applicable to Qt6 because the ref counting has
-already been removed there:
-https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670
-
-BUG: 449688
- src/corelib/thread/qthreadpool.cpp | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/corelib/thread/qthreadpool.cpp
b/src/corelib/thread/qthreadpool.cpp
-index 40cc646519..8aa06a4c8f 100644
a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function
functionToRun)
- return false;
-
- QRunnable *runnable = QRunnable::create(std::move(functionToRun));
-+Q_ASSERT(runnable->ref == 0);
-+++runnable->ref;
- if (d->tryStart(runnable))
- return true;
-+--runnable->ref;
-+Q_ASSERT(runnable->ref == 0);
- delete runnable;
- return false;
- }
---
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild
deleted file mode 100644
index 5817a2b70616..
--- a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
- QT5_KDEPATCHSET_REV=3
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic toolchain-funcs qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-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}/${P}-fix-crash-w-debug.patch" ) # bug 889160, pending
upstream
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 87418de51e6792ae2c60ad63256aeeddf557076a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 5 11:35:36 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 5 13:54:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87418de5
dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=5
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 +
dev-qt/qtcore/qtcore-5.15.8-r3.ebuild | 123 ++
2 files changed, 124 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 81c2b8f8d13e..1ba76bb0dd29 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B
0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2
SHA512
2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B
115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366
SHA512
d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B
f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8
SHA512
f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B
cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b
SHA512
29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
new file mode 100644
index ..7e19031cbe35
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != ** ]]; then
+ QT5_KDEPATCHSET_REV=5
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+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
+)
+
+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
+
+ # Leads to miscompiled qtcore, bug #865339
+ tc-is-clang && append-flags -fno-stack-clash-protection
+
+ qt5-build_src_prepare
+
+ # workaround for 0148-Annotate-QMutex-...patch adding a header
+
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 376ce2fa6490d8bfae789e830fb0285f5e58f48d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jan 21 19:36:31 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jan 21 19:36:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376ce2fa
dev-qt/qtcore: Stabilize 5.15.8-r1 ppc, #888946
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
index 1d46f4fe454c..75b9d56cafc0 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} != ** ]]; then
QT5_KDEPATCHSET_REV=3
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
QT5_MODULE="qtbase"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/
commit: a28e37a50372eb61fc0e9f1d3a65f3a7914a969c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 10 12:15:08 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 10 12:23:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28e37a5
dev-qt/qtcore: Drop obsolete patches
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../qtcore/files/qtcore-5.15.5-QTBUG-105286.patch | 165 -
.../qtcore-5.15.5-hack_never_use_execinfo.patch| 27
dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch | 29
3 files changed, 221 deletions(-)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
deleted file mode 100644
index 985dd283dbd4..
--- a/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 7f9253defd2e90f900d963c6d248a2a0bdaca1a8 Mon Sep 17 00:00:00 2001
-From: Volker Hilsheimer
-Date: Tue, 16 Aug 2022 15:32:58 +0200
-Subject: [PATCH] Don't access QObjectPrivate::declarativeData unguarded
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The QObjectPrivate::declarativeData member is stored in a union with
-currentChildBeingDeleted. The QObject destructor always sets the
-currentChildBeingDeleted member of the union. It also sets the
-isDeletingChildren bool, which is the only way to find out which union
-member we can safely access.
-
-While the QObject destructor is deleting children and isDeletingChildren
-is set, we must not access the declarativeData member of the union.
-
-Add a test case that initializes the function pointers for the
-declarative handlers and constructs a situation where an object
-emits a signal while it is destroying children.
-
-Fixes: QTBUG-105286
-Pick-to: 6.4 6.3 6.3.2 6.2 5.15
-Change-Id: Iea5ba2f7843b6926a8d157be166e6044d98d6c02
-Reviewed-by: Qt CI Bot
-Reviewed-by: Mårten Nordheim
-(cherry picked from commit 3be99799a675a631c67e05897383af9abbc377b3)
- src/corelib/kernel/qobject.cpp| 4 +-
- src/corelib/kernel/qobject_p.h| 2 +-
- .../corelib/kernel/qobject/tst_qobject.cpp| 77 +++
- 3 files changed, 80 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
-index 0124f88abd..1f3843669b 100644
a/src/corelib/kernel/qobject.cpp
-+++ b/src/corelib/kernel/qobject.cpp
-@@ -992,7 +992,7 @@ QObject::~QObject()
- emit destroyed(this);
- }
-
--if (d->declarativeData) {
-+if (!d->isDeletingChildren && d->declarativeData) {
- if
(static_cast(d->declarativeData)->ownedByQml1) {
- if (QAbstractDeclarativeData::destroyed_qml1)
- QAbstractDeclarativeData::destroyed_qml1(d->declarativeData,
this);
-@@ -2583,7 +2583,7 @@ int QObject::receivers(const char *signal) const
- if (!d->isSignalConnected(signal_index))
- return receivers;
-
--if (d->declarativeData && QAbstractDeclarativeData::receivers) {
-+if (!d->isDeletingChildren && d->declarativeData &&
QAbstractDeclarativeData::receivers) {
- receivers +=
QAbstractDeclarativeData::receivers(d->declarativeData, this,
- signal_index);
- }
-diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
-index 66c19d174e..46dcb93521 100644
a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -428,7 +428,7 @@ inline void
QObjectPrivate::checkForIncompatibleLibraryVersion(int version) cons
-
- inline bool QObjectPrivate::isDeclarativeSignalConnected(uint signal_index)
const
- {
--return declarativeData && QAbstractDeclarativeData::isSignalConnected
-+return !isDeletingChildren && declarativeData &&
QAbstractDeclarativeData::isSignalConnected
- && QAbstractDeclarativeData::isSignalConnected(declarativeData,
q_func(), signal_index);
- }
-
-diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
-index 9bd66c0835..ed4a0bae5d 100644
a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
-+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
-@@ -158,6 +158,7 @@ private slots:
- void nullReceiver();
- void functorReferencesConnection();
- void disconnectDisconnects();
-+void declarativeData();
- };
-
- struct QObjectCreatedOnShutdown
-@@ -7679,5 +7680,81 @@ void tst_QObject::disconnectDisconnects()
- Q_STATIC_ASSERT(QtPrivate::HasQ_OBJECT_Macro::Value);
- Q_STATIC_ASSERT(!QtPrivate::HasQ_OBJECT_Macro::Value);
-
-+#ifdef QT_BUILD_INTERNAL
-+/*
-+Since QObjectPrivate stores the declarativeData pointer in a union with
the pointer
-+to the currently destroyed child, calls to the QtDeclarative handlers
need to be
-+correctly guarded. QTBUG-105286
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: aa9f1348aba68a47eb6fd0a26814c25448d0471a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 30 08:22:56 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 30 08:22:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9f1348
dev-qt/qtcore: Fix syncqt.pl path (use shipped version)
Closes: https://bugs.gentoo.org/883701
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.7.ebuild
b/dev-qt/qtcore/qtcore-5.15.7.ebuild
index e1d88ae1b477..f101b07bb635 100644
--- a/dev-qt/qtcore/qtcore-5.15.7.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.7.ebuild
@@ -81,7 +81,7 @@ src_prepare() {
qt5-build_src_prepare
# workaround for 0171-Annotate-QMutex-...patch adding a header
- perl ${QT5_BINDIR}/syncqt.pl -version ${PV} || die
+ perl bin/syncqt.pl -version ${PV} || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 17c0974925e74910eca31090b67689b3058cd4a2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 5 09:29:02 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 5 16:35:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c09749
dev-qt/qtcore: drop 5.15.5-r2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 102 --
1 file changed, 102 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
deleted file mode 100644
index 8bdc3597ff8b..
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ /dev/null
@@ -1,102 +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 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}"
-
-PATCHES=( "${FILESDIR}/${P}-hack_never_use_execinfo.patch" )
-
-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
-)
-
-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
-
- eapply "${FILESDIR}/${P}-slibtool.patch" # bug 792804, TODO: merge into
_QT5_GENTOOPATCHSET_REV
-
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: e095968872cd514f56f94098b44a8c8aae9fe42a
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Oct 28 18:59:04 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Oct 28 18:59:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0959688
dev-qt/qtcore: Stabilize 5.15.5-r3 ppc, #866323
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index d3e77b111790..a1f9e116021f 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 752733c11882d4b4c6deb06cebe1d5ab1b4854b3
Author: Sam James gentoo org>
AuthorDate: Tue Oct 4 17:32:22 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 4 17:32:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752733c1
dev-qt/qtcore: Stabilize 5.15.5-r3 arm, #866323
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index b67a3207333d..d3e77b111790 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: e64f792085dd37c140fbf2d255b00f7c9d41a771
Author: Sam James gentoo org>
AuthorDate: Tue Oct 4 17:32:15 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 4 17:32:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64f7920
dev-qt/qtcore: Stabilize 5.15.5-r3 arm64, #866323
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index dc2a182d9ec1..b67a3207333d 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 8cb3b481cb7c53e57dd6f8161280805794031f6c
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Aug 27 08:25:56 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Aug 27 08:25:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb3b481
dev-qt/qtcore: amd64 stable wrt bug #866323
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index 8814aeb235d1..f635c9398262 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: dfbe5b1419fd97ddc62b01f5cebaada0c8a90ea6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Aug 27 08:38:54 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Aug 27 08:38:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbe5b14
dev-qt/qtcore: x86 stable wrt bug #866323
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index f635c9398262..dc2a182d9ec1 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 1dd8364d77ae2782e61b8d653d9675cc661dafe7
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Aug 26 13:20:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Aug 26 13:20:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd8364d
dev-qt/qtcore: Stabilize 5.15.5-r3 ppc64, #866323
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index 521f2c4e0632..8814aeb235d1 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: b7878373380a080f7a9c7f60e5ae420937f64e94
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 24 14:06:31 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 24 14:16:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7878373
dev-qt/qtcore: Don't access QObjectPrivate::declarativeData unguarded
QTBUG: https://bugreports.qt.io/browse/QTBUG-105286
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../qtcore/files/qtcore-5.15.5-QTBUG-105286.patch | 165 +
dev-qt/qtcore/qtcore-5.15.5-r3.ebuild | 105 +
2 files changed, 270 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
new file mode 100644
index ..985dd283dbd4
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.5-QTBUG-105286.patch
@@ -0,0 +1,165 @@
+From 7f9253defd2e90f900d963c6d248a2a0bdaca1a8 Mon Sep 17 00:00:00 2001
+From: Volker Hilsheimer
+Date: Tue, 16 Aug 2022 15:32:58 +0200
+Subject: [PATCH] Don't access QObjectPrivate::declarativeData unguarded
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The QObjectPrivate::declarativeData member is stored in a union with
+currentChildBeingDeleted. The QObject destructor always sets the
+currentChildBeingDeleted member of the union. It also sets the
+isDeletingChildren bool, which is the only way to find out which union
+member we can safely access.
+
+While the QObject destructor is deleting children and isDeletingChildren
+is set, we must not access the declarativeData member of the union.
+
+Add a test case that initializes the function pointers for the
+declarative handlers and constructs a situation where an object
+emits a signal while it is destroying children.
+
+Fixes: QTBUG-105286
+Pick-to: 6.4 6.3 6.3.2 6.2 5.15
+Change-Id: Iea5ba2f7843b6926a8d157be166e6044d98d6c02
+Reviewed-by: Qt CI Bot
+Reviewed-by: Mårten Nordheim
+(cherry picked from commit 3be99799a675a631c67e05897383af9abbc377b3)
+---
+ src/corelib/kernel/qobject.cpp| 4 +-
+ src/corelib/kernel/qobject_p.h| 2 +-
+ .../corelib/kernel/qobject/tst_qobject.cpp| 77 +++
+ 3 files changed, 80 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
+index 0124f88abd..1f3843669b 100644
+--- a/src/corelib/kernel/qobject.cpp
b/src/corelib/kernel/qobject.cpp
+@@ -992,7 +992,7 @@ QObject::~QObject()
+ emit destroyed(this);
+ }
+
+-if (d->declarativeData) {
++if (!d->isDeletingChildren && d->declarativeData) {
+ if
(static_cast(d->declarativeData)->ownedByQml1) {
+ if (QAbstractDeclarativeData::destroyed_qml1)
+ QAbstractDeclarativeData::destroyed_qml1(d->declarativeData,
this);
+@@ -2583,7 +2583,7 @@ int QObject::receivers(const char *signal) const
+ if (!d->isSignalConnected(signal_index))
+ return receivers;
+
+-if (d->declarativeData && QAbstractDeclarativeData::receivers) {
++if (!d->isDeletingChildren && d->declarativeData &&
QAbstractDeclarativeData::receivers) {
+ receivers +=
QAbstractDeclarativeData::receivers(d->declarativeData, this,
+ signal_index);
+ }
+diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
+index 66c19d174e..46dcb93521 100644
+--- a/src/corelib/kernel/qobject_p.h
b/src/corelib/kernel/qobject_p.h
+@@ -428,7 +428,7 @@ inline void
QObjectPrivate::checkForIncompatibleLibraryVersion(int version) cons
+
+ inline bool QObjectPrivate::isDeclarativeSignalConnected(uint signal_index)
const
+ {
+-return declarativeData && QAbstractDeclarativeData::isSignalConnected
++return !isDeletingChildren && declarativeData &&
QAbstractDeclarativeData::isSignalConnected
+ && QAbstractDeclarativeData::isSignalConnected(declarativeData,
q_func(), signal_index);
+ }
+
+diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+index 9bd66c0835..ed4a0bae5d 100644
+--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+@@ -158,6 +158,7 @@ private slots:
+ void nullReceiver();
+ void functorReferencesConnection();
+ void disconnectDisconnects();
++void declarativeData();
+ };
+
+ struct QObjectCreatedOnShutdown
+@@ -7679,5 +7680,81 @@ void tst_QObject::disconnectDisconnects()
+ Q_STATIC_ASSERT(QtPrivate::HasQ_OBJECT_Macro::Value);
+ Q_STATIC_ASSERT(!QtPrivate::HasQ_OBJECT_Macro::Value);
+
++#ifdef QT_BUILD_INTERNAL
++/*
++Since QObjectPrivate stores the declarativeData pointer in a union with
the pointer
++to the currently destroyed child, calls to the QtDeclarative handlers
need to be
++
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: 0f18ee87c123a9194c6caee268403ecc7dc45e80
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 15 10:37:37 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 15 10:37:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f18ee87
dev-qt/qtcore: drop 5.15.5-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
.../files/qtcore-5.15.5-fortify-source-3.patch | 61
dev-qt/qtcore/qtcore-5.15.5-r1.ebuild | 102 -
3 files changed, 164 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9667a62512b5..88d6a49f0581 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,3 @@
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
SHA512
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B
48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b
SHA512
ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B
68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e
SHA512
d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B
e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5
SHA512
ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
deleted file mode 100644
index 1be46b496cf9..
--- a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://invent.kde.org/qt/qt/qtbase/-/commit/6d3d164bec17876f5b24ae9102767ef1236aa37b
-
-From 6d3d164bec17876f5b24ae9102767ef1236aa37b Mon Sep 17 00:00:00 2001
-From: Sam James
-Date: Mon, 20 Jun 2022 20:35:12 +0100
-Subject: [PATCH] QArrayData: fix UB via reinterpret_cast (crash with
- FORTIFY_SOURCE=3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-FORTIFY_SOURCE=3 is a new level of FORTIFY_SOURCE available with GCC 12+.
-
-With Qt 5.15, it ends up triggering UB in the pointer arithmetic
-in QArrayData which breaks various FOSS applications using qtcore.
-
-Qt upstream fixed this independently for 6.x (in at least
-eab6eb64d2fab21c4791738323ca7d670a907de1) but did so at the same time as
-various internal changes and hence is not appropriate for cherry-picking to
5.15.x.
-
-I reported the issue to Qt (QTBUG-103782) and they've created a fix for 5.15
which
-is not yet public but based on the description in the bug, should be
functionally
-the same as this. They have not backported the intrusive internal changes
-from 6.x.
-
-Originally grabbed from
https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtbase/mitigate-FORTIFY_SOURCE-3.patch.
-
-Bug: https://bugs.gentoo.org/847145
-Bug: https://bugs.gentoo.org/852974
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-Task-number: QTBUG-103782
-Thanks-to: Martin Liška
a/src/corelib/tools/qarraydata.h
-+++ b/src/corelib/tools/qarraydata.h
-@@ -42,6 +42,7 @@
-
- #include
- #include
-+#include
-
- QT_BEGIN_NAMESPACE
-
-@@ -58,14 +59,14 @@ struct Q_CORE_EXPORT QArrayData
- {
- Q_ASSERT(size == 0
- || offset < 0 || size_t(offset) >= sizeof(QArrayData));
--return reinterpret_cast(this) + offset;
-+return reinterpret_cast (reinterpret_cast(this) +
offset);
- }
-
- const void *data() const
- {
- Q_ASSERT(size == 0
- || offset < 0 || size_t(offset) >= sizeof(QArrayData));
--return reinterpret_cast(this) + offset;
-+return reinterpret_cast (reinterpret_cast(this) +
offset);
- }
-
- // This refers to array data mutability, not "header data" represented by
-GitLab
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
deleted file mode 100644
index 80b1d1cbcbf4..
--- a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 2de7b9c50ab2bd63b55f957381e104d19f325e4d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Aug 12 14:31:21 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Aug 12 14:31:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de7b9c5
dev-qt/qtcore: x86 stable wrt bug #860258
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 47b7c19b3135..8bdc3597ff8b 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: b18f93c2827bebefadb637e58917f2b24d81156a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Aug 5 07:14:30 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Aug 5 07:14:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18f93c2
dev-qt/qtcore: amd64 stable wrt bug #860258
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 680f248df595..47b7c19b3135 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 447d475820fee0fdce24b881f1a0634c6d729ac3
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Aug 5 05:47:15 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Aug 5 05:47:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447d4758
dev-qt/qtcore: Stabilize 5.15.5-r2 arm64, #860258
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index f9bee63a25f8..680f248df595 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 40ca69e1dcb2a6afeb4c01677532e005b2142021
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Aug 5 05:47:09 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Aug 5 05:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ca69e1
dev-qt/qtcore: Stabilize 5.15.5-r2 arm, #860258
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 73065ec8df69..f9bee63a25f8 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 5f9c9f67566fda313df6d77968fc33a2c5f54e95
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Aug 4 17:55:12 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Aug 4 17:55:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9c9f67
dev-qt/qtcore: Stabilize 5.15.5-r2 ppc64, #860258
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 6e023b754b27..73065ec8df69 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: ef0cad393654d67dd2eed8d4508947d6fa22e924
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Aug 4 17:55:05 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Aug 4 17:55:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0cad39
dev-qt/qtcore: Stabilize 5.15.5-r2 ppc, #860258
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index e86b12357c55..6e023b754b27 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: c4859473944244496cbd0b28f5fb525a4a930e4b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 17 15:57:54 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 23 11:21:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4859473
dev-qt/qtcore: Fix configure w/ slibtool
Closes: https://bugs.gentoo.org/792804
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch | 29
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild| 2 ++
2 files changed, 31 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch
new file mode 100644
index ..a7ae5702cb4d
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch
@@ -0,0 +1,29 @@
+From beebf54552e85c07496aa748710df76131620834 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 17 Jul 2022 17:43:27 +0200
+Subject: [PATCH] Remove quoting around $MAKE call
+
+Fixes build with e.g. MAKE='make libtool=...'
+
+Gentoo-bug: https://bugs.gentoo.org/792804
+Signed-off-by: Andreas Sturmlechner
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index b6c9b462..096706b0 100755
+--- a/configure
b/configure
+@@ -795,7 +795,7 @@ setBootstrapVariable()
+
+ if [ "$OPT_VERBOSE" = yes ]; then
+ # Show the output of make
+-(cd "$outpath/qmake"; "$MAKE") || exit 2
++(cd "$outpath/qmake"; $MAKE) || exit 2
+ else
+ # Hide the output of make
+ # Use bash to print dots, if we have it, and stdout is a tty.
+--
+2.35.1
+
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 2b2d3b2fe2b5..e86b12357c55 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -61,6 +61,8 @@ src_prepare() {
# fix missing qt_version_tag symbol w/ LTO, bug 674382
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+ eapply "${FILESDIR}/${P}-slibtool.patch" # bug 792804, TODO: merge into
_QT5_GENTOOPATCHSET_REV
+
qt5-build_src_prepare
}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: f80f3b27a81313f051b2ba0961a110aa14abb76d
Author: Alfred Persson Forsberg catcream org>
AuthorDate: Tue Jun 21 00:42:04 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 23 11:21:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80f3b27
dev-qt/qtcore: fix musl with libexecinfo
QtCore incorrectly assumes that execinfo is already linked on Linux if
execinfo.h is present. The edge case here is that on musl you can
install libexecinfo standalone, thereby QtCore will detect the header
but not the library, and QtCore will think that glibc has already linked it.
There is no code/config for QMake to detect and link against
-lexecinfo except on the BSD:s. Qt should properly add something
similar for non-glibc as well.
This is just a *fix* compatible with all supported Gentoo systems.
Signed-off-by: Alfred Persson Forsberg catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26012
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../qtcore-5.15.5-hack_never_use_execinfo.patch| 27 ++
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 2 ++
2 files changed, 29 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch
new file mode 100644
index ..c74de19c6144
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch
@@ -0,0 +1,27 @@
+QtCore only links with -lexecinfo on *bsd and
+incorrectly assumes it's already linked on Linux
+if execinfo.h exists.
+
+This is a fix specificallly for non-glibc systems, was written for musl.
+We'll look to add a build system option for libexecinfo in future.
+
+---
+ src/corelib/global/qlogging.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
+index 89f49324..1c34a1af 100644
+--- a/src/corelib/global/qlogging.cpp
b/src/corelib/global/qlogging.cpp
+@@ -106,7 +106,7 @@
+ #if __UCLIBC_HAS_BACKTRACE__
+ # define QLOGGING_HAVE_BACKTRACE
+ #endif
+-# elif (defined(__GLIBC__) && defined(__GLIBCXX__)) ||
(__has_include() && __has_include())
++# elif (defined(__GLIBC__) && defined(__GLIBCXX__))
+ #define QLOGGING_HAVE_BACKTRACE
+ # endif
+ #endif
+--
+2.35.1
+
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 22d03f26bc3a..2b2d3b2fe2b5 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -27,6 +27,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-hack_never_use_execinfo.patch" )
+
QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 96a7b4d60fe78c9ce04f9da2bead9edb719aae55
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 17 15:12:20 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 23 11:21:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a7b4d6
dev-qt/qtcore: Bump to QT5_KDEPATCHSET_REV=2
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 +
dev-qt/qtcore/qtcore-5.15.5-r2.ebuild | 98 +++
2 files changed, 99 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9f98cfd5161e..9667a62512b5 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
SHA512
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B
48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b
SHA512
ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
+DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B
68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e
SHA512
d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B
e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5
SHA512
ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
new file mode 100644
index ..22d03f26bc3a
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -0,0 +1,98 @@
+# 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 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
+)
+
+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
+
+ 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}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 1b6279c10a63bb853538ad5fa269225ac97fd084
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 6 09:19:12 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 6 10:27:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6279c1
dev-qt/qtcore: Drop 5.15.5 (r0)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.5.ebuild | 117 -
1 file changed, 117 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5.ebuild
b/dev-qt/qtcore/qtcore-5.15.5.ebuild
deleted file mode 100644
index 5ae91ec69b8c..
--- a/dev-qt/qtcore/qtcore-5.15.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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
-)
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: a4c6b218d085912da86092a40d9888c3965b5154
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jul 4 17:58:24 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jul 4 17:58:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c6b218
dev-qt/qtcore: Stabilize 5.15.5-r1 arm64, #853232
Signed-off-by: Arthur Zamarin gentoo.org>
dev-qt/qtcore/qtcore-5.15.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
index 05ee0b027e03..80b1d1cbcbf4 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
commit: cb10b0356e62b2521c0d4592a35b5dfb6e5cd2ca
Author: Sam James gentoo org>
AuthorDate: Sun Jun 26 08:22:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 26 08:25:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb10b035
dev-qt/qtcore: backport FORTIFY_SOURCE=3 patch
GCC 12 is now in ~arch and we're likely to get more people trying
out F_S=3 as a result. This patch is now in Qt5PatchCollection
and given the previous workaround ended up being insufficient
(it's not enough to force F_S=2 in qtcore, as reverse deps
end up being broken if _they_ are built with F_S=3, even
though the cause is in qtcore), let's backport the fix now.
Bug: https://bugs.gentoo.org/847145
Closes: https://bugs.gentoo.org/852974
Signed-off-by: Sam James gentoo.org>
.../files/qtcore-5.15.5-fortify-source-3.patch | 61
dev-qt/qtcore/qtcore-5.15.5-r1.ebuild | 102 +
2 files changed, 163 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
b/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
new file mode 100644
index ..1be46b496cf9
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
@@ -0,0 +1,61 @@
+https://invent.kde.org/qt/qt/qtbase/-/commit/6d3d164bec17876f5b24ae9102767ef1236aa37b
+
+From 6d3d164bec17876f5b24ae9102767ef1236aa37b Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Mon, 20 Jun 2022 20:35:12 +0100
+Subject: [PATCH] QArrayData: fix UB via reinterpret_cast (crash with
+ FORTIFY_SOURCE=3)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+FORTIFY_SOURCE=3 is a new level of FORTIFY_SOURCE available with GCC 12+.
+
+With Qt 5.15, it ends up triggering UB in the pointer arithmetic
+in QArrayData which breaks various FOSS applications using qtcore.
+
+Qt upstream fixed this independently for 6.x (in at least
+eab6eb64d2fab21c4791738323ca7d670a907de1) but did so at the same time as
+various internal changes and hence is not appropriate for cherry-picking to
5.15.x.
+
+I reported the issue to Qt (QTBUG-103782) and they've created a fix for 5.15
which
+is not yet public but based on the description in the bug, should be
functionally
+the same as this. They have not backported the intrusive internal changes
+from 6.x.
+
+Originally grabbed from
https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtbase/mitigate-FORTIFY_SOURCE-3.patch.
+
+Bug: https://bugs.gentoo.org/847145
+Bug: https://bugs.gentoo.org/852974
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
+Task-number: QTBUG-103782
+Thanks-to: Martin Liška
+--- a/src/corelib/tools/qarraydata.h
b/src/corelib/tools/qarraydata.h
+@@ -42,6 +42,7 @@
+
+ #include
+ #include
++#include
+
+ QT_BEGIN_NAMESPACE
+
+@@ -58,14 +59,14 @@ struct Q_CORE_EXPORT QArrayData
+ {
+ Q_ASSERT(size == 0
+ || offset < 0 || size_t(offset) >= sizeof(QArrayData));
+-return reinterpret_cast(this) + offset;
++return reinterpret_cast (reinterpret_cast(this) +
offset);
+ }
+
+ const void *data() const
+ {
+ Q_ASSERT(size == 0
+ || offset < 0 || size_t(offset) >= sizeof(QArrayData));
+-return reinterpret_cast(this) + offset;
++return reinterpret_cast (reinterpret_cast(this) +
offset);
+ }
+
+ // This refers to array data mutability, not "header data" represented by
+GitLab
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
new file mode 100644
index ..c2235698ecbf
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+QT5_MODULE="qtbase"
+inherit linux-info 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}"/${P}-fortify-source-3.patch
+)
+
+pkg_pretend() {
+ use kernel_linux || return
+ get_running_version
+ if kernel_is -lt 4 11 && ! use old-kernel; then
+ ewarn "The running
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 7394bb5f2e482b7bc5505161edaff2f2295dc047
Author: Sam James gentoo org>
AuthorDate: Sun Jun 19 22:44:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 19 22:44:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7394bb5f
dev-qt/qtcore: Stabilize 5.15.4-r3 ppc64, #851900
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
index 42dbe8213232..a3855efd1db1 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: c96fc48cc60e2e964bcd7bf139e8dd1cd66161f5
Author: Sam James gentoo org>
AuthorDate: Sun Jun 19 22:44:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 19 22:44:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96fc48c
dev-qt/qtcore: Stabilize 5.15.4-r3 ppc, #851900
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
index 3755c174dadf..42dbe8213232 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: a60e3b516365fa808ee9d7821f1c2fcea423c432
Author: Sam James gentoo org>
AuthorDate: Sun Jun 19 05:30:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 19 05:30:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60e3b51
dev-qt/qtcore: Stabilize 5.15.4-r3 x86, #851900
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
index 0b579a9a6c97..3755c174dadf 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: dff2e5788f84cc1f95a0c0a9af1f885c03a31647
Author: Sam James gentoo org>
AuthorDate: Sun Jun 19 05:29:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 19 05:29:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff2e578
dev-qt/qtcore: Stabilize 5.15.4-r3 amd64, #851900
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
index 304b7edf21bc..0b579a9a6c97 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 8000f7a09965314241de5f01c786abf0082a8544
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 9 13:52:06 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 9 14:12:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8000f7a0
dev-qt/qtcore: Add 5.15.4 QT5_KDEPATCHSET_REV=3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 +
dev-qt/qtcore/qtcore-5.15.4-r3.ebuild | 121 ++
2 files changed, 122 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 690621983b17..35b784000864 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,5 @@
DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B
a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c
SHA512
042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
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-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B
9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c
SHA512
01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B
3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b
SHA512
91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
new file mode 100644
index ..304b7edf21bc
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
@@ -0,0 +1,121 @@
+# 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.
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 9e73dad4db68a5ad67cfb70af3c04031a9074bd2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 30 15:59:28 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 30 16:09:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e73dad4
dev-qt/qtcore: Drop 5.15.4-r0, 5.15.4-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 -
dev-qt/qtcore/qtcore-5.15.4-r1.ebuild | 121 --
dev-qt/qtcore/qtcore-5.15.4.ebuild| 102
3 files changed, 224 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 00973c551288..690621983b17 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,4 @@
DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B
a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c
SHA512
042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B
a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417
SHA512
a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B
315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08
SHA512
ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B
9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c
SHA512
01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B
3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b
SHA512
91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
deleted file mode 100644
index 034469ed1e79..
--- a/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
+++ /dev/null
@@ -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=1
-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
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 07a1746b6e393fe9674f3c350cd3468c8b66df85
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 30 15:59:00 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 30 16:09:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a1746b
dev-qt/qtcore: Add 5.15.4 QT5_KDEPATCHSET_REV=2
See also:
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/153
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/155
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest| 1 +
dev-qt/qtcore/qtcore-5.15.4-r2.ebuild | 121 ++
2 files changed, 122 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 876cb884f820..00973c551288 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,4 +1,5 @@
DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B
a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c
SHA512
042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B
a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417
SHA512
a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B
315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08
SHA512
ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B
9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c
SHA512
01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B
3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b
SHA512
91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
new file mode 100644
index ..799954faa0fa
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
@@ -0,0 +1,121 @@
+# 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
+
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 3c4656a189e254231b94cef558530c42ea8db690
Author: Sam James gentoo org>
AuthorDate: Wed May 25 23:10:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed May 25 23:11:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4656a1
dev-qt/qtcore: add FORTIFY_SOURCE=3 workaround (force back to =2)
As discussed with asturm until we know what's happening with
the upstream bug. We can consider the opensuse patch once
that's resolved, if the upstream fix isn't made public, almost
certainly via KDE Qt5PatchCollection. But we'll see.
Closes: https://bugs.gentoo.org/847145
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.4-r1.ebuild | 121 ++
1 file changed, 121 insertions(+)
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
b/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
new file mode 100644
index ..034469ed1e79
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=1
+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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 0b43cfa3fcec0ba17347550bf713ff8ff4699328
Author: WANG Xuerui gentoo org>
AuthorDate: Thu May 19 05:03:48 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Thu May 19 05:07:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b43cfa3
dev-qt/qtcore: keyword 5.15.3 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
dev-qt/qtcore/qtcore-5.15.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.3.ebuild
b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index fca2881a9617..7f54b039a377 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/
commit: 376ebf984ca9cf36f04b9812ce42f549f2d34a89
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Apr 18 07:00:11 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 18 07:15:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376ebf98
dev-qt/qtcore: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Sam James gentoo.org>
...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50
dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch | 271 -
dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch | 47
3 files changed, 368 deletions(-)
diff --git
a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc39759..
--- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an
additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used
(at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard
and qtwayland.
-During upgrade from =Qt-5.14, as a consequence of slot upgrade
rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have
been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the
_populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be
added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For
debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only
debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of
CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a
Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make
IsDebugAndRelease
-optional and default to FALSE.
-
a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23
13:37:32.0 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09
15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
-
- file(GLOB pluginTargets
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
-
--macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin
Configuration PLUGIN_LOCATION
-- IsDebugAndRelease)
-+macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin
Configuration PLUGIN_LOCATION)
-+set(IsDebugAndRelease FALSE)
-+set (list_var ${ARGN})
-+list(LENGTH list_var num_extra_arg)
-+if (${num_extra_arg} GREATER 0)
-+list(GET list_var 0 IsDebugAndRelease)
-+endif()
-+
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY
IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
deleted file mode 100644
index 1c8f1e89e7d5..
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?=
-Date: Sat, 10 Oct 2020 19:26:13 +0200
-Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
- file-system"
-
-This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
- src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++
- 1 file changed, 64 insertions(+), 141 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp
b/src/corelib/time/qtimezoneprivate_tz.cpp
-index c5c70b7364..01f9a6cce0 100644
a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1,6 +1,5 @@
- /
- **
--** Copyright (C) 2020 The Qt Company Ltd.
- ** Copyright (C) 2019 Crimson AS
- ** Copyright (C) 2013 John Layt
- ** Contact: https://www.qt.io/licensing/
-@@ -43,19 +42,18 @@
- #include "qtimezoneprivate_p.h"
- #include "private/qlocale_tools_p.h"
-
--#include
--#include
- #include
--#include
- #include
-+#include
-+#include
-+#include
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
commit: 3884552b6dd1bdeea1ca82bd23b6736c519ebe90
Author: Han Gao gmail com>
AuthorDate: Sun Mar 27 13:05:18 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 30 18:56:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3884552b
dev-qt/qtcore: use link option -pthread instead of -lpthread
Bug: https://bugs.gentoo.org/803470
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Han Gao gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24711
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 +
dev-qt/qtcore/qtcore-5.15.3.ebuild | 4 +++
2 files changed, 45 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
new file mode 100644
index ..c83c59ac3113
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
@@ -0,0 +1,41 @@
+# 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 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": {
diff --git a/dev-qt/qtcore/qtcore-5.15.3.ebuild
b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index 156e4f73b725..8e924cdfabd0 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
+)
+
pkg_pretend() {
use kernel_linux || return
get_running_version
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 2c8f2b87835a2a77334472682025d93f3babe819
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 20 12:17:03 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 20 13:24:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8f2b87
dev-qt/qtcore: Drop 5.15.2-r11
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 104 -
2 files changed, 105 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9408a916e7bf..32718f267d7e 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,2 +1 @@
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B
3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54
SHA512
6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
deleted file mode 100644
index 4fa3eccb6511..
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa 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}
- >=dev-qt/qtchooser-66-r1
-"
-
-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.14.1-cmake-macro-backward-compat.patch # bug
703306
- "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-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
-
- 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
-
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 8e8fcd88e4d33e0982c40bed58dfbeabd85282ef
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Jan 20 12:14:59 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Jan 20 12:14:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8fcd88
dev-qt/qtcore: Stabilize 5.15.2-r14 arm, #829923
Signed-off-by: Jakov Smolić gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index 7cc68bee181c..3ad237c5094d 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 53ebce9143c38fc05f19c0e8953bb3170080f93b
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Jan 20 08:59:56 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Jan 20 08:59:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ebce91
dev-qt/qtcore: Stabilize 5.15.2-r14 x86, #829923
Signed-off-by: Jakov Smolić gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index cb13f3fd0422..7cc68bee181c 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 66573486ce5432c5705d350a7eb2424f2e3a524e
Author: Sam James gentoo org>
AuthorDate: Wed Jan 19 22:42:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 19 22:42:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66573486
dev-qt/qtcore: Stabilize 5.15.2-r14 ppc, #829923
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index b363dd813723..cb13f3fd0422 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 6ce1984bda7d92a87128359b4c6660bae32e4a51
Author: Sam James gentoo org>
AuthorDate: Wed Jan 19 22:42:35 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 19 22:42:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce1984b
dev-qt/qtcore: Stabilize 5.15.2-r14 ppc64, #829923
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index b4a1f81ebe34..b363dd813723 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 452d2ab59f8793b6fa883ffc181a3d4b66a7831e
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Jan 18 22:52:19 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Jan 18 22:52:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452d2ab5
dev-qt/qtcore: Stabilize 5.15.2-r14 amd64, #829923
Signed-off-by: Jakov Smolić gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index 363ceb67039c..9cac84d9e69a 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 67cc49f990eb8a587caef83c9035518840bb0944
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 18 16:42:29 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 18 16:42:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cc49f9
dev-qt/qtcore: Drop 5.15.2-r13
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.2-r13.ebuild | 104 -
2 files changed, 105 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 5e69125c6d40..9408a916e7bf 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,2 @@
-DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B
9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370
SHA512
df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B
3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54
SHA512
6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
deleted file mode 100644
index 0b8f86d5973a..
--- a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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}
- >=dev-qt/qtchooser-66-r1
-"
-
-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.14.1-cmake-macro-backward-compat.patch # bug
703306
- "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-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
-
- 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
-
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 0131b6cc91387f1b06b13bcabfb9c404688d507e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 15 14:11:14 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 15 14:12:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0131b6cc
dev-qt/qtcore: 5.15.2-r14 version bump at KDE f4ac0b55
Marc Mutz (1):
QTzTimeZonePrivate: fix UB (data race on m_icu)
Volker Hilsheimer (1):
Don't access QObject::objectName during QThread start
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.2-r14.ebuild | 104 +
2 files changed, 105 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4f0dd80dbe1f..5e69125c6d40 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,2 +1,3 @@
DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B
9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370
SHA512
df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B
3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54
SHA512
6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
new file mode 100644
index ..363ceb67039c
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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}
+ >=dev-qt/qtchooser-66-r1
+"
+
+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.14.1-cmake-macro-backward-compat.patch # bug
703306
+ "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+)
+
+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
+
+ 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
+
+ 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
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 652c73b5e469b985670628eb7001e03076aeabf7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 12 12:55:53 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 12 16:12:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652c73b5
dev-qt/qtcore: 5.15.2-r13 version bump at KDE 38ad2f39
Changes since 7c6c0030cf80ef7b9ace42996b0e0c3a72f76860:
Alexander Volkov (1):
Call statx() with AT_NO_AUTOMOUNT
Allan Sandfeld Jensen (1):
Avoid mixing atomic futex changes and QAtomic
Andreas Buhr (1):
Fix segmentation fault in QObject::dumpObjectInfo
Andreas Sturmlechner (1):
QDateTime: Don't require c++17
Antonio Rojas (1):
Restore C++11 compatibility after e8b9f4c28d3ab5e960dc54f2dc0c4b749b0b50e0
Ievgenii Meshcheriakov (2):
QThread: Reset the system thread ID when thread exits on Unix
QThread: Remove superfluous initialization of threadId on Unix
Jarek Kobus (1):
Fix pattern type matching
Marc Mutz (8):
QVarLengthArray: fix UB (precondition violation) in range-erase()
QString: fix UB (pointer arithmetic on nullptr) in qLastIndexOf
QDateTime: fix UB (signed overflow) in addDays()
QVariantAnimation: fix UB (FP 0/0) in interpolated() arg calculation
QThread: fix UB (invalid enum value) on Private::Priority
QVarLengthArray: assert that the range passed to erase() is valid
QVarLengthArray: fix insert() type/alias mismatch between decl and impl
QVarLengthArray: fix size update on failed append()
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.2-r13.ebuild | 104 +
2 files changed, 105 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 8f45ea5ec73a..4f0dd80dbe1f 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1 +1,2 @@
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B
9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370
SHA512
df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
new file mode 100644
index ..0b8f86d5973a
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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}
+ >=dev-qt/qtchooser-66-r1
+"
+
+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.14.1-cmake-macro-backward-compat.patch # bug
703306
+ "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+)
+
+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
+
+ 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
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: c66afae009859b5a3018825c0e2ed348e3af4a01
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 12 15:46:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 12 16:12:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66afae0
dev-qt/qtcore: Drop 5.15.2-r12
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtcore-5.15.2-fix-stack-smashing.patch | 105
dev-qt/qtcore/qtcore-5.15.2-r12.ebuild | 106 -
2 files changed, 211 deletions(-)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
deleted file mode 100644
index cfc187251ccb..
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 463c338b09710609e0dc82f67e03c829a7b83788 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen
-Date: Fri, 14 May 2021 10:43:11 +0200
-Subject: [PATCH] Avoid mixing atomic futex changes and QAtomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Either the mix of futex and atomic, or the mix of 32-bit futex and
-64-bit atomic doesn't work. In any case, the existing code leads to
-bad behavior.
-
-* asturm 2021-11-19: Also threw the typo fix from 587e3bb0 into the mix.
-
-Pick-to: 6.1 5.15
-Fixes: QTBUG-92188
-Change-Id: Icc6ba28d6e2465c373d00e84f4da2b92c037e797
-Reviewed-by: Qt CI Bot
-Reviewed-by: Mårten Nordheim
-(cherry picked from commit 2d9cc639a4a7a5e97979a6034364bd67dfa10c23)
- src/corelib/thread/qsemaphore.cpp | 46 ---
- 1 file changed, 17 insertions(+), 29 deletions(-)
-
-diff --git a/src/corelib/thread/qsemaphore.cpp
b/src/corelib/thread/qsemaphore.cpp
-index d4fb756b94..1d01fc1b28 100644
a/src/corelib/thread/qsemaphore.cpp
-+++ b/src/corelib/thread/qsemaphore.cpp
-@@ -357,47 +357,31 @@ void QSemaphore::release(int n)
- quintptr prevValue = u.fetchAndAddRelease(nn);
- if (futexNeedsWake(prevValue)) {
- #ifdef FUTEX_OP
--if (!futexHasWaiterCount) {
--/*
-- On 32-bit systems, all waiters are waiting on the same
address,
-- so we'll wake them all and ask the kernel to clear the
high bit.
--
-- atomic {
-- int oldval = u;
-- u = oldval & ~(1 << 31);
-- futexWake(u, INT_MAX);
-- if (oldval == 0) // impossible condition
-- futexWake(u, INT_MAX);
-- }
--*/
--quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--quint32 oparg = 31;
--quint32 cmp = FUTEX_OP_CMP_EQ;
--quint32 cmparg = 0;
--futexWakeOp(u, INT_MAX, INT_MAX, u, FUTEX_OP(op, oparg, cmp,
cmparg));
--} else {
-+if (futexHasWaiterCount) {
- /*
-On 64-bit systems, the single-token waiters wait on the
low half
-and the multi-token waiters wait on the upper half. So we
ask
-the kernel to wake up n single-token waiters and all
multi-token
-- waiters (if any), then clear the multi-token wait bit.
-+ waiters (if any), and clear the multi-token wait bit.
-
-atomic {
- int oldval = *upper;
-- *upper = oldval & ~(1 << 31);
-+ *upper = oldval | 0;
- futexWake(lower, n);
-- if (oldval < 0) // sign bit set
-+ if (oldval != 0) // always true
- futexWake(upper, INT_MAX);
-}
- */
--quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--quint32 oparg = 31;
--quint32 cmp = FUTEX_OP_CMP_LT;
-+quint32 op = FUTEX_OP_OR;
-+quint32 oparg = 0;
-+quint32 cmp = FUTEX_OP_CMP_NE;
- quint32 cmparg = 0;
-+u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
- futexWakeOp(*futexLow32(), n, INT_MAX, *futexHigh32(),
FUTEX_OP(op, oparg, cmp, cmparg));
-+return;
- }
--#else
--// Unset the bit and wake everyone. There are two possibibilies
-+#endif
-+// Unset the bit and wake everyone. There are two possibilities
- // under which a thread can set the bit between the AND and the
- // futexWake:
- // 1) it did see the new counter value, but it wasn't enough for
-@@ -405,8 +389,12 @@ void QSemaphore::release(int n)
- // 2) it did not see the new counter value, in which case its
-
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: 11cc810ba55dfd4db304cc59cefa8b53365337f2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 16 13:32:37 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 16 13:33:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cc810b
dev-qt/qtcore: Fix stack smashing crash
Test it in ~arch while upstream are making up their minds.
See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/81
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445719
Bug: https://bugs.gentoo.org/824286
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtcore-5.15.2-fix-stack-smashing.patch | 105
dev-qt/qtcore/qtcore-5.15.2-r12.ebuild | 106 +
2 files changed, 211 insertions(+)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
new file mode 100644
index ..cfc187251ccb
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
@@ -0,0 +1,105 @@
+From 463c338b09710609e0dc82f67e03c829a7b83788 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen
+Date: Fri, 14 May 2021 10:43:11 +0200
+Subject: [PATCH] Avoid mixing atomic futex changes and QAtomic
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Either the mix of futex and atomic, or the mix of 32-bit futex and
+64-bit atomic doesn't work. In any case, the existing code leads to
+bad behavior.
+
+* asturm 2021-11-19: Also threw the typo fix from 587e3bb0 into the mix.
+
+Pick-to: 6.1 5.15
+Fixes: QTBUG-92188
+Change-Id: Icc6ba28d6e2465c373d00e84f4da2b92c037e797
+Reviewed-by: Qt CI Bot
+Reviewed-by: Mårten Nordheim
+(cherry picked from commit 2d9cc639a4a7a5e97979a6034364bd67dfa10c23)
+---
+ src/corelib/thread/qsemaphore.cpp | 46 ---
+ 1 file changed, 17 insertions(+), 29 deletions(-)
+
+diff --git a/src/corelib/thread/qsemaphore.cpp
b/src/corelib/thread/qsemaphore.cpp
+index d4fb756b94..1d01fc1b28 100644
+--- a/src/corelib/thread/qsemaphore.cpp
b/src/corelib/thread/qsemaphore.cpp
+@@ -357,47 +357,31 @@ void QSemaphore::release(int n)
+ quintptr prevValue = u.fetchAndAddRelease(nn);
+ if (futexNeedsWake(prevValue)) {
+ #ifdef FUTEX_OP
+-if (!futexHasWaiterCount) {
+-/*
+- On 32-bit systems, all waiters are waiting on the same
address,
+- so we'll wake them all and ask the kernel to clear the
high bit.
+-
+- atomic {
+- int oldval = u;
+- u = oldval & ~(1 << 31);
+- futexWake(u, INT_MAX);
+- if (oldval == 0) // impossible condition
+- futexWake(u, INT_MAX);
+- }
+-*/
+-quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
+-quint32 oparg = 31;
+-quint32 cmp = FUTEX_OP_CMP_EQ;
+-quint32 cmparg = 0;
+-futexWakeOp(u, INT_MAX, INT_MAX, u, FUTEX_OP(op, oparg, cmp,
cmparg));
+-} else {
++if (futexHasWaiterCount) {
+ /*
+On 64-bit systems, the single-token waiters wait on the
low half
+and the multi-token waiters wait on the upper half. So we
ask
+the kernel to wake up n single-token waiters and all
multi-token
+- waiters (if any), then clear the multi-token wait bit.
++ waiters (if any), and clear the multi-token wait bit.
+
+atomic {
+ int oldval = *upper;
+- *upper = oldval & ~(1 << 31);
++ *upper = oldval | 0;
+ futexWake(lower, n);
+- if (oldval < 0) // sign bit set
++ if (oldval != 0) // always true
+ futexWake(upper, INT_MAX);
+}
+ */
+-quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
+-quint32 oparg = 31;
+-quint32 cmp = FUTEX_OP_CMP_LT;
++quint32 op = FUTEX_OP_OR;
++quint32 oparg = 0;
++quint32 cmp = FUTEX_OP_CMP_NE;
+ quint32 cmparg = 0;
++u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
+ futexWakeOp(*futexLow32(), n, INT_MAX, *futexHigh32(),
FUTEX_OP(op, oparg, cmp, cmparg));
++return;
+ }
+-#else
+-// Unset the bit and wake everyone. There are two possibibilies
++#endif
++// Unset the bit and wake everyone. There are two possibilities
+ // under which a thread can set the bit between the AND and the
+ //
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 1f26857d3b72fda90945c6d4d2f9abbd9021c0b0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 16 12:16:28 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 16 12:23:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f26857d
dev-qt/qtcore: Drop 5.15.2-r10
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 -
dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 104 -
2 files changed, 105 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6b292bfec0c4..8f45ea5ec73a 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,2 +1 @@
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
deleted file mode 100644
index ee99b42e8112..
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa 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}
- >=dev-qt/qtchooser-66-r1
-"
-
-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.14.1-cmake-macro-backward-compat.patch # bug
703306
- "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-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
-
- 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
-
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: dcf5a62ebb6a0220602e91715b5219f4cdeb9ace
Author: Sam James gentoo org>
AuthorDate: Wed Dec 15 23:55:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 15 23:55:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf5a62e
dev-qt/qtcore: Stabilize 5.15.2-r11 arm, #828047
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 8a21d5767d95..4fa3eccb6511 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: c8c9b95d61e2b482e8270e6cfdaa944efa4fc7d5
Author: Sam James gentoo org>
AuthorDate: Wed Dec 15 23:55:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 15 23:55:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c9b95d
dev-qt/qtcore: Stabilize 5.15.2-r11 ppc, #828047
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 9bcacab93498..8a21d5767d95 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: b4b96762436be39fc886721e2e5398d9f43c968d
Author: Sam James gentoo org>
AuthorDate: Wed Dec 15 23:38:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 15 23:38:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b96762
dev-qt/qtcore: Stabilize 5.15.2-r11 arm64, #828047
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 93bcca9fc170..26a82cb46316 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 7af51acff029d838505e377a103841e9086c6342
Author: Jakov Smolić gentoo org>
AuthorDate: Wed Dec 15 13:55:47 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Dec 15 14:46:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af51acf
dev-qt/qtcore: Stabilize 5.15.2-r11 x86, #828047
Signed-off-by: Jakov Smolić gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 5aa6175df22f..93bcca9fc170 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: ae3bf1863c893cfb44bea4ab2e03f849fc5cd8e0
Author: Jakov Smolić gentoo org>
AuthorDate: Wed Dec 15 13:41:39 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Dec 15 13:41:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3bf186
dev-qt/qtcore: Stabilize 5.15.2-r11 amd64, #828047
Signed-off-by: Jakov Smolić gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
index 23c3a8a4ba45..5aa6175df22f 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: a622c93bdfad98396162466c6390c827d230fe34
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 10 11:38:08 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 10 13:19:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a622c93b
dev-qt/qtcore: 5.15.2-r11 version bump at KDE 7c6c0030
"Optimize mime type matching"
"Fix handling of Sunday in POSIX time-zone rules"
QTBUG: https://bugreports.qt.io/browse/QTBUG-90553
"QAbstractFileEngine: fix UB (data race) on qt_file_engine_handlers_in_use"
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 1 +
dev-qt/qtcore/qtcore-5.15.2-r11.ebuild | 104 +
2 files changed, 105 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4b8920365b9d..6b292bfec0c4 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1 +1,2 @@
+DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B
623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b
SHA512
eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B
2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a
SHA512
b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
new file mode 100644
index ..23c3a8a4ba45
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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}
+ >=dev-qt/qtchooser-66-r1
+"
+
+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.14.1-cmake-macro-backward-compat.patch # bug
703306
+ "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+)
+
+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
+
+ 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
+
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: a96a69f9a759b9b27f1599cdb304843ab8e74127
Author: Sam James gentoo org>
AuthorDate: Sun Oct 17 00:29:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 17 00:29:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96a69f9
dev-qt/qtcore: Stabilize 5.15.2-r10 ppc, #806797
Signed-off-by: Sam James gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index 809ba50bd24..ee99b42e811 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="icu old-kernel systemd"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtsql/, dev-qt/qtgui/
commit: 74998ac6ae9d56523ecb97c7e7c1c8e0f8f94166
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 2 14:13:21 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 3 08:45:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74998ac6
dev-qt: Replace $(ver_cut 1-3) instances w/ ${QT5_PV}
Dropping unnecessary subshells.
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 2 +-
dev-qt/qtgui/qtgui-5.15.2-r13.ebuild | 2 +-
dev-qt/qtsql/qtsql-5.15.2-r10.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index 5570c8d3074..44e955e9f6e 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -8,7 +8,7 @@ QT5_MODULE="qtbase"
inherit linux-info qt5-build
DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
+SLOT=5/${QT5_PV}
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
index 82f3e496623..6504f338542 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
@@ -8,7 +8,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 707658
+SLOT=5/${QT5_PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
index b4a101fead0..20503946883 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
@@ -8,7 +8,7 @@ QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
+SLOT=5/${QT5_PV} # bug 639140
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/
commit: 3fa746ae2ea465002a6f4ccbf3f1f1d74c9753d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 29 17:40:18 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 29 17:47:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa746ae dev-qt/qtcore: Consolidate QT5_MODULE=qtbase to a4f9e569 snapshot Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/Manifest | 2 +- dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 6dd68edabe8..c69b3ee123f 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,3 +1,3 @@ -DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12 +DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild index 7cdf654113b..e5cd3ee95db 100644 --- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild @@ -3,7 +3,7 @@ EAPI=8 -KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719 +KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd QT5_MODULE="qtbase" inherit linux-info qt5-build
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
commit: 8d4714fcd0c97dfa8c420ef2596923d9b3a5379f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 22 12:58:24 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 22 19:47:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4714fc
dev-qt/qtcore: Switch to KDE 64a00680 snapshot
Incorporates upstream commit d2bd04d9fe03912097d3246b7d03ef14f425256b,
so we can drop a patch from FILESDIR. Does not otherwise change anything
for dev-qt/qtcore.
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtcore/Manifest | 2 +-
.../files/qtcore-5.15.2-revert-3a273ac4.patch | 56 --
dev-qt/qtcore/qtcore-5.15.2-r10.ebuild | 5 +-
3 files changed, 2 insertions(+), 61 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6ec5cdd58fd..6dd68edabe8 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,3 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B
2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398
SHA512
40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B
ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2
SHA512
c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12
DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B
a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0
SHA512
da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B
0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42
SHA512
a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
deleted file mode 100644
index a29e1b5256d..000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d9a85af5f24d0608c79b2d87b01213833bee01e5 Mon Sep 17 00:00:00 2001
-From: David Faure
-Date: Thu, 19 Aug 2021 15:07:13 +0200
-Subject: [PATCH] Revert "QString::lastIndexOf: fix off-by-one for zero length
- matches"
-
-This reverts commit 3a273ac47f20e82a1f2f63411b210025ca0f4495.
-
-See QTBUG-94215
-
-6cee204d56205e250b0675c9c6d4dd8a2367f3c4 for qtbase/dev changes the
-behaviour even further, I'm pretty sure we don't want that in Qt 5.15.x,
-see discussion in https://codereview.qt-project.org/c/qt/qtbase/+/365179.
-
-Change-Id: I663d74e0d44ebf46291fe0e8a7dc609be82eedc6
- src/corelib/text/qstring.cpp| 4 ++--
- tests/auto/corelib/text/qstring/tst_qstring.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
-index 02a9fe3a30..e6e7cbaad4 100644
a/src/corelib/text/qstring.cpp
-+++ b/src/corelib/text/qstring.cpp
-@@ -4558,13 +4558,13 @@ int QString::lastIndexOf(const QRegularExpression ,
int from, QRegularExpress
- return -1;
- }
-
--int endpos = (from < 0) ? (size() + from + 1) : (from);
-+int endpos = (from < 0) ? (size() + from + 1) : (from + 1);
- QRegularExpressionMatchIterator iterator = re.globalMatch(*this);
- int lastIndex = -1;
- while (iterator.hasNext()) {
- QRegularExpressionMatch match = iterator.next();
- int start = match.capturedStart();
--if (start <= endpos) {
-+if (start < endpos) {
- lastIndex = start;
- if (rmatch)
- *rmatch = std::move(match);
-diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp
b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-index 8f53824050..4c4a8f0416 100644
a/tests/auto/corelib/text/qstring/tst_qstring.cpp
-+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-@@ -1674,7 +1674,7 @@ void tst_QString::lastIndexOf()
- QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected);
- QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs),
expected);
-
--if (from >= -1 && from < haystack.size() && needle.size() > 0) {
-+if (from >= -1 && from < haystack.size()) {
- // unfortunately, QString and QRegExp don't have the same out of
bound semantics
- // I think QString is wrong -- See file log for contact information.
- {
