nixpkgs/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch

diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
index 32cb1530..375baa41 100755
--- a/data/dconf/make-dconf-override-db.sh
+++ b/data/dconf/make-dconf-override-db.sh
@@ -12,15 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
 export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
 mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
 
-eval `dbus-launch --sh-syntax`
-
-trap cleanup EXIT
-
-cleanup() {
-  test $? -eq 0 && exit
-  rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID
-}
-
 # in case that schema is not installed on the system
 glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
 
@@ -57,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then
     umount $TMPDIR/cache/gvfs
 fi
 rm -rf $TMPDIR
-
-kill $DBUS_SESSION_BUS_PID
ibus: build without dbus-launch Patch the build script so that it does not attempt to start D-Bus. ibus attempted to start D-Bus using `dbus-launch` in order to process GSettings schemas. This will fail in the sandbox, but it turns out that we don't need it anyway! 2023-02-20 19:01:58 +00:00			`diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh`
ibus: 1.5.28 -> 1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29-rc1 This release fixes build reproducibility with parallel `make`. Changes: - Adds libdbusmenu-gtk3 dependency, now required for appindicator support - Adds workaround for interaction between `AX_PROG_{CC,CXX}` autoconf macro and unwrapped GCC binaries - Patches generated version number to remove incorrect `-rcX` suffix - Removes upstreamed patches, rebases `build-without-dbus-launch.patch` - Enables Wayland by default to match upstream behavior 2023-12-28 20:06:06 +00:00			`index 32cb1530..375baa41 100755`
ibus: build without dbus-launch Patch the build script so that it does not attempt to start D-Bus. ibus attempted to start D-Bus using `dbus-launch` in order to process GSettings schemas. This will fail in the sandbox, but it turns out that we don't need it anyway! 2023-02-20 19:01:58 +00:00			`--- a/data/dconf/make-dconf-override-db.sh`
			`+++ b/data/dconf/make-dconf-override-db.sh`
ibus: 1.5.28 -> 1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29-rc1 This release fixes build reproducibility with parallel `make`. Changes: - Adds libdbusmenu-gtk3 dependency, now required for appindicator support - Adds workaround for interaction between `AX_PROG_{CC,CXX}` autoconf macro and unwrapped GCC binaries - Patches generated version number to remove incorrect `-rcX` suffix - Removes upstreamed patches, rebases `build-without-dbus-launch.patch` - Enables Wayland by default to match upstream behavior 2023-12-28 20:06:06 +00:00			`@@ -12,15 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"`
ibus: build without dbus-launch Patch the build script so that it does not attempt to start D-Bus. ibus attempted to start D-Bus using `dbus-launch` in order to process GSettings schemas. This will fail in the sandbox, but it turns out that we don't need it anyway! 2023-02-20 19:01:58 +00:00			`export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"`
			`mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR`

			-eval `dbus-launch --sh-syntax`
			`-`
ibus: 1.5.28 -> 1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29-rc1 This release fixes build reproducibility with parallel `make`. Changes: - Adds libdbusmenu-gtk3 dependency, now required for appindicator support - Adds workaround for interaction between `AX_PROG_{CC,CXX}` autoconf macro and unwrapped GCC binaries - Patches generated version number to remove incorrect `-rcX` suffix - Removes upstreamed patches, rebases `build-without-dbus-launch.patch` - Enables Wayland by default to match upstream behavior 2023-12-28 20:06:06 +00:00			`-trap cleanup EXIT`
			`-`
			`-cleanup() {`
			`- test $? -eq 0 && exit`
			`- rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID`
			`-}`
ibus: build without dbus-launch Patch the build script so that it does not attempt to start D-Bus. ibus attempted to start D-Bus using `dbus-launch` in order to process GSettings schemas. This will fail in the sandbox, but it turns out that we don't need it anyway! 2023-02-20 19:01:58 +00:00			`-`
			`# in case that schema is not installed on the system`
			`glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"`

ibus: 1.5.28 -> 1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29 https://github.com/ibus/ibus/releases/tag/1.5.29-rc1 This release fixes build reproducibility with parallel `make`. Changes: - Adds libdbusmenu-gtk3 dependency, now required for appindicator support - Adds workaround for interaction between `AX_PROG_{CC,CXX}` autoconf macro and unwrapped GCC binaries - Patches generated version number to remove incorrect `-rcX` suffix - Removes upstreamed patches, rebases `build-without-dbus-launch.patch` - Enables Wayland by default to match upstream behavior 2023-12-28 20:06:06 +00:00			`@@ -57,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then`
ibus: build without dbus-launch Patch the build script so that it does not attempt to start D-Bus. ibus attempted to start D-Bus using `dbus-launch` in order to process GSettings schemas. This will fail in the sandbox, but it turns out that we don't need it anyway! 2023-02-20 19:01:58 +00:00			`umount $TMPDIR/cache/gvfs`
			`fi`
			`rm -rf $TMPDIR`
			`-`
			`-kill $DBUS_SESSION_BUS_PID`