[oe] [RFC meta-gnome][PATCH 02/16] ibus: add recipe for ibus to support gnome-settings-daemon and gnome-shell

Mon Oct 29 22:33:31 UTC 2018

On Mon, Oct 29, 2018 at 5:41 PM brendank310 <brendank310 at gmail.com> wrote:
>
> From: Brendan Kerrigan <kerriganb at ainfosec.com>
>
> Signed-off-by: Brendan Kerrigan <kerriganb at ainfosec.com>
> ---
>  .../ibus/0001-strip-out-dbus-build-dep.patch  | 29 ++++++++++++
>  ...0002-decorate-automake-for-valaflags.patch | 46 +++++++++++++++++++
>  .../recipes-gnome/gnome3/ibus_1.5.19.bb       | 41 +++++++++++++++++
>  3 files changed, 116 insertions(+)
>  create mode 100644 meta-gnome/recipes-gnome/gnome3/ibus/0001-strip-out-dbus-build-dep.patch
>  create mode 100644 meta-gnome/recipes-gnome/gnome3/ibus/0002-decorate-automake-for-valaflags.patch
>  create mode 100644 meta-gnome/recipes-gnome/gnome3/ibus_1.5.19.bb
>
> diff --git a/meta-gnome/recipes-gnome/gnome3/ibus/0001-strip-out-dbus-build-dep.patch b/meta-gnome/recipes-gnome/gnome3/ibus/0001-strip-out-dbus-build-dep.patch
> new file mode 100644
> index 000000000..43197615d
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome3/ibus/0001-strip-out-dbus-build-dep.patch
> @@ -0,0 +1,29 @@
> +ibus: Don't run dbus tests within the build.
> +
> +  Prevent a test requiring spawning a dbus session from running
> +  during the build.
> +
> +  Upstream-status: Inappropriate [disable-feature]
> +
> +  Signed-off-by: Brendan Kerrigan <kerriganb at ainfosec.com>
> +
> +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
> +index 9c650e9..d7320c3 100755
> +--- a/data/dconf/make-dconf-override-db.sh
> ++++ b/data/dconf/make-dconf-override-db.sh
> +@@ -12,10 +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 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
> +-
> + # in case that schema is not installed on the system
> + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
> +
> +@@ -47,4 +43,3 @@ done
> +
> + rm -rf $TMPDIR
> +
> +-kill $DBUS_SESSION_BUS_PID
> diff --git a/meta-gnome/recipes-gnome/gnome3/ibus/0002-decorate-automake-for-valaflags.patch b/meta-gnome/recipes-gnome/gnome3/ibus/0002-decorate-automake-for-valaflags.patch
> new file mode 100644
> index 000000000..b15fec1d4
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome3/ibus/0002-decorate-automake-for-valaflags.patch
> @@ -0,0 +1,46 @@
> +ibus: Add automake decorations to sed in appropriate paths
> +
> +  Multiple vapidir paths are required to build ibus correctly,
> +  so decorations are added to the automake files to allow for
> +  sed'ing the appropriate path during do_configure_prepend.
> +
> +  Upstream-status: Inappropriate [configuration]
> +
> +  Signed-off-by: Brendan Kerrigan <kerriganb at ainfosec.com>
> +
> +diff --git a/engine/Makefile.am b/engine/Makefile.am
> +index 86f0e2b..7e922b5 100644
> +--- a/engine/Makefile.am
> ++++ b/engine/Makefile.am
> +@@ -53,6 +53,7 @@ AM_VALAFLAGS = \
> +       --vapidir=$(top_builddir)/bindings/vala \
> +       --pkg=ibus-1.0 \
> +       --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
> ++      @EXTRA_AM_VALAFLAGS@ \
> +       $(NULL)
> +
> + libexec_PROGRAMS = \
> +diff --git a/tools/Makefile.am b/tools/Makefile.am
> +index 5c18d3d..fe727c1 100644
> +--- a/tools/Makefile.am
> ++++ b/tools/Makefile.am
> +@@ -61,6 +61,7 @@ AM_VALAFLAGS = \
> +       --pkg=posix \
> +       --pkg=config \
> +       --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
> ++      @EXTRA_AM_VALAFLAGS@ \
> +       $(NULL)
> +
> + bin_PROGRAMS = ibus
> +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
> +index aaba7a4..ba48175 100644
> +--- a/ui/gtk3/Makefile.am
> ++++ b/ui/gtk3/Makefile.am
> +@@ -80,6 +80,7 @@ AM_VALAFLAGS = \
> +       --pkg=xi \
> +       --pkg=gdk-wayland \
> +       --target-glib="$(VALA_TARGET_GLIB_VERSION)" \
> ++      @EXTRA_AM_VALAFLAGS@ \
> +       $(NULL)
> +
> + if ENABLE_LIBNOTIFY
> diff --git a/meta-gnome/recipes-gnome/gnome3/ibus_1.5.19.bb b/meta-gnome/recipes-gnome/gnome3/ibus_1.5.19.bb
> new file mode 100644
> index 000000000..ce609fda0
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome3/ibus_1.5.19.bb
> @@ -0,0 +1,41 @@
> +DESCRIPTION = "Intelligent Input Bus for Linux/Unix"
> +LICENSE = "LGPLv2.1"
> +DEPENDS = "prelink \
> +           glib-2.0 \
> +           gsettings-desktop-schemas \
> +           json-glib \
> +           gnome-desktop3 \
> +           gettext-native \
> +           intltool-native \
> +           dconf \
> +           libnotify \
> +           gconf-native \
> +           gtk+ \
> +          "
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
> +
> +SRC_URI = " \
> +           https://github.com/ibus/ibus/releases/download/${PV}/${PN}-${PV}.tar.gz \
> +           file://0001-strip-out-dbus-build-dep.patch \
> +           file://0002-decorate-automake-for-valaflags.patch \
> +          "
> +
> +SRC_URI[md5sum] = "a2be6f200dd9ada2501474a6877a73ef"
> +SRC_URI[sha256sum] = "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429"
> +S = "${WORKDIR}/${PN}-${PV}"
> +
> +inherit autotools pkgconfig gtk-doc distro_features_check vala gobject-introspection
> +
> +FILES_${PN} += "${datadir}"
> +FILES_${PN} += "${libdir}"
> +
> +EXTRA_OECONF += " --disable-emoji-dict --disable-unicode-dict --disable-tests "
> +
> +do_configure_prepend() {
> +       touch ${S}/ChangeLog
> +       sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/tools/Makefile.am
> +       sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/engine/Makefile.am
> +       sed -i "s^@EXTRA_AM_VALAFLAGS@^--vapidir=${RECIPE_SYSROOT_NATIVE}${datadir}/vala-0.38/vapi --vapidir=${B}/bindings/vala --pkg gio-2.0^g" ${S}/ui/gtk3/Makefile.am
> +}
> +
We have vala-0.42 on master. Maybe you want to create a variable for
this to avoid redundancies - or better some auto script magic?