libical: bump, fix (#6788)

dev-libs/libical/libical-3.0.14.recipe

@@ -7,10 +7,9 @@ HOMEPAGE="http://libical.github.io/libical/"
 COPYRIGHT="1999-2015 Eric Busboom"
 LICENSE="MPL v1.0
 	GNU LGPL v2.1"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://github.com/libical/libical/releases/download/v$portVersion/libical-$portVersion.tar.gz"
-CHECKSUM_SHA256="654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da"
-PATCHES="libical-$portVersion.patchset"
+CHECKSUM_SHA256="4284b780356f1dc6a01f16083e7b836e63d3815e27ed0eaaad684712357ccc8f"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
@@ -27,6 +26,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix >= 66
 	lib:libicuuc$secondaryArchSuffix >= 66
+	devel:libxml2$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -39,28 +39,30 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libical$secondaryArchSuffix == $portVersion base
+	devel:libicui18n$secondaryArchSuffix >= 66
+	devel:libicuuc$secondaryArchSuffix >= 66
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libicui18n$secondaryArchSuffix >= 66
-	devel:libicuuc$secondaryArchSuffix >= 66
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	cmake . \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_INCLUDEDIR=$incDir \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
- 		-DUSE_BUILTIN_TZDATA=true
+		-DCMAKE_BUILD_TYPE=Release \
+ 		-DUSE_BUILTIN_TZDATA=true \
+		-DICAL_GLIB=False \
+		-DSHARED_ONLY=true \
+		$cmakeDirArgs
 	make $jobArgs
 }
 

dev-libs/libical/patches/libical-2.0.0.patchset

@@ -1,38 +0,0 @@
-From 2f7b40a28c76c4807d19063bd45588527fa77340 Mon Sep 17 00:00:00 2001
-From: raefaldhia <raefaldhiamartya@gmail.com>
-Date: Mon, 19 Dec 2016 08:47:41 +0700
-Subject: Add compatibility to build in haiku
-
-
-diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
-index 03f0a58..3482636 100644
---- a/src/libical/icaltz-util.c
-+++ b/src/libical/icaltz-util.c
-@@ -83,6 +83,8 @@
- #define bswap_64 __builtin_bswap64
- #endif
- 
-+#include <ByteOrder.h>
-+
- typedef struct
- {
-     char ttisgmtcnt[4];
-@@ -132,13 +134,13 @@ static int decode(const void *ptr)
- #if defined(_BIG_ENDIAN)
-         return *(const int *)ptr;
- #else
--        return BSWAP_32(*(const int *)ptr);
-+        return B_SWAP_INT32(*(const int *)ptr);
- #endif
- #else
-     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof(int) == 4) {
-         return *(const int *)ptr;
-     } else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof(int) == 4) {
--        return (int)bswap_32(*(const unsigned int *)ptr);
-+        return (int)B_SWAP_INT32(*(const unsigned int *)ptr);
- #endif
-     } else {
-         const unsigned char *p = ptr;
--- 
-2.7.0
-