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

Accepting request 381915 from KDE:Frameworks5

Browse Source 
Update to 5.6.1

OBS-URL: https://build.opensuse.org/request/show/381915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
2016-04-07 11:28:19 +00:00
committed by Git OBS Bridge
parent ec7e41451a 508184b984
commit c33764788e
5 changed files with 113 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
discover-5.5.4.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3bac1dfbc60ec57649954ce14c792143d0f2f3314cc6b8a502e4abe2d242ba34
size 843084

3
discover-5.6.1.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1a6715cd0498a713b803258eb0c50aa864e62cb9171db523a74ea89e16083bd
size 867300

22
discover.changes
View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Mar 29 16:20:34 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.6.1
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.1.php
-------------------------------------------------------------------
Sun Mar 20 09:19:46 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.6.0
* New feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.6.0.php
-------------------------------------------------------------------
Thu Mar 10 19:00:34 UTC 2016 - tittiatcoke@gmail.com
- Recommend the lang package when the languages are packaged
(boo#970470)
-------------------------------------------------------------------
Fri Feb 5 20:50:34 UTC 2016 - tittiatcoke@gmail.com

111
discover.spec
View File

@@ -16,8 +16,9 @@
#
%bcond_without lang
Name: discover
Version: 5.5.4
Version: 5.6.1
Release: 0
Summary: KDE Software Installer
License: GPL-2.0
@@ -27,40 +28,36 @@ 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: libAppstreamQt-devel
BuildRequires: cmake >= 2.8.12
BuildRequires: karchive-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kdeclarative-devel
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kio-devel
BuildRequires: kitemviews-devel
BuildRequires: knewstuff-devel
BuildRequires: knotifications-devel
BuildRequires: ktextwidgets-devel
BuildRequires: kwallet-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: libattica-devel
BuildRequires: plasma-framework-devel
BuildRequires: solid-devel
BuildRequires: libAppstreamQt-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5QuickWidgets)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
Requires: libzypp-plugin-appdata
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Attica)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5Declarative)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5Plasma)
BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(Qca-qt5)
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Quick)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
Requires: AppStream
Requires: libzypp-plugin-appdata
%if %{with lang}
Recommends: %{name}-lang
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -68,6 +65,7 @@ Disover is the KDE software installer, implemented as an app store like applicat
%package plasmoid
Summary: Update notification plasmoid for KDE Software Manager
Group: System/GUI/KDE
Conflicts: plasma5-pk-updates
Requires: %{name} = %{version}
@@ -87,48 +85,49 @@ This is the systray plasmoid to notify the user that updates are available
%install
%kf5_makeinstall -C build
%suse_update_desktop_file -r org.kde.discover Qt KDE System PackageManager
%suse_update_desktop_file -r muon-updater Qt KDE System PackageManager
%find_lang muon-notifier %{name}.lang
%find_lang muon-updater %{name}.lang
%find_lang muon-exporter %{name}.lang
%find_lang muon-discover %{name}.lang
%suse_update_desktop_file -r plasma-discover-updater Qt KDE System PackageManager
%if %{with lang}
%find_lang libdiscover %{name}.lang
%find_lang plasma-discover-exporter %{name}.lang
%find_lang plasma-discover-notifier %{name}.lang
%find_lang plasma-discover %{name}.lang
%find_lang plasma-discover-updater %{name}.lang
%find_lang plasma_applet_org.kde.muonnotifier plasma.lang
%else
touch plasma.lang
%endif
%files
%defattr(-,root,root)
%doc COPYING COPYING.GFDL COPYING.LIB
%{_bindir}/muon-discover
%{_bindir}/muon-updater
%{_libdir}/libDiscoverCommon.so
%{_libdir}/libDiscoverNotifiers.so
%{_kf5_bindir}/plasma-discover
%{_kf5_bindir}/plasma-discover-updater
%{_kf5_libdir}/plasma-discover/
%{_kf5_plugindir}/discover-notifier/
%{_kf5_plugindir}/discover/
%dir %{_kf5_qmldir}/org
%dir %{_kf5_qmldir}/org/kde
%{_kf5_qmldir}/org/kde/discover/
%{_kf5_qmldir}/org/kde/discovernotifier/
%{_kf5_qmldir}/
%{_kf5_applicationsdir}/org.kde.discover.desktop
%{_kf5_applicationsdir}/muon-updater.desktop
%{_kf5_iconsdir}/hicolor/*/apps/muondiscover.*
%{_kf5_notifydir}/muonabstractnotifier.notifyrc
%{_kf5_kxmlguidir}/muondiscover/
%{_kf5_kxmlguidir}/muonupdater/
%{_datadir}/libdiscover/
%{_datadir}/muondiscover/
%{_kf5_applicationsdir}/plasma-discover-updater.desktop
%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
%{_kf5_notifydir}/discoverabstractnotifier.notifyrc
%{_kf5_kxmlguidir}/plasmadiscover/
%{_kf5_kxmlguidir}/plasmadiscoverupdater/
%{_kf5_sharedir}/libdiscover/
%{_kf5_sharedir}/plasmadiscover/
%if %{with lang}
%files lang -f %{name}.lang
%defattr(-,root,root)
%endif
%files plasmoid -f plasma.lang
%defattr(-,root,root)
%doc COPYING COPYING.GFDL COPYING.LIB
%dir %{_datadir}/plasma
%dir %{_datadir}/plasma/plasmoids
%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/
%dir %{_kf5_sharedir}/plasma
%dir %{_kf5_sharedir}/plasma/plasmoids
%{_kf5_sharedir}/plasma/plasmoids/org.kde.discovernotifier/
%{_kf5_servicesdir}/plasma-applet-org.kde.discovernotifier.desktop
%changelog

51
fix_for_gcc4.diff
View File

@@ -1,19 +1,34 @@
From e651466574bc08a8afe5b8bff40d23070f94d434 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Fri, 5 Feb 2016 10:40:05 +0100
Subject: Make it compile with GCC < 5
diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
index 48a75e2..af095eb 100644
--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
@@ -196,7 +196,7 @@ void PackageKitBackend::refreshDatabase()
{
if (!m_refresher) {
m_refresher = PackageKit::Daemon::refreshCache(false);
- connect(m_refresher, &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList);
+ connect(m_refresher.data(), &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList);
} else {
qWarning() << "already resetting";
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);