diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch index 507c17ec353..b8b024e392d 100644 --- a/srcpkgs/libical/patches/fix-cross.patch +++ b/srcpkgs/libical/patches/fix-cross.patch @@ -1,24 +1,56 @@ -diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt -index f0eaf01..5fc7cc2 100644 ---- a/src/libical-glib/CMakeLists.txt +--- a/src/libical-glib/CMakeLists.txt.orig +++ b/src/libical-glib/CMakeLists.txt -@@ -1,16 +1,10 @@ +@@ -1,25 +1,9 @@ add_definitions(-Dlibical_ical_EXPORTS) --# build the src-generator --add_executable(src-generator + # build ical-glib-src-generator +-add_executable(ical-glib-src-generator - tools/generator.c - tools/generator.h - tools/xml-parser.c - 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( -+ OUTPUT ${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}/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}/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 - api/i-cal-array.xml - api/i-cal-attach.xml +@@ -72,22 +56,10 @@ + 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( diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template index 913be53ef07..73888d413a3 100644 --- a/srcpkgs/libical/template +++ b/srcpkgs/libical/template @@ -1,7 +1,7 @@ # Template file for 'libical' pkgname=libical -version=3.0.8 -revision=3 +version=3.0.10 +revision=1 build_style=cmake build_helper="gir qemu" configure_args="-DICAL_BUILD_DOCS=false @@ -13,8 +13,7 @@ maintainer="Orphaned " license="LGPL-2.1-only, MPL-2.0" homepage="http://libical.github.io/libical/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f -disable_parallel_build=yes +checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4 build_options="gir" build_options_default="gir"