gentoo auto-resync : 10:12:2022 - 15:20:44

4 files changed, 0 insertions, 224 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index f2ae0e31a72f..0be797496f03 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,6 +1,3 @@
-AUX qtcore-5.15.5-QTBUG-105286.patch 6250 BLAKE2B bacfd0420e0a1f163d97d75fd2d6c65d1fbdf2b90ace33129caea3c682f5cc54dd3429bd5a0d5865ad9fe291a8abbc9b5951a2e7791ae283da53e839c51dac0b SHA512 397df84c0984c403e5151a63bbfcd925c0cb05bf4d818089c95a72bc7914666912e441baaad808800425c25a62af003431c5459c55c2c3b3e8ef1c73c7f9755e
-AUX qtcore-5.15.5-hack_never_use_execinfo.patch 880 BLAKE2B e63e908d592da13f5c762fdd2d38dc223a04dab772381c837a93446d41a16071b51b2b4685084b8de956c5a95b0c71e97a63eb21b99dae764cc202bba899840e SHA512 c9b73d0eb1e957b2ab7b47b4cb7ace72004bf937927572bc86d27536f0b92a4594df8897862090454b1110753af03b6bab3eabdaa728b5cf42b8e2d21ef039cb
-AUX qtcore-5.15.5-slibtool.patch 867 BLAKE2B 0e368bac0d3a066e64a45162ba874a857fa37550ae8b2a9d9378d1c864553bf793c53d5e3079f3e80a4c7f5e03201a0a45d084d0dc83fc35ec509f6ceae50188 SHA512 fdc58a17685ed2c66ab68741778a708dd3869ae1fc49b94bef676b96cab3895e68f835dd9e9653ffe707f179a9be5cbe72491b5d1923ad0c4136fc0f92b4033a
 DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
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..000000000000
--- 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 <volker.hilsheimer@qt.io>
-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 <qt_ci_bot@qt-project.org>
-Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
-(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<QAbstractDeclarativeDataImpl*>(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<tst_QObject>::Value);
- Q_STATIC_ASSERT(!QtPrivate::HasQ_OBJECT_Macro<SiblingDeleter>::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
-+*/
-+namespace QtDeclarative {
-+static QAbstractDeclarativeData *theData;
-+
-+static void destroyed(QAbstractDeclarativeData *data, QObject *)
-+{
-+    QCOMPARE(data, theData);
-+}
-+static void signalEmitted(QAbstractDeclarativeData *data, QObject *, int, void **)
-+{
-+    QCOMPARE(data, theData);
-+}
-+// we can't use QCOMPARE in the next two functions, as they don't return void
-+static int receivers(QAbstractDeclarativeData *data, const QObject *, int)
-+{
-+    QTest::qCompare(data, theData, "data", "theData", __FILE__, __LINE__);
-+    return 0;
-+}
-+static bool isSignalConnected(QAbstractDeclarativeData *data, const QObject *, int)
-+{
-+    QTest::qCompare(data, theData, "data", "theData", __FILE__, __LINE__);
-+    return true;
-+}
-+
-+class Object : public QObject
-+{
-+    Q_OBJECT
-+public:
-+    using QObject::QObject;
-+    ~Object()
-+    {
-+        if (Object *p = static_cast<Object *>(parent()))
-+            p->emitSignal();
-+    }
-+
-+    void emitSignal()
-+    {
-+        emit theSignal();
-+    }
-+
-+signals:
-+    void theSignal();
-+};
-+
-+}
-+#endif
-+
-+void tst_QObject::declarativeData()
-+{
-+#ifdef QT_BUILD_INTERNAL
-+    QScopedValueRollback destroyed(QAbstractDeclarativeData::destroyed,
-+                                   QtDeclarative::destroyed);
-+    QScopedValueRollback signalEmitted(QAbstractDeclarativeData::signalEmitted,
-+                                       QtDeclarative::signalEmitted);
-+    QScopedValueRollback receivers(QAbstractDeclarativeData::receivers,
-+                                   QtDeclarative::receivers);
-+    QScopedValueRollback isSignalConnected(QAbstractDeclarativeData::isSignalConnected,
-+                                           QtDeclarative::isSignalConnected);
-+
-+    QtDeclarative::Object p;
-+    QObjectPrivate *priv = QObjectPrivate::get(&p);
-+    priv->declarativeData = QtDeclarative::theData = new QAbstractDeclarativeData;
-+
-+    connect(&p, &QtDeclarative::Object::theSignal, &p, []{
-+    });
-+
-+    QtDeclarative::Object *child = new QtDeclarative::Object;
-+    child->setParent(&p);
-+#endif
-+}
-+
- QTEST_MAIN(tst_QObject)
- #include "tst_qobject.moc"
--- 
-GitLab
-
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
deleted file mode 100644
index c74de19c6144..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.5-hack_never_use_execinfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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(<cxxabi.h>) && __has_include(<execinfo.h>))
-+#  elif (defined(__GLIBC__) && defined(__GLIBCXX__))
- #    define QLOGGING_HAVE_BACKTRACE
- #  endif
- #endif
--- 
-2.35.1
-
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch b/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch
deleted file mode 100644
index a7ae5702cb4d..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.5-slibtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From beebf54552e85c07496aa748710df76131620834 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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
-