[arch-commits] Commit in gnome-packagekit/trunk (0001-alpm-hooks.patch PKGBUILD)

[Christian Hesse]

    Date: Monday, September 11, 2017 @ 21:46:16
  Author: eworm
Revision: 257049

upgpkg: gnome-packagekit 3.26.0-1

new upstream release

Modified:
  gnome-packagekit/trunk/PKGBUILD
Deleted:
  gnome-packagekit/trunk/0001-alpm-hooks.patch

-----------------------+
 0001-alpm-hooks.patch |   38 --------------------------------------
 PKGBUILD              |   34 ++++++++++------------------------
 2 files changed, 10 insertions(+), 62 deletions(-)

Deleted: 0001-alpm-hooks.patch
===================================================================
--- 0001-alpm-hooks.patch	2017-09-11 21:41:55 UTC (rev 257048)
+++ 0001-alpm-hooks.patch	2017-09-11 21:46:16 UTC (rev 257049)
@@ -1,38 +0,0 @@
-From 25da5747d55adceb7ccebba4e82af295eb397cb7 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Thu, 1 Jun 2017 16:15:59 +0200
-Subject: Add new status "Running hooks"
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
-Signed-off-by: Richard Hughes <richard at hughsie.com>
----
- src/gpk-enum.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/gpk-enum.c b/src/gpk-enum.c
-index 09a1118..2bf8af5 100644
---- a/src/gpk-enum.c
-+++ b/src/gpk-enum.c
-@@ -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,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));
- 	}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-11 21:41:55 UTC (rev 257048)
+++ PKGBUILD	2017-09-11 21:46:16 UTC (rev 257049)
@@ -4,39 +4,25 @@
 # Contributor: Jonathan Conder <jonno.conder at gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.24.0
-pkgrel=2
+pkgver=3.26.0
+pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
 url='http://www.packagekit.org/'
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'libnotify' 'packagekit')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'libcanberra')
-source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        '0001-alpm-hooks.patch')
-sha256sums=('8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f'
-            '97ccebcf0146a72876a4a6a9f88b5fa15b6d7f8cd915bd98c760f42d9f139c80')
+makedepends=('meson' 'intltool' 'itstool' 'docbook-xsl' 'libcanberra')
+source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -Np1 < "${srcdir}"/0001-alpm-hooks.patch
-}
-
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-schemas-compile \
-		--disable-gtk-doc
-	sed -i 's|docbook2man|docbook2man --sgml|' man/Makefile
-	make
+	meson "${pkgname}-${pkgver}" build \
+		--prefix=/usr \
+		--sysconfdir=/etc
+	ninja -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
+	DESTDIR="$pkgdir" ninja -C build install
 }