moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

evolution-data-server: fix patch whitespace

Browse source
This commit is contained in:
Michal Vasilek 2021-12-04 19:11:29 +01:00 • committed by paper
parent 42b1230d76
commit 7f4e198827
1 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

68
srcpkgs/evolution-data-server/patches/gen-tables.patch
View file

@ -1,64 +1,64 @@
camel-gen-tables and gen-western-table are executed in the build process so camel-gen-tables and gen-western-table are executed in the build process so
they need to be built for the host architecture they need to be built for the host architecture
--- a/src/camel/CMakeLists.txt.orig 2018-10-27 15:24:42.168166299 +0200 --- a/src/camel/CMakeLists.txt
+++ b/src/camel/CMakeLists.txt 2018-10-27 15:37:04.341765727 +0200 +++ b/src/camel/CMakeLists.txt
@@ -1,17 +1,10 @@ @@ -7,18 +7,10 @@ glib_mkenums_multiple(camel-enumtypes CAMEL_ENUMTYPES_H
glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H) camel-url.h
)
-add_executable(camel-gen-tables -add_executable(camel-gen-tables
- camel-gen-tables.c - camel-gen-tables.c
-) -)
- -
-target_include_directories(camel-gen-tables PUBLIC -target_include_directories(camel-gen-tables PUBLIC
- ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}
-) -)
-
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
- DEPENDS camel-gen-tables - DEPENDS camel-gen-tables
+ COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/camel-gen-tables.c -I${CMAKE_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables + COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/camel-gen-tables.c -I${CMAKE_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables
+ && ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c + && ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
) )
set(SOURCES set(SOURCES
--- a/src/addressbook/libebook-contacts/CMakeLists.txt
--- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig 2018-10-27 15:42:14.644088211 +0200 +++ b/src/addressbook/libebook-contacts/CMakeLists.txt
+++ b/src/addressbook/libebook-contacts/CMakeLists.txt 2018-10-27 15:45:43.359285829 +0200 @@ -2,31 +2,12 @@ glib_mkenums(e-book-contacts-enumtypes e-book-contacts-enums.h E_BOOK_CONTACTS_E
@@ -2,31 +2,12 @@
add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc) add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)
-add_executable(gen-western-table -add_executable(gen-western-table
- gen-western-table.c - gen-western-table.c
-) -)
- -
-target_compile_definitions(gen-western-table PRIVATE -target_compile_definitions(gen-western-table PRIVATE
- -DG_LOG_DOMAIN=\"gen-western-table\" - -DG_LOG_DOMAIN=\"gen-western-table\"
-) -)
- -
-target_compile_options(gen-western-table PUBLIC -target_compile_options(gen-western-table PUBLIC
- ${GNOME_PLATFORM_CFLAGS} - ${GNOME_PLATFORM_CFLAGS}
-) -)
- -
-target_include_directories(gen-western-table PUBLIC -target_include_directories(gen-western-table PUBLIC
- ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}
- ${GNOME_PLATFORM_INCLUDE_DIRS} - ${GNOME_PLATFORM_INCLUDE_DIRS}
-) -)
- -
-target_link_libraries(gen-western-table -target_link_libraries(gen-western-table
- ${GNOME_PLATFORM_LDFLAGS} - ${GNOME_PLATFORM_LDFLAGS}
-) -)
- -
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
- DEPENDS gen-western-table e-name-western-tables.h.in - DEPENDS gen-western-table e-name-western-tables.h.in
+ COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/gen-western-table.c -I${CMAKE_BINARY_DIR} + COMMAND /usr/bin/gcc ${CMAKE_CURRENT_SOURCE_DIR}/gen-western-table.c -I${CMAKE_BINARY_DIR}
+ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lglib-2.0 -o ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table + -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lglib-2.0 -o ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table
+ && ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h + && ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
+ DEPENDS e-name-western-tables.h.in + DEPENDS e-name-western-tables.h.in
) )
set(DEPENDENCIES set(DEPENDENCIES