From 86fa5a514107485d2e0e4698add4498b0b384bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 24 May 2020 12:07:42 +0700 Subject: [PATCH] Revert "fcitx: update to 4.2.9.7." This reverts commit 937a7554782fe6388cd36ba6ff30226a39d5fd70. It looks like json-c is the culprit. Building 4.2.9.6 also crash if json-c-devel was added to makedepends. --- srcpkgs/fcitx/template | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index 16c0a17a7af..9d40087f3dd 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -1,28 +1,27 @@ # Template file for 'fcitx' pkgname=fcitx -version=4.2.9.7 -revision=1 +reverts="4.2.9.7_1" +version=4.2.9.6 +revision=4 build_style=cmake short_desc="Flexible Context-aware Input Tool with eXtension" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://fcitx-im.org/" distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz" -checksum=cf333b2a90be616ffed8b83438dfe3dc0e22ecf034b9f651167203ecbe3f6f8f +checksum=a59351bbae42d62aad61bd604154b8a49b822b3337ff4d2df5622881f680d943 hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules qt-qmake" makedepends="iso-codes gettext-devel enchant-devel libxml2-devel - json-c-devel opencc-devel libxkbfile-devel icu-devel qt-devel dbus-devel gtk+-devel gtk+3-devel" lib32disabled=yes -configure_args="-Wno-dev -DSYSCONFDIR=/etc -DFORCE_PRESAGE=OFF +configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT_IM_MODULE=ON -DFORCE_ENCHANT=ON" -if [ "$XBPS_TARGET_LIBC" = musl ]; then - configure_args+=" -DENABLE_BACKTRACE=OFF" - makedepends+=" libexecinfo-devel" -fi +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -DENABLE_BACKTRACE=OFF";; +esac if [ "$CROSS_BUILD" ]; then configure_args+=" -DENABLE_GIR=OFF" @@ -31,18 +30,18 @@ fi pre_configure() { # include FcitxMacro.cmake without invoking fcitx4-config - vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \ - cmake/FcitxConfig.cmake + sed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \ + cmake/FcitxConfig.cmake if [ "$CROSS_BUILD" ]; then # use host binaries - vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/dev;/usr/lib/fcitx/libexec;' \ - cmake/FcitxMacro.cmake - vsed -i -e 's;${PROJECT_BINARY_DIR}/src/module/spell/dict;/usr/lib/fcitx/libexec;' \ - src/module/spell/dict/CMakeLists.txt - vsed -i -e 's;${PROJECT_BINARY_DIR}/tools/cli;/usr/bin;' \ - src/im/pinyin/data/CMakeLists.txt \ - src/im/table/data/CMakeLists.txt + sed -i -e 's;${PROJECT_BINARY_DIR}/tools/dev;/usr/lib/fcitx/libexec;' \ + cmake/FcitxMacro.cmake + sed -i -e 's;${PROJECT_BINARY_DIR}/src/module/spell/dict;/usr/lib/fcitx/libexec;' \ + src/module/spell/dict/CMakeLists.txt + sed -i -e 's;${PROJECT_BINARY_DIR}/tools/cli;/usr/bin;' \ + src/im/pinyin/data/CMakeLists.txt \ + src/im/table/data/CMakeLists.txt fi }