Fix build (using upstream patch).

3 files changed, 69 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5baf32292409..b15001755f5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evolution-etesync
 	pkgdesc = EteSync (end-to-end encrypted sync) plugin for Evolution
 	pkgver = 1.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gitlab.gnome.org/GNOME/evolution-etesync/
 	arch = x86_64
 	arch = aarch64
@@ -17,7 +17,9 @@ pkgbase = evolution-etesync
 	depends = evolution-data-server
 	depends = libetebase
 	source = https://gitlab.gnome.org/GNOME/evolution-etesync/-/archive/1.0.0/evolution-etesync-1.0.0.tar.gz
+	source = c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff
 	sha256sums = 4e0daa9144962176e474d7f3acb03417d69057cea7fe5131381c7c5b68e6205d
+	sha256sums = SKIP
 
 pkgname = evolution-etesync
 
diff --git a/PKGBUILD b/PKGBUILD
index 375519c27f52..6edc0499b4f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=evolution-etesync
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="EteSync (end-to-end encrypted sync) plugin for Evolution"
 arch=(x86_64 aarch64)
 url="https://gitlab.gnome.org/GNOME/evolution-etesync/"
@@ -10,8 +10,14 @@ license=('LGPL')
 depends=(libgee json-glib evolution-data-server libetebase)
 makedepends=(cmake meson ninja vala intltool evolution)
 _pkgname_ver="$pkgname-$pkgver"
-source=("https://gitlab.gnome.org/GNOME/$pkgname/-/archive/${pkgver}/$_pkgname_ver.tar.gz")
-sha256sums=('4e0daa9144962176e474d7f3acb03417d69057cea7fe5131381c7c5b68e6205d')
+source=("https://gitlab.gnome.org/GNOME/$pkgname/-/archive/${pkgver}/$_pkgname_ver.tar.gz"
+        c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff)
+sha256sums=('4e0daa9144962176e474d7f3acb03417d69057cea7fe5131381c7c5b68e6205d' 'SKIP')
+
+prepare() {
+  cd "$_pkgname_ver"
+  git apply "${srcdir}/c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff"
+}
 
 build() {
   cd "$_pkgname_ver"
diff --git a/c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff b/c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff
new file mode 100644
index 000000000000..2dcc1ac54d5c
--- /dev/null
+++ b/c75e4e0d2baef67dea73ef1e01fd860692e4c70e.diff
@@ -0,0 +1,57 @@
+diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
+index a79419a02ae0aabb6a994789915ba58df21e608f..339f1da4b453e526a7b6db8f7ae98dcc721193c6 100644
+--- a/cmake/modules/PrintableOptions.cmake
++++ b/cmake/modules/PrintableOptions.cmake
+@@ -19,36 +19,44 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
++macro(add_printable_variable_filepath _name _description _default_value)
++	if("${_name}" STREQUAL "")
++		message(FATAL_ERROR "filepath variable name cannot be empty")
++	endif("${_name}" STREQUAL "")
++	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
++	add_printable_variable_bare(${_name})
++endmacro()
++
+ function(print_build_options)
+ 	message(STATUS "Configure options:")
+