libical: update to 3.0.10, rebuild for icu-69.1
This commit is contained in:
parent
24a0296805
commit
77f29d676f
2 changed files with 48 additions and 17 deletions
|
@ -1,24 +1,56 @@
|
||||||
diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
|
--- a/src/libical-glib/CMakeLists.txt.orig
|
||||||
index f0eaf01..5fc7cc2 100644
|
|
||||||
--- a/src/libical-glib/CMakeLists.txt
|
|
||||||
+++ b/src/libical-glib/CMakeLists.txt
|
+++ b/src/libical-glib/CMakeLists.txt
|
||||||
@@ -1,16 +1,10 @@
|
@@ -1,25 +1,9 @@
|
||||||
add_definitions(-Dlibical_ical_EXPORTS)
|
add_definitions(-Dlibical_ical_EXPORTS)
|
||||||
|
|
||||||
-# build the src-generator
|
# build ical-glib-src-generator
|
||||||
-add_executable(src-generator
|
-add_executable(ical-glib-src-generator
|
||||||
- tools/generator.c
|
- tools/generator.c
|
||||||
- tools/generator.h
|
- tools/generator.h
|
||||||
- tools/xml-parser.c
|
- tools/xml-parser.c
|
||||||
- tools/xml-parser.h
|
- tools/xml-parser.h
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
|
||||||
|
-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
|
||||||
|
-
|
||||||
|
-install(
|
||||||
|
- TARGETS ical-glib-src-generator
|
||||||
|
- EXPORT IcalGlibSrcGenerator
|
||||||
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
|
||||||
|
-)
|
||||||
|
-install(
|
||||||
|
- EXPORT IcalGlibSrcGenerator
|
||||||
|
- NAMESPACE native-
|
||||||
|
- DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
|
||||||
+add_custom_command(
|
+add_custom_command(
|
||||||
+ OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
|
+ OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
|
||||||
+ COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
|
+ COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
|
||||||
)
|
)
|
||||||
|
|
||||||
-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
|
|
||||||
-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
|
|
||||||
-
|
|
||||||
list(APPEND API_FILES
|
list(APPEND API_FILES
|
||||||
api/i-cal-array.xml
|
@@ -72,22 +56,10 @@
|
||||||
api/i-cal-attach.xml
|
list(APPEND xml_files ${xml_file_fullpath})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
-if(CMAKE_CROSSCOMPILING)
|
||||||
|
- # import native ical-glib-src-generator when cross-compiling
|
||||||
|
- set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
|
||||||
|
- CACHE FILEPATH
|
||||||
|
- "Path to exported ical-glib-src-generator target from native build"
|
||||||
|
- )
|
||||||
|
- include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
|
||||||
|
- set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
|
||||||
|
-else()
|
||||||
|
- set(ical-glib-src-generator_EXE ical-glib-src-generator)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
add_custom_command (
|
||||||
|
OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
|
||||||
|
- COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
|
||||||
|
- DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
|
||||||
|
+ COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
|
||||||
|
+ DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
|
||||||
|
)
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'libical'
|
# Template file for 'libical'
|
||||||
pkgname=libical
|
pkgname=libical
|
||||||
version=3.0.8
|
version=3.0.10
|
||||||
revision=3
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
build_helper="gir qemu"
|
build_helper="gir qemu"
|
||||||
configure_args="-DICAL_BUILD_DOCS=false
|
configure_args="-DICAL_BUILD_DOCS=false
|
||||||
|
@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="LGPL-2.1-only, MPL-2.0"
|
license="LGPL-2.1-only, MPL-2.0"
|
||||||
homepage="http://libical.github.io/libical/"
|
homepage="http://libical.github.io/libical/"
|
||||||
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
|
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
|
||||||
checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
|
checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
|
||||||
disable_parallel_build=yes
|
|
||||||
|
|
||||||
build_options="gir"
|
build_options="gir"
|
||||||
build_options_default="gir"
|
build_options_default="gir"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue