From c083a82641317b8afa7d0f14eeb0051b0b5dd1e054a7370979ce4dc3b2866587 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 26 Sep 2022 20:35:32 +0000 Subject: [PATCH] Qt 5.15.6, untested. OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtbase?expand=0&rev=40 --- 0001-Add-remote-print-queue-support.patch | 16 +- _service | 4 +- libqt5-qtbase.changes | 156 ++++++++++++++++++++ libqt5-qtbase.spec | 6 +- qtbase-everywhere-src-5.15.5+kde166.obscpio | 3 - qtbase-everywhere-src-5.15.6+kde177.obscpio | 3 + qtbase-everywhere-src.obsinfo | 6 +- 7 files changed, 174 insertions(+), 20 deletions(-) delete mode 100644 qtbase-everywhere-src-5.15.5+kde166.obscpio create mode 100644 qtbase-everywhere-src-5.15.6+kde177.obscpio diff --git a/0001-Add-remote-print-queue-support.patch b/0001-Add-remote-print-queue-support.patch index e832755..a0677f3 100644 --- a/0001-Add-remote-print-queue-support.patch +++ b/0001-Add-remote-print-queue-support.patch @@ -1,4 +1,4 @@ -From 81f14d2b93f2691a5887207b137fdffb7238d87b Mon Sep 17 00:00:00 2001 +From f39caba21d60cb55d0c807dccd8af8578ed6c8e8 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Tue, 6 Jun 2017 16:34:32 +0200 Subject: [PATCH] Add remote print queue support @@ -73,7 +73,7 @@ index 1f9cbc4565..522cfc81b6 100644 QFile::remove(tempFile); } diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp -index 1131d43f64..0806ba3abd 100644 +index 42a7a821f2..3fbfcd2425 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp +++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp @@ -61,6 +61,35 @@ @@ -112,7 +112,7 @@ index 1131d43f64..0806ba3abd 100644 QT_BEGIN_NAMESPACE #if QT_CONFIG(dialogbuttonbox) -@@ -159,11 +188,26 @@ QPrintDevice QCupsPrinterSupport::createPrintDevice(const QString &id) +@@ -159,17 +188,35 @@ QPrintDevice QCupsPrinterSupport::createPrintDevice(const QString &id) QStringList QCupsPrinterSupport::availablePrintDeviceIds() const { @@ -141,11 +141,9 @@ index 1131d43f64..0806ba3abd 100644 + list.reserve(qt_cups_num_printers); + for (int i = 0; i < qt_cups_num_printers; ++i) { QString printerId = QString::fromLocal8Bit(dests[i].name); - if (dests[i].instance) { + if (dests[i].instance) printerId += QLatin1Char('/') + QString::fromLocal8Bit(dests[i].instance); -@@ -172,7 +216,10 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const - list.append(printerId); - } + list.append(printerId); } - cupsFreeDests(count, dests); + if (!enablePrinterDiscovery) { @@ -155,7 +153,7 @@ index 1131d43f64..0806ba3abd 100644 return list; } -@@ -185,8 +232,18 @@ QString QCupsPrinterSupport::staticDefaultPrintDeviceId() +@@ -182,8 +229,18 @@ QString QCupsPrinterSupport::staticDefaultPrintDeviceId() { QString printerId; cups_dest_t *dests; @@ -176,7 +174,7 @@ index 1131d43f64..0806ba3abd 100644 if (dests[i].is_default) { printerId = QString::fromLocal8Bit(dests[i].name); if (dests[i].instance) { -@@ -195,8 +252,30 @@ QString QCupsPrinterSupport::staticDefaultPrintDeviceId() +@@ -192,8 +249,30 @@ QString QCupsPrinterSupport::staticDefaultPrintDeviceId() } } } diff --git a/_service b/_service index ded0b76..713f9a7 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.5+kde@TAG_OFFSET@ + 5.15.6+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qtbase.git git qtbase-everywhere-src kde/5.15 - v5.15.5-lts-lgpl + v5.15.6-lts-lgpl enable diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index a8a8c3a..8ad9c82 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,159 @@ +------------------------------------------------------------------- +Mon Sep 26 11:59:50 UTC 2022 - Fabian Vogt + +- Update to version 5.15.6+kde177, rebased upstream: + * QStringIterator: fix UB [2/2]: use std::less to compare pointers + * QStringIterator: fix UB [1/2]: use has{Next,Previous}() more + * Assert validity in QStringIterator's unchecked methods + * eglfs: Fix crash when painting the mouse cursor in a multiscreen setup + * xcb: fix the build of native painting + * QNetworkReplyFileImpl: Don't emit 'finished' in the ctor + * Fix typo in code + * Fix typo in QAbstractItemModelTester + * sqldrivers: Fix typo in error message + * network: Fix typos in messages + * Remove XCB_EVENT_MASK_RESIZE_REDIRECT for Qt:WindowTransparentForInput + * Fix build without dbus support + * Revert "Remove the dead code for blocking methods from QtConcurrent" + * QAIV: Reset double-click flag in mousePressEvent + * Fix possible undefined behavior in clear_thread_data + * Revert "xcb: implement missing bits from ICCCM 4.1.4 WM_STATE handling" + * 3rdparty: apply a fix to the last zlib fix + * add color picking support on wayland using the XDG desktop portal + * Use class scope to refer to static function + * fix AT_SPI_BUS_ADDRESS actually working + * 3rdparty/zlib: backport the fix to CVE-2022-37434 + * widgets: avoid setting X11BypassWindowManagerHint in QToolBar + * Don't access QObjectPrivate::declarativeData unguarded + * Apply CVE-2022-27404-27405-27406-qtbase-5.15.diff + * xcb: Update _NET_SUPPORTED when the window manager changes it + * Revert "CUPS: Add support for accessible IPP printers" + * QtConcurrent::ReduceKernel: fix race conditions + * Fix crash in QKmsDevice::createScreenForConnector + * Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO' + * Fallback to another file dialog implementation when XDP is inaccessible + * Add QXdgDesktopPortalFileDialog::useNativeFileDialog() + * qmake: Ignore stderr when determining the macOS SDK version + * Fix QDBusInterface crashing with empty path on construction + * Network: Update expired cert + * Android: guard getStateCount() with correct VERSION.SDK_INT + * Add note on selecting the device which is used to run tests on Android + * fc: Clean up current config on shutdown + * Doc: Add see also links to operator== and operator!= + * Fix framework dependencies in .la files + * Fix Style java code format and warnings + * wasm: fix network crash on abort + * Update bundled Freetype to 2.10.4 + * CMake: Prevent multiple creation of the targets 'aab' and 'apk' + * Android: Fix fullscreen bottom bar hide issues + * xkb.compose: get locale from user env settings + * xcb: implement missing bits from ICCCM 4.1.4 WM_STATE handling + * macOS: Fix leaked NSMutableArray in applicationActivationChanged + * StyleSheet: Use rule for ComboBox in embedded QLineEdit + * Fix hidden API access for Android style + * Fix memory leak if eXIf has incorrect crc + * Fix invalid snippet reference in qtnetwork-index.html + * Doc: Fix QList::fromVector example in QList documentation + * Turn off feature timezone for emscripten + * QXpmHandler: actually limit characters-per-pixel to four + * QXpmHandler: fix re-entrancy bug in xpm_color_name + * QObject: cleanup the orphaned connection lists on destruction + * Fix crash in concurrent disconnect + * cleanOrphanedConnectionsImpl: Allow to skip locking + * QOrderedMutexLocker: Disable copy and provide explicit dismiss function + * Handle even more include in enum cases + * macOS: Stop relying on balanced CGDisplay reconfiguration callbacks + * QFuture: fix result reporting in the filter mode + * Doc: Minor cleanup in QWidget docs + * Don't report results when the results list is empty + * Windows QPA: Fix coordinates reported through UI Automation + * Make QSqlRecord benchmarks non-fatuous + * Halve the data-set size of tst_QSqlRecord::benchmarkRecord() + * Update deprecated NSAccessibility method + * H2: emit encrypted for at least the first reply, similar to H1 + * QFile benchmark: only set up and tear down the data directory once + * Unify and clean up two identical tst_qfile::*_data() functions + * Move QSKIP()s to _data() functions in QFile benchmark + * Scale image with MDI icons using the correction factor + * QNetworkDiskCache: Fix tracking of size during storeItem() + * Always update the input method when QLineEdit receives focus + * Fix qdbusperformance and qprocess benchmarks + * QListView: don't scroll if selected items are removed + * macOS: Detect sandboxed state for command line apps + * Update obsoleted functionality in preparation for Qt 6 + * Change QCollator's default locale to QLocale().collation() + * QDuplicateTracker: reserve() for at least Prealloc elements + * Point out that QTreeView's expandAll/expandToDepth don't fetch data + * QDuplicateTracker: fix the static buffer size calculation + * macOS: Don't make frameless tool windows miniaturizable + * macOS: Don't mangle QByteArray settings with @ prefix by decoding as UTF-8 + * tst_QtConcurrentThreadEngine: fix the threadCount() test + * Fix QTextFormat::FullWidthSelection for right-to-left text layouts + * Fix auto completion in QFileDialog on Windows + * QFile benchmark: always use Unbuffered for QFSFileEngine tests + * Fix QDirIterator benchmark to actually find its test data + * macOS: Keep NSWindow alive after handling windowShouldClose callback + * Windows QPA: Fix dock widget drag&drop failure + * Remove the dead code for blocking methods from QtConcurrent + * QtConcurrent: call the non-blocking versions in blocking ones + * macOS 10.15: Fix focus frame for combo boxes + * Fix placement of placeholder text in QLineEdits with action icons + * macOS: fix separator actions not showing in menus + * QIcc: Update test for invalid values + * Doc: Use https for links to unicode.org + * Doc: Add a note about a limitation in QDockWidget on macOS + * macOS: Notify socket notifier on connection error + * QGlobalStatic: fix warning when using cv-qualified types + * Fix right-to-left text with DirectWrite engine + QPainterPath + * Fix mapping between Han and other CJK scripts + * Doc: Improve QTransform documentation + * Documentation: Remove section advertising Amazon + * Fix linking of debug projects against release Qt on Darwin platforms + * Extend documentation for QFile:copy() + * macOS: Unregister screen notification handlers on QGuiApplication shutdown + * macOS 11: Fix positioning of focus frame around combobox + * QString: Respect precision when reading data for %.*s format string + * Fix leak of transaction context handle in QSql's OCI driver + * macOS: Allow programatically minimizing frameless windows + * Doc: Move overrideCursor() from QApplication to QGuiApplication + * Doc: Add note to Qt::MatchFlags about implementation dependent behavior + * Update md4c to 0.4.8 + * Android: fix mimetype/namefilters handling for FileDialog + * Enable glyph cache workaround for Apple M-family of GPUs + * Fix rendering of text checkboxes when text is selected + * Update public suffix list + * iOS: cleanup connection when a screen disconnects + * Windows: Read page size and orientation from setup dialog + * qmake: Enable response files for WASM on Windows + * QTextDocumentFragment: fix ifdef range + * Update CLDR qt_attribution.json + * Hangul composition: use < base + count checks, not <= checks + * Doc: Fix snippet for QRandomGenerator64 docs + * Fix date parsing when local time lacks the start of the day + * Fix misplacement of placeholder text in QLineEdit with RTL content + * Fix unaligned specialData formats + * QWidgetTextControl: ignore GroupSwitchModifier for BackSpace + * QFlags::testFlag: clarify the behavior in the docs + * Android: Fix build error issue in examples + * Silence misleading exception print in setQtContextDelegate + * Fix scrolling of tab bar when the visible tab is wider than the visible space + * Fix augmentation of UI language list + * Calculate space requirement of menu items based on widest elements + * Correct examples for int validation in QValidator documentation + * tst_QTimer::remainingTime(): get rid of QTest::currentTestFailed() + * macOS: allow Qt::AA_DontShowShortcutsInContextMenus overrides + * Fix conversion of swap interval from QGLFormat to QSurfaceFormat + * Fix rearranging of icons in listview via drag'n'drop + * Fix flaky QTimer::remainingTime() test + * tst_QDateTimeEdit::editingRanged(): use QScopedPointer + * QAbstractItemView: don't block dragging after double click + * xcb: Add more debug info for XCB_INPUT event + * QPageSize: make PageSizeId ctor non-explicit + * QtGui/math3d : Fix QQuaternion::getEulerAngles +- Commits dropped by the rebase: + * Restore C++11 compatibility of QSharedPointer code +- Refresh 0001-Add-remote-print-queue-support.patch + ------------------------------------------------------------------- Fri Jul 01 10:37:16 UTC 2022 - Fabian Vogt diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 94245a0..8cbdd05 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -29,15 +29,15 @@ %bcond_without harfbuzz Name: libqt5-qtbase -Version: 5.15.5+kde166 +Version: 5.15.6+kde177 Release: 0 Summary: C++ Program Library, Core Components License: LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1 Group: System/Libraries Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.15.5 -%define so_version 5.15.5 +%define real_version 5.15.6 +%define so_version 5.15.6 %define tar_version qtbase-everywhere-src-%{version} Source: %{tar_version}.tar.xz # to get mtime of file: diff --git a/qtbase-everywhere-src-5.15.5+kde166.obscpio b/qtbase-everywhere-src-5.15.5+kde166.obscpio deleted file mode 100644 index 7d7b640..0000000 --- a/qtbase-everywhere-src-5.15.5+kde166.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f7d78fc74637ff423f220922d7ef22f3837b77941d8702eab6badad4a5815c5 -size 292265486 diff --git a/qtbase-everywhere-src-5.15.6+kde177.obscpio b/qtbase-everywhere-src-5.15.6+kde177.obscpio new file mode 100644 index 0000000..e2daf4b --- /dev/null +++ b/qtbase-everywhere-src-5.15.6+kde177.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:564a3591b3a026aacf3b9989d235ff90e927938279ae8d752c346cd1a9c37706 +size 293071886 diff --git a/qtbase-everywhere-src.obsinfo b/qtbase-everywhere-src.obsinfo index 31cb8c7..afdfc5b 100644 --- a/qtbase-everywhere-src.obsinfo +++ b/qtbase-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qtbase-everywhere-src -version: 5.15.5+kde166 -mtime: 1656519067 -commit: 75c0053006d05c930749652dfb0120c5a78689de +version: 5.15.6+kde177 +mtime: 1663626648 +commit: 411b90bfe5a0c57f526b93f2c01cf089e70266ad