Accepting request 1319531 from KDE:Extra

- Update 0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch to build with graphviz 14.* OBS-URL: https://build.opensuse.org/request/show/1319531 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdstatemachineeditor?expand=0&rev=14
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdstatemachineeditor?expand=0&rev=39
2025-11-24 13:12:01 +00:00 · 2025-11-23 14:06:20 +00:00 · 2025-11-23 14:05:39 +00:00 · 2025-11-23 14:03:28 +00:00 · 2025-09-26 20:25:06 +00:00 · 2025-09-26 07:34:00 +00:00
6 changed files with 76 additions and 113 deletions
--- a/0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch
+++ b/0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch
@@ -1,4 +1,4 @@
-From dcf2086d5e96ef98e593f639d4c613b863e4f54e Mon Sep 17 00:00:00 2001
+From 631968d008366eecf9c9cdaf04041d73b9ef29af Mon Sep 17 00:00:00 2001
 From: Christophe Marin <christophe@krop.fr>
 Date: Sat, 1 Feb 2025 11:11:46 +0100
 Subject: [PATCH] CMake - Find gvplugin_dot_layout on openSUSE
@@ -8,25 +8,27 @@ removes the symlinks for libgvplugin_*.

 The build system needs a workaround.
 ---
- cmake/FindGraphviz.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ cmake/FindGraphviz.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)

 diff --git a/cmake/FindGraphviz.cmake b/cmake/FindGraphviz.cmake
-index fd0e2d4..d19babf 100644
+index c528a03..78c1a90 100644
 --- a/cmake/FindGraphviz.cmake
 +++ b/cmake/FindGraphviz.cmake
-@@ -120,9 +120,10 @@ find_library(
+@@ -120,9 +120,12 @@ find_library(
     PATH_SUFFIXES ${GRAPHVIZ_LIB_PATH_SUFFIX} ${_GRAPHVIZ_FIND_OPTS}
 )
 
-+# Due to how graphviz is packaged in openSUSE, we have to explictly look for libgvplugin_dot_layout.so.6
+# Due to graphviz maintainer decision, the gvplugin_dot_layout symlink is
+# missing in the graphviz package. We need to work around this decision to
+# build kdstatemachineeditor
 find_library(
     GRAPHVIZ_PLUGIN_DOT_LAYOUT_LIBRARY
 -    NAMES gvplugin_dot_layout
-+    NAMES gvplugin_dot_layout libgvplugin_dot_layout.so.6
+    NAMES gvplugin_dot_layout libgvplugin_dot_layout.so.6 libgvplugin_dot_layout.so.8
     HINTS ${_GRAPHVIZ_LIBRARY_DIR}
     PATH_SUFFIXES ${GRAPHVIZ_LIB_PATH_SUFFIX} ${_GRAPHVIZ_FIND_OPTS} graphviz
 )
 -- 
-2.48.1
+2.51.1

--- a/3
+++ b/3
@@ -1,3 +0,0 @@
-<multibuild>
-  <flavor>qt6</flavor>
-</multibuild>
--- a/kdstatemachineeditor-2.1.0.tar.gz
+++ b/kdstatemachineeditor-2.1.0.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1167d651f34c598e8b091a1224b970d15177ea51d9eb3c1e1a7f00caf8bc3cf
-size 1012048
--- a/kdstatemachineeditor-2.2.0.tar.gz
+++ b/kdstatemachineeditor-2.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fb961da3277c8d8884352aaed5ded601264944f3972e4180fa65de8714347df
+size 1010337
--- a/kdstatemachineeditor.changes
+++ b/kdstatemachineeditor.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Nov 23 14:02:52 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update 0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch to
+  build with graphviz 14.*
+
+-------------------------------------------------------------------
+Fri Sep 26 07:29:46 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 2.2.0
+  * Bump embedded Graphviz to 13.1.0
+  * Remove Qt 5 support to simplify maintenance
+  * Fix build with Qt 6.10
+- Drop the Qt 5 flavor
+
 -------------------------------------------------------------------
 Fri May 16 06:04:36 UTC 2025 - Christophe Marin <christophe@krop.fr>

--- a/kdstatemachineeditor.spec
+++ b/kdstatemachineeditor.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdstatemachineeditor
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,59 +15,37 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #

-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "qt6"
-%define qt6 1
-%define pkg_suffix -qt6
-%define qt_suffix 6
-%define qt_min_version 6.1
-%else
-%define qt5 1
-%define qt_suffix 5
-%define qt_min_version 5.15
-%endif
+
+%define qt6_version 6.1
 #
 %global sover 2
-%define libnamecore libkdstatemachineeditor_core%{?qt6:%{pkg_suffix}-}%{sover}
-%define libnamedebuginterfaceclient libkdstatemachineeditor_debuginterfaceclient%{?qt6:%{pkg_suffix}-}%{sover}
-%define libnamedebuginterfacesource libkdstatemachineeditor_debuginterfacesource%{?qt6:%{pkg_suffix}}-static
-%define libnameview libkdstatemachineeditor_view%{?qt6:%{pkg_suffix}-}%{sover}
 #
-Name:           kdstatemachineeditor%{?pkg_suffix}
-Version:        2.1.0
+Name:           kdstatemachineeditor
+Version:        2.2.0
 Release:        0
 Summary:        A framework for creating Qt State Machine metacode using a GUI
 # Legal: NOTE the EULA mentioned in LICENSE.txt only applies to "Licensed Product" users.
 License:        LGPL-2.1-only
-Group:          Development/Libraries/C and C++
 URL:            https://kdab.github.io/KDStateMachineEditor/
 Source0:        https://github.com/KDAB/KDStateMachineEditor/releases/download/v%{version}/kdstatemachineeditor-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE -- work around build issue caused by graphviz packaging decisions
 Patch0:         0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch
-BuildRequires:  cmake >= 3.16.0
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel >= 2.30.1
 BuildRequires:  graphviz-gnome
-BuildRequires:  cmake(Qt%{qt_suffix}Core) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}Gui) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}Quick) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}QuickWidgets) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}RemoteObjects) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}Scxml) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}Test) >= %{qt_min_version}
-BuildRequires:  cmake(Qt%{qt_suffix}Widgets) >= %{qt_min_version}
-%if 0%{?qt5}
-BuildRequires:  libQt5Gui-private-headers-devel >= %{qt_min_version}
-BuildRequires:  libqt5-qtscxml-private-headers-devel >= %{qt_min_version}
-BuildRequires:  cmake(Qt5XmlPatterns) >= %{qt_min_version}
-%endif
-%if 0%{?qt6}
-BuildRequires:  qt6-gui-private-devel >= %{qt_min_version}
-BuildRequires:  qt6-scxml-private-devel >= %{qt_min_version}
-BuildRequires:  cmake(Qt6Core5Compat) >= %{qt_min_version}
-BuildRequires:  cmake(Qt6QuickControls2) >= %{qt_min_version}
-BuildRequires:  cmake(Qt6StateMachine) >= %{qt_min_version}
-%endif
+BuildRequires:  qt6-gui-private-devel >= %{qt6_version}
+BuildRequires:  qt6-scxml-private-devel >= %{qt6_version}
+BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Core5Compat) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Gui) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Quick) >= %{qt6_version}
+BuildRequires:  cmake(Qt6QuickControls2) >= %{qt6_version}
+BuildRequires:  cmake(Qt6QuickWidgets) >= %{qt6_version}
+BuildRequires:  cmake(Qt6RemoteObjects) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Scxml) >= %{qt6_version}
+BuildRequires:  cmake(Qt6StateMachine) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Test) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
 Requires:       graphviz-plugins-core

 %description
@@ -76,31 +54,28 @@ to help develop State Machine Editing graphical user
 interfaces and tools. Output from such applications is in metacode
 or QML that can then be used in Qt or QtQuick projects.

-%package -n %{libnamecore}
+%package -n libkdstatemachineeditor_core-qt6-%{sover}
 Summary:        KDAB State Machine Editor core library
-Group:          System/Libraries

-%description -n %{libnamecore}
+%description -n libkdstatemachineeditor_core-qt6-%{sover}
 The KDAB State Machine Editor Library is a framework that can be used
 to help develop State Machine Editing graphical user
 interfaces and tools. Output from such applications is in metacode
 or QML that can then be used in Qt or QtQuick projects.

-%package -n %{libnamedebuginterfaceclient}
+%package -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
 Summary:        KDAB State Machine Editor core library
-Group:          System/Libraries

-%description -n %{libnamedebuginterfaceclient}
+%description -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
 The KDAB State Machine Editor Library is a framework that can be used
 to help develop State Machine Editing graphical user
 interfaces and tools. Output from such applications is in metacode
 or QML that can then be used in Qt or QtQuick projects.

-%package -n %{libnamedebuginterfacesource}
+%package -n libkdstatemachineeditor_debuginterfacesource-qt6-static
 Summary:        KDAB State Machine Editor core library
-Group:          System/Libraries

-%description -n %{libnamedebuginterfacesource}
+%description -n libkdstatemachineeditor_debuginterfacesource-qt6-static
 The KDAB State Machine Editor Library is a framework that can be used
 to help develop State Machine Editing graphical user
 interfaces and tools. Output from such applications is in metacode
@@ -110,11 +85,10 @@ This package provides a static library that can be injected into a
 process running on the target in order to get information about the
 internal state machines.

-%package -n %{libnameview}
+%package -n libkdstatemachineeditor_view-qt6-%{sover}
 Summary:        KDAB State Machine Editor view library
-Group:          System/Libraries

-%description -n %{libnameview}
+%description -n libkdstatemachineeditor_view-qt6-%{sover}
 The KDAB State Machine Editor Library is a framework that can be used
 to help develop State Machine Editing graphical user
 interfaces and tools. Output from such applications is in metacode
@@ -122,13 +96,12 @@ or QML that can then be used in Qt or QtQuick projects.

 %package devel
 Summary:        Introspection/Debugging Tool for Qt Applications
-Group:          Development/Libraries/C and C++
-Requires:       %{libnamecore} = %{version}
-Requires:       %{libnamedebuginterfaceclient} = %{version}
-Requires:       %{libnamedebuginterfacesource} = %{version}
-Requires:       %{libnameview} = %{version}
-Provides:       %{name} = %{version}
-Obsoletes:      %{name} < %{version}
+Requires:       libkdstatemachineeditor_core-qt6-%{sover} = %{version}
+Requires:       libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover} = %{version}
+Requires:       libkdstatemachineeditor_debuginterfacesource-qt6-static = %{version}
+Requires:       libkdstatemachineeditor_view-qt6-%{sover} = %{version}
+Provides:       kdstatemachineeditor-qt6 = %{version}
+Obsoletes:      kdstatemachineeditor-qt6 < %{version}

 %description devel
 The KDAB State Machine Editor Library is a framework that can be used
@@ -143,65 +116,41 @@ or QML that can then be used in Qt or QtQuick projects.
 # libkdstatemachineeditor_debuginterfacesource is a static library
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects

-%if 0%{?qt5}
-%cmake \
-  -DECM_MKSPECS_INSTALL_DIR:STRING=%{_libdir}/qt5/mkspecs/modules \
-  -DKDSME_QT6:BOOL=FALSE \
-  -DKDSME_INTERNAL_GRAPHVIZ:BOOL=FALSE
-
-%cmake_build
-%endif
-
-%if 0%{?qt6}
 %cmake_qt6 \
-  -DKDSME_QT6:BOOL=TRUE \
  -DKDSME_INTERNAL_GRAPHVIZ:BOOL=FALSE

 %qt6_build
-%endif

 %install
-%if 0%{?qt5}
-%cmake_install
-%endif
-
-%if 0%{?qt6}
 %qt6_install
-%endif

-%ldconfig_scriptlets -n %{libnamecore}
-%ldconfig_scriptlets -n %{libnamedebuginterfaceclient}
-%ldconfig_scriptlets -n %{libnameview}
+%ldconfig_scriptlets -n libkdstatemachineeditor_core-qt6-%{sover}
+%ldconfig_scriptlets -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
+%ldconfig_scriptlets -n libkdstatemachineeditor_view-qt6-%{sover}

-%files -n %{libnamecore}
+%files -n libkdstatemachineeditor_core-qt6-%{sover}
 %license LICENSES/*
 %doc CHANGES README.md
-%{_libdir}/libkdstatemachineeditor_core%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_core-qt6.so.%{sover}

-%files -n %{libnamedebuginterfaceclient}
+%files -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
 %license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_debuginterfaceclient%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_debuginterfaceclient-qt6.so.%{sover}

-%files -n %{libnamedebuginterfacesource}
+%files -n libkdstatemachineeditor_debuginterfacesource-qt6-static
 %license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_debuginterfacesource%{?pkg_suffix}.a
+%{_libdir}/libkdstatemachineeditor_debuginterfacesource-qt6.a

-%files -n %{libnameview}
+%files -n libkdstatemachineeditor_view-qt6-%{sover}
 %license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_view%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_view-qt6.so.%{sover}

 %files devel
 %license LICENSES/*
-%{_includedir}/kdstatemachineeditor%{?pkg_suffix}/
-%{_libdir}/cmake/KDSME%{?pkg_suffix}/
-%{_libdir}/libkdstatemachineeditor_core%{?pkg_suffix}.so
-%{_libdir}/libkdstatemachineeditor_debuginterfaceclient%{?pkg_suffix}.so
-%{_libdir}/libkdstatemachineeditor_view%{?pkg_suffix}.so
-%if 0%{?qt5}
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMECore.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEDebugInterfaceClient.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEDebugInterfaceSource.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEView.pri
-%endif
+%{_includedir}/kdstatemachineeditor-qt6/
+%{_libdir}/cmake/KDSME-qt6/
+%{_libdir}/libkdstatemachineeditor_core-qt6.so
+%{_libdir}/libkdstatemachineeditor_debuginterfaceclient-qt6.so
+%{_libdir}/libkdstatemachineeditor_view-qt6.so

 %changelog
Author	SHA256	Message	Date
Ana Guerrero	69fe6d33af	Accepting request 1319531 from KDE:Extra - Update 0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch to build with graphviz 14.* OBS-URL: https://build.opensuse.org/request/show/1319531 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdstatemachineeditor?expand=0&rev=14	2025-11-24 13:12:01 +00:00
Christophe Marin	10061b7802	OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdstatemachineeditor?expand=0&rev=39	2025-11-23 14:06:20 +00:00
Christophe Marin	7ab359e60a	OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdstatemachineeditor?expand=0&rev=38	2025-11-23 14:05:39 +00:00
Christophe Marin	b884bf46ba	OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdstatemachineeditor?expand=0&rev=37	2025-11-23 14:03:28 +00:00
Ana Guerrero	359c9d0274	Accepting request 1307297 from KDE:Extra Update to 2.2.0 OBS-URL: https://build.opensuse.org/request/show/1307297 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdstatemachineeditor?expand=0&rev=13	2025-09-26 20:25:06 +00:00
Christophe Marin	385fea0454	Update to 2.2.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdstatemachineeditor?expand=0&rev=35	2025-09-26 07:34:00 +00:00