Date: Wednesday, June 7, 2017 @ 18:07:19 Author: eworm Revision: 235375
upgpkg: gnome-packagekit 3.24.0-2 use unmodified upstream patch with packagekit 1.1.6 Modified: gnome-packagekit/trunk/0001-alpm-hooks.patch gnome-packagekit/trunk/PKGBUILD -----------------------+ 0001-alpm-hooks.patch | 18 ++++++++++-------- PKGBUILD | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) Modified: 0001-alpm-hooks.patch =================================================================== --- 0001-alpm-hooks.patch 2017-06-07 18:06:02 UTC (rev 235374) +++ 0001-alpm-hooks.patch 2017-06-07 18:07:19 UTC (rev 235375) @@ -1,36 +1,38 @@ From 25da5747d55adceb7ccebba4e82af295eb397cb7 Mon Sep 17 00:00:00 2001 From: Christian Hesse <[email protected]> Date: Thu, 1 Jun 2017 16:15:59 +0200 -Subject: [PATCH 1/1] Add new status "Running hooks" +Subject: Add new status "Running hooks" -Removed version check from upstream patch. +Signed-off-by: Christian Hesse <[email protected]> +Signed-off-by: Richard Hughes <[email protected]> --- src/gpk-enum.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/gpk-enum.c b/src/gpk-enum.c -index 09a11183..2bf8af53 100644 +index 09a1118..2bf8af5 100644 --- a/src/gpk-enum.c +++ b/src/gpk-enum.c -@@ -95,6 +95,7 @@ static const PkEnumMatch enum_status_icon_name[] = { +@@ -95,6 +95,9 @@ static const PkEnumMatch enum_status_icon_name[] = { {PK_STATUS_ENUM_CHECK_EXECUTABLE_FILES, "pk-package-info"}, {PK_STATUS_ENUM_CHECK_LIBRARIES, "pk-package-info"}, {PK_STATUS_ENUM_COPY_FILES, "pk-package-info"}, ++#if PK_CHECK_VERSION(1,1,6) + {PK_STATUS_ENUM_RUN_HOOK, "pk-setup"}, ++#endif {0, NULL} }; -@@ -888,6 +891,10 @@ gpk_status_enum_to_localised_text (PkStatusEnum status) +@@ -888,6 +891,12 @@ gpk_status_enum_to_localised_text (PkStatusEnum status) /* TRANSLATORS: we are copying package files to prepare to install */ text = _("Copying files"); break; ++#if PK_CHECK_VERSION(1,1,6) + case PK_STATUS_ENUM_RUN_HOOK: + /* TRANSLATORS: we are running hooks pre or post transaction */ + text = _("Running hooks"); + break; ++#endif default: g_warning ("status unrecognized: %s", pk_status_enum_to_string (status)); } --- -2.13.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-07 18:06:02 UTC (rev 235374) +++ PKGBUILD 2017-06-07 18:07:19 UTC (rev 235375) @@ -5,7 +5,7 @@ pkgname=gnome-packagekit pkgver=3.24.0 -pkgrel=1.1 +pkgrel=2 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' @@ -15,7 +15,7 @@ source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"; '0001-alpm-hooks.patch') sha256sums=('8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f' - 'f30c6ba74f47d10f56fc9c602cc4e4a03a19526ef02eea28752739f267c8483c') + '97ccebcf0146a72876a4a6a9f88b5fa15b6d7f8cd915bd98c760f42d9f139c80') prepare() { cd "${srcdir}/${pkgname}-${pkgver}"
