[arch-commits] Commit in packagekit/trunk (2 files)

[Antonio Rojas]

    Date: Wednesday, June 2, 2021 @ 06:37:09
  Author: arojas
Revision: 953155

Support new pacman 6 options (FS#71085)

Added:
  packagekit/trunk/0015-support-new-pacman-options.patch
Modified:
  packagekit/trunk/PKGBUILD

---------------------------------------+
 0015-support-new-pacman-options.patch |   48 ++++++++++++++++++++++++++++++++
 PKGBUILD                              |    8 +++--
 2 files changed, 53 insertions(+), 3 deletions(-)

Added: 0015-support-new-pacman-options.patch
===================================================================
--- 0015-support-new-pacman-options.patch	                        (rev 0)
+++ 0015-support-new-pacman-options.patch	2021-06-02 06:37:09 UTC (rev 953155)
@@ -0,0 +1,48 @@
+diff --git a/backends/alpm/pk-alpm-config.c b/backends/alpm/pk-alpm-config.c
+index 20da84e45..cfe916aa0 100644
+--- a/backends/alpm/pk-alpm-config.c
++++ b/backends/alpm/pk-alpm-config.c
+@@ -40,7 +40,7 @@ static gchar *xfercmd = NULL;
+ typedef struct
+ {
+ 	 gboolean		 checkspace, color, disabledownloadtimeout, ilovecandy,
+-				totaldl, usesyslog, verbosepkglists, is_check;
++				noprogressbar, totaldl, usesyslog, verbosepkglists, is_check;
+ 
+ 	 gchar			*arch, *cleanmethod, *dbpath, *gpgdir, *logfile,
+ 				*root, *xfercmd;
+@@ -146,6 +146,14 @@ pk_alpm_config_set_ilovecandy (PkAlpmConfig *config)
+ 	config->ilovecandy = TRUE;
+ }
+ 
++static void
++pk_alpm_config_set_noprogressbar (PkAlpmConfig *config)
++{
++	g_return_if_fail (config != NULL);
++
++	config->noprogressbar = TRUE;
++}
++
+ static void
+ pk_alpm_config_set_totaldl (PkAlpmConfig *config)
+ {
+@@ -182,6 +190,7 @@ static const PkAlpmConfigBoolean pk_alpm_config_boolean_options[] = {
+ 	{ "Color", pk_alpm_config_set_color },
+ 	{ "DisableDownloadTimeout", pk_alpm_config_set_disabledownloadtimeout },
+ 	{ "ILoveCandy", pk_alpm_config_set_ilovecandy },
++	{ "NoProgressBar", pk_alpm_config_set_noprogressbar },
+ 	{ "TotalDownload", pk_alpm_config_set_totaldl },
+ 	{ "UseSyslog", pk_alpm_config_set_usesyslog },
+ 	{ "VerbosePkgLists", pk_alpm_config_set_verbosepkglists },
+@@ -599,6 +608,11 @@ pk_alpm_config_parse (PkAlpmConfig *config, const gchar *filename,
+ 			continue;
+ 		}
+ 
++		if (g_strcmp0 (key, "ParallelDownloads") == 0 && str != NULL) {
++			/* Ignore "ParallelDownloads" key instead of crashing */
++			continue;
++		}
++
+ 		/* report errors from above */
+ 		g_set_error (&e, PK_ALPM_ERROR, PK_ALPM_ERR_CONFIG_INVALID,
+ 			     "unrecognised directive '%s'", key);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-02 05:52:49 UTC (rev 953154)
+++ PKGBUILD	2021-06-02 06:37:09 UTC (rev 953155)
@@ -4,7 +4,7 @@
 pkgbase='packagekit'
 pkgname=('packagekit' 'libpackagekit-glib')
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A system designed to make installation and updates of packages easier'
 arch=('x86_64')
 url='https://www.freedesktop.org/software/PackageKit/'
@@ -28,7 +28,8 @@
          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
-         0014-Fix-get-updates.patch)
+         0014-Fix-get-updates.patch
+         0015-support-new-pacman-options.patch)
 sha256sums=('d3bef282f8b45963618adb69ed5199f23640b00b98ead66291ae30cff8068e4a'
             '3c4d5a2658c9ed28ff949f7a2aa0c99e1a85e63f7fd0b068d3b9278ace503c16'
             '258ff42a2c0f9dd5d609785d5535af35294c5940b63936fa32fdc4cff4b3151d'
@@ -43,7 +44,8 @@
             '217d918bc69318523b686ed47c78922633d5a4b736b126abf0d99fad4a584a3e'
             'a2ff81d619e0e9be87188c046367581b61d5756d294012cb886431454afbe249'
             '0188f015890681acdded08a2372cf6963a5b9436e98734dcab07b9d0147310c9'
-            '2e7e542a6115f3ed993c71c63bf41206552f6028282778c7f90fdfb2fd9eebe8')
+            '2e7e542a6115f3ed993c71c63bf41206552f6028282778c7f90fdfb2fd9eebe8'
+            '2012114520c304b78340dfd33e87862d0a2e973d51c3dadd8e6cf0483a041735')
 
 prepare() {
   for _patch in *.patch; do