Accepting request 477849 from home:Zaitor:branches:GNOME:Factory

Drop obsolete patch, no current version of openSUSE are using that version of vala anymore.

OBS-URL: https://build.opensuse.org/request/show/477849
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=159
This commit is contained in:
Marguerite Su 2017-03-09 12:05:55 +00:00 committed by Git OBS Bridge
parent c234992d6d
commit 0f76521279
3 changed files with 5 additions and 17 deletions

View File

@ -1,13 +0,0 @@
Index: ibus-1.5.8/configure.ac
===================================================================
--- ibus-1.5.8.orig/configure.ac
+++ ibus-1.5.8/configure.ac
@@ -125,7 +125,7 @@ AC_SUBST(DATE_DISPLAY)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CC_STDC
-AM_PROG_VALAC([0.20])
+AM_PROG_VALAC([0.18])
AC_PROG_INSTALL
AC_PROG_MAKE_SET

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 1 14:25:29 UTC 2017 - zaitor@opensuse.org
- Drop ibus-vala-0.18.patch: No longer needed.
-------------------------------------------------------------------
Wed Mar 1 13:16:08 UTC 2017 - dimstar@opensuse.org

View File

@ -58,9 +58,6 @@ Patch4: ibus-xim-fix-re-focus-after-lock.patch
# is enabled, and fix syntax errors in python-config.py
Patch5: ibus-force-python3.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
# lower vala version
Patch6: ibus-vala-0.18.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
Patch7: ibus-python3-migration.patch
# PATCH-FIX-UPSTREAM ftake@geeko.jp
# Select an IM engine at the first login
@ -243,7 +240,6 @@ docs for ibus.
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if 0%{?suse_version} < 1310
%patch6 -p1
sed -i \
-e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
-e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \