diff options
Diffstat (limited to 'meta/recipes-support/libical/libical')
3 files changed, 33 insertions, 114 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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
3 | |||
4 | From 52d603212173d4502800bf746436a93f806a8898 Mon Sep 17 00:00:00 2001 | ||
5 | From: Allen Winter <allen.winter@kdab.com> | ||
6 | Date: Sat, 31 Oct 2020 17:38:01 -0400 | ||
7 | Subject: [PATCH] Fix build with icu-68.1 | ||
8 | |||
9 | Use stdbool.h to define true and false when possible | ||
10 | |||
11 | Issue#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 | |||
18 | diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake | ||
19 | index 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) | ||
30 | diff --git a/config.h.cmake b/config.h.cmake | ||
31 | index 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 | ||
44 | diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c | ||
45 | index 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 | -- | ||
80 | 2.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 deleted file mode 100644 index b7b757d74b..0000000000 --- a/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From e33bc310238bba1690f2c71ad333e10b9e422ea9 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sat, 19 Oct 2019 14:23:06 +0200 | ||
4 | Subject: [PATCH] Use our hand-build native src-generator | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
12 | --- | ||
13 | src/libical-glib/CMakeLists.txt | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt | ||
17 | index f3704e6..ce9db16 100644 | ||
18 | --- a/src/libical-glib/CMakeLists.txt | ||
19 | +++ b/src/libical-glib/CMakeLists.txt | ||
20 | @@ -63,8 +63,8 @@ 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 | |||
30 | configure_file( | ||
31 | -- | ||
32 | 2.21.0 | ||
33 | |||
diff --git a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch new file mode 100644 index 0000000000..3841c060ee --- /dev/null +++ b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From c06d8a8990c996cbb854508a944202ba70ba7a7c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 3 Mar 2022 20:10:04 -0800 | ||
4 | Subject: [PATCH] cmake: Do not export CC into gir compiler | ||
5 | |||
6 | this helps cross compilers where full compiler commandline defines the | ||
7 | compiler rather than just CC variable, therefore let it use the default | ||
8 | values from environment and not synthesize it from CMAKE_C_COMPILER just | ||
9 | for this case. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/libical/libical/pull/552] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | cmake/modules/GObjectIntrospectionMacros.cmake | 3 +-- | ||
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake | ||
18 | index 83aff931..d7d3f898 100644 | ||
19 | --- a/cmake/modules/GObjectIntrospectionMacros.cmake | ||
20 | +++ b/cmake/modules/GObjectIntrospectionMacros.cmake | ||
21 | @@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) | ||
22 | set(_gir_libtool "--no-libtool") | ||
23 | |||
24 | add_custom_command( | ||
25 | - COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" | ||
26 | - ${GObjectIntrospection_SCANNER} | ||
27 | + COMMAND ${GObjectIntrospection_SCANNER} | ||
28 | ${GObjectIntrospection_SCANNER_ARGS} | ||
29 | --namespace=${_gir_namespace} | ||
30 | --nsversion=${_gir_version} | ||
31 | -- | ||
32 | 2.35.1 | ||
33 | |||