1
0

3 Commits

8 changed files with 71 additions and 122 deletions

View File

@@ -1,3 +1,3 @@
<multibuild>
<package>kquickimageeditor6</package>
<flavor>qt6</flavor>
</multibuild>

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:330ebf3653883eeebde54385d783c51c2d30ff77d41b294ece79af7e9c21c6f8
size 3286792

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEOf+pPK6cavwhKtACAjJUSCBORSoFAmVDx6YACgkQAjJUSCBO
RSppqwgAphXlfi+StvgzctQyYV2cs1ch2/v4+erBE1kIBARNqCBrIz0sTdtT0ZIY
Wikw2OiRr6JXBnMF9L81H1P1IeBQhWou9bXTL9ygg0mMMD+DkwJTBgfhst2ly5T5
E0PmJvZvGqlrMVw6/gb9uAUYSYM9+umvlAAxYQVTAW/WNMTVUnQsMhxLZ6ERI4Yg
PG+GK2+SVC0LpyE0NbID6yyzAUjDILmmA74rjEjhWV3RRM49xw+4H2Of7H0J9bvt
IPNVhzu+9ipMnrTkenS3OJKQYLUULWjvbDSjT+4/CQanlDq2DB4+FoPWGqRCEU7W
EV6vVjGhG+9BTM6oEj49Zn2rfyVF0w==
=HOKJ
-----END PGP SIGNATURE-----

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ebbfdce39efbbb63679badc3320fe06eb3aa68a4da5f50740197645c985ad0f
size 3295008

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEOf+pPK6cavwhKtACAjJUSCBORSoFAmeJYSkACgkQAjJUSCBO
RSpFGwf6A8KvVvvfbSt0XtnXINyA44bJnu6dJEfffsnNknLUylRmCY0f1ICtVTSm
tO15yYrYO19hbS/E+Liw3MPrIQiZ+pf+ZrODN7tzJIKJZTyz/GK7owm6zCCWRFWP
Y37467YrNKud1TFXvNAsyqPVdD8WvcZ975V8x6nWvoi381yxZO2+bRRxpSf5H6Rx
JMNyeUr3SRCIR/fAPgxByXGkqV9fjByB18hAETIMd6jyJ1MVqib9X9w00QVtn4K4
d5UUiteP04LzuGC4YcFkD2kPZ3PGSLSNyKAkXB1xkFnrGH9zGByhf70kPYnTDa2F
9s5o0xKjSuyOnbPo6G2QzOvV/UXycg==
=Zwhi
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Feb 18 09:47:04 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 0.5.0
* Port away from Qt5Compat
* Drop Qt5 support
* Port to declarative type registration
* Remove qml version from imports
- Drop the Qt 5 flavor
-------------------------------------------------------------------
Thu Feb 29 14:07:34 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@@ -1,7 +1,7 @@
#
# spec file for package kquickimageeditor
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,35 @@
#
%define kf5_version 5.91.0
%define qt5_version 5.15.0
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == ""
ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "qt6"
%define qt6 1
%define pkg_suffix 6
%define kf6_version 6.0.0
%define qt6_version 6.6.0
%endif
%define rname kquickimageeditor
%bcond_without lang
Name: kquickimageeditor
Version: 0.3.0
%bcond_without released
Name: kquickimageeditor%{?pkg_suffix}
Version: 0.5.0
Release: 0
Summary: A set of QtQuick components for image editing
License: LGPL-2.1-or-later
URL: https://www.kde.org
Source0: https://download.kde.org/stable/kquickimageeditor/%{name}-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/kquickimageeditor/%{name}-%{version}.tar.xz.sig
Source2: %{name}.keyring
Source0: https://download.kde.org/stable/kquickimageeditor/%{rname}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/kquickimageeditor/%{rname}-%{version}.tar.xz.sig
Source2: kquickimageeditor.keyring
%endif
%if 0%{?qt6}
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
%endif
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: cmake(Qt5Core) >= %{qt5_version}
BuildRequires: cmake(Qt5Quick) >= %{qt5_version}
%description
KQuickImageEditor is a set of QtQuick components providing basic image editing
@@ -48,33 +59,42 @@ capabilities.
%package devel
Summary: Development files for KQuickImageEditor
Requires: kquickimageeditor-imports = %{version}
Requires: cmake(Qt5Core)
Requires: kquickimageeditor%{?pkg_suffix}-imports = %{version}
%if 0%{?qt6}
Requires: cmake(Qt6Core) >= %{qt6_version}
# TODO: Remove after next update
Conflicts: kquickimageeditor-devel
%endif
%description devel
Development files for KQuickImageEditor, a set of QtQuick components providing
basic image editing capabilities.
%prep
%autosetup -p1
%autosetup -p1 -n %{rname}-%{version}
%build
%cmake_kf5 -d build
%cmake_build
%if 0%{?qt6}
%cmake_kf6
%kf6_build
%endif
%install
%kf5_makeinstall -C build
%if 0%{?qt6}
%kf6_install
%endif
%files imports
%license LICENSES/*
%doc README*
%dir %{_kf5_qmldir}/org/
%dir %{_kf5_qmldir}/org/kde/
%{_kf5_qmldir}/org/kde/kquickimageeditor/
%doc README.md
%if 0%{?qt6}
%{_kf6_qmldir}/org/kde/kquickimageeditor/
%endif
%files devel
%{_kf5_cmakedir}/KQuickImageEditor/
%{_kf5_mkspecsdir}/qt_KQuickImageEditor.pri
%if 0%{?qt6}
%{_kf6_cmakedir}/KQuickImageEditor/
%{_kf6_mkspecsdir}/qt_KQuickImageEditor.pri
%endif
%changelog

View File

@@ -1,81 +0,0 @@
#
# spec file for package kquickimageeditor6
#
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define kf6_version 6.0.0
%define qt6_version 6.6.0
%define rname kquickimageeditor
%bcond_without released
Name: kquickimageeditor6
Version: 0.3.0
Release: 0
Summary: A set of QtQuick components for image editing
License: LGPL-2.1-or-later
URL: https://www.kde.org
Source0: https://download.kde.org/stable/kquickimageeditor/%{rname}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/kquickimageeditor/%{rname}-%{version}.tar.xz.sig
Source2: kquickimageeditor.keyring
%endif
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
%description
KQuickImageEditor is a set of QtQuick components providing basic image editing
capabilities.
%package imports
Summary: A set of QtQuick components for image editing
Requires: qt6-qt5compat-imports >= %{qt6_version}
%description imports
KQuickImageEditor is a set of QtQuick components providing basic image editing
capabilities.
%package devel
Summary: Development files for KQuickImageEditor
Requires: kquickimageeditor6-imports = %{version}
Requires: cmake(Qt6Core) >= %{qt6_version}
Conflicts: kquickimageeditor-devel
%description devel
Development files for KQuickImageEditor, a set of QtQuick components providing
basic image editing capabilities.
%prep
%autosetup -p1 -n %{rname}-%{version}
%build
%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
%kf6_build
%install
%kf6_install
%files imports
%license LICENSES/*
%doc README.md
%{_kf6_qmldir}/org/kde/kquickimageeditor/
%files devel
%{_kf6_cmakedir}/KQuickImageEditor/
%{_kf6_mkspecsdir}/qt_KQuickImageEditor.pri
%changelog