aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/default-icon-colour.patch14
-rw-r--r--debian/patches/disable-experimental-non-null.patch2
-rw-r--r--debian/patches/relax-test-missing-ibus.patch11
-rw-r--r--debian/patches/series1
4 files changed, 20 insertions, 8 deletions
diff --git a/debian/patches/default-icon-colour.patch b/debian/patches/default-icon-colour.patch
index 0f1de6c0..e916f0a2 100644
--- a/debian/patches/default-icon-colour.patch
+++ b/debian/patches/default-icon-colour.patch
@@ -1,10 +1,10 @@
--- a/lib/main.vala
+++ b/lib/main.vala
-@@ -183,6 +183,7 @@
- Pango.FontDescription description;
- var style = get_style_context ();
- 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);
+@@ -207,6 +207,7 @@
- var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, W, H);
+ 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
index 69698d37..2d2329c3 100644
--- a/debian/patches/disable-experimental-non-null.patch
+++ b/debian/patches/disable-experimental-non-null.patch
@@ -9,7 +9,7 @@
+AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
- indicator_keyboard_test_SOURCES = main.vala \
+ indicator_keyboard_tests_SOURCES = main.vala \
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -146,7 +146,7 @@
diff --git a/debian/patches/relax-test-missing-ibus.patch b/debian/patches/relax-test-missing-ibus.patch
new file mode 100644
index 00000000..5b384579
--- /dev/null
+++ b/debian/patches/relax-test-missing-ibus.patch
@@ -0,0 +1,11 @@
+--- 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
index 83bb2430..2a60b05c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
default-icon-colour.patch
disable-experimental-non-null.patch
+relax-test-missing-ibus.patch