rpm/discover
SHA256
1
0
Fork 0
forked from pool/discover
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=33

Browse Source
This commit is contained in:
Hrvoje Senjan 2016-06-16 16:49:44 +00:00 committed by Git OBS Bridge
parent af3c612a25
commit a772f71ca7
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
discover.spec
View File

@ -25,8 +25,6 @@ License: GPL-2.0
Group: System/GUI/KDE Group: System/GUI/KDE
Url: https://quickgit.kde.org/?p=discover.git Url: https://quickgit.kde.org/?p=discover.git
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
#PATCH-FIX-UPSTREAM fix_for_gcc4.diff -- adjust the connect call so that it also builds with gcc48
Patch1: fix_for_gcc4.diff
BuildRequires: PackageKit-Qt5-devel BuildRequires: PackageKit-Qt5-devel
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
@ -77,7 +75,6 @@ This is the systray plasmoid to notify the user that updates are available
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build

34
fix_for_gcc4.diff
View File

@ -1,34 +0,0 @@
diff --git a/libdiscover/backends/PackageKitBackend/PKTransaction.cpp b/libdiscover/backends/PackageKitBackend/PKTransaction.cpp
index 9afa28a..ca35c66 100644
--- a/libdiscover/backends/PackageKitBackend/PKTransaction.cpp
+++ b/libdiscover/backends/PackageKitBackend/PKTransaction.cpp
@@ -64,13 +64,13 @@ void PKTransaction::start()
};
Q_ASSERT(m_trans);
- connect(m_trans, &PackageKit::Transaction::finished, this, &PKTransaction::cleanup);
- connect(m_trans, &PackageKit::Transaction::errorCode, this, &PKTransaction::errorFound);
- connect(m_trans, &PackageKit::Transaction::mediaChangeRequired, this, &PKTransaction::mediaChange);
- connect(m_trans, &PackageKit::Transaction::requireRestart, this, &PKTransaction::requireRestart);
- connect(m_trans, &PackageKit::Transaction::itemProgress, this, &PKTransaction::progressChanged);
- connect(m_trans, &PackageKit::Transaction::eulaRequired, this, &PKTransaction::eulaRequired);
- connect(m_trans, &PackageKit::Transaction::allowCancelChanged, this, &PKTransaction::cancellableChanged);
+ connect(m_trans.data(), &PackageKit::Transaction::finished, this, &PKTransaction::cleanup);
+ connect(m_trans.data(), &PackageKit::Transaction::errorCode, this, &PKTransaction::errorFound);
+ connect(m_trans.data(), &PackageKit::Transaction::mediaChangeRequired, this, &PKTransaction::mediaChange);
+ connect(m_trans.data(), &PackageKit::Transaction::requireRestart, this, &PKTransaction::requireRestart);
+ connect(m_trans.data(), &PackageKit::Transaction::itemProgress, this, &PKTransaction::progressChanged);
+ connect(m_trans.data(), &PackageKit::Transaction::eulaRequired, this, &PKTransaction::eulaRequired);
+ connect(m_trans.data(), &PackageKit::Transaction::allowCancelChanged, this, &PKTransaction::cancellableChanged);
setCancellable(m_trans->allowCancel());
}
@@ -106,7 +106,7 @@ void PKTransaction::cleanup(PackageKit::Transaction::Exit exit, uint runtime)
cancel = true;
}
- disconnect(m_trans, nullptr, this, nullptr);
+ disconnect(m_trans.data(), nullptr, this, nullptr);
m_trans = nullptr;
PackageKit::Transaction* t = PackageKit::Daemon::resolve(resource()->packageName(), PackageKit::Transaction::FilterArch);