[arch-commits] Commit in packagekit/trunk (0014-Fix-get-updates.patch PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, June 2, 2021 @ 05:52:20
  Author: arojas
Revision: 953153

Fix getting updates

Added:
  packagekit/trunk/0014-Fix-get-updates.patch
Modified:
  packagekit/trunk/PKGBUILD

----------------------------+
 0014-Fix-get-updates.patch |   36 ++++++++++++++++++++++++++++++++++++
 PKGBUILD                   |    8 +++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0014-Fix-get-updates.patch
===================================================================
--- 0014-Fix-get-updates.patch	                        (rev 0)
+++ 0014-Fix-get-updates.patch	2021-06-02 05:52:20 UTC (rev 953153)
@@ -0,0 +1,36 @@
+From 0f6d9cc6f50db5fc014f71069dfa2e7fde00766a Mon Sep 17 00:00:00 2001
+From: Jan Blackquill <uhhadd at gmail.com>
+Date: Tue, 1 Jun 2021 20:45:58 -0400
+Subject: [PATCH] Fix get-updates
+
+---
+ backends/alpm/pk-alpm-update.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/backends/alpm/pk-alpm-update.c b/backends/alpm/pk-alpm-update.c
+index 0c802c5af..5ae169b32 100644
+--- a/backends/alpm/pk-alpm-update.c
++++ b/backends/alpm/pk-alpm-update.c
+@@ -392,6 +392,7 @@ pk_backend_get_updates_thread (PkBackendJob *job, GVariant* params, gpointer p)
+ 	PkBitfield filters = 0;
+ 	FILE *file;
+ 	int stored_count;
++	alpm_handle_t* old_handle = priv->alpm;
+ 	alpm_handle_t* handle = pk_alpm_configure (backend, PK_BACKEND_CONFIG_FILE, TRUE, &error);
+ 
+ 	alpm_logaction (handle, PK_LOG_PREFIX, "synchronizing package lists\n");
+@@ -400,7 +401,11 @@ pk_backend_get_updates_thread (PkBackendJob *job, GVariant* params, gpointer p)
+ 	/* set total size to minus the number of databases */
+ 	i = alpm_get_syncdbs (handle);
+ 
++	// swap around the handles since the refresh database will grab
++	// the main system handle and not the check update handle otherwise
++	priv->alpm = handle;
+ 	pk_alpm_refresh_databases (job, TRUE, i, &error);
++	priv->alpm = old_handle;
+ 
+ 	if (pk_backend_job_get_role (job) == PK_ROLE_ENUM_GET_UPDATES) {
+ 		g_variant_get (params, "(t)", &filters);
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-02 05:49:36 UTC (rev 953152)
+++ PKGBUILD	2021-06-02 05:52:20 UTC (rev 953153)
@@ -4,7 +4,7 @@
 pkgbase='packagekit'
 pkgname=('packagekit' 'libpackagekit-glib')
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A system designed to make installation and updates of packages easier'
 arch=('x86_64')
 url='https://www.freedesktop.org/software/PackageKit/'
@@ -27,7 +27,8 @@
          0010-alpm-fix-bug-waiting-to-happen-with-cast-from-ptr-to.patch
          0011-alpm-silence-warning-for-gool-to-ptr-conversion-with.patch
          0012-alpm-fix-warning-about-fallthrough-be-explicit-about.patch
-         0013-build-fix-overall-sysconfdir-handling-so-it-can-work.patch)
+         0013-build-fix-overall-sysconfdir-handling-so-it-can-work.patch
+         0014-Fix-get-updates.patch)
 sha256sums=('d3bef282f8b45963618adb69ed5199f23640b00b98ead66291ae30cff8068e4a'
             '3c4d5a2658c9ed28ff949f7a2aa0c99e1a85e63f7fd0b068d3b9278ace503c16'
             '258ff42a2c0f9dd5d609785d5535af35294c5940b63936fa32fdc4cff4b3151d'
@@ -41,7 +42,8 @@
             '58bab6f4d9d3ba3b99fe8409cd3602453507219a62714b493453e81c3d6eb50a'
             '217d918bc69318523b686ed47c78922633d5a4b736b126abf0d99fad4a584a3e'
             'a2ff81d619e0e9be87188c046367581b61d5756d294012cb886431454afbe249'
-            '0188f015890681acdded08a2372cf6963a5b9436e98734dcab07b9d0147310c9')
+            '0188f015890681acdded08a2372cf6963a5b9436e98734dcab07b9d0147310c9'
+            '2e7e542a6115f3ed993c71c63bf41206552f6028282778c7f90fdfb2fd9eebe8')
 
 prepare() {
   for _patch in *.patch; do