forked from pool/kirigami2
Accepting request 636005 from KDE:Frameworks5
KDE Frameworks 5.50 OBS-URL: https://build.opensuse.org/request/show/636005 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kirigami2?expand=0&rev=17
This commit is contained in:
commit
85f27afd1d
@ -1,26 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5fd1c7fb34faa9d739967d24a261be85a9d8a908a54927ddf7fbcb3d0f4c56f1
|
|
||||||
size 326532
|
|
3
kirigami2-5.50.0.tar.xz
Normal file
3
kirigami2-5.50.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b4673b6c6739f58839cc1d7f47de9b288361e5718ec40f8f3eabd00874ee8449
|
||||||
|
size 119288
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 15 10:46:05 UTC 2018 - fabian@ritter-vogt.de
|
||||||
|
|
||||||
|
- Require the library in the -devel subpackage
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 5.50.0
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/kde-frameworks-5.50.0.php
|
||||||
|
- Changes since 5.49.0:
|
||||||
|
* Too many changes to list here
|
||||||
|
- Dropped patches, now upstream:
|
||||||
|
* fix-build-with-gcc48.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Aug 19 09:19:12 UTC 2018 - christophe@krop.fr
|
Sun Aug 19 09:19:12 UTC 2018 - christophe@krop.fr
|
||||||
|
|
||||||
|
@ -17,22 +17,20 @@
|
|||||||
|
|
||||||
|
|
||||||
%define lname libKF5Kirigami2-5
|
%define lname libKF5Kirigami2-5
|
||||||
%define _tar_path 5.49
|
%define _tar_path 5.50
|
||||||
# Full KF5 version (e.g. 5.33.0)
|
# Full KF5 version (e.g. 5.33.0)
|
||||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||||
# Last major and minor KF5 version (e.g. 5.33)
|
# Last major and minor KF5 version (e.g. 5.33)
|
||||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: kirigami2
|
Name: kirigami2
|
||||||
Version: 5.49.0
|
Version: 5.50.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Set of QtQuick components
|
Summary: Set of QtQuick components
|
||||||
License: LGPL-2.1-or-later
|
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
|
|
||||||
Patch0: 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
|
||||||
@ -64,6 +62,7 @@ Based on Qt Quick Controls 2. This package contains the base shared libraries.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development package for kirigami
|
Summary: Development package for kirigami
|
||||||
Group: Development/Libraries/KDE
|
Group: Development/Libraries/KDE
|
||||||
|
Requires: %{lname} = %{version}
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -74,9 +73,6 @@ Development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%if 0%{?suse_version} < 1500
|
|
||||||
%patch0 -p1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
Reference in New Issue
Block a user