Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-connectivity for
openSUSE:Factory checked in at 2023-12-04 22:59:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-connectivity (Old)
and /work/SRC/openSUSE:Factory/.qt6-connectivity.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-connectivity"
Mon Dec 4 22:59:38 2023 rev:19 rq:1130404 version:6.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-connectivity/qt6-connectivity.changes
2023-10-13 23:14:35.594845927 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-connectivity.new.25432/qt6-connectivity.changes
2023-12-04 22:59:42.471699263 +0100
@@ -1,0 +2,6 @@
+Mon Nov 27 14:00:07 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 6.6.1:
+ * https://www.qt.io/blog/qt-6.6.1-released
+
+-------------------------------------------------------------------
Old:
----
qtconnectivity-everywhere-src-6.6.0.tar.xz
New:
----
qtconnectivity-everywhere-src-6.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-connectivity.spec ++++++
--- /var/tmp/diff_new_pack.eofhVf/_old 2023-12-04 22:59:43.295729586 +0100
+++ /var/tmp/diff_new_pack.eofhVf/_new 2023-12-04 22:59:43.299729733 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.6.0
+%define real_version 6.6.1
%define short_version 6.6
%define tar_name qtconnectivity-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-connectivity%{?pkg_suffix}
-Version: 6.6.0
+Version: 6.6.1
Release: 0
Summary: Qt 6 connectivity tools and libraries
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ qtconnectivity-everywhere-src-6.6.0.tar.xz ->
qtconnectivity-everywhere-src-6.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.6.0/.cmake.conf
new/qtconnectivity-everywhere-src-6.6.1/.cmake.conf
--- old/qtconnectivity-everywhere-src-6.6.0/.cmake.conf 2023-10-03
20:26:50.000000000 +0200
+++ new/qtconnectivity-everywhere-src-6.6.1/.cmake.conf 2023-11-20
12:56:26.000000000 +0100
@@ -1,3 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.6.0")
+set(QT_REPO_MODULE_VERSION "6.6.1")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.6.0/.tag
new/qtconnectivity-everywhere-src-6.6.1/.tag
--- old/qtconnectivity-everywhere-src-6.6.0/.tag 2023-10-03
20:26:50.000000000 +0200
+++ new/qtconnectivity-everywhere-src-6.6.1/.tag 2023-11-20
12:56:26.000000000 +0100
@@ -1 +1 @@
-e5a5b47da00ffa5018a8c587999beab3527e7b9e
+02626fe90cdd19f64b773a7ab5c276b0d3fef0d3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/dependencies.yaml
new/qtconnectivity-everywhere-src-6.6.1/dependencies.yaml
--- old/qtconnectivity-everywhere-src-6.6.0/dependencies.yaml 2023-10-03
20:26:50.000000000 +0200
+++ new/qtconnectivity-everywhere-src-6.6.1/dependencies.yaml 2023-11-20
12:56:26.000000000 +0100
@@ -1,7 +1,7 @@
dependencies:
../qtbase:
- ref: 33f5e985e480283bb0ca9dea5f82643e825ba87c
+ ref: e2cbce919ccefcae2b18f90257d67bc6e24c3c94
required: true
../qtdeclarative:
- ref: e559d5cf2b66c4a973f83f173d57676a21d287ef
+ ref: 30cb9f48bacdd8092b2264e6067476cafb2d7e39
required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java
new/qtconnectivity-everywhere-src-6.6.1/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java
---
old/qtconnectivity-everywhere-src-6.6.0/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java
2023-10-03 20:26:50.000000000 +0200
+++
new/qtconnectivity-everywhere-src-6.6.1/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java
2023-11-20 12:56:26.000000000 +0100
@@ -257,6 +257,9 @@
private synchronized void handleOnConnectionStateChange(BluetoothGatt gatt,
int status, int
newState) {
+
+ Log.d(TAG, "Connection state changes to: " + newState + ", status: " +
status
+ + ", qtObject: " + (qtObject != 0));
if (qtObject == 0)
return;
@@ -1077,11 +1080,14 @@
handleForTimeout.set(HANDLE_FOR_RESET);
readWriteQueue.clear();
+ pendingJob = null;
}
// This function is called from Qt thread
public synchronized boolean discoverServiceDetails(String serviceUuid,
boolean fullDiscovery)
{
+ Log.d(TAG, "Discover service details for: " + serviceUuid + ",
fullDiscovery: "
+ + fullDiscovery + ", BluetoothGatt: " + (mBluetoothGatt !=
null));
try {
if (mBluetoothGatt == null)
return false;
@@ -1471,6 +1477,10 @@
*/
private synchronized void performNextIO()
{
+ Log.d(TAG, "Perform next BTLE IO, job queue size: " +
readWriteQueue.size()
+ + ", a job is pending: " + (pendingJob != null) + ",
BluetoothGatt: "
+ + (mBluetoothGatt != null));
+
if (mBluetoothGatt == null)
return;
@@ -1534,7 +1544,7 @@
}
if (nextJob.jobType != IoJobType.Mtu && nextJob.jobType !=
IoJobType.Rssi) {
- Log.w(TAG, "Performing queued job, handle: " + handle + " " +
nextJob.jobType + " (" +
+ Log.d(TAG, "Performing queued job, handle: " + handle + " " +
nextJob.jobType + " (" +
(nextJob.requestedWriteType ==
BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE) +
") ValueKnown: " + nextJob.entry.valueKnown + " Skipping: "
+ skip +
" " + nextJob.entry.type);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/android/jni_android.cpp
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/android/jni_android.cpp
---
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/android/jni_android.cpp
2023-10-03 20:26:50.000000000 +0200
+++
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/android/jni_android.cpp
2023-11-20 12:56:26.000000000 +0100
@@ -18,6 +18,7 @@
typedef QHash<QByteArray, QJniObject> JCachedStringFields;
Q_GLOBAL_STATIC(JCachedStringFields, cachedStringFields)
+Q_GLOBAL_STATIC(QMutex, stringCacheMutex);
/*
* This function operates on the assumption that each
@@ -25,6 +26,7 @@
*/
QJniObject valueFromStaticFieldCache(const char *key, const char *className,
const char *fieldName)
{
+ QMutexLocker lock(stringCacheMutex());
JCachedStringFields::iterator it = cachedStringFields()->find(key);
if (it == cachedStringFields()->end()) {
QJniEnvironment env;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
---
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
2023-10-03 20:26:50.000000000 +0200
+++
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/qbluetoothlocaldevice_bluez.cpp
2023-11-20 12:56:26.000000000 +0100
@@ -169,6 +169,7 @@
if (d_ptr->pairingTarget) {
qCDebug(QT_BT_BLUEZ) << "Cancelling pending pairing request
to" << d_ptr->pairingTarget->address();
QDBusPendingReply<> cancelReply =
d_ptr->pairingTarget->CancelPairing();
+ d_ptr->pairingRequestCanceled = true;
cancelReply.waitForFinished();
delete d_ptr->pairingTarget;
d_ptr->pairingTarget = nullptr;
@@ -641,12 +642,19 @@
if (reply.isError()) {
qCWarning(QT_BT_BLUEZ) << "Failed to create pairing" <<
reply.error().name();
- if (reply.error().name() !=
QStringLiteral("org.bluez.Error.AuthenticationCanceled"))
+ const bool canceledByUs =
+ (reply.error().name() ==
QStringLiteral("org.bluez.Error.AuthenticationCanceled"))
+ && pairingRequestCanceled;
+ if (!canceledByUs)
emit q->errorOccurred(QBluetoothLocalDevice::PairingError);
+
+ pairingRequestCanceled = false;
watcher->deleteLater();
return;
}
+ pairingRequestCanceled = false;
+
if (adapter) {
if (!pairingTarget) {
qCWarning(QT_BT_BLUEZ) << "Pairing target expected but found null
pointer.";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/qbluetoothlocaldevice_p.h
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/qbluetoothlocaldevice_p.h
---
old/qtconnectivity-everywhere-src-6.6.0/src/bluetooth/qbluetoothlocaldevice_p.h
2023-10-03 20:26:50.000000000 +0200
+++
new/qtconnectivity-everywhere-src-6.6.1/src/bluetooth/qbluetoothlocaldevice_p.h
2023-11-20 12:56:26.000000000 +0100
@@ -120,6 +120,7 @@
QTimer *pairingDiscoveryTimer = nullptr;
QBluetoothLocalDevice::HostMode currentMode;
int pendingHostModeChange;
+ bool pairingRequestCanceled = false;
public slots:
void pairingCompleted(QDBusPendingCallWatcher *);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/nfc/doc/src/nfc-overview.qdoc
new/qtconnectivity-everywhere-src-6.6.1/src/nfc/doc/src/nfc-overview.qdoc
--- old/qtconnectivity-everywhere-src-6.6.0/src/nfc/doc/src/nfc-overview.qdoc
2023-10-03 20:26:50.000000000 +0200
+++ new/qtconnectivity-everywhere-src-6.6.1/src/nfc/doc/src/nfc-overview.qdoc
2023-11-20 12:56:26.000000000 +0100
@@ -7,7 +7,7 @@
\title Qt NFC Overview
\page qtnfc-overview.html
\brief Provides access to NFC enabled devices.
-\ingroup explanation
+\ingroup explanations-networkingandconnectivity
\tableofcontents
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtconnectivity-everywhere-src-6.6.0/src/nfc/qnearfieldmanager_ios.mm
new/qtconnectivity-everywhere-src-6.6.1/src/nfc/qnearfieldmanager_ios.mm
--- old/qtconnectivity-everywhere-src-6.6.0/src/nfc/qnearfieldmanager_ios.mm
2023-10-03 20:26:50.000000000 +0200
+++ new/qtconnectivity-everywhere-src-6.6.1/src/nfc/qnearfieldmanager_ios.mm
2023-11-20 12:56:26.000000000 +0100
@@ -143,6 +143,7 @@
isSessionScheduled = true;
return true;
}
+ isSessionScheduled = false;
if (accessMethod == QNearFieldTarget::TagTypeSpecificAccess) {
startSession();
