~ubuntu-branches/ubuntu/oneiric/libgnome-keyring/oneiric-201109060911

« back to all changes in this revision

Viewing changes to debian/patches/06_ftbfs-armel.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2010-03-07 21:29:27 UTC
  • Revision ID: james.westby@ubuntu.com-20100307212927-9yrqiio3tfhu376o
Tags: 2.29.4git20100224-0ubuntu2
* debian/patches/06_ftbfs-armel.patch:
  + fix LP: #533998 - ftbfs on armel; we drop g_asserts on va_list
    types; the macros should be safe on their own

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- libgnome-keyring-2.29.4git20100224/library/gnome-keyring.c.orig     2010-03-07 21:19:25.105973201 +0100
 
2
+++ libgnome-keyring-2.29.4git20100224/library/gnome-keyring.c  2010-03-07 21:24:27.255970923 +0100
 
3
@@ -4535,7 +4535,6 @@
 
4
        GkrOperation *op;
 
5
 
 
6
        g_assert (schema);
 
7
-       g_assert (va);
 
8
        g_assert (callback);
 
9
 
 
10
        attributes = schema_attribute_list_va (schema, va);
 
11
@@ -4663,7 +4662,6 @@
 
12
        GkrOperation *op;
 
13
 
 
14
        g_assert (schema);
 
15
-       g_assert (va);
 
16
        g_assert (callback);
 
17
 
 
18
        attributes = schema_attribute_list_va (schema, va);