Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libqt5-qtbase for openSUSE:Factory 
checked in at 2021-06-27 18:58:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtbase"

Sun Jun 27 18:58:59 2021 rev:120 rq:902487 version:5.15.2+kde200

Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes      
2021-06-01 10:34:12.636480936 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.2625/libqt5-qtbase.changes    
2021-06-27 18:59:59.700348031 +0200
@@ -1,0 +2,26 @@
+Thu Jun 24 19:16:41 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Revert to the default platform plugin list ("wayland;xcb")
+
+-------------------------------------------------------------------
+Thu Jun 24 09:02:42 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Update to version 5.15.2+kde200:
+  * Optimize quadratic-time insertion in QSortFilterProxyModel
+
+-------------------------------------------------------------------
+Mon Jun 21 08:07:20 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Switch to KDE's maintenance branch
+- Update to version 5.15.2+kde199:
+  * Too many changes to list here
+- Add patch to reset version to 5.15.2:
+  * 0001-Revert-Bump-version.patch
+- Drop patches, now upstream:
+  * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
+  * 0001-Fix-allocated-memory-of-QByteArray.patch
+  * 0001-Fix-build-with-GCC-11-include-limits.patch
+  * 0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
+  * 0002-Build-fixes-for-GCC-11.patch
+
+-------------------------------------------------------------------

Old:
----
  0001-Fix-allocated-memory-of-QByteArray.patch
  0001-Fix-build-with-GCC-11-include-limits.patch
  0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
  0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
  0002-Build-fixes-for-GCC-11.patch
  qtbase-everywhere-src-5.15.2.tar.xz

New:
----
  0001-Revert-Bump-version.patch
  _service
  _servicedata
  qtbase-everywhere-src-5.15.2+kde200.obscpio
  qtbase-everywhere-src.obsinfo

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.3K4CgI/_old  2021-06-27 19:00:04.328354111 +0200
+++ /var/tmp/diff_new_pack.3K4CgI/_new  2021-06-27 19:00:04.336354121 +0200
@@ -16,7 +16,7 @@
 #
 
 
-%define qt5_snapshot 0
+%define qt5_snapshot 1
 %define journald 1
 
 %ifarch %arm aarch64
@@ -29,7 +29,7 @@
 %bcond_without harfbuzz
 
 Name:           libqt5-qtbase
-Version:        5.15.2
+Version:        5.15.2+kde200
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
@@ -38,8 +38,8 @@
 %define base_name libqt5
 %define real_version 5.15.2
 %define so_version 5.15.2
-%define tar_version qtbase-everywhere-src-5.15.2
-Source:         
https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
+%define tar_version qtbase-everywhere-src-%{version}
+Source:         %{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
 Source2:        macros.qt5
@@ -52,6 +52,7 @@
 Patch3:         0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch
 # Proposed: https://bugreports.qt.io/browse/QTBUG-88491
 Patch4:         0001-Avoid-SIGABRT-on-platform-plugin-initialization-fail.patch
+Patch5:         0001-Revert-Bump-version.patch
 # PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude 
rc4 ciphers from being used by default
 Patch6:         disable-rc4-ciphers-bnc865241.diff
 Patch8:         tell-the-truth-about-private-api.patch
@@ -63,16 +64,9 @@
 Patch21:        0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
 Patch24:        fix-fixqt4headers.patch
 # patches 1000-2000 and above from upstream 5.15 branch #
-# Merged: https://bugreports.qt.io/browse/QTBUG-87010
-Patch1000:      0001-Fix-allocated-memory-of-QByteArray.patch
-# Merged: https://bugreports.qt.io/browse/QTBUG-88435
-Patch1001:      0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
 # patches 2000-3000 and above from upstream qt6/dev branch #
 # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
 Patch2001:      0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
-Patch2002:      0001-Fix-build-with-GCC-11-include-limits.patch
-Patch2003:      0002-Build-fixes-for-GCC-11.patch
-Patch2004:      0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
 BuildRequires:  cups-devel
 BuildRequires:  double-conversion-devel
 BuildRequires:  gcc-c++
@@ -909,7 +903,6 @@
        -plugin-sql-psql -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
        -plugin-sql-odbc \
        -plugin-sql-mysql -I/usr/include/mysql/ \
-       -qpa "xcb;wayland" \
        -no-feature-relocatable \
        QMAKE_CFLAGS+="$CFLAGS" \
        QMAKE_CXXFLAGS+="$CXXFLAGS"

++++++ 0001-Revert-Bump-version.patch ++++++
>From e08cc7a0cec3c6fb69415b8e76e70b37088b561c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Mon, 21 Jun 2021 12:29:39 +0200
Subject: [PATCH] Revert "Bump version"

This reverts commit 6344955d17e17e2398720fe60c34cfc2a4a95208.
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 1bf1a80475..9476d20099 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 QT_SOURCE_TREE = $$PWD
 QT_BUILD_TREE = $$shadowed($$PWD)
 
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
-- 
2.20.1

++++++ _service ++++++
<services>
  <service name="obs_scm" mode="disabled">
   <param name="changesgenerate">enable</param>
   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
   <param name="url">https://invent.kde.org/qt/qt/qtbase.git</param>
   <param name="scm">git</param>
   <param name="filename">qtbase-everywhere-src</param>
   <param name="revision">kde/5.15</param>
   <param name="parent-tag">v5.15.2</param>
   <param name="changesgenerate">enable</param>
  </service>
  <service name="set_version" mode="disabled"/>
  <service name="tar" mode="buildtime"/>
  <service name="recompress" mode="buildtime">
   <param name="file">*.tar</param>
   <param name="compression">xz</param>
  </service>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
                <param 
name="url">https://invent.kde.org/qt/qt/qtbase.git</param>
              <param 
name="changesrevision">b8841b34c5b90bf32394568102888ddc559f3ddc</param></service></servicedata>++++++
 qtbase-everywhere-src.obsinfo ++++++
name: qtbase-everywhere-src
version: 5.15.2+kde200
mtime: 1624296086
commit: b8841b34c5b90bf32394568102888ddc559f3ddc

Reply via email to