aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-08-24 15:53:12 -0500
committerTed Gould <ted@gould.cx>2011-08-24 15:53:12 -0500
commit97d93f51f464eb88bdf46c902d5be61a0cae41bb (patch)
treec8bc10379a6ab4e07ba8d236b1b2e2038a9ec61e /debian/patches
parentb08640dfaa65d54ac758e14f103e92bdc20990e0 (diff)
parentcb4fecf5e6eec692069d4e2417f58a77d604887f (diff)
downloadlibdbusmenu-97d93f51f464eb88bdf46c902d5be61a0cae41bb.tar.gz
libdbusmenu-97d93f51f464eb88bdf46c902d5be61a0cae41bb.tar.bz2
libdbusmenu-97d93f51f464eb88bdf46c902d5be61a0cae41bb.zip
Merge from U. Desktop
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/lp799878.patch17
-rw-r--r--debian/patches/series1
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/lp799878.patch b/debian/patches/lp799878.patch
new file mode 100644
index 0000000..dff130a
--- /dev/null
+++ b/debian/patches/lp799878.patch
@@ -0,0 +1,17 @@
+=== modified file 'libdbusmenu-glib/server.c'
+--- old/libdbusmenu-glib/server.c 2011-06-17 03:42:29 +0000
++++ new/libdbusmenu-glib/server.c 2011-06-28 16:40:16 +0000
+@@ -976,10 +976,10 @@
+ gotsomething = TRUE;
+ } else {
+ GError * error = NULL;
+- megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ia(s))"), "[ ]", NULL, NULL, &error);
++ megadata[1] = g_variant_parse(G_VARIANT_TYPE("a(ias)"), "[ ]", NULL, NULL, &error);
+
+ if (error != NULL) {
+- g_warning("Unable to parse '[ ]' as a 'a(ia(s))': %s", error->message);
++ g_warning("Unable to parse '[ ]' as a 'a(ias)': %s", error->message);
+ g_error_free(error);
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..43b331a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp799878.patch