summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libical')
-rw-r--r--meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch81
-rw-r--r--meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch45
-rw-r--r--meta/recipes-support/libical/libical_3.0.9.bb (renamed from meta/recipes-support/libical/libical_3.0.8.bb)14
3 files changed, 28 insertions, 112 deletions
diff --git a/meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch b/meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch
deleted file mode 100644
index 79e1475c6c..0000000000
--- a/meta/recipes-support/libical/libical/0001-Fix-build-with-icu-68.1.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From 52d603212173d4502800bf746436a93f806a8898 Mon Sep 17 00:00:00 2001
5From: Allen Winter <allen.winter@kdab.com>
6Date: Sat, 31 Oct 2020 17:38:01 -0400
7Subject: [PATCH] Fix build with icu-68.1
8
9Use stdbool.h to define true and false when possible
10
11Issue#448
12---
13 ConfigureChecks.cmake | 1 +
14 config.h.cmake | 3 +++
15 src/libical/icalrecur.c | 10 ++++++++--
16 3 files changed, 12 insertions(+), 2 deletions(-)
17
18diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
19index e4d0e2ec..bba33fa9 100644
20--- a/ConfigureChecks.cmake
21+++ b/ConfigureChecks.cmake
22@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
23 check_include_files(fcntl.h HAVE_FCNTL_H)
24 check_include_files(unistd.h HAVE_UNISTD_H)
25 check_include_files(wctype.h HAVE_WCTYPE_H)
26+check_include_files(stdbool.h HAVE_STDBOOL_H)
27
28 include(CheckFunctionExists)
29 if(WIN32 AND MSVC)
30diff --git a/config.h.cmake b/config.h.cmake
31index 8fd3421b..c8008692 100644
32--- a/config.h.cmake
33+++ b/config.h.cmake
34@@ -39,6 +39,9 @@
35 /* Define to 1 if you have the <dirent.h> header file. */
36 #cmakedefine HAVE_DIRENT_H 1
37
38+/* Define to 1 if you have the <stdbool.h> header file. */
39+#cmakedefine HAVE_STDBOOL_H 1
40+
41 /* Define if we have pthread. */
42 #cmakedefine HAVE_PTHREAD_ATTR_GET_NP 1
43 #cmakedefine HAVE_PTHREAD_GETATTR_NP 1
44diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
45index 73178450..b3f054b8 100644
46--- a/src/libical/icalrecur.c
47+++ b/src/libical/icalrecur.c
48@@ -145,6 +145,12 @@
49 #if defined(HAVE_LIBICU)
50 #include <unicode/ucal.h>
51 #include <unicode/ustring.h>
52+#if defined(HAVE_STDBOOL_H)
53+#include <stdbool.h>
54+#else
55+#define false 0
56+#define true 1
57+#endif
58 #define RSCALE_IS_SUPPORTED 1
59 #else
60 #define RSCALE_IS_SUPPORTED 0
61@@ -1018,7 +1024,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void)
62
63 calendars = icalarray_new(sizeof(const char **), 20);
64
65- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
66+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
67 while ((cal = uenum_next(en, NULL, &status))) {
68 cal = icalmemory_tmp_copy(cal);
69 icalarray_append(calendars, &cal);
70@@ -1411,7 +1417,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
71 }
72
73 /* Check if specified calendar is supported */
74- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
75+ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
76 while ((cal = uenum_next(en, NULL, &status))) {
77 if (!strcmp(cal, rule.rscale)) {
78 is_hebrew = !strcmp(rule.rscale, "hebrew");
79--
802.25.1
81
diff --git a/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch b/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch
index b7b757d74b..0813641ee9 100644
--- a/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch
+++ b/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch
@@ -1,33 +1,32 @@
1From e33bc310238bba1690f2c71ad333e10b9e422ea9 Mon Sep 17 00:00:00 2001 1From 378df7d6ef9207d3e11a3de54ffd05c04c6c0e0b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sat, 19 Oct 2019 14:23:06 +0200 3Date: Wed, 24 Feb 2021 20:28:22 +0000
4Subject: [PATCH] Use our hand-build native src-generator 4Subject: [PATCH] Use our hand-build native src-generator
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8 5
9Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [reported at https://github.com/libical/libical/issues/481]
10 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12--- 8---
13 src/libical-glib/CMakeLists.txt | 4 ++-- 9 src/libical-glib/CMakeLists.txt | 7 +------
14 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 1 insertion(+), 6 deletions(-)
15 11
16diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt 12diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
17index f3704e6..ce9db16 100644 13index 13f77aa..c337c9e 100644
18--- a/src/libical-glib/CMakeLists.txt 14--- a/src/libical-glib/CMakeLists.txt
19+++ b/src/libical-glib/CMakeLists.txt 15+++ b/src/libical-glib/CMakeLists.txt
20@@ -63,8 +63,8 @@ endforeach() 16@@ -74,12 +74,7 @@ endforeach()
21
22 add_custom_command (
23 OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
24- COMMAND ${EXECUTABLE_OUTPUT_PATH}/src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
25- DEPENDS ${EXECUTABLE_OUTPUT_PATH}/src-generator ${xml_files}
26+ COMMAND ${CMAKE_BINARY_DIR}/src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
27+ DEPENDS ${CMAKE_BINARY_DIR}/src-generator ${xml_files}
28 )
29 17
30 configure_file( 18 if(CMAKE_CROSSCOMPILING)
19 # import native ical-glib-src-generator when cross-compiling
20- set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
21- CACHE FILEPATH
22- "Path to exported ical-glib-src-generator target from native build"
23- )
24- include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
25- set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
26+ set(ical-glib-src-generator_EXE ${CMAKE_BINARY_DIR}/src-generator)
27 else()
28 set(ical-glib-src-generator_EXE ical-glib-src-generator)
29 endif()
31-- 30--
322.21.0 312.17.1
33 32
diff --git a/meta/recipes-support/libical/libical_3.0.8.bb b/meta/recipes-support/libical/libical_3.0.9.bb
index ffc117d439..d03f2f6486 100644
--- a/meta/recipes-support/libical/libical_3.0.8.bb
+++ b/meta/recipes-support/libical/libical_3.0.9.bb
@@ -12,19 +12,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
12 " 12 "
13SECTION = "libs" 13SECTION = "libs"
14 14
15SRC_URI = " \ 15SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
16 https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ 16 file://0001-Use-our-hand-build-native-src-generator.patch \
17 file://0001-Use-our-hand-build-native-src-generator.patch \
18 file://0001-Fix-build-with-icu-68.1.patch \
19" 17"
20SRC_URI[md5sum] = "41bd1f1fcdcb4779cea478bb55cf07bf" 18SRC_URI[sha256sum] = "bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728"
21SRC_URI[sha256sum] = "09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f"
22UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" 19UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
23 20
24inherit cmake pkgconfig 21inherit cmake pkgconfig
25 22
26do_compile_prepend() { 23do_compile_prepend() {
27 # As long as https://github.com/libical/libical/issues/394 is open build native src-generator manually 24 # As long as https://github.com/libical/libical/issues/481 is open build native src-generator manually
28 NATIVE_CFLAGS="${BUILD_CFLAGS} `pkg-config-native --cflags glib-2.0` `pkg-config-native --cflags libxml-2.0`" 25 NATIVE_CFLAGS="${BUILD_CFLAGS} `pkg-config-native --cflags glib-2.0` `pkg-config-native --cflags libxml-2.0`"
29 NATIVE_LDFLAGS="${BUILD_LDFLAGS} `pkg-config-native --libs glib-2.0` `pkg-config-native --libs libxml-2.0`" 26 NATIVE_LDFLAGS="${BUILD_LDFLAGS} `pkg-config-native --libs glib-2.0` `pkg-config-native --libs libxml-2.0`"
30 ${BUILD_CC} $NATIVE_CFLAGS ${S}/src/libical-glib/tools/generator.c ${S}/src/libical-glib/tools/xml-parser.c -o ${B}/src-generator $NATIVE_LDFLAGS 27 ${BUILD_CC} $NATIVE_CFLAGS ${S}/src/libical-glib/tools/generator.c ${S}/src/libical-glib/tools/xml-parser.c -o ${B}/src-generator $NATIVE_LDFLAGS
@@ -46,5 +43,6 @@ do_install_append () {
46 sed -i \ 43 sed -i \
47 -e 's,${STAGING_LIBDIR},${libdir},g' \ 44 -e 's,${STAGING_LIBDIR},${libdir},g' \
48 -e 's,${STAGING_INCDIR},${includedir},g' \ 45 -e 's,${STAGING_INCDIR},${includedir},g' \
49 ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake 46 ${D}${libdir}/cmake/LibIcal/LibIcal*.cmake \
47 ${D}${libdir}/cmake/LibIcal/Ical*.cmake
50} 48}