Re: [PR PATCH] [Updated] ibus: update to 1.5.28.

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages ibus
https://github.com/void-linux/void-packages/pull/42460

ibus: update to 1.5.28.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42460.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ibus-42460.patch --]
[-- Type: text/x-diff, Size: 4658 bytes --]

From 31e2f1ba5c09538ff4be0bf231a13e547d956ff2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Feb 2023 05:41:35 -0800
Subject: [PATCH] ibus: update to 1.5.28.

---
 srcpkgs/ibus/patches/fix-cross.patch | 74 ++++++++++++++++++++++++++++
 srcpkgs/ibus/template                | 12 +++--
 2 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/ibus/patches/fix-cross.patch

diff --git a/srcpkgs/ibus/patches/fix-cross.patch b/srcpkgs/ibus/patches/fix-cross.patch
new file mode 100644
index 000000000000..94fc253b972a
--- /dev/null
+++ b/srcpkgs/ibus/patches/fix-cross.patch
@@ -0,0 +1,74 @@
+From f61de00ad884b3272ebdede574a4937cd93921a2 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 26 Feb 2023 05:31:50 -0800
+Subject: [PATCH] configure: Fix cross compiling with
+ gen-internal-compose-table
+
+Use AX_PROG_CC_FOR_BUILD to get build CC/CFLAGS/LDFLAGS/etc.
+Use AC_COMPILE_IFELSE insead of AC_RUN_IFELSE.
+---
+ configure.ac    | 8 ++++++--
+ src/Makefile.am | 9 ++++++++-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cba242df2..8cac59d23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -131,6 +131,10 @@ AM_PROG_VALAC([0.20])
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
++m4_ifdef([AX_PROG_CC_FOR_BUILD], [
++AX_PROG_CC_FOR_BUILD
++], [AC_FATAL([AX_PROG_CC_FOR_BUILD not found, you'll need to install autoconf-archive])])
++
+ # i18n stuff
+ AM_GNU_GETTEXT_VERSION([0.19.8])
+ AM_GNU_GETTEXT([external])
+@@ -154,7 +158,7 @@ AC_SUBST(LIBDL)
+ # Check endianness.
+ AC_MSG_CHECKING([build system endianness])
+ ENDIAN=unknown
+-AC_RUN_IFELSE(
++AC_COMPILE_IFELSE(
+     [AC_LANG_PROGRAM(
+         [[
+             #include <endian.h>
+@@ -165,7 +169,7 @@ AC_RUN_IFELSE(
+     )],
+     [ENDIAN=little]
+ )
+-AC_RUN_IFELSE(
++AC_COMPILE_IFELSE(
+     [AC_LANG_PROGRAM(
+         [[
+             #include <endian.h>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 426376ddd..65624afb3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -41,7 +41,9 @@ INTROSPECTION_COMPILER_ARGS = \
+     $(NULL)
+ INTROSPECTION_GIRS =
+ CLEANFILES =
+-noinst_PROGRAMS = gen-internal-compose-table
++
++GEN_INTERNAL_COMPOSE_TABLE = gen-internal-compose-table
++noinst_PROGRAMS = $(GEN_INTERNAL_COMPOSE_TABLE)
+ 
+ # C preprocessor flags
+ AM_CPPFLAGS =                                           \
+@@ -196,6 +198,11 @@ gen_internal_compose_table_SOURCES = \
+     ibuskeyuni.c        \
+     $(NULL)
+ gen_internal_compose_table_CFLAGS = $(AM_CFLAGS)
++$(GEN_INTERNAL_COMPOSE_TABLE): CC=$(CC_FOR_BUILD)
++$(GEN_INTERNAL_COMPOSE_TABLE): CCLD=$(CC_FOR_BUILD)
++$(GEN_INTERNAL_COMPOSE_TABLE): CFLAGS=$(CFLAGS_FOR_BUILD)
++$(GEN_INTERNAL_COMPOSE_TABLE): CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++$(GEN_INTERNAL_COMPOSE_TABLE): LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ gen_internal_compose_table_LDADD = \
+     @GLIB2_LIBS@        \
+     @GOBJECT2_LIBS@     \
+
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 77a7a06a3037..b704c703b386 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus'
 pkgname=ibus
-version=1.5.27
-revision=2
+version=1.5.28
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --enable-gtk4
@@ -11,7 +11,7 @@ configure_args="--enable-ui --enable-gtk3 --enable-gtk4
  $(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
  --enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
 hostmakedepends="pkg-config libtool gettext-devel intltool dconf
- python3 glib-devel vala
+ python3 glib-devel vala automake gtk-doc autoconf-archive
  $(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
 makedepends="dconf-devel gtk+-devel gtk+3-devel gtk4-devel hicolor-icon-theme
  iso-codes json-glib-devel libnotify-devel librsvg-devel python3-xdg
@@ -23,7 +23,7 @@ maintainer="oreo639 <oreo6391@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/ibus/ibus"
 distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-checksum=6efbda5adb96f607cf7108d1e270962c0729a59c9ea6d58eea2dde0e3cbb97df
+checksum=6c9ff3a7576c3d61264f386030f47ee467eb7298c8104367002986e008765667
 
 build_options="ibus_setup dicts"
 desc_option_ibus_setup="Enable support for building the ibus setup UI"
@@ -33,6 +33,10 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" dicts"
 fi
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vinstall bindings/pygobject/gi/overrides/IBus.py 644 ${py3_sitelib}/gi/overrides
 }