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

[Christian Hesse]

    Date: Saturday, January 17, 2015 @ 01:06:33
  Author: eworm
Revision: 126021

upgpkg: gnome-packagekit 3.14.2-2

Modified:
  gnome-packagekit/trunk/PKGBUILD
Deleted:
  gnome-packagekit/trunk/packagekit-0.8.patch

----------------------+
 PKGBUILD             |   46 +++++++++++++++-------------------
 packagekit-0.8.patch |   65 -------------------------------------------------
 2 files changed, 20 insertions(+), 91 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-17 00:03:31 UTC (rev 126020)
+++ PKGBUILD	2015-01-17 00:06:33 UTC (rev 126021)
@@ -1,10 +1,10 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jonathan Conder <jonno.conder at gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.12.2
-pkgrel=1
+pkgver=3.14.2
+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/'
@@ -11,31 +11,25 @@
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'libnotify' 'packagekit')
 makedepends=('intltool' 'itstool' 'docbook-xsl' 'libcanberra')
-install="$pkgname.install"
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
-        "packagekit-0.8.patch")
-sha256sums=('a4d5fca6f9481b48202f996c8a3835051c98b6e6df0929394704c3c41e28afb2'
-            '717ba4d281adbafc9409202538ad1c8ce9a2bb41a6a0bc127e8dd5c4c1da1d65')
+install="${pkgname}.install"
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('d3abbf6f7e599a5f39dda28b99a5f511380612283078a35ea8daf71e6c51ebc3')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
-
-  _mime='application/x-xz-compressed-tar;application/x-servicepack;'
-  sed -i "s at MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-schemas-compile \
+		--disable-gtk-doc \
+	PYTHON=/usr/bin/python2
+	sed -i 's|docbook2man|docbook2man --sgml|' man/Makefile
+	make
 }
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --disable-schemas-compile \
-              PYTHON=/usr/bin/python2
-  make
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}

Deleted: packagekit-0.8.patch
===================================================================
--- packagekit-0.8.patch	2015-01-17 00:03:31 UTC (rev 126020)
+++ packagekit-0.8.patch	2015-01-17 00:06:33 UTC (rev 126021)
@@ -1,65 +0,0 @@
-From 4077ba3ea30354ef070d640a5af4b6a913e97f4b Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Tue, 18 Jun 2013 12:56:05 +0000
-Subject: Ignore package progress updates when the transaction is being simulated
-
-PackageKit backends do not have to issue INFO_FINISHED when simulating, and most
-don't bother. As we didn't special-case simulation, we set up the activity
-spinner on the Package(INFO_UPDATING) event and do not cancel the signal.
-
-This leaves every row in the update viewer with a spinning cursor, which due to
-the way the code was structured lead to an O(n*n) exposion of updates to the
-cell renderers for each update. For a dozen or so updates it was not noticable,
-and nobody noticed the slight increase of CPU usage.
-
-Now that TeX Live has officially jumped the shark and has many hundreds of
-sub-packages, it's quite plausible to have *thousands* of small packages to
-update. This means that the O(n*n) bug stops being a minor increase in CPU and
-starts to use the CPU at 100% for many hours before completing.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=969852
----
-diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
-index 53be9cf..a2182a1 100644
---- a/src/gpk-update-viewer.c
-+++ b/src/gpk-update-viewer.c
-@@ -841,6 +841,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
- 	gchar *text;
- 	gint percentage;
- 	GtkWidget *widget;
-+	guint64 transaction_flags;
- 	PkInfoEnum info;
- 	PkRoleEnum role;
- 	PkStatusEnum status;
-@@ -853,6 +854,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
- 		      "percentage", &percentage,
- 		      "package", &package,
- 		      "allow-cancel", &allow_cancel,
-+		      "transaction-flags", &transaction_flags,
- 		      NULL);
- 
- 	if (type == PK_PROGRESS_TYPE_PACKAGE) {
-@@ -864,6 +866,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
- 		GtkTreePath *path;
- 		gboolean scroll;
- 
-+		/* ignore simulation phase */
-+		if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE))
-+			goto out;
-+
- 		/* add the results, not the progress */
- 		if (role == PK_ROLE_ENUM_GET_UPDATES)
- 			goto out;
-@@ -1040,6 +1046,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
- 		guint size_display;
- 		PkItemProgress *item_progress;
- 
-+		/* ignore simulation phase */
-+		if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE))
-+			goto out;
-+
- 		g_object_get (progress,
- 			      "item-progress", &item_progress,
- 			      NULL);
---
-cgit v0.9.2