forked from pool/discover
Accepting request 417800 from KDE:Frameworks5
Update to 5.7.3 OBS-URL: https://build.opensuse.org/request/show/417800 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3dd7305a1b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b9a1e986a633f1a47ef3649e997f6d5d7339c0d12e5890f8ceba10acfb93951
|
||||
size 868028
|
||||
3
discover-5.7.3.tar.xz
Normal file
3
discover-5.7.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d4a9140c36f809b11ddd1974b1eb48e4a6fcee3f51490526d4036757f849ab7b
|
||||
size 815736
|
||||
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 2 11:35:50 UTC 2016 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.7.3
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.3.php
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 20 08:54:15 UTC 2016 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.7.2
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.2.php
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 13 06:13:23 UTC 2016 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.7.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.1.php
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 30 12:02:18 UTC 2016 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.7.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.0.php
|
||||
- Drop upstreamed fix_for_gcc4.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
@ -18,15 +18,13 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: discover
|
||||
Version: 5.6.4
|
||||
Version: 5.7.3
|
||||
Release: 0
|
||||
Summary: KDE Software Installer
|
||||
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
|
||||
@ -36,8 +34,8 @@ BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(KF5Archive)
|
||||
BuildRequires: cmake(KF5Attica)
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5Crash)
|
||||
BuildRequires: cmake(KF5CoreAddons)
|
||||
BuildRequires: cmake(KF5Crash)
|
||||
BuildRequires: cmake(KF5DBusAddons)
|
||||
BuildRequires: cmake(KF5Declarative)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
@ -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
|
||||
@ -86,16 +83,12 @@ 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 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
|
||||
%find_lang plasma_applet_org.kde.discovernotifier plasma.lang
|
||||
%else
|
||||
touch plasma.lang
|
||||
%endif
|
||||
@ -104,19 +97,18 @@ This is the systray plasmoid to notify the user that updates are available
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING COPYING.GFDL COPYING.LIB
|
||||
%{_kf5_bindir}/plasma-discover
|
||||
%{_kf5_bindir}/plasma-discover-updater
|
||||
%{_kf5_libdir}/plasma-discover/
|
||||
%{_kf5_plugindir}/discover-notifier/
|
||||
%{_kf5_plugindir}/discover/
|
||||
%{_kf5_qmldir}/
|
||||
%{_kf5_applicationsdir}/org.kde.discover.desktop
|
||||
%{_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/
|
||||
%{_kf5_appstreamdir}/
|
||||
%{_kf5_configdir}/discover_ktexteditor_codesnippets_core.knsrc
|
||||
|
||||
%if %{with lang}
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
@ -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);
|
||||
Loading…
Reference in New Issue
Block a user