| 1 |
commit: 5cd01d132be45451a6ce59844c62b6d50242d5e9 |
| 2 |
Author: Naohiro Aota <naota <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 4 21:47:46 2018 +0000 |
| 4 |
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 5 09:55:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd01d13 |
| 7 |
|
| 8 |
app-i18n/ibus: add patch to fix test failures |
| 9 |
|
| 10 |
Add upstream patch to enable GSettings in the test. |
| 11 |
https://github.com/ibus/ibus/commit/10cc30eac200d10b581d9d2122d5a732f4880943 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/664804 |
| 14 |
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org> |
| 15 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 16 |
|
| 17 |
.../ibus-1.5.18-enable-gsettings-in-runtest.patch | 62 ++++++++++++++++++++++ |
| 18 |
app-i18n/ibus/ibus-1.5.18.ebuild | 4 +- |
| 19 |
2 files changed, 65 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..24b5cd3f6a8 |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-i18n/ibus/files/ibus-1.5.18-enable-gsettings-in-runtest.patch |
| 26 |
@@ -0,0 +1,62 @@ |
| 27 |
+From 4b4fe00cc2750713ef8d2bc0a9f396ab577c36fc Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Naohiro Aota <naota@g.o> |
| 29 |
+Date: Thu, 4 Oct 2018 18:14:17 +0900 |
| 30 |
+Subject: [PATCH] src/tests: Enable GSettings in runtest in ibus-1.5.18 |
| 31 |
+ |
| 32 |
+This patch is based on: |
| 33 |
+https://github.com/ibus/ibus/commit/10cc30eac200d10b581d9d2122d5a732f4880943 |
| 34 |
+ |
| 35 |
+Signed-off-by: Naohiro Aota <naota@g.o> |
| 36 |
+--- |
| 37 |
+ src/tests/runtest | 21 +++++++++++++++++++++ |
| 38 |
+ 1 file changed, 21 insertions(+) |
| 39 |
+ |
| 40 |
+diff --git a/src/tests/runtest b/src/tests/runtest |
| 41 |
+index 0e43fee..84d85ab 100755 |
| 42 |
+--- a/src/tests/runtest |
| 43 |
++++ b/src/tests/runtest |
| 44 |
+@@ -29,6 +29,7 @@ ibus-engine-switch |
| 45 |
+ ibus-compose |
| 46 |
+ test-stress |
| 47 |
+ " |
| 48 |
++IBUS_SCHEMA_FILE='org.freedesktop.ibus.gschema.xml' |
| 49 |
+ |
| 50 |
+ # Portable replacement of basename. |
| 51 |
+ func_basename () { |
| 52 |
+@@ -80,6 +81,12 @@ trap 'func_cleanup $tstdir' 1 2 3 15 |
| 53 |
+ tst=$1; shift |
| 54 |
+ tstdir=tmp-`func_basename $tst` |
| 55 |
+ |
| 56 |
++# IBusEngine has GSettings |
| 57 |
++if test ! -f "$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" ; then |
| 58 |
++ echo "NOT FOUND $top_builddir/data/dconf/$IBUS_SCHEMA_FILE" |
| 59 |
++ exit -1 |
| 60 |
++fi |
| 61 |
++ |
| 62 |
+ test -d $tstdir || mkdir $tstdir |
| 63 |
+ |
| 64 |
+ ( cd $tstdir |
| 65 |
+@@ -101,6 +108,20 @@ test -d $tstdir || mkdir $tstdir |
| 66 |
+ IBUS_ADDRESS_FILE=$PWD/ibus-daemon.pid |
| 67 |
+ export IBUS_ADDRESS_FILE |
| 68 |
+ |
| 69 |
++ cp "../$top_builddir/data/dconf/$IBUS_SCHEMA_FILE" $PWD |
| 70 |
++ glib-compile-schemas $PWD |
| 71 |
++ if test $? -ne 0 ; then |
| 72 |
++ echo "FAILED glib-compile-schemas" |
| 73 |
++ retval=1 |
| 74 |
++ return |
| 75 |
++ fi |
| 76 |
++ if test ! -f $PWD/gschemas.compiled ; then |
| 77 |
++ echo "NOT FOUND $PWD/gschemas.compiled" |
| 78 |
++ retval=1 |
| 79 |
++ return |
| 80 |
++ fi |
| 81 |
++ export GSETTINGS_SCHEMA_DIR=$PWD |
| 82 |
++ |
| 83 |
+ # Start ibus-daemon. |
| 84 |
+ ../$top_builddir/bus/ibus-daemon \ |
| 85 |
+ --daemonize \ |
| 86 |
+-- |
| 87 |
+2.19.0 |
| 88 |
+ |
| 89 |
|
| 90 |
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild |
| 91 |
index 4aff43a818d..d966417a8ef 100644 |
| 92 |
--- a/app-i18n/ibus/ibus-1.5.18.ebuild |
| 93 |
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2018 Gentoo Foundation |
| 96 |
+# Copyright 1999-2018 Gentoo Authors |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI="6" |
| 100 |
@@ -72,6 +72,8 @@ DEPEND="${CDEPEND} |
| 101 |
nls? ( sys-devel/gettext ) |
| 102 |
unicode? ( app-i18n/unicode-data )" |
| 103 |
|
| 104 |
+PATCHES=( "${FILESDIR}"/${P}-enable-gsettings-in-runtest.patch ) |
| 105 |
+ |
| 106 |
src_prepare() { |
| 107 |
vala_src_prepare --ignore-use |
| 108 |
sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac |
Archives