Date: Thursday, May 16, 2013 @ 04:45:17
Author: jconder
Revision: 90941
upgpkg: packagekit 0.7.6-10
move files from /usr/sbin to /usr/bin
Modified:
packagekit/trunk/PKGBUILD
packagekit/trunk/alpm.patch
------------+
PKGBUILD | 7 ++++---
alpm.patch | 42 +++++++++++++++++++++++++-----------------
2 files changed, 29 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-15 21:35:03 UTC (rev 90940)
+++ PKGBUILD 2013-05-16 02:45:17 UTC (rev 90941)
@@ -3,7 +3,7 @@
pkgbase='packagekit'
pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
pkgver=0.7.6
-pkgrel=9
+pkgrel=10
pkgdesc="A system designed to make installation and updates of packages
easier."
arch=('i686' 'x86_64')
url="http://www.packagekit.org";
@@ -18,7 +18,7 @@
'libarchive.patch')
sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
- 'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415'
+ 'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23'
'0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
build() {
@@ -31,6 +31,7 @@
patch -Np1 -i "$srcdir/adopt.patch"
patch -Np1 -i "$srcdir/alpm.patch"
patch -Np1 -i "$srcdir/libarchive.patch"
+ sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am'
export PYTHON=/usr/bin/python2
./autogen.sh --prefix=/usr \
@@ -52,7 +53,7 @@
--disable-dummy \
--enable-alpm \
--with-default-backend=alpm
- make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs'
+ make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs
-Wno-deprecated-declarations -Wno-suggest-attribute=format'
}
package_packagekit() {
Modified: alpm.patch
===================================================================
--- alpm.patch 2013-05-15 21:35:03 UTC (rev 90940)
+++ alpm.patch 2013-05-16 02:45:17 UTC (rev 90941)
@@ -1080,7 +1080,7 @@
out:
diff --git a/backends/alpm/pk-backend-transaction.c
b/backends/alpm/pk-backend-transaction.c
-index 76402f0..5e32151 100644
+index 76402f0..554f06d 100644
--- a/backends/alpm/pk-backend-transaction.c
+++ b/backends/alpm/pk-backend-transaction.c
@@ -63,7 +63,7 @@ alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar
*basename)
@@ -1130,7 +1130,15 @@
if (percent == recent) {
break;
}
-@@ -388,6 +393,17 @@ pk_backend_output (PkBackend *self, const gchar *output)
+@@ -316,7 +321,6 @@ pk_backend_transaction_conv_cb (alpm_question_t question,
gpointer data1,
+ case ALPM_QUESTION_REPLACE_PKG:
+ case ALPM_QUESTION_CONFLICT_PKG:
+ case ALPM_QUESTION_CORRUPTED_PKG:
+- case ALPM_QUESTION_LOCAL_NEWER:
+ /* these actions are mostly harmless */
+ g_debug ("safe question %d", question);
+ *result = 1;
+@@ -388,6 +392,17 @@ pk_backend_output (PkBackend *self, const gchar *output)
}
static void
@@ -1148,7 +1156,7 @@
pk_backend_transaction_dep_resolve (PkBackend *self)
{
g_return_if_fail (self != NULL);
-@@ -427,7 +443,8 @@ pk_backend_transaction_add_done (PkBackend *self,
alpm_pkg_t *pkg)
+@@ -427,7 +442,8 @@ pk_backend_transaction_add_done (PkBackend *self,
alpm_pkg_t *pkg)
name = alpm_pkg_get_name (pkg);
version = alpm_pkg_get_version (pkg);
@@ -1158,7 +1166,7 @@
pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
optdepends = alpm_pkg_get_optdepends (pkg);
-@@ -435,8 +452,10 @@ pk_backend_transaction_add_done (PkBackend *self,
alpm_pkg_t *pkg)
+@@ -435,8 +451,10 @@ pk_backend_transaction_add_done (PkBackend *self,
alpm_pkg_t *pkg)
pk_backend_output (self, "Optional dependencies:\n");
for (i = optdepends; i != NULL; i = i->next) {
@@ -1170,7 +1178,7 @@
pk_backend_output (self, output);
g_free (output);
}
-@@ -467,7 +486,8 @@ pk_backend_transaction_remove_done (PkBackend *self,
alpm_pkg_t *pkg)
+@@ -467,7 +485,8 @@ pk_backend_transaction_remove_done (PkBackend *self,
alpm_pkg_t *pkg)
name = alpm_pkg_get_name (pkg);
version = alpm_pkg_get_version (pkg);
@@ -1180,7 +1188,7 @@
pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED);
pk_backend_output_end (self);
}
-@@ -498,45 +518,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self,
alpm_pkg_t *pkg,
+@@ -498,45 +517,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self,
alpm_pkg_t *pkg,
pk_backend_output_start (self, pkg);
}
@@ -1307,7 +1315,7 @@
pk_backend_transaction_setup (PkBackend *self)
{
g_return_if_fail (self != NULL);
-@@ -545,12 +626,46 @@ pk_backend_transaction_setup (PkBackend *self)
+@@ -545,12 +625,46 @@ pk_backend_transaction_setup (PkBackend *self)
}
static void
@@ -1355,7 +1363,7 @@
switch (event) {
case ALPM_EVENT_CHECKDEPS_START:
case ALPM_EVENT_RESOLVEDEPS_START:
-@@ -559,7 +674,6 @@ pk_backend_transaction_event_cb (alpm_event_t event,
gpointer data,
+@@ -559,7 +673,6 @@ pk_backend_transaction_event_cb (alpm_event_t event,
gpointer data,
case ALPM_EVENT_FILECONFLICTS_START:
case ALPM_EVENT_INTERCONFLICTS_START:
@@ -1363,7 +1371,7 @@
case ALPM_EVENT_DELTA_INTEGRITY_START:
case ALPM_EVENT_DISKSPACE_START:
pk_backend_transaction_test_commit (backend);
-@@ -582,23 +696,73 @@ pk_backend_transaction_event_cb (alpm_event_t event,
gpointer data,
+@@ -582,23 +695,73 @@ pk_backend_transaction_event_cb (alpm_event_t event,
gpointer data,
break;
case ALPM_EVENT_UPGRADE_START:
@@ -1438,7 +1446,7 @@
default:
g_debug ("unhandled event %d", event);
break;
-@@ -623,7 +787,7 @@ pk_backend_transaction_initialize (PkBackend *self,
alpm_transflag_t flags,
+@@ -623,7 +786,7 @@ pk_backend_transaction_initialize (PkBackend *self,
alpm_transflag_t flags,
g_return_val_if_fail (cancellable != NULL, FALSE);
if (alpm_trans_init (alpm, flags) < 0) {
@@ -1447,7 +1455,7 @@
g_set_error_literal (error, ALPM_ERROR, errno,
alpm_strerror (errno));
return FALSE;
-@@ -692,6 +856,7 @@ alpm_depend_free (alpm_depend_t *depend)
+@@ -692,6 +855,7 @@ alpm_depend_free (alpm_depend_t *depend)
{
free (depend->name);
free (depend->version);
@@ -1455,7 +1463,7 @@
free (depend);
}
-@@ -731,7 +896,7 @@ alpm_conflict_build_list (const alpm_list_t *i)
+@@ -731,7 +895,7 @@ alpm_conflict_build_list (const alpm_list_t *i)
g_string_append_printf (list, "%s <-> %s (%s), ",
conflict->package1,
conflict->package2, reason);
@@ -1464,7 +1472,7 @@
}
}
-@@ -837,12 +1002,12 @@ pk_backend_transaction_simulate (PkBackend *self,
GError **error)
+@@ -837,12 +1001,12 @@ pk_backend_transaction_simulate (PkBackend *self,
GError **error)
}
if (prefix != NULL) {
@@ -1479,7 +1487,7 @@
g_set_error_literal (error, ALPM_ERROR, errno,
alpm_strerror (errno));
}
-@@ -959,12 +1124,12 @@ pk_backend_transaction_commit (PkBackend *self, GError
**error)
+@@ -959,12 +1123,12 @@ pk_backend_transaction_commit (PkBackend *self, GError
**error)
}
if (prefix != NULL) {
@@ -1494,7 +1502,7 @@
g_set_error_literal (error, ALPM_ERROR, errno,
alpm_strerror (errno));
}
-@@ -993,7 +1158,7 @@ pk_backend_transaction_end (PkBackend *self, GError
**error)
+@@ -993,7 +1157,7 @@ pk_backend_transaction_end (PkBackend *self, GError
**error)
}
if (alpm_trans_release (alpm) < 0) {
@@ -1597,7 +1605,7 @@
alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs);
diff --git a/configure.ac b/configure.ac
-index 37e8a64..2e85f6f 100644
+index 37e8a64..4a33dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -707,9 +707,7 @@ if test x$enable_opkg = xyes; then
@@ -1607,7 +1615,7 @@
- AC_CHECK_HEADER([alpm.h],
- [],
- [AC_MSG_ERROR([No ALPM headers found])])
-+ PKG_CHECK_MODULES(ALPM, libalpm >= 4.1.0)
++ PKG_CHECK_MODULES(ALPM, libalpm >= 8.0.1)
fi
if test x$enable_poldek = xyes; then
