Date: Thursday, December 1, 2022 @ 19:23:03
Author: eworm
Revision: 1355793
upgpkg: packagekit 1.2.6-1: new upstream release
Modified:
packagekit/trunk/0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch
packagekit/trunk/PKGBUILD
Deleted:
packagekit/trunk/0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
-----------------------------------------------------------------+
0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch | 8 -
0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch | 47
----------
PKGBUILD | 12 +-
3 files changed, 9 insertions(+), 58 deletions(-)
Modified: 0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch
===================================================================
--- 0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch
2022-12-01 19:22:23 UTC (rev 1355792)
+++ 0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch
2022-12-01 19:23:03 UTC (rev 1355793)
@@ -15,7 +15,7 @@
custom sysconfidr on the cmdline.
---
backends/alpm/meson.build | 8 ++++----
- backends/aptcc/meson.build | 2 +-
+ backends/apt/meson.build | 2 +-
backends/slack/meson.build | 5 +++--
backends/slack/pk-backend-slack.cc | 2 +-
backends/slack/tests/meson.build | 3 ++-
@@ -53,10 +53,10 @@
- install_dir: join_paths(get_option('sysconfdir'), 'PackageKit', 'alpm.d')
+ install_dir: join_paths(pk_sysconfdir, 'PackageKit', 'alpm.d')
)
-diff --git a/backends/aptcc/meson.build b/backends/aptcc/meson.build
+diff --git a/backends/apt/meson.build b/backends/apt/meson.build
index 5df8f29e2..b29af882b 100644
---- a/backends/aptcc/meson.build
-+++ b/backends/aptcc/meson.build
+--- a/backends/apt/meson.build
++++ b/backends/apt/meson.build
@@ -75,7 +75,7 @@ shared_module(
install_data(
Deleted: 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
===================================================================
--- 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
2022-12-01 19:22:23 UTC (rev 1355792)
+++ 0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch
2022-12-01 19:23:03 UTC (rev 1355793)
@@ -1,47 +0,0 @@
-From 2b6c18e142b93ecfe71d91356d63018d91aa907d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?=
- <[email protected]>
-Date: Fri, 9 Sep 2022 20:03:11 -0400
-Subject: [PATCH 1/1] Fix incorrect handling of hookdirs config [fixes #342]
-
-Fix `pk_alpm_config_list_options` incorrect alphabetical order, otherwise the
hookdirs config is not available.
-
-Iterate through `config->hookdirs` and use the correct API call to set
additional hooks directories `alpm_option_add_hookdir`, this way SYSHOOKDIR is
not overridden
----
- backends/alpm/pk-alpm-config.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/backends/alpm/pk-alpm-config.c b/backends/alpm/pk-alpm-config.c
-index 0a64a1890..c96b4e167 100644
---- a/backends/alpm/pk-alpm-config.c
-+++ b/backends/alpm/pk-alpm-config.c
-@@ -362,6 +362,7 @@ typedef struct
- /* keep this in alphabetical order */
- static const PkAlpmConfigList pk_alpm_config_list_options[] = {
- { "HoldPkg", G_STRUCT_OFFSET (PkAlpmConfig, holdpkgs) },
-+ { "HookDir", G_STRUCT_OFFSET (PkAlpmConfig, hookdirs) },
- { "IgnoreGroup", G_STRUCT_OFFSET (PkAlpmConfig, ignoregroups) },
- { "IgnorePkg", G_STRUCT_OFFSET (PkAlpmConfig, ignorepkgs) },
- { "LocalFileSigLevel", G_STRUCT_OFFSET (PkAlpmConfig,
-@@ -370,7 +371,6 @@ static const PkAlpmConfigList
pk_alpm_config_list_options[] = {
- { "NoUpgrade", G_STRUCT_OFFSET (PkAlpmConfig, noupgrades) },
- { "RemoteFileSigLevel", G_STRUCT_OFFSET (PkAlpmConfig,
- remotefilesiglevels) },
-- { "HookDir", G_STRUCT_OFFSET (PkAlpmConfig, hookdirs) },
- { NULL, 0 }
- };
-
-@@ -1014,7 +1014,9 @@ pk_alpm_config_configure_alpm (PkBackend *backend,
PkAlpmConfig *config, GError
- config->noupgrades = NULL;
-
- /* alpm takes ownership */
-- alpm_option_set_noupgrades (handle, config->hookdirs);
-+ for(alpm_list_t *j = config->hookdirs; j; j = j->next) {
-+ alpm_option_add_hookdir(handle, j->data);
-+ }
- config->hookdirs = NULL;
-
- pk_alpm_config_configure_repos (backend, config, handle, error);
---
-2.38.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-01 19:22:23 UTC (rev 1355792)
+++ PKGBUILD 2022-12-01 19:23:03 UTC (rev 1355793)
@@ -3,8 +3,8 @@
pkgbase='packagekit'
pkgname=('packagekit' 'libpackagekit-glib')
-pkgver=1.2.5
-pkgrel=2
+pkgver=1.2.6
+pkgrel=1
pkgdesc='A system designed to make installation and updates of packages easier'
arch=('x86_64')
url='https://www.freedesktop.org/software/PackageKit/'
@@ -15,11 +15,9 @@
validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17' # Richard
Hughes <[email protected]>
'EC60AABDF42AAE8FB062640480858FA38F62AF74') # Kalev Lember
<[email protected]>
source=("https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${pkgver}.tar.xz";
- '0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch'
- '0002-Fix-incorrect-handling-of-hookdirs-config-fixes-342.patch')
-sha256sums=('e08cb9164700ac684386e4257f783493ebac637141d34a8ce8077147ea10ad26'
- '1f648e1ad7309e769449783a0ecadc78bac18460518e8b8394f6532d66874d51'
- 'f07c02dea37d3d6d73f41f6a3fc6b40f0b75a38bdd96bd52b11a949e79a0608c')
+ '0001-build-fix-overall-sysconfdir-handling-so-it-can-work.patch')
+sha256sums=('1a0cf173065ce9232c6d5fb044bf6b606147a8702dc6ff4753c2a08331c52e51'
+ '31bda312a0320bdf4b084a89cd6b13f1366b50d5c1cf7c9a77a1e1024eca30ea')
prepare() {
for _patch in *.patch; do
