Accepting request 1074774 from KDE:Extra
- Add allow_build_without_deprecated_method.patch Backport upstream fix for Qt 6.4 build failure (forwarded request 1071801 from tux93) OBS-URL: https://build.opensuse.org/request/show/1074774 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruqola?expand=0&rev=14
This commit is contained in:
commit
934f90bf6b
27
allow_build_without_deprecated_method.patch
Normal file
27
allow_build_without_deprecated_method.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 47d9c358003d587f2fb049df9124c6aa04a5673e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laurent Montel <montel@kde.org>
|
||||||
|
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
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 14 14:50:34 UTC 2023 - Marcel Kuehlhorn <tux93@opensuse.org>
|
||||||
|
|
||||||
|
- 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 <tux93@opensuse.org>
|
Mon Feb 6 09:51:08 UTC 2023 - Marcel Kuehlhorn <tux93@opensuse.org>
|
||||||
|
|
||||||
|
@ -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
|
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
%endif
|
%endif
|
||||||
|
# PATCH-FIX-UPSTREAM: Fix build error with Qt 6.4
|
||||||
|
Patch0: allow_build_without_deprecated_method.patch
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: cmake(KF5Archive)
|
BuildRequires: cmake(KF5Archive)
|
||||||
BuildRequires: cmake(KF5CoreAddons)
|
BuildRequires: cmake(KF5CoreAddons)
|
||||||
|
Loading…
Reference in New Issue
Block a user