From bc07a23b33f89e1ff1b52bd985ea9f8eb76eab1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 11:00:04 +0700 Subject: [PATCH] fcitx: normalise patch --- srcpkgs/fcitx/patches/execinfo.patch | 4 ++-- srcpkgs/fcitx/patches/girpath.patch | 4 ++-- srcpkgs/fcitx/template | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/fcitx/patches/execinfo.patch b/srcpkgs/fcitx/patches/execinfo.patch index aa00e4ac03b..1b7d9838e21 100644 --- a/srcpkgs/fcitx/patches/execinfo.patch +++ b/srcpkgs/fcitx/patches/execinfo.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.bak 2017-12-02 13:38:52.784843265 +0100 -+++ src/CMakeLists.txt 2017-12-02 13:39:15.028841808 +0100 +--- a/src/CMakeLists.txt 2017-12-02 13:38:52.784843265 +0100 ++++ b/src/CMakeLists.txt 2017-12-02 13:39:15.028841808 +0100 @@ -1,6 +1,8 @@ include_directories(${LIBINTL_INCLUDE_DIR}) include_directories(${LIBICONV_INCLUDE_DIR}) diff --git a/srcpkgs/fcitx/patches/girpath.patch b/srcpkgs/fcitx/patches/girpath.patch index cae47b748e9..dd50600ebf8 100644 --- a/srcpkgs/fcitx/patches/girpath.patch +++ b/srcpkgs/fcitx/patches/girpath.patch @@ -1,7 +1,7 @@ diff --git src/lib/fcitx-gclient/CMakeLists.txt src/lib/fcitx-gclient/CMakeLists.txt index ea1d50f..20b2359 100644 ---- src/lib/fcitx-gclient/CMakeLists.txt -+++ src/lib/fcitx-gclient/CMakeLists.txt +--- a/src/lib/fcitx-gclient/CMakeLists.txt ++++ b/src/lib/fcitx-gclient/CMakeLists.txt @@ -65,6 +65,8 @@ install(FILES ${FCITX_GCLIENT_HEADERS} if(ENABLE_GIR) diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index 00675b1fedc..8e080e8499e 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -4,23 +4,23 @@ version=4.2.9.8 revision=4 build_style=cmake build_helper=gir +configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF + -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF + -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)" +hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel" +makedepends="iso-codes gettext-devel enchant-devel libxml2-devel + json-c-devel opencc-devel + libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel" +depends="fcitx5-icons fcitx5-chinese-addons-icons" 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=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6 - -hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel" -makedepends="iso-codes gettext-devel enchant-devel libxml2-devel - json-c-devel opencc-devel - libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel" -depends="fcitx5-icons fcitx5-chinese-addons-icons" lib32disabled=yes -configure_args="-DCMAKE_BUILD_TYPE=None - -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF - -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF - -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)" + +patch_args=-Np1 # Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel case "$XBPS_TARGET_MACHINE" in