commit layer-shell-qt6 for openSUSE:Factory

7 Oct 2024

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package layer-shell-qt6 for openSUSE:Factory checked in at 2024-10-07 21:47:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/layer-shell-qt6 (Old)
 and      /work/SRC/openSUSE:Factory/.layer-shell-qt6.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "layer-shell-qt6"

Mon Oct  7 21:47:40 2024 rev:12 rq:1205915 version:6.2.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/layer-shell-qt6/layer-shell-qt6.changes	2024-09-11 16:55:40.562741167 +0200
+++ /work/SRC/openSUSE:Factory/.layer-shell-qt6.new.19354/layer-shell-qt6.changes	2024-10-07 21:48:08.460039690 +0200
@@ -1,0 +2,23 @@
+Sat Oct  5 10:44:22 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.2.0:
+  * New bugfix release
+  * For more details see https://kde.org/announcements/plasma/6/6.2.0
+- Changes since 6.1.90:
+  * update version for new release
+
+-------------------------------------------------------------------
+Tue Sep 17 14:53:43 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 6.1.90:
+  * New feature release
+  * For more details see https://kde.org/announcements/plasma/6/6.1.90
+- Changes since 6.1.5:
+  * update version for new release
+  * Reformat CMake code for better readability
+  * Generate wayland code with PRIVATE_CODE
+  * Port to QWaylandWindow::updateExposure()
+  * Port to QWaylandShellSurface::setWindowSize()
+  * update version for new release
+
+-------------------------------------------------------------------

Old:
----
  layer-shell-qt-6.1.5.tar.xz
  layer-shell-qt-6.1.5.tar.xz.sig

New:
----
  layer-shell-qt-6.2.0.tar.xz
  layer-shell-qt-6.2.0.tar.xz.sig

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

Other differences:
------------------
++++++ layer-shell-qt6.spec ++++++
--- /var/tmp/diff_new_pack.6EgjQS/_old	2024-10-07 21:48:09.020062990 +0200
+++ /var/tmp/diff_new_pack.6EgjQS/_new	2024-10-07 21:48:09.024063157 +0200
@@ -17,8 +17,8 @@
 #
 
 
-%define kf6_version 6.2.0
-%define qt6_version 6.6.0
+%define kf6_version 6.5.0
+%define qt6_version 6.7.0
 
 # Full Plasma 6 version (e.g. 6.0.0)
 %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
@@ -27,14 +27,14 @@
 %define rname layer-shell-qt
 %bcond_without released
 Name:           layer-shell-qt6
-Version:        6.1.5
+Version:        6.2.0
 Release:        0
 Summary:        wlr-layer-shell integration for Qt
 License:        LGPL-3.0-or-later
 URL:            https://www.kde.org
-Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source:         %{rname}-%{version}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
+Source1:        %{rname}-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}

++++++ layer-shell-qt-6.1.5.tar.xz -> layer-shell-qt-6.2.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/layer-shell-qt-6.1.5/CMakeLists.txt new/layer-shell-qt-6.2.0/CMakeLists.txt
--- old/layer-shell-qt-6.1.5/CMakeLists.txt	2024-09-10 10:51:02.000000000 +0200
+++ new/layer-shell-qt-6.2.0/CMakeLists.txt	2024-10-03 14:37:33.000000000 +0200
@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.1.5")
+set(PROJECT_VERSION "6.2.0")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)
 
-set(QT_MIN_VERSION "6.6.0")
-set(KF6_MIN_VERSION "6.2.0")
+set(QT_MIN_VERSION "6.7.0")
+set(KF6_MIN_VERSION "6.5.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 20)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/layer-shell-qt-6.1.5/src/CMakeLists.txt new/layer-shell-qt-6.2.0/src/CMakeLists.txt
--- old/layer-shell-qt-6.1.5/src/CMakeLists.txt	2024-09-10 10:51:02.000000000 +0200
+++ new/layer-shell-qt-6.2.0/src/CMakeLists.txt	2024-10-03 14:37:33.000000000 +0200
@@ -4,10 +4,16 @@
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
 
 add_library(LayerShellQtInterface)
-qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES
-    ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
-    ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
-    ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
+
+if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
+    set(private_code_option  "PRIVATE_CODE")
+endif()
+qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface
+    ${private_code_option}
+    FILES
+        ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
+        ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
 )
 
 ecm_qt_declare_logging_category(LayerShellQtInterface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/layer-shell-qt-6.1.5/src/qwaylandlayersurface.cpp new/layer-shell-qt-6.2.0/src/qwaylandlayersurface.cpp
--- old/layer-shell-qt-6.1.5/src/qwaylandlayersurface.cpp	2024-09-10 10:51:02.000000000 +0200
+++ new/layer-shell-qt-6.2.0/src/qwaylandlayersurface.cpp	2024-10-03 14:37:33.000000000 +0200
@@ -110,9 +110,13 @@
 
 void QWaylandLayerSurface::applyConfigure()
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = true;
+#endif
     window()->resizeFromApplyConfigure(m_pendingSize);
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     m_configuring = false;
+#endif
 }
 
 void QWaylandLayerSurface::setDesiredSize(const QSize &size)
@@ -163,6 +167,7 @@
         set_layer(layer);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
 void QWaylandLayerSurface::setWindowGeometry(const QRect &geometry)
 {
     if (m_configuring) {
@@ -171,6 +176,12 @@
 
     setDesiredSize(geometry.size());
 }
+#else
+void QWaylandLayerSurface::setWindowSize(const QSize &size)
+{
+    setDesiredSize(size);
+}
+#endif
 
 bool QWaylandLayerSurface::requestActivate()
 {
@@ -220,8 +231,10 @@
 {
 #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
     window()->handleExpose(QRect(QPoint(), m_pendingSize));
-#else
+#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     window()->sendRecursiveExposeEvent();
+#else
+    window()->updateExposure();
 #endif
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/layer-shell-qt-6.1.5/src/qwaylandlayersurface_p.h new/layer-shell-qt-6.2.0/src/qwaylandlayersurface_p.h
--- old/layer-shell-qt-6.1.5/src/qwaylandlayersurface_p.h	2024-09-10 10:51:02.000000000 +0200
+++ new/layer-shell-qt-6.2.0/src/qwaylandlayersurface_p.h	2024-10-03 14:37:33.000000000 +0200
@@ -43,7 +43,11 @@
     void setLayer(uint32_t layer);
 
     void applyConfigure() override;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     void setWindowGeometry(const QRect &geometry) override;
+#else
+    void setWindowSize(const QSize &size) override;
+#endif
 
     bool requestActivate() override;
     void setXdgActivationToken(const QString &token) override;
@@ -61,7 +65,9 @@
     QString m_activationToken;
 
     bool m_configured = false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
     bool m_configuring = false;
+#endif
 };
 
 }

    

Source-Sync

tags

participants (1)