Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gammaray for openSUSE:Leap:16.0 
checked in at 2025-04-23 18:08:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:16.0/gammaray (Old)
 and      /work/SRC/openSUSE:Leap:16.0/.gammaray.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gammaray"

Wed Apr 23 18:08:25 2025 rev:2 rq:1272201 version:3.1.0

Changes:
--------
--- /work/SRC/openSUSE:Leap:16.0/gammaray/gammaray.changes      2025-03-19 
11:43:24.897393029 +0100
+++ /work/SRC/openSUSE:Leap:16.0/.gammaray.new.30101/gammaray.changes   
2025-04-23 18:10:06.868363580 +0200
@@ -1,0 +2,23 @@
+Thu Apr  3 07:09:48 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Add upstream change:
+  * gammaray-qt69.patch
+
+-------------------------------------------------------------------
+Sat Feb  1 10:59:42 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Drop the KDStateMachineEditor build dependency.
+  The option is turned off by default and there's currently no
+  way to use the system KDSME.
+
+-------------------------------------------------------------------
+Wed Nov 20 12:12:19 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Stop using the %suse_update_desktop_file macro
+
+-------------------------------------------------------------------
+Mon Oct 28 08:43:13 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Add a _constraints file to fix oom issues when building gammaray
+
+-------------------------------------------------------------------

New:
----
  _constraints
  gammaray-qt69.patch

BETA DEBUG BEGIN:
  New:- Add upstream change:
  * gammaray-qt69.patch
BETA DEBUG END:

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

Other differences:
------------------
++++++ gammaray.spec ++++++
--- /var/tmp/diff_new_pack.8A1waQ/_old  2025-04-23 18:10:07.700398455 +0200
+++ /var/tmp/diff_new_pack.8A1waQ/_new  2025-04-23 18:10:07.700398455 +0200
@@ -36,7 +36,9 @@
 Summary:        Introspection/Debugging Tool for Qt Applications
 License:        GPL-2.0-or-later
 URL:            https://www.kdab.com/gammaray
-Source:         
https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{rname}-%{version}.tar.gz
+Source0:        
https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{rname}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch0:         gammaray-qt69.patch
 BuildRequires:  binutils-devel
 BuildRequires:  cmake >= 3.16.0
 BuildRequires:  doxygen
@@ -46,7 +48,6 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libdw-devel
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
 BuildRequires:  cmake(Qt%{qt_suffix}3DAnimation) >= %{qt_min_version}
 BuildRequires:  cmake(Qt%{qt_suffix}3DExtras) >= %{qt_min_version}
 BuildRequires:  cmake(Qt%{qt_suffix}3DInput) >= %{qt_min_version}
@@ -80,8 +81,6 @@
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{qt_min_version}
 BuildRequires:  libqt5-qtscxml-private-headers-devel >= %{qt_min_version}
 BuildRequires:  libqt5-qttools-doc >= %{qt_min_version}
-# No Qt6 support in current release
-BuildRequires:  cmake(KDSME)
 BuildRequires:  cmake(KF5CoreAddons)
 BuildRequires:  cmake(KF5SyntaxHighlighting)
 BuildRequires:  cmake(Qt5AttributionsScannerTools) >= %{qt_min_version}
@@ -107,9 +106,7 @@
 BuildRequires:  qt6-scxml-private-devel >= %{qt_min_version}
 BuildRequires:  qt6-statemachine-private-devel >= %{qt_min_version}
 BuildRequires:  qt6-widgets-private-devel >= %{qt_min_version}
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150500
 BuildRequires:  cmake(Qt6Location) >= %{qt_min_version}
-%endif
 BuildRequires:  cmake(Qt6ShaderTools) >= %{qt_min_version}
 BuildRequires:  cmake(Qt6StateMachine) >= %{qt_min_version}
 BuildRequires:  cmake(Qt6ToolsTools) >= %{qt_min_version}
@@ -167,6 +164,9 @@
 %prep
 %autosetup -p1 -n %{rname}-%{version}
 
+# Unused
+rm -r 3rdparty/KDStateMachineEditor
+
 %build
 %define _lto_cflags %{nil}
 %if 0%{?qt5}
@@ -198,8 +198,6 @@
 # Already packaged with %%doc and %%license tags
 rm -r %{buildroot}%{_datadir}/doc
 
-%suse_update_desktop_file GammaRay Development Debugger
-
 %fdupes %{buildroot}
 
 %ldconfig_scriptlets -n libgammaray%{?pkg_suffix}-%{soversion}

++++++ _constraints ++++++
<?xml version="1.0" encoding="UTF-8"?>
<constraints>
  <hardware>
    <memory>
      <size unit="G">4</size>
    </memory>
  </hardware>
  <overwrite>
    <conditions>
      <arch>ppc64le</arch>
      <arch>s390x</arch>
    </conditions>
    <hardware>
      <memory>
        <size unit="G">5</size>
      </memory>
    </hardware>
  </overwrite>
</constraints>

++++++ gammaray-qt69.patch ++++++
>From 73a102f50f0c4f9482f90b84814aa9cd812c3136 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.wegh...@posteo.de>
Date: Fri, 20 Dec 2024 11:47:11 +0100
Subject: [PATCH] Fix build for Qt >= 6.9

QMutableTouchEvent::from was removed in qtbase commit [1]

    commit e9cabe22c1e7ae64e48690b7dada2b83161e6340
    Author: Allan Sandfeld Jensen <allan.jen...@qt.io>
    Date:   Tue Nov 12 16:25:28 2024 +0100

        QMutable{Touch,SinglePoint}Event: Remove unsafe from() getters

        The getters were used to convert types in an undefined manner.
        No usage of the methods outside of qtbase (Qt and KDE searched)
        has been found, and qtbase is already fixed.

        Change-Id: I9fe77de842a2e0023b011e6eee257d6c6a28a3f5
        Reviewed-by: Allan Sandfeld Jensen <allan.jen...@qt.io>

For Qt >= 6.9, use the API introduced in [2]

    commit acc3ef6653c710b509e9321663986910f88ac3b4
    Author: Allan Sandfeld Jensen <allan.jen...@qt.io>
    Date:   Tue Nov 12 12:34:15 2024 +0100

        Fix ubsan warning of illegal cast and illegal method call

        Avoid casting an event to a type it does not have. Instead use a static 
accessor class.

        Pick-to: 6.8
        Task-number: QTBUG-99563
        Change-Id: Ideb11779b1510cd10a27fb8bc40bcc8e4849bf15
        Reviewed-by: Marc Mutz <marc.m...@qt.io>

instead.

[1] 
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9cabe22c1e7ae64e48690b7dada2b83161e6340
[2] 
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=acc3ef6653c710b509e9321663986910f88ac3b4
---
 core/remoteviewserver.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/remoteviewserver.cpp b/core/remoteviewserver.cpp
index 955bea2aed..b6d3804708 100644
--- a/core/remoteviewserver.cpp
+++ b/core/remoteviewserver.cpp
@@ -188,8 +188,12 @@ void RemoteViewServer::sendTouchEvent(int type, int 
touchDeviceType, int deviceC
     const QEventPoint::States states(touchPointStates);
     QTouchEvent event(QEvent::Type(type), m_touchDevice.get(), 
Qt::KeyboardModifiers(modifiers), states, touchPoints);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
+    QMutableTouchEvent::setTarget(&event, m_eventReceiver);
+#else
     auto *mut = QMutableTouchEvent::from(&event);
     mut->setTarget(m_eventReceiver);
+#endif
 #else
     if (!m_touchDevice) {
         // create our own touch device, the system may not have one already, 
or it may not have

Reply via email to