forked from pool/kinfocenter5
This commit is contained in:
parent
1c5e9d7f29
commit
84e9aa6944
@ -1,27 +0,0 @@
|
|||||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
||||||
Date: Wed, 02 Mar 2016 14:25:41 +0000
|
|
||||||
Subject: Fix build
|
|
||||||
X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=b4994c307ce86b52e20c4afb35ff2eaf12bfd8f1
|
|
||||||
---
|
|
||||||
Fix build
|
|
||||||
---
|
|
||||||
|
|
||||||
|
|
||||||
--- a/Modules/about-distro/src/Module.cpp
|
|
||||||
+++ b/Modules/about-distro/src/Module.cpp
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <QIcon>
|
|
||||||
#include <QStandardPaths>
|
|
||||||
|
|
||||||
+#include <kcoreaddons_version.h>
|
|
||||||
#include <KAboutData>
|
|
||||||
#if KCOREADDONS_VERSION >= QT_VERSION_CHECK(5,20,0)
|
|
||||||
#include <KCoreAddons>
|
|
||||||
@@ -34,7 +35,6 @@
|
|
||||||
#include <KFormat>
|
|
||||||
#include <KLocalizedString>
|
|
||||||
#include <KSharedConfig>
|
|
||||||
-#include <kcoreaddons_version.h>
|
|
||||||
|
|
||||||
#include <solid/device.h>
|
|
||||||
#include <solid/processor.h>
|
|
@ -28,8 +28,6 @@ Source: kinfocenter-%{version}.tar.xz
|
|||||||
Source99: %{name}-rpmlintrc
|
Source99: %{name}-rpmlintrc
|
||||||
# PATCH-FIX-OPENSUSE plasma-session-name.patch
|
# PATCH-FIX-OPENSUSE plasma-session-name.patch
|
||||||
Patch0: plasma-session-name.patch
|
Patch0: plasma-session-name.patch
|
||||||
# PATCH-FIX-UPSTREAM fix-build.patch
|
|
||||||
Patch1: fix-build.patch
|
|
||||||
BuildRequires: extra-cmake-modules >= 1.2.0
|
BuildRequires: extra-cmake-modules >= 1.2.0
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: libraw1394-devel
|
BuildRequires: libraw1394-devel
|
||||||
@ -81,7 +79,6 @@ KDE Utility that provides information about a computer system.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n kinfocenter-%{version}
|
%setup -q -n kinfocenter-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
|
||||||
|
Loading…
Reference in New Issue
Block a user