From ffc820025e2b796fe3b996ace5d21ff25daca75d9d95749436f8166dd5e98248 Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Mon, 27 Mar 2023 20:16:36 +0000 Subject: [PATCH] Accepting request 1071801 from home:tux93:branches:KDE:Extra - Add allow_build_without_deprecated_method.patch Backport upstream fix for Qt 6.4 build failure OBS-URL: https://build.opensuse.org/request/show/1071801 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/ruqola?expand=0&rev=24 --- allow_build_without_deprecated_method.patch | 27 +++++++++++++++++++++ ruqola.changes | 6 +++++ ruqola.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 allow_build_without_deprecated_method.patch diff --git a/allow_build_without_deprecated_method.patch b/allow_build_without_deprecated_method.patch new file mode 100644 index 0000000..0376fdd --- /dev/null +++ b/allow_build_without_deprecated_method.patch @@ -0,0 +1,27 @@ +From 47d9c358003d587f2fb049df9124c6aa04a5673e Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Mon, 30 Jan 2023 13:17:45 +0100 +Subject: [PATCH] Allow to build without deprecated method (Qt 6.4) + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 837a167a2..7d6f7f856 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,8 +155,8 @@ set_package_properties(KF5NetworkManager + + + include_directories(${CMAKE_CURRENT_BINARY_DIR}) +-ecm_set_disabled_deprecation_versions(QT 5.15.2 +- KF 6.0.0 ++ecm_set_disabled_deprecation_versions(QT 6.4 ++ KF 5.102.0 + ) + if (OPTION_BUILD_PYTHON_BINDINGS) + remove_definitions(-DQT_STRICT_ITERATORS) +-- +GitLab + diff --git a/ruqola.changes b/ruqola.changes index 9f6c307..959fa03 100644 --- a/ruqola.changes +++ b/ruqola.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 14 14:50:34 UTC 2023 - Marcel Kuehlhorn + +- Add allow_build_without_deprecated_method.patch + Backport upstream fix for Qt 6.4 build failure + ------------------------------------------------------------------- Mon Feb 6 09:51:08 UTC 2023 - Marcel Kuehlhorn diff --git a/ruqola.spec b/ruqola.spec index 831bd2c..b72b544 100644 --- a/ruqola.spec +++ b/ruqola.spec @@ -29,6 +29,8 @@ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig Source2: %{name}.keyring %endif +# PATCH-FIX-UPSTREAM: Fix build error with Qt 6.4 +Patch0: allow_build_without_deprecated_method.patch BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5CoreAddons)