Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] evolution-data-server: fix patch whitespace
@ 2021-12-04 18:12 paper42
  2021-12-04 19:02 ` [PR PATCH] [Updated] " paper42
  2021-12-06 10:02 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2021-12-04 18:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages evolution-data-server-patch
https://github.com/void-linux/void-packages/pull/34381

evolution-data-server: fix patch whitespace
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-evolution-data-server-patch-34381.patch --]
[-- Type: text/x-diff, Size: 5144 bytes --]

From 4f955eb8342b56055e64e5614ca557807936dc56 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Dec 2021 19:11:29 +0100
Subject: [PATCH] evolution-data-server: fix patch whitespace

---
 .../patches/gen-tables.patch                  | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/srcpkgs/evolution-data-server/patches/gen-tables.patch b/srcpkgs/evolution-data-server/patches/gen-tables.patch
index d21fa8c617cd..f08fd3ffcba2 100644
--- a/srcpkgs/evolution-data-server/patches/gen-tables.patch
+++ b/srcpkgs/evolution-data-server/patches/gen-tables.patch
@@ -1,64 +1,64 @@
 camel-gen-tables and gen-western-table are executed in the build process so
 they need to be built for the host architecture
 
---- a/src/camel/CMakeLists.txt.orig       2018-10-27 15:24:42.168166299 +0200
-+++ b/src/camel/CMakeLists.txt    2018-10-27 15:37:04.341765727 +0200
-@@ -1,17 +1,10 @@
- glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
-
--add_executable(camel-gen-tables
--       camel-gen-tables.c
--)
--
--target_include_directories(camel-gen-tables PUBLIC
--       ${CMAKE_BINARY_DIR}
--)
-
- add_custom_command(
-        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
--       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
-+               && ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
- )
-
- set(SOURCES
-
---- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig       2018-10-27 15:42:14.644088211 +0200
-+++ b/src/addressbook/libebook-contacts/CMakeLists.txt    2018-10-27 15:45:43.359285829 +0200
-@@ -2,31 +2,12 @@
-
+--- a/src/addressbook/libebook-contacts/CMakeLists.txt
++++ b/src/addressbook/libebook-contacts/CMakeLists.txt
+@@ -2,31 +2,12 @@ glib_mkenums(e-book-contacts-enumtypes e-book-contacts-enums.h E_BOOK_CONTACTS_E
+ 
  add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)
-
+ 
 -add_executable(gen-western-table
--       gen-western-table.c
+-	gen-western-table.c
 -)
 -
 -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
--       ${GNOME_PLATFORM_CFLAGS}
+-	${GNOME_PLATFORM_CFLAGS}
 -)
 -
 -target_include_directories(gen-western-table PUBLIC
--       ${CMAKE_BINARY_DIR}
--       ${GNOME_PLATFORM_INCLUDE_DIRS}
+-	${CMAKE_BINARY_DIR}
+-	${GNOME_PLATFORM_INCLUDE_DIRS}
 -)
 -
 -target_link_libraries(gen-western-table
--       ${GNOME_PLATFORM_LDFLAGS}
+-	${GNOME_PLATFORM_LDFLAGS}
 -)
 -
  add_custom_command(
-        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
--       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}
-+               -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
-+       DEPENDS e-name-western-tables.h.in
+ 	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
+-	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}
++			-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
++	DEPENDS e-name-western-tables.h.in
  )
-
+ 
  set(DEPENDENCIES
+--- a/src/camel/CMakeLists.txt
++++ b/src/camel/CMakeLists.txt
+@@ -7,18 +7,10 @@ glib_mkenums_multiple(camel-enumtypes CAMEL_ENUMTYPES_H
+ 	camel-url.h
+ )
+ 
+-add_executable(camel-gen-tables
+-	camel-gen-tables.c
+-)
+-
+-target_include_directories(camel-gen-tables PUBLIC
+-	${CMAKE_BINARY_DIR}
+-)
+-
+ add_custom_command(
+ 	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
+-	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
++			&& ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+ )
+ 
+ set(SOURCES

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] evolution-data-server: fix patch whitespace
  2021-12-04 18:12 [PR PATCH] evolution-data-server: fix patch whitespace paper42
@ 2021-12-04 19:02 ` paper42
  2021-12-06 10:02 ` [PR PATCH] [Merged]: " paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2021-12-04 19:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages evolution-data-server-patch
https://github.com/void-linux/void-packages/pull/34381

evolution-data-server: fix patch whitespace
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-evolution-data-server-patch-34381.patch --]
[-- Type: text/x-diff, Size: 5003 bytes --]

From 58e2b392fc408ebf42f2218a2add576d72a9abb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Dec 2021 19:11:29 +0100
Subject: [PATCH] evolution-data-server: fix patch whitespace

---
 .../patches/gen-tables.patch                  | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/evolution-data-server/patches/gen-tables.patch b/srcpkgs/evolution-data-server/patches/gen-tables.patch
index d21fa8c617cd..f111ef2625ab 100644
--- a/srcpkgs/evolution-data-server/patches/gen-tables.patch
+++ b/srcpkgs/evolution-data-server/patches/gen-tables.patch
@@ -1,64 +1,64 @@
 camel-gen-tables and gen-western-table are executed in the build process so
 they need to be built for the host architecture
 
---- a/src/camel/CMakeLists.txt.orig       2018-10-27 15:24:42.168166299 +0200
-+++ b/src/camel/CMakeLists.txt    2018-10-27 15:37:04.341765727 +0200
-@@ -1,17 +1,10 @@
- glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
-
+--- a/src/camel/CMakeLists.txt
++++ b/src/camel/CMakeLists.txt
+@@ -7,18 +7,10 @@ glib_mkenums_multiple(camel-enumtypes CAMEL_ENUMTYPES_H
+ 	camel-url.h
+ )
+ 
 -add_executable(camel-gen-tables
--       camel-gen-tables.c
+-	camel-gen-tables.c
 -)
 -
 -target_include_directories(camel-gen-tables PUBLIC
--       ${CMAKE_BINARY_DIR}
+-	${CMAKE_BINARY_DIR}
 -)
-
+-
  add_custom_command(
-        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
--       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
-+               && ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${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
+-	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
++		&& ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
  )
-
+ 
  set(SOURCES
-
---- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig       2018-10-27 15:42:14.644088211 +0200
-+++ b/src/addressbook/libebook-contacts/CMakeLists.txt    2018-10-27 15:45:43.359285829 +0200
-@@ -2,31 +2,12 @@
-
+--- a/src/addressbook/libebook-contacts/CMakeLists.txt
++++ b/src/addressbook/libebook-contacts/CMakeLists.txt
+@@ -2,31 +2,12 @@ glib_mkenums(e-book-contacts-enumtypes e-book-contacts-enums.h E_BOOK_CONTACTS_E
+ 
  add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)
-
+ 
 -add_executable(gen-western-table
--       gen-western-table.c
+-	gen-western-table.c
 -)
 -
 -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
--       ${GNOME_PLATFORM_CFLAGS}
+-	${GNOME_PLATFORM_CFLAGS}
 -)
 -
 -target_include_directories(gen-western-table PUBLIC
--       ${CMAKE_BINARY_DIR}
--       ${GNOME_PLATFORM_INCLUDE_DIRS}
+-	${CMAKE_BINARY_DIR}
+-	${GNOME_PLATFORM_INCLUDE_DIRS}
 -)
 -
 -target_link_libraries(gen-western-table
--       ${GNOME_PLATFORM_LDFLAGS}
+-	${GNOME_PLATFORM_LDFLAGS}
 -)
 -
  add_custom_command(
-        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
--       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}
-+               -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
-+       DEPENDS e-name-western-tables.h.in
+ 	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
+-	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}
++		-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
++	DEPENDS e-name-western-tables.h.in
  )
-
+ 
  set(DEPENDENCIES

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: evolution-data-server: fix patch whitespace
  2021-12-04 18:12 [PR PATCH] evolution-data-server: fix patch whitespace paper42
  2021-12-04 19:02 ` [PR PATCH] [Updated] " paper42
@ 2021-12-06 10:02 ` paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2021-12-06 10:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]

There's a merged pull request on the void-packages repository

evolution-data-server: fix patch whitespace
https://github.com/void-linux/void-packages/pull/34381

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-12-06 10:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-04 18:12 [PR PATCH] evolution-data-server: fix patch whitespace paper42
2021-12-04 19:02 ` [PR PATCH] [Updated] " paper42
2021-12-06 10:02 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).