Commit 2038eb43 authored by Osamu Aoki's avatar Osamu Aoki

adjust path to Debian multiarch

Signed-off-by: Osamu Aoki's avatarOsamu Aoki <osamu@debian.org>
parent e351ece9
From: Simon McVittie <smcv@debian.org>
Subject: Re: Bug#922516: missing binary gtk-query-immodules-3.0
Date: Sun, 17 Feb 2019 14:18:48 +0000
Please add /usr/lib/x86_64-linux-gnu/libgtk-3-0 to the PATH when running
tests that rely on gtk-query-immodules-3.0, or invoke it by its full
path. Note that this is a Debian-specific change and should not be
upstreamed.
--- a/src/tests/runtest
+++ b/src/tests/runtest
@@ -36,12 +36,15 @@
test-stress
"
IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml'
-GTK_QUERY_MODULE=gtk-query-immodules-3.0-32
+#GTK_QUERY_MODULE=gtk-query-immodules-3.0-32
+# On Debian with multiarch support, gtk-query-immodules-3.0 is under
+# /usr/lib/x86_64-linux-gnu/libgtk-3-0/
+GTK_QUERY_MODULE=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libgtk-3-0/gtk-query-immodules-3.0
MACHINE=`uname -m`
-if test x"$MACHINE" = xx86_64 ; then
- GTK_QUERY_MODULE=gtk-query-immodules-3.0-64
-fi
+###if test x"$MACHINE" = xx86_64 ; then
+### GTK_QUERY_MODULE=gtk-query-immodules-3.0-64
+###fi
retval=0
debian-multiarch.patch
bashisn.patch
remove-popup
dconf-Use-dbus-run-session-to-set-up-dconf-overrides.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment