jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fcitx: revert using libexecinfo

Browse source 
Closes: #12594 [via git-merge-pr]
This commit is contained in:
newbluemoon 2018-03-16 17:01:50 +01:00 committed by Jürgen Buchmüller
parent 46e07d4b77
commit c1e6243d94
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/fcitx/patches/execinfo.patch Normal file
View file

@ -0,0 +1,12 @@
--- CMakeLists.txt.bak 2017-12-02 13:38:52.784843265 +0100
+++ 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})
-include_directories(${LIBEXECINFO_INCLUDE_DIR})
+if(ENABLE_BACKTRACE)
+ include_directories(${LIBEXECINFO_INCLUDE_DIR})
+endif()
include_directories(${DL_INCLUDE_DIR})
include_directories(${PTHREAD_INCLUDE_DIR})

4
srcpkgs/fcitx/template
View file

@ -1,7 +1,7 @@
# Template file for 'fcitx' # Template file for 'fcitx'
pkgname=fcitx pkgname=fcitx
version=4.2.9.6 version=4.2.9.6
revision=2 revision=3
build_style=cmake build_style=cmake
short_desc="Flexible Context-aware Input Tool with eXtension" short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Robert La Spina <rkidlaspina@gmail.com>" maintainer="Robert La Spina <rkidlaspina@gmail.com>"
@ -19,7 +19,7 @@ configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
-DFORCE_ENCHANT=ON" -DFORCE_ENCHANT=ON"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel";; *-musl) configure_args+=" -DENABLE_BACKTRACE=OFF";;
esac esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then