diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/patches/default-icon-colour.patch | 10 | ||||
-rw-r--r-- | debian/patches/disable-experimental-non-null.patch | 68 | ||||
-rw-r--r-- | debian/patches/relax-test-missing-ibus.patch | 11 | ||||
-rw-r--r-- | debian/patches/series | 3 |
4 files changed, 0 insertions, 92 deletions
diff --git a/debian/patches/default-icon-colour.patch b/debian/patches/default-icon-colour.patch deleted file mode 100644 index e916f0a2..00000000 --- a/debian/patches/default-icon-colour.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/main.vala -+++ b/lib/main.vala -@@ -207,6 +207,7 @@ - - Pango.FontDescription description; - var colour = ((!) style).get_color (Gtk.StateFlags.NORMAL); -+ colour = { 0.5, 0.5, 0.5, 1.0 }; - ((!) style).get (Gtk.StateFlags.NORMAL, Gtk.STYLE_PROPERTY_FONT, out description); - - var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, W, H); diff --git a/debian/patches/disable-experimental-non-null.patch b/debian/patches/disable-experimental-non-null.patch deleted file mode 100644 index 2d434a0d..00000000 --- a/debian/patches/disable-experimental-non-null.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -5,8 +5,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_tests_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/relax-test-missing-ibus.patch b/debian/patches/relax-test-missing-ibus.patch deleted file mode 100644 index 5b384579..00000000 --- a/debian/patches/relax-test-missing-ibus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/main.vala -+++ b/tests/main.vala -@@ -648,7 +648,7 @@ - section.get_item_attribute (2, Menu.ATTRIBUTE_LABEL, "s", out label); - assert (strcmp (label, "Esperanto") == 0); - section.get_item_attribute (3, Menu.ATTRIBUTE_LABEL, "s", out label); -- assert (strcmp (label, "Pinyin") == 0); -+ assert (label.ascii_casecmp ("Pinyin") == 0); - } - - public int main (string[] args) { diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2a60b05c..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -default-icon-colour.patch -disable-experimental-non-null.patch -relax-test-missing-ibus.patch |