commit f55ebdbe40c502c4ee4f87def50f2d61b78a239b
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 20 11:43:58 2014 +0100
- up to 1.5.0.20140114
ibus-xkb-am.patch | 18 ++++++++++++++++++
ibus-xkb-vala.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
ibus-xkb.spec | 34 ++++++++++++++++++++++++---------
3 files changed, 98 insertions(+), 9 deletions(-)
---
diff --git a/ibus-xkb.spec b/ibus-xkb.spec
index 9cbbf4b..02e59df 100644
--- a/ibus-xkb.spec
+++ b/ibus-xkb.spec
@@ -8,16 +8,22 @@
Summary: XKB module for IBus
Summary(pl.UTF-8): Moduł XKB dla platformy IBus
Name: ibus-xkb
-Version: 1.4.99.20120525
-Release: 2
+Version: 1.5.0.20140114
+Release: 1
License: LGPL v2+
Group: Libraries
#Source0Download: http://code.google.com/p/ibus/downloads/list
-Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: c29db74b3add447f58a1bed2d4d55138
-URL: http://code.google.com/p/ibus/
+Source0:
https://github.com/ibus/ibus-xkb/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: c0bc5be7f0c068bea1e4785c5b60694b
+Patch0: %{name}-vala.patch
+Patch1: %{name}-am.patch
+URL: https://github.com/ibus/ibus-xkb/
%{?with_gconf:BuildRequires: GConf2-devel >= 2.12}
%{?with_gnomekbd:BuildRequires: atk-devel}
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake >= 1:1.10
+# dbus-launch used in dconf configuration generation
+%{?with_dconf:BuildRequires: dbus-x11}
%{?with_dconf:BuildRequires: dconf-devel >= 0.7.5}
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.26.0
@@ -25,15 +31,18 @@ BuildRequires: gobject-introspection-devel >= 0.6.8
BuildRequires: gtk+3-devel >= 3.0
BuildRequires: ibus-devel >= 1.4.99
BuildRequires: intltool >= 0.35.0
+BuildRequires: iso-codes
%{?with_gnomekbd:BuildRequires: libgnomekbd-devel}
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python >= 1:2.5
-BuildRequires: vala >= 2:0.14
+BuildRequires: vala >= 2:0.24
BuildRequires: vala-ibus >= 1.4.99
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libxkbfile-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: ibus >= 1.4.99
+Requires: iso-codes
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_libdir}/ibus
@@ -99,11 +108,19 @@ API języka Vala dla biblioteki ibus-xkb.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
+%{__libtoolize}
+%{__intltoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
%{?with_dconf:--enable-dconf} \
- %{!?with_gconf:--disable-gconf} \
+ %{?with_gconf:--enable-gconf} \
%{!?with_gnomekbd:--disable-libgnomekbd} \
--disable-silent-rules \
%{?with_static_libs:--enable-static}
@@ -147,10 +164,9 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS README
%attr(755,root,root) %{_bindir}/ibus-setup-xkb
%attr(755,root,root) %{_libexecdir}/ibus-engine-xkb
-%attr(755,root,root) %{_libexecdir}/ibus-xkb
%attr(755,root,root) %{_libexecdir}/ibus-xkb-ui-gtk3
%{_datadir}/ibus/component/gtkxkbpanel.xml
%{_datadir}/ibus/component/xkb.xml
diff --git a/ibus-xkb-am.patch b/ibus-xkb-am.patch
new file mode 100644
index 0000000..ef92eb2
--- /dev/null
+++ b/ibus-xkb-am.patch
@@ -0,0 +1,18 @@
+--- ibus-xkb-1.5.0.20140114/ui/gtk3/Makefile.am.orig 2014-01-11
15:22:55.000000000 +0100
++++ ibus-xkb-1.5.0.20140114/ui/gtk3/Makefile.am 2014-12-20
10:58:06.226621255 +0100
+@@ -55,7 +55,6 @@
+ @GIO2_CFLAGS@ \
+ @GTHREAD2_CFLAGS@ \
+ @GTK3_CFLAGS@ \
+- @X11_CFLAGS@ \
+ @IBUS_CFLAGS@ \
+ $(INCLUDES) \
+ -DG_LOG_DOMAIN=\"IBUS\" \
+@@ -76,7 +75,6 @@
+ @GIO2_LIBS@ \
+ @GTHREAD2_LIBS@ \
+ @GTK3_LIBS@ \
+- @X11_LIBS@ \
+ @IBUS_LIBS@ \
+ -lXi \
+ $(libibus_xkb) \
diff --git a/ibus-xkb-vala.patch b/ibus-xkb-vala.patch
new file mode 100644
index 0000000..0e52aba
--- /dev/null
+++ b/ibus-xkb-vala.patch
@@ -0,0 +1,55 @@
+Gdk.EventKey is a pointer in Vala 0.23+
+--- ibus-xkb-1.5.0.20140114/ui/gtk3/switcher.vala.orig 2014-01-11
15:22:55.000000000 +0100
++++ ibus-xkb-1.5.0.20140114/ui/gtk3/switcher.vala 2014-12-20
10:53:47.543298768 +0100
+@@ -328,21 +328,21 @@
+
+ public override bool key_press_event(Gdk.EventKey e) {
+ bool retval = true;
+- Gdk.EventKey *pe = &e;
++ Gdk.EventKey pe = e;
+
+ 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
+@@ -350,7 +350,7 @@
+ break;
+ }
+
+- switch (pe->keyval) {
++ switch (pe.keyval) {
+ case 0x08fb: /* leftarrow */
+ case 0xff51: /* Left */
+ previous_engine();
+@@ -366,7 +366,7 @@
+ 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;
+@@ -379,7 +379,7 @@
+ }
+
+ public override bool key_release_event(Gdk.EventKey e) {
+- Gdk.EventKey *pe = &e;
++ Gdk.EventKey pe = e;
+
+ if (KeybindingManager.primary_modifier_still_pressed((Gdk.Event *)pe,
+ m_primary_modifier)) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-xkb.git/commitdiff/f55ebdbe40c502c4ee4f87def50f2d61b78a239b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
