Merge branch '3.0'

libical · Oct 27, 2024 · 3648f5a · 3648f5a
2 parents a8f69b3 + a74e463
commit 3648f5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.krazy b/.krazy
@@ -33,6 +33,8 @@ SKIP /test-data/
 #Skip zoneinfo
 SKIP /zoneinfo/
 
+SKIP /book/
+
 STYLE_LINEMAX 120
 STYLE_PYTHONSTYLE_OFFSET 4
 STYLE_CMAKESTYLE_OFFSET 2
diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
@@ -102,7 +102,7 @@ add_custom_target(
   BYPRODUCTS ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h
              ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
              ${CMAKE_CURRENT_BINARY_DIR}/ical-glib-build-check.c
-  COMMENT "Generate the libical-glib-private.h headers"
+  COMMENT "Generate the libical-glib sources"
 )
 
 configure_file(
@@ -142,7 +142,7 @@ target_link_libraries(
 )
 if(NOT SHARED_ONLY AND NOT STATIC_ONLY)
   add_library(ical-glib-static STATIC ${LIBICAL_GLIB_SOURCES})
-  add_dependencies(ical-glib-static ical-header)
+  add_dependencies(ical-glib-static ical-header ical-glib-header)
   target_compile_options(
     ical-glib-static PUBLIC ${GLIB_CFLAGS} -DG_LOG_DOMAIN="libical-glib" -DLIBICAL_GLIB_COMPILATION
   )

diff --git a/src/libical/icalvalue.c b/src/libical/icalvalue.c
@@ -244,7 +244,7 @@ static char *icalmemory_strdup_and_quote(const icalvalue *value, const char *unq
      * In order to meet that requirement we'd need to set MAX_ITERATIONS to (1024 * 128) approximately.
      * We don't feel safe setting MAX_ITERATIONS that low.
      */
-    static const size_t MAX_ITERATIONS = (1024 * 1024 * 10); // should be plenty, but not low enough to avoid timeouts when fuzzy testing
+    static const size_t MAX_ITERATIONS = (1024 * 1024 * 10);
     char *str;
     char *str_p;
     const char *p;