Date: Monday, April 8, 2013 @ 13:30:07
Author: jconder
Revision: 87869
upgpkg: packagekit 0.7.6-7
fix build error
Modified:
packagekit/trunk/PKGBUILD
packagekit/trunk/alpm.patch
------------+
PKGBUILD | 4 ++--
alpm.patch | 22 ++++++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-08 10:05:32 UTC (rev 87868)
+++ PKGBUILD 2013-04-08 11:30:07 UTC (rev 87869)
@@ -3,7 +3,7 @@
pkgbase='packagekit'
pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
pkgver=0.7.6
-pkgrel=6
+pkgrel=7
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'
- '067f39917f5442b8146c793b62f86f66fc8a4c7e391c0f3219d13f98d45ba630'
+ 'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415'
'0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
build() {
Modified: alpm.patch
===================================================================
--- alpm.patch 2013-04-08 10:05:32 UTC (rev 87868)
+++ alpm.patch 2013-04-08 11:30:07 UTC (rev 87869)
@@ -40,7 +40,7 @@
alpm_strerror (errno));
}
diff --git a/backends/alpm/pk-backend-config.c
b/backends/alpm/pk-backend-config.c
-index c8fd13b..1a82637 100644
+index c8fd13b..03adb47 100644
--- a/backends/alpm/pk-backend-config.c
+++ b/backends/alpm/pk-backend-config.c
@@ -33,35 +33,32 @@
@@ -357,14 +357,14 @@
+
+ return g_strcmp0 (section->name, name);
+}
-+
+
+- if (alpm_list_find_str (config->repos, repo) == NULL) {
+- config->repos = alpm_list_add (config->repos, g_strdup (repo));
+static PkBackendConfigSection *
+pk_backend_config_enter_section (PkBackendConfig *config, const gchar *name)
+{
+ PkBackendConfigSection *section;
-
-- if (alpm_list_find_str (config->repos, repo) == NULL) {
-- config->repos = alpm_list_add (config->repos, g_strdup (repo));
++
+ g_return_val_if_fail (config != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
@@ -426,8 +426,8 @@
{
- alpm_siglevel_t *level;
-
- g_return_val_if_fail (config != NULL, FALSE);
- g_return_val_if_fail (section != NULL, FALSE);
+- g_return_val_if_fail (config != NULL, FALSE);
+- g_return_val_if_fail (section != NULL, FALSE);
- g_return_val_if_fail (list != NULL, FALSE);
-
- level = g_hash_table_lookup (config->levels, section);
@@ -439,8 +439,7 @@
-
- while (TRUE) {
- gboolean package = TRUE, database = TRUE;
-+ g_return_val_if_fail (words != NULL, FALSE);
-
+-
- if (g_str_has_prefix (list, "Package")) {
- database = FALSE;
- list += 7;
@@ -506,7 +505,10 @@
- ++list;
- }
- }
--
++ g_return_if_fail (config != NULL);
++ g_return_if_fail (section != NULL);
++ g_return_if_fail (words != NULL);
+
- return TRUE;
+ section->siglevels = alpm_list_add_words (section->siglevels, words);
}
