rdieter pushed to apper (f21). "use cache_age for updater applet too (#1188207)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 28 15:02:51 UTC 2015


>From 8b014bbac9c0c887a21f61cf3d481d343384a36d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 28 Apr 2015 10:01:55 -0500
Subject: use cache_age for updater applet too (#1188207)


diff --git a/apper-0.9.1-pk_cache_age.patch b/apper-0.9.1-pk_cache_age.patch
index 9f0ddf5..a66574a 100644
--- a/apper-0.9.1-pk_cache_age.patch
+++ b/apper-0.9.1-pk_cache_age.patch
@@ -1,6 +1,6 @@
-diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.cpp
---- apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age	2014-08-25 13:51:50.000000000 -0500
-+++ apper-0.9.1/apperd/RefreshCacheTask.cpp	2015-04-27 14:25:21.663347177 -0500
+diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.orig apper-0.9.1/apperd/RefreshCacheTask.cpp
+--- apper-0.9.1/apperd/RefreshCacheTask.cpp.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/apperd/RefreshCacheTask.cpp	2015-04-28 09:54:49.676361482 -0500
 @@ -33,7 +33,8 @@ RefreshCacheTask::RefreshCacheTask(QObje
      QObject(parent),
      m_transaction(0),
@@ -19,9 +19,9 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.cpp.pk_cache_age apper-0.9.1/apperd
          m_transaction = Daemon::refreshCache(false);
          connect(m_transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)),
                  this, SLOT(refreshCacheFinished(PackageKit::Transaction::Exit,uint)));
-diff -up apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age apper-0.9.1/apperd/RefreshCacheTask.h
---- apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age	2014-08-25 13:51:50.000000000 -0500
-+++ apper-0.9.1/apperd/RefreshCacheTask.h	2015-04-27 14:24:13.004451853 -0500
+diff -up apper-0.9.1/apperd/RefreshCacheTask.h.orig apper-0.9.1/apperd/RefreshCacheTask.h
+--- apper-0.9.1/apperd/RefreshCacheTask.h.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/apperd/RefreshCacheTask.h	2015-04-28 09:54:49.676361482 -0500
 @@ -44,6 +44,7 @@ private:
      Transaction *m_transaction;
      KNotification *m_notification;
@@ -30,9 +30,9 @@ diff -up apper-0.9.1/apperd/RefreshCacheTask.h.pk_cache_age apper-0.9.1/apperd/R
      QString m_lastErrorString;
  };
  
-diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.cpp
---- apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age	2014-08-25 13:51:50.000000000 -0500
-+++ apper-0.9.1/ApperKCM/ApperKCM.cpp	2015-04-27 14:22:58.971449606 -0500
+diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.orig apper-0.9.1/ApperKCM/ApperKCM.cpp
+--- apper-0.9.1/ApperKCM/ApperKCM.cpp.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/ApperKCM/ApperKCM.cpp	2015-04-28 09:54:49.677361486 -0500
 @@ -77,6 +77,7 @@ ApperKCM::ApperKCM(QWidget *parent, cons
      m_findIcon("edit-find"),
      m_cancelIcon("dialog-cancel"),
@@ -49,9 +49,9 @@ diff -up apper-0.9.1/ApperKCM/ApperKCM.cpp.pk_cache_age apper-0.9.1/ApperKCM/App
      transaction->refreshCache(m_forceRefreshCache);
      transactionW->setTransaction(transaction, Transaction::RoleRefreshCache);
  
-diff -up apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age apper-0.9.1/ApperKCM/ApperKCM.h
---- apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age	2014-08-25 13:51:50.000000000 -0500
-+++ apper-0.9.1/ApperKCM/ApperKCM.h	2015-04-27 14:22:01.562706932 -0500
+diff -up apper-0.9.1/ApperKCM/ApperKCM.h.orig apper-0.9.1/ApperKCM/ApperKCM.h
+--- apper-0.9.1/ApperKCM/ApperKCM.h.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/ApperKCM/ApperKCM.h	2015-04-28 09:54:49.677361486 -0500
 @@ -119,6 +119,7 @@ private:
      FiltersMenu *m_filtersMenu;
      Transaction::Roles m_roles;
@@ -60,3 +60,45 @@ diff -up apper-0.9.1/ApperKCM/ApperKCM.h.pk_cache_age apper-0.9.1/ApperKCM/Apper
  
      TransactionHistory *m_history;
  
+diff -up apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig apper-0.9.1/declarative-plugins/daemonhelper.cpp
+--- apper-0.9.1/declarative-plugins/daemonhelper.cpp.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/declarative-plugins/daemonhelper.cpp	2015-04-28 09:56:00.150621345 -0500
+@@ -32,3 +32,8 @@ uint DaemonHelper::getTimeSinceLastRefre
+ {
+     return Daemon::global()->getTimeSinceAction(Transaction::RoleRefreshCache);
+ }
++
++void DaemonHelper::setCacheAge (int age)
++{
++   Daemon::setHints(QLatin1String("cache-age=")+QString::number(age));
++}
+diff -up apper-0.9.1/declarative-plugins/daemonhelper.h.orig apper-0.9.1/declarative-plugins/daemonhelper.h
+--- apper-0.9.1/declarative-plugins/daemonhelper.h.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/declarative-plugins/daemonhelper.h	2015-04-28 09:55:29.216507280 -0500
+@@ -30,6 +30,7 @@ public:
+ 
+ public slots:
+     uint getTimeSinceLastRefresh();
++    void setCacheAge (int age);
+ };
+ 
+ #endif // DAEMONHELPER_H
+diff -up apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml
+--- apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml.orig	2014-08-25 13:51:50.000000000 -0500
++++ apper-0.9.1/plasmoid/package/contents/ui/Transaction.qml	2015-04-28 09:56:59.005838365 -0500
+@@ -27,6 +27,7 @@ FocusScope {
+     clip: true
+ 
+     property int progressWidth: 30
++    property int cacheAge: 600
+     property alias transaction: updateTransaction
+ 
+     signal finished(bool success);
+@@ -38,6 +39,7 @@ FocusScope {
+ 
+     function refreshCache() {
+         updateTransaction.enableJobWatcher(false);
++        DaemonHelper.setCacheAge(cacheAge);
+         updateTransaction.refreshCache(false);
+     }
+ 
diff --git a/apper.spec b/apper.spec
index ae03de0..5f19ca5 100644
--- a/apper.spec
+++ b/apper.spec
@@ -10,7 +10,7 @@
 
 Name:    apper
 Version: 0.9.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: KDE interface for PackageKit
 
 License: GPLv2+
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Tue Apr 28 2015 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-10
+- use cache_age for updater applet too (#1188207)
+
 * Mon Apr 27 2015 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-9
 - Apper won't check for updates (#1188207)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/apper.git/commit/?h=f21&id=8b014bbac9c0c887a21f61cf3d481d343384a36d


More information about the scm-commits mailing list