diff --git a/SOURCES/0001-Fix-a-build-error-of-Gdk.EventKey-with-vala-0.23.2.patch b/SOURCES/0001-Fix-a-build-error-of-Gdk.EventKey-with-vala-0.23.2.patch new file mode 100644 index 0000000..f9d2f93 --- /dev/null +++ b/SOURCES/0001-Fix-a-build-error-of-Gdk.EventKey-with-vala-0.23.2.patch @@ -0,0 +1,82 @@ +From 67343c621eb5b19bfba40d3b3af6ddacf7032e1c Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Fri, 21 Feb 2014 11:45:55 +0900 +Subject: [PATCH] Fix a build error of Gdk.EventKey with vala 0.23.2 + +Review URL: https://codereview.appspot.com/66480044 +--- + ui/gtk3/switcher.vala | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala +index c606682..d7f7366 100644 +--- a/ui/gtk3/switcher.vala ++++ b/ui/gtk3/switcher.vala +@@ -340,21 +340,29 @@ class Switcher : Gtk.Window { + + public override bool key_press_event(Gdk.EventKey e) { + bool retval = true; ++ ++/* Gdk.EventKey is changed to the pointer. ++ * https://git.gnome.org/browse/vala/commit/?id=598942f1 ++ */ ++#if VALA_0_24 ++ Gdk.EventKey pe = e; ++#else + Gdk.EventKey *pe = &e; ++#endif + + if (m_popup_delay_time > 0) { + restore_window_position("pressed"); + } + + do { +- uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state; ++ uint modifiers = KeybindingManager.MODIFIER_FILTER & pe.state; + + if ((modifiers != m_modifiers) && + (modifiers != (m_modifiers | Gdk.ModifierType.SHIFT_MASK))) { + break; + } + +- if (pe->keyval == m_keyval) { ++ if (pe.keyval == m_keyval) { + if (modifiers == m_modifiers) + next_engine(); + else // modififers == m_modifiers | SHIFT_MASK +@@ -362,7 +370,7 @@ class Switcher : Gtk.Window { + break; + } + +- switch (pe->keyval) { ++ switch (pe.keyval) { + case 0x08fb: /* leftarrow */ + case 0xff51: /* Left */ + previous_engine(); +@@ -378,7 +386,7 @@ class Switcher : Gtk.Window { + case 0xff54: /* Down */ + break; + default: +- debug("0x%04x", pe->keyval); ++ debug("0x%04x", pe.keyval); + if (m_loop != null) { + m_loop.quit(); + m_loop = null; +@@ -391,9 +399,13 @@ class Switcher : Gtk.Window { + } + + public override bool key_release_event(Gdk.EventKey e) { ++#if VALA_0_24 ++ Gdk.EventKey pe = e; ++#else + Gdk.EventKey *pe = &e; ++#endif + +- if (KeybindingManager.primary_modifier_still_pressed((Gdk.Event *)pe, ++ if (KeybindingManager.primary_modifier_still_pressed((Gdk.Event) pe, + m_primary_modifier)) { + return true; + } +-- +2.4.3 + diff --git a/SPECS/ibus.spec b/SPECS/ibus.spec index 9136a67..621214f 100644 --- a/SPECS/ibus.spec +++ b/SPECS/ibus.spec @@ -26,7 +26,7 @@ Name: ibus Version: 1.5.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -44,6 +44,8 @@ Patch2: %{name}-541492-xkb.patch Patch3: %{name}-530711-preload-sys.patch # Hide minor input method engines on ibus-setup by locale Patch4: %{name}-xx-setup-frequent-lang.patch +# Fix build with newer vala versions +Patch5: 0001-Fix-a-build-error-of-Gdk.EventKey-with-vala-0.23.2.patch # Removed the target. # rhpkg srpm's target is rhel but it runs on fedora box. @@ -230,6 +232,7 @@ rm -f data/dconf/00-upstream-settings %endif %patch3 -p1 -b .preload-sys %patch4 -p1 -b .setup-frequent-lang +%patch5 -p1 %if (0%{?fedora} < 19 && 0%{?rhel} < 7) %patch95 -p1 -b .ctrl @@ -418,6 +421,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &> /dev/null || : %{_datadir}/gtk-doc/html/* %changelog +* Thu Jul 23 2015 Rui Matos - 1.5.3-13 +- Resolves: #1238397 - ibus doesn't build with vala in 7.2 + * Fri Apr 03 2015 Takao Fujiwara - 1.5.3-12 - Resolves: #1183909 - programs using "PreeditType: OverTheSpot" is stalled - Resolves: #1191825 - gtk2's immodules.cache won't be updated in some cases