diff --git a/libs/libical/Makefile b/libs/libical/Makefile index b2a551c7f..dc8385d5a 100644 --- a/libs/libical/Makefile +++ b/libs/libical/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libical -PKG_VERSION:=3.0.6 -PKG_RELEASE:=1 +PKG_VERSION:=3.0.9 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=5c8a21c2b732ece4a33e5c862970b4f35a8548bbcda50de5695f6fc211ac4d97 +PKG_HASH:=bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728 PKG_SOURCE_URL:=https://github.com/libical/libical/releases/download/v$(PKG_VERSION)/ PKG_MAINTAINER:=Jose Zapater @@ -20,10 +20,9 @@ PKG_LICENSE:=LGPL-2.1-or-later MPL-2.0 PKG_LICENSE_FILES:=COPYING CMAKE_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk +include ../../devel/ninja/ninja-cmake.mk define Package/libical SECTION:=libs diff --git a/libs/libical/patches/001-disable-icu-and-bdb-support.patch b/libs/libical/patches/001-disable-icu-and-bdb-support.patch index 0f5087637..204ed3d56 100644 --- a/libs/libical/patches/001-disable-icu-and-bdb-support.patch +++ b/libs/libical/patches/001-disable-icu-and-bdb-support.patch @@ -1,81 +1,18 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -170,43 +170,43 @@ endif() +@@ -192,7 +192,6 @@ 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 + # RSCALE info at https://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() -+# 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() + set_package_properties(ICU PROPERTIES + TYPE RECOMMENDED + PURPOSE "For RSCALE (RFC7529) support" +@@ -216,7 +215,6 @@ if(ICU_I18N_FOUND) + 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() -+# 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) + set_package_properties(BDB PROPERTIES + TYPE OPTIONAL + PURPOSE "For Berkeley DB storage support"