diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index 7a1ae6ec8de..db38a95e675 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -1,7 +1,7 @@ # Template file for 'ibus' pkgname=ibus -version=1.5.30 -revision=2 +version=1.5.32 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--enable-ui --enable-gtk3 --enable-gtk4 @@ -23,32 +23,25 @@ maintainer="oreo639 " 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=05b84d4a45139face161596e5ade8e6c5da55cfaf6f194861da66516190f5b96 +checksum=b24f41ae38b236b254c09f1a8f53c2354b69b0789e89cea888d0494b09d15d67 build_options="ibus_setup dicts" desc_option_ibus_setup="Enable support for building the ibus setup UI" build_options_default="ibus_setup dicts" -post_configure() { - # Force re-generate valac files for gcc 14 - make -C ui/gtk3 maintainer-clean-generic +pre_configure() { + autoreconf -fi + + # Regenerate sources with new vala + find -name '*.vala' -exec touch {} \; } pre_build() { - [ -n "${CROSS_BUILD}" ] || return 0 + export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs" +} - # TODO: fix this hack! - # - # GIR_EXTRA_LIBS_PATH in g-ir-scanner-qemuwrapper is not being honored, - # and the linker cannot find libibus-1.0.so.5 when scanning. Linking - # the missing library alongside the scanner targets is sufficient. - local s d - - s="${wrksrc}/src/.libs/libibus-1.0.so.5" - for d in tools bindings/vala client/wayland; do - mkdir -p "${d}/.libs" - ln -Tsf "${s}" "${d}/.libs/libibus-1.0.so.5" - done +pre_install() { + export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs" } post_install() {