SHA256
1
0
forked from pool/kirigami2

Accepting request 616631 from home:wolfi323:branches:home:luca_b:kf547

- Add fix-build-with-gcc48.patch to make it compile with gcc 4.8 on
  Leap 42.3

OBS-URL: https://build.opensuse.org/request/show/616631
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=52
This commit is contained in:
Luca Beltrame 2018-06-14 04:50:14 +00:00 committed by Git OBS Bridge
parent 51d6d27601
commit 4678c3aff7
3 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 4f92428600aa0bcee9a300884941803383f1da41 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Wed, 13 Jun 2018 12:11:25 +0200
Subject: [PATCH] Fix build with gcc 4.8
See https://bugreports.qt.io/browse/QTBUG-48988
---
src/delegaterecycler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/delegaterecycler.cpp b/src/delegaterecycler.cpp
index f648fc7..b51b5dd 100644
--- a/src/delegaterecycler.cpp
+++ b/src/delegaterecycler.cpp
@@ -213,7 +213,7 @@ void DelegateRecycler::setSourceComponent(QQmlComponent *component)
if (!m_item) {
obj->deleteLater();
} else {
- connect(m_item, &QObject::destroyed, ctx, &QObject::deleteLater);
+ connect(m_item.data(), &QObject::destroyed, ctx, &QObject::deleteLater);
}
} else {
QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext();
--
2.13.7

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 13 17:03:25 UTC 2018 - wbauer@tmo.at
- Add fix-build-with-gcc48.patch to make it compile with gcc 4.8 on
Leap 42.3
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org

View File

@ -31,6 +31,8 @@ License: LGPL-2.1-or-later
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Url: http://www.kde.org/ Url: http://www.kde.org/
Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch: fix-build-with-gcc48.patch
BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: cmake(Qt5Core) >= 5.7.0 BuildRequires: cmake(Qt5Core) >= 5.7.0
@ -72,6 +74,9 @@ Development files.
%prep %prep
%setup -q %setup -q
%if 0%{?suse_version} < 1500
%patch -p1
%endif
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build