From 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 4 Mar 2013 00:03:49 -0800 Subject: Mon Mar 4 00:03:48 PST 2013 --- community/packagekit/PKGBUILD | 11 ++++++---- community/packagekit/libarchive.patch | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 community/packagekit/libarchive.patch (limited to 'community/packagekit') diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index be6935348..65e8fb431 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85382 2013-03-01 10:36:54Z andrea $ +# $Id: PKGBUILD 85588 2013-03-03 17:28:55Z dreisner $ # Maintainer: Jonathan Conder pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python') pkgver=0.7.6 -pkgrel=3 +pkgrel=5 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" @@ -13,9 +13,11 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' '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 @@ build() { sed -i 's@bin/python@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 \ diff --git a/community/packagekit/libarchive.patch b/community/packagekit/libarchive.patch new file mode 100644 index 000000000..083a9433a --- /dev/null +++ b/community/packagekit/libarchive.patch @@ -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; + } -- cgit v1.2.3-54-g00ecf