aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-07-04 00:12:14 -0400
committerWilliam Hua <william.hua@canonical.com>2013-07-04 00:12:14 -0400
commit6061e1de2a680b14b1a6e1eb2642d0a643910a73 (patch)
tree5eafcd0ca3371523cc5d2482d333b822c130b98f /debian
parent7507be3ce89d7bb02fb41847a015f7c0400bb926 (diff)
downloadayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.tar.gz
ayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.tar.bz2
ayatana-indicator-keyboard-6061e1de2a680b14b1a6e1eb2642d0a643910a73.zip
Disable experimental non-null for tests.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/disable-experimental-non-null.patch68
-rw-r--r--debian/patches/series1
2 files changed, 69 insertions, 0 deletions
diff --git a/debian/patches/disable-experimental-non-null.patch b/debian/patches/disable-experimental-non-null.patch
new file mode 100644
index 00000000..69698d37
--- /dev/null
+++ b/debian/patches/disable-experimental-non-null.patch
@@ -0,0 +1,68 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -4,8 +4,7 @@
+
+ AM_CFLAGS = -w
+ AM_LDFLAGS = -lm
+-AM_VALAFLAGS = --enable-experimental-non-null \
+- --metadatadir $(top_srcdir)/deps \
++AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
+ --vapidir $(top_srcdir)/deps
+
+ indicator_keyboard_test_SOURCES = main.vala \
+--- a/tests/main.vala
++++ b/tests/main.vala
+@@ -146,7 +146,7 @@
+ action_group.disconnect (signal_name);
+
+ var state = action_group.get_action_state ("current");
+- var current = ((!) state).get_uint32 ();
++ var current = state.get_uint32 ();
+ assert (current == 2);
+
+ try {
+@@ -410,7 +410,7 @@
+ action_group.disconnect (signal_name);
+
+ var state = action_group.get_action_state ("indicator");
+- assert (((!) state).lookup ("visible", "b", out visible));
++ assert (state.lookup ("visible", "b", out visible));
+ assert (visible);
+
+ loop = new MainLoop (null, false);
+@@ -433,7 +433,7 @@
+ action_group.disconnect (signal_name);
+
+ state = action_group.get_action_state ("indicator");
+- assert (((!) state).lookup ("visible", "b", out visible));
++ assert (state.lookup ("visible", "b", out visible));
+ assert (!visible);
+
+ loop = new MainLoop (null, false);
+@@ -456,7 +456,7 @@
+ action_group.disconnect (signal_name);
+
+ state = action_group.get_action_state ("indicator");
+- assert (((!) state).lookup ("visible", "b", out visible));
++ assert (state.lookup ("visible", "b", out visible));
+ assert (visible);
+ }
+
+@@ -505,7 +505,7 @@
+ action_group.disconnect (signal_name);
+
+ var state = action_group.get_action_state ("current");
+- var current = ((!) state).get_uint32 ();
++ var current = state.get_uint32 ();
+ assert (current == 1);
+
+ try {
+@@ -538,7 +538,7 @@
+ action_group.disconnect (signal_name);
+
+ state = action_group.get_action_state ("current");
+- current = ((!) state).get_uint32 ();
++ current = state.get_uint32 ();
+ assert (current == 0);
+
+ try {
diff --git a/debian/patches/series b/debian/patches/series
index a0ecd8c3..83bb2430 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
default-icon-colour.patch
+disable-experimental-non-null.patch