[ibus] Fixed a build failure in rawhide.
Takao Fujiwara
fujiwara at fedoraproject.org
Wed Jan 16 01:28:56 UTC 2013
commit c6718d9385aefc55fa24ca07cfbf501a969fa05f
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Wed Jan 16 10:25:30 2013 +0900
Fixed a build failure in rawhide.
ibus-xx-f17.patch | 80 -
ibus-xx-vapi-build-failure.diff | 8847 --------------------------------------
ibus-xx-vapi-build-failure.patch | 80 +
ibus.spec | 4 +
4 files changed, 84 insertions(+), 8927 deletions(-)
---
diff --git a/ibus-xx-f17.patch b/ibus-xx-f17.patch
index 01bffe3..9fda068 100644
--- a/ibus-xx-f17.patch
+++ b/ibus-xx-f17.patch
@@ -1,83 +1,3 @@
---- ibus-1.5.1/bindings/vala/Makefile.am.orig 2013-01-15 16:58:25.571433690 +0900
-+++ ibus-1.5.1/bindings/vala/Makefile.am 2013-01-15 16:58:46.983455158 +0900
-@@ -20,17 +20,38 @@
- # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- # Boston, MA 02111-1307 USA
-
---include $(VAPIGEN_MAKEFILE)
-+vapidir = $(datadir)/vala/vapi
-+dist_vapi_DATA = \
-+ ibus- at IBUS_API_VERSION@.vapi \
-+ ibus- at IBUS_API_VERSION@.deps \
-+ $(NULL)
-
-+# Don't rebuild vapi every time gir is updated.
-+if ENABLE_LIBGNOMEKBD
- vapi_deps = \
-- IBus-1.0.metadata \
-- IBus-1.0-custom.vala \
-- $(top_builddir)/src/IBus-1.0.gir \
-+ $(srcdir)/IBus-1.0.metadata \
-+ $(srcdir)/IBus-1.0-custom.vala \
-+ | \
-+ $(builddir)/gkbd.vapi \
-+ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
- $(NULL)
-+else
-+vapi_deps = \
-+ $(srcdir)/IBus-1.0.metadata \
-+ $(srcdir)/IBus-1.0-custom.vala \
-+ | \
-+ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
-+ $(NULL)
-+endif
-
--if ENABLE_LIBGNOMEKBD
--vapi_deps += $(builddir)/gkbd.vapi
-+ibus- at IBUS_API_VERSION@.vapi: $(vapi_deps)
-+ $(AM_V_GEN) $(VAPIGEN) --library ibus- at IBUS_API_VERSION@ \
-+ --pkg gio-2.0 \
-+ --metadatadir=$(srcdir) \
-+ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
-+ $(srcdir)/IBus-1.0-custom.vala
-
-+if ENABLE_LIBGNOMEKBD
- $(builddir)/gkbd.vapi:
- $(AM_V_GEN) $(VAPIGEN) --library gkbd \
- --metadatadir $(srcdir) \
-@@ -39,25 +60,10 @@ $(builddir)/gkbd.vapi:
- $(NULL)
- endif
-
--ibus-1.0.vapi: $(vapi_deps)
--
--VAPIGEN_VAPIS = ibus-1.0.vapi
--
--ibus_1_0_vapi_DEPS = gio-2.0
--ibus_1_0_vapi_METADATADIRS = $(srcdir)
--ibus_1_0_vapi_FILES = \
-- $(top_builddir)/src/IBus-1.0.gir \
-- $(srcdir)/IBus-1.0-custom.vala \
-- $(NULL)
--
--vapidir = $(datadir)/vala/vapi
--vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
--
- EXTRA_DIST = \
- Gkbd-3.0.metadata \
- IBus-1.0.metadata \
- IBus-1.0-custom.vala \
-- ibus-1.0.deps \
- config.vapi \
- xi.vapi \
- Xkl-1.0.metadata \
-@@ -65,4 +71,6 @@ EXTRA_DIST = \
-
- CLEANFILES = gkbd.vapi
-
-+MAINTAINERCLEANFILES = ibus- at IBUS_API_VERSION@.vapi
-+
- -include $(top_srcdir)/git.mk
--- ibus-1.5.1/setup/keyboardshortcut.py.orig 2013-01-15 17:00:05.093191054 +0900
+++ ibus-1.5.1/setup/keyboardshortcut.py 2013-01-15 17:00:18.034160760 +0900
@@ -207,7 +207,7 @@ class KeyboardShortcutSelection(Gtk.VBox
diff --git a/ibus-xx-vapi-build-failure.patch b/ibus-xx-vapi-build-failure.patch
new file mode 100644
index 0000000..20670db
--- /dev/null
+++ b/ibus-xx-vapi-build-failure.patch
@@ -0,0 +1,80 @@
+--- ibus-1.5.1/bindings/vala/Makefile.am.orig 2013-01-15 16:58:25.571433690 +0900
++++ ibus-1.5.1/bindings/vala/Makefile.am 2013-01-15 16:58:46.983455158 +0900
+@@ -20,17 +20,38 @@
+ # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ # Boston, MA 02111-1307 USA
+
+--include $(VAPIGEN_MAKEFILE)
++vapidir = $(datadir)/vala/vapi
++dist_vapi_DATA = \
++ ibus- at IBUS_API_VERSION@.vapi \
++ ibus- at IBUS_API_VERSION@.deps \
++ $(NULL)
+
++# Don't rebuild vapi every time gir is updated.
++if ENABLE_LIBGNOMEKBD
+ vapi_deps = \
+- IBus-1.0.metadata \
+- IBus-1.0-custom.vala \
+- $(top_builddir)/src/IBus-1.0.gir \
++ $(srcdir)/IBus-1.0.metadata \
++ $(srcdir)/IBus-1.0-custom.vala \
++ | \
++ $(builddir)/gkbd.vapi \
++ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
+ $(NULL)
++else
++vapi_deps = \
++ $(srcdir)/IBus-1.0.metadata \
++ $(srcdir)/IBus-1.0-custom.vala \
++ | \
++ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
++ $(NULL)
++endif
+
+-if ENABLE_LIBGNOMEKBD
+-vapi_deps += $(builddir)/gkbd.vapi
++ibus- at IBUS_API_VERSION@.vapi: $(vapi_deps)
++ $(AM_V_GEN) $(VAPIGEN) --library ibus- at IBUS_API_VERSION@ \
++ --pkg gio-2.0 \
++ --metadatadir=$(srcdir) \
++ $(top_srcdir)/src/IBus- at IBUS_API_VERSION@.gir \
++ $(srcdir)/IBus-1.0-custom.vala
+
++if ENABLE_LIBGNOMEKBD
+ $(builddir)/gkbd.vapi:
+ $(AM_V_GEN) $(VAPIGEN) --library gkbd \
+ --metadatadir $(srcdir) \
+@@ -39,25 +60,10 @@ $(builddir)/gkbd.vapi:
+ $(NULL)
+ endif
+
+-ibus-1.0.vapi: $(vapi_deps)
+-
+-VAPIGEN_VAPIS = ibus-1.0.vapi
+-
+-ibus_1_0_vapi_DEPS = gio-2.0
+-ibus_1_0_vapi_METADATADIRS = $(srcdir)
+-ibus_1_0_vapi_FILES = \
+- $(top_builddir)/src/IBus-1.0.gir \
+- $(srcdir)/IBus-1.0-custom.vala \
+- $(NULL)
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+-
+ EXTRA_DIST = \
+ Gkbd-3.0.metadata \
+ IBus-1.0.metadata \
+ IBus-1.0-custom.vala \
+- ibus-1.0.deps \
+ config.vapi \
+ xi.vapi \
+ Xkl-1.0.metadata \
+@@ -65,4 +71,6 @@ EXTRA_DIST = \
+
+ CLEANFILES = gkbd.vapi
+
++MAINTAINERCLEANFILES = ibus- at IBUS_API_VERSION@.vapi
++
+ -include $(top_srcdir)/git.mk
diff --git a/ibus.spec b/ibus.spec
index 2767740..98930e7 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -66,6 +66,8 @@ Patch92: %{name}-xx-g-s-disable-preedit.patch
# The patch enables to build on fedora 17.
Patch93: %{name}-xx-f17.patch
%endif
+# Fix the build failure in f17 and f19 vala.
+Patch94: %{name}-xx-vapi-build-failure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -269,6 +271,8 @@ UpdateTimestamps -p1 %{PATCH4}
%patch93 -p1 -b .f17
UpdateTimestamps -p1 %{PATCH93}
%endif
+%patch94 -p1 -b .vapi
+UpdateTimestamps -p1 %{PATCH94}
%build
%if %with_xkbfile
More information about the scm-commits
mailing list