From dbeb866753c77682618610bd8e67b3e218d67337 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 9 Dec 2017 01:40:34 +0100 Subject: [PATCH] libical: Built-in tz data, avoid libdb and libicu --- packages/libical/CMakeLists.txt.patch | 53 +++++++++++++++++++++++++++ packages/libical/build.sh | 4 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 packages/libical/CMakeLists.txt.patch diff --git a/packages/libical/CMakeLists.txt.patch b/packages/libical/CMakeLists.txt.patch new file mode 100644 index 000000000..eca346f03 --- /dev/null +++ b/packages/libical/CMakeLists.txt.patch @@ -0,0 +1,53 @@ +Avoid opportunistic linkage against libdb and libicu. + +diff -u -r ../libical-3.0.1/CMakeLists.txt ./CMakeLists.txt +--- ../libical-3.0.1/CMakeLists.txt 2017-11-19 14:32:53.000000000 +0000 ++++ ./CMakeLists.txt 2017-12-08 23:54:59.745527096 +0000 +@@ -154,47 +154,6 @@ + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS True) + endif() + +-# libicu is highly recommended for RSCALE support +-# libicu can be found at http://www.icu-project.org +-# RSCALE info at http://tools.ietf.org/html/rfc7529 +-find_package(ICU) +-set_package_properties(ICU PROPERTIES +- TYPE RECOMMENDED +- PURPOSE "For RSCALE (RFC7529) support" +-) +-add_feature_info( +- "RSCALE support (RFC7529)" +- ICU_FOUND +- "build in RSCALE support" +-) +-if(ICU_FOUND) +- set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc +- set(HAVE_LIBICU 1) +- if(ICU_MAJOR_VERSION VERSION_GREATER 50) +- set(HAVE_ICU_DANGI TRUE) +- else() +- set(HAVE_ICU_DANGI FALSE) +- endif() +-endif() +-if(ICU_I18N_FOUND) +- set(HAVE_LIBICU_I18N 1) +-endif() +- +-# compile in Berkeley DB support +-find_package(BDB) +-set_package_properties(BDB PROPERTIES +- TYPE OPTIONAL +- PURPOSE "For Berkeley DB storage support" +-) +-add_feature_info( +- "Berkeley DB storage support" +- BDB_FOUND +- "build in support for Berkeley DB storage" +-) +-if(BDB_FOUND) +- set(HAVE_BDB True) +-endif() +- + # MSVC specific definitions + if(WIN32) + if(MSVC) diff --git a/packages/libical/build.sh b/packages/libical/build.sh index 3773b30c4..7b99e71df 100644 --- a/packages/libical/build.sh +++ b/packages/libical/build.sh @@ -1,5 +1,7 @@ +TERMUX_PKG_HOMEPAGE=http://libical.github.io/libical/ TERMUX_PKG_DESCRIPTION="Libical is an Open Source implementation of the iCalendar protocols and protocol data units" TERMUX_PKG_VERSION=3.0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libical/libical/releases/download/v$TERMUX_PKG_VERSION/libical-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libxml2" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSHARED_ONLY=true -DICAL_GLIB=false" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSHARED_ONLY=true -DICAL_GLIB=false -DUSE_BUILTIN_TZDATA=true"