[rpms/ibus] autotool: Add --with-python-overrides-dir configure option for Flatpak

[Takao Fujiwara <tfujiwar@redhat.com>]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : b281cd08ee72367930109768d4195150bcbb3015
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2024-10-04T22:10:32+09:00
Stats  : +76/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/b281cd08ee72367930109768d4195150bcbb3015?branch=autotool

Log:
Add --with-python-overrides-dir configure option for Flatpak

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index f98c588..0f28d71 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -81,3 +81,75 @@ index caad1b0b..10d09d75 100644
 -- 
 2.46.0
 
+From eb92f6f1a3401ad8b1b884c1ceab5dbdc4942403 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 4 Oct 2024 21:34:02 +0900
+Subject: [PATCH] configure: Add --with-python-overrides-dir option
+
+The default GI directory is /usr in Flatpak but the directory is readonly
+with `flatpak-builder` and the Flatpak specific GI files are installed in
+/app GI directory.
+
+Fixes: https://github.com/ibus/ibus/commit/20b29c1
+---
+ configure.ac                          | 28 +++++++++++++++------------
+ test/org.test.IBus.Fedoraproject.json |  4 ++--
+ test/org.test.IBus.Freedesktop.json   |  4 ++--
+ test/org.test.IBus.GNOME.json         |  4 ++--
+ 4 files changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ec392a81..453c83ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,24 +512,27 @@ AM_CONDITIONAL([ENABLE_DAEMON], [true])
+ 
+ PYGOBJECT_REQUIRED=3.0.0
+ 
++# Define Python overrides dir.
+ # When IBus is built with the Json files in test directory, the build
+-# tries to install IBus.py file into pyoverridesdir
+-# but the directory is readonly with `flatpak-builder`
+-AC_ARG_ENABLE(pygobject,
+-    AS_HELP_STRING([--disable-pygobject],
+-                   [Disable pygobject.]),
+-    [enable_pygobject=$enableval],
+-    [enable_pygobject=yes]
++# tries to install IBus.py file into pyoverridesdir.
++# The default GI directory is /usr in Flatpak but the directory is readonly
++# with `flatpak-builder` and the Flatpak specific GI files are installed in
++# /app GI directory.
++AC_ARG_WITH(python-overrides-dir,
++    AS_HELP_STRING([--with-python-overrides-dir[=DIR]],
++        [Select Python overrides dir]),
++    pyoverridesdir=$with_python_overrides_dir
+ )
+ 
+-if test "x$enable_pygobject" = "xyes"; then
+-    PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
+-                     [enable_pygobject=yes], [enable_pygobject=no])
+-fi
++PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
++                 [enable_pygobject=yes], [enable_pygobject=no])
++
+ if test "x$enable_pygobject" = "xyes"; then
+     PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
+ 
+-    pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
++    if test x"$pyoverridesdir" = x""; then
++        pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
++    fi
+     AC_SUBST(pyoverridesdir)
+ 
+     if test x"$enable_python2" = x"yes"; then
+@@ -935,6 +938,7 @@ Build options:
+   CFLAGS                        $CFLAGS
+   PYTHON                        $PYTHON
+   PYTHON2                       $PYTHON2
++  Python overrides dir          $pyoverridesdir
+   Enable python2                $enable_python2
+   Gtk2 immodule dir             $GTK2_IM_MODULEDIR
+   Gtk3 immodule dir             $GTK3_IM_MODULEDIR
+-- 
+2.46.1
+

diff --git a/ibus.spec b/ibus.spec
index c85098b..be4487a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,7 +62,7 @@
 Name:           ibus
 Version:        1.5.31~beta2
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -614,6 +614,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Oct 04 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta2-3
+- Add --with-python-overrides-dir configure option for Flatpak
+
 * Tue Sep 24 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta2-2
 - Resolves #2310892 Show Emojier dialog from menu item