Commit 3ac4bf63 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/libical: bump version to v1.0.1 and switch to cmake 

Project moved to github according to http://sourceforge.net/projects/freeassociation

"As of 2014-06-14, this project may now be found at http://github.com/libical.

"

[Thomas: propagate the C++ dependency to bluez5_utils OBEX support,
which selects libical.]

Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b40509c7

package/bluez5_utils/Config.in

+4 −0
Original line number Diff line number Diff line
@@ -29,9 +29,13 @@ if BR2_PACKAGE_BLUEZ5_UTILS 
config BR2_PACKAGE_BLUEZ5_UTILS_OBEX

	bool "build OBEX support"

	select BR2_PACKAGE_LIBICAL

	depends on BR2_INSTALL_LIBSTDCPP

	help

	  Enable the OBEX support in Bluez 5.x.



comment "OBEX support needs a toolchain w/ C++"

	depends on !BR2_INSTALL_LIBSTDCPP



config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT

	bool "build CLI client"

	select BR2_PACKAGE_READLINE

package/libical/0001-no-tests.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Disable tests to avoid MMU dependency due to fork.



Fixes

CMakeFiles/regression.dir/regression.c.o: In function `_test_file_locks':

/home/br/br4/output/build/libical-v1.0.1/src/test/regression.c:(.text+0x96d8): undefined reference to `_fork'



Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>



diff -uNr libical-1.0.1.org/src/CMakeLists.txt libical-1.0.1/src/CMakeLists.txt

--- libical-1.0.1.org/src/CMakeLists.txt	2014-10-09 17:07:05.000000000 +0200

+++ libical-1.0.1/src/CMakeLists.txt	2015-04-25 17:41:22.657345548 +0200

@@ -1,7 +1,6 @@

 add_subdirectory(libical)

 add_subdirectory(libicalss)

 add_subdirectory(libicalvcal)

-add_subdirectory(test)

 

 if(MSVC)

   install(FILES

package/libical/Config.in

+6 −3
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBICAL

	bool "libical"

	depends on BR2_INSTALL_LIBSTDCPP

	depends on !BR2_STATIC_LIBS

	depends on BR2_USE_WCHAR

	help

	  libical is an Open Source (MPL/LGPL) implementation of the IETF's

	  iCalendar Calendaring and Scheduling protocols.



	  http://www.citadel.org/doku.php/documentation:featured_projects:libical

	  http://libical.github.io/libical



comment "libical needs a toolchain w/ wchar"

	depends on !BR2_USE_WCHAR
 
comment "libical needs a toolchain w/ C++, dynamic library, wchar"

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \

		BR2_STATIC_LIBS

package/libical/libical.hash

+1 −1
Original line number Diff line number Diff line 
# Locally computed:

sha256  2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0  libical-0.48.tar.gz
 
sha256	089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592	libical-1.0.1.tar.gz

package/libical/libical.mk

+7 −3
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ 
#

################################################################################



LIBICAL_VERSION = 0.48

LIBICAL_SITE = http://downloads.sourceforge.net/project/freeassociation/libical/libical-$(LIBICAL_VERSION)

LIBICAL_VERSION = 1.0.1

LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION)

LIBICAL_INSTALL_STAGING = YES

LIBICAL_LICENSE = MPLv1.0 or LGPLv2.1

LIBICAL_LICENSE_FILES = LICENSE



$(eval $(autotools-package))
 
# building without this option is broken, it is used by

# Gentoo/alpinelinux as well

LIBICAL_CONF_OPTS = -DSHARED_ONLY=true



$(eval $(cmake-package))