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

PATCH New Bernd Kuhls 2 participants 2 messages May 2, 2015 – Jul 13, 2015

lore

Share & tools

lore

Bernd Kuhls

author

2015-05-02 09:15 UTC #0 lore raw

PATCH v2 1/1 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."

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: use _SITE instead of github helper (Thomas)
add C++ dependency

 package/libical/0001-no-tests.patch |   19 +++++++++++++++++++
 package/libical/Config.in           |    9 ++++++---
 package/libical/libical.hash        |    2 +-
 package/libical/libical.mk          |   10 +++++++---
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 package/libical/0001-no-tests.patch

package/libical/0001-no-tests.patch new file +19 -0

new file mode 100644
index 0000000..324c04f
@@ -0,0 +1,19 @@
+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 <[email protected]>
+
+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

index 9bb63c3..48170e9 100644
@@ -1,11 +1,14 @@
 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

index 2382ad7..5c42cdc 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0  libical-0.48.tar.gz
+sha256	089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592	libical-1.0.1.tar.gz

package/libical/libical.mk +7 -3

index 4025627..e8cb3f8 100644
@@ -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))

Signature · 1 line

1.7.10.4

Thomas Petazzoni

2015-07-13 10:28 UTC #1 lore raw

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

Dear Bernd Kuhls,

Quoted 8 lines · Bernd Kuhls

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."
Signed-off-by Bernd Kuhls <[email protected]>
---
v2: use _SITE instead of github helper (Thomas)
add C++ dependency

Applied after doing the following change:

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

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com