diff --git a/discover.spec b/discover.spec index 9c670ef..7869381 100644 --- a/discover.spec +++ b/discover.spec @@ -25,8 +25,6 @@ License: GPL-2.0 Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git 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: cmake >= 2.8.12 BuildRequires: extra-cmake-modules @@ -77,7 +75,6 @@ This is the systray plasmoid to notify the user that updates are available %prep %setup -q -%patch1 -p1 %build %cmake_kf5 -d build diff --git a/fix_for_gcc4.diff b/fix_for_gcc4.diff deleted file mode 100644 index 47d63e7..0000000 --- a/fix_for_gcc4.diff +++ /dev/null @@ -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);