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

[Jonathan Conder]

    Date: Friday, March 1, 2013 @ 07:05:12
  Author: jconder
Revision: 85326

upgpkg: packagekit 0.7.6-4

libarchive rebuild

Added:
  packagekit/trunk/libarchive.patch
Modified:
  packagekit/trunk/PKGBUILD

------------------+
 PKGBUILD         |   13 ++++++++-----
 libarchive.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-01 02:43:05 UTC (rev 85325)
+++ PKGBUILD	2013-03-01 06:05:12 UTC (rev 85326)
@@ -3,19 +3,21 @@
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
 pkgver=0.7.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
-             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt4'
+             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
              'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
-        'adopt.patch')
+        'adopt.patch'
+	'libarchive.patch')
 sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
-            'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8')
+            'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
+	    '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
 
 build() {
   cd "$srcdir/PackageKit-$pkgver"
@@ -25,6 +27,7 @@
   sed -i 's at bin/python at bin/python2@' 'lib/python/packagekit/'*.py
 
   patch -Np1 -i "$srcdir/adopt.patch"
+  patch -Np1 -i "$srcdir/libarchive.patch"
 
   export PYTHON=/usr/bin/python2
   ./configure --prefix=/usr \
@@ -78,7 +81,7 @@
 }
 
 package_packagekit-qt2() {
-  depends=('packagekit' 'qt4')
+  depends=('packagekit' 'qt')
   pkgdesc=('Qt bindings for PackageKit')
 
   cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2"

Added: libarchive.patch
===================================================================
--- libarchive.patch	                        (rev 0)
+++ libarchive.patch	2013-03-01 06:05:12 UTC (rev 85326)
@@ -0,0 +1,39 @@
+diff -Nru a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c
+--- a/lib/packagekit-glib2/pk-service-pack.c	2012-08-17 00:36:38.000000000 +1200
++++ b/lib/packagekit-glib2/pk-service-pack.c	2013-03-01 19:00:08.773738469 +1300
+@@ -207,7 +207,7 @@
+ 	archive_read_support_format_tar (arch);
+ 
+ 	/* open the tar file */
+-	r = archive_read_open_file (arch, filename, 10240);
++	r = archive_read_open_filename (arch, filename, 10240);
+ 	if (r) {
+ 		g_set_error (error, PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_FAILED_EXTRACTION,
+ 				      "cannot open: %s", archive_error_string (arch));
+@@ -246,7 +246,7 @@
+ 	/* close the archive */
+ 	if (arch != NULL) {
+ 		archive_read_close (arch);
+-		archive_read_finish (arch);
++		archive_read_free (arch);
+ 	}
+ 
+ 	/* switch back to PWD */
+@@ -572,7 +572,7 @@
+ 
+ 	/* we can only write tar achives */
+ 	arch = archive_write_new ();
+-	archive_write_set_compression_none (arch);
++	archive_write_add_filter_none (arch);
+ 	archive_write_set_format_ustar (arch);
+ 	archive_write_open_filename (arch, state->filename);
+ 
+@@ -596,7 +596,7 @@
+ 	/* close the archive */
+ 	if (arch != NULL) {
+ 		archive_write_close (arch);
+-		archive_write_finish (arch);
++		archive_write_free (arch);
+ 	}
+ 	return ret;
+ }