Update to evolution-data-server-3.40.1.

This commit is contained in:
ajacoutot 2021-05-13 10:21:53 +00:00
parent a6d0e12e6a
commit 0ad9f93869
5 changed files with 32 additions and 73 deletions

View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.270 2021/02/23 19:39:11 sthen Exp $
# $OpenBSD: Makefile,v 1.271 2021/05/13 10:21:53 ajacoutot Exp $
# XXX add libphonenumber support when a cpp release is out
COMMENT= unified backend for PIM programs
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 3.38.4
GNOME_VERSION= 3.40.1
CATEGORIES= databases productivity
SHARED_LIBS += camel-1.2 41.4
SHARED_LIBS += edataserver-1.2 22.4
SHARED_LIBS += ebackend-1.2 8.4
SHARED_LIBS += edataserverui-1.2 4.4
SHARED_LIBS += ebook-contacts-1.2 5.4
SHARED_LIBS += edata-book-1.2 20.2
SHARED_LIBS += ebook-1.2 23.2
SHARED_LIBS += ecal-2.0 0.2
SHARED_LIBS += edata-cal-2.0 0.2
SHARED_LIBS += camel-1.2 41.5
SHARED_LIBS += edataserver-1.2 22.5
SHARED_LIBS += ebackend-1.2 8.5
SHARED_LIBS += edataserverui-1.2 4.5
SHARED_LIBS += ebook-contacts-1.2 5.5
SHARED_LIBS += edata-book-1.2 20.3
SHARED_LIBS += ebook-1.2 23.3
SHARED_LIBS += ecal-2.0 0.3
SHARED_LIBS += edata-cal-2.0 0.3
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (evolution-data-server-3.38.4.tar.xz) = rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU=
SIZE (evolution-data-server-3.38.4.tar.xz) = 4663372
SHA256 (evolution-data-server-3.40.1.tar.xz) = 6sdfNIql3vvpRz+jCrYIRjXuZNjj6q7GCmLCfxScPiI=
SIZE (evolution-data-server-3.40.1.tar.xz) = 4625316

View File

@ -1,59 +0,0 @@
$OpenBSD: patch-cmake_modules_PrintableOptions_cmake,v 1.1 2021/04/29 16:36:12 rsadowski Exp $
PrintableOptions.cmake: Correct variable name comparison
c95a70bfeae25ba11fbe50fe759a6cdb29388e44
Index: cmake/modules/PrintableOptions.cmake
--- cmake/modules/PrintableOptions.cmake.orig
+++ cmake/modules/PrintableOptions.cmake
@@ -19,40 +19,40 @@
# 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 "")
+ if("${_name}" STREQUAL "")
message(FATAL_ERROR "filepath variable name cannot be empty")
- endif(_name STREQUAL "")
+ endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE FILEPATH ${_description})
add_printable_variable_bare(${_name})
endmacro()

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-cmake_modules_SetupBuildFlags_cmake,v 1.5 2021/05/13 10:21:53 ajacoutot Exp $
XXX push upstream
There's another check for BSD later on in the file; it should use it.
Index: cmake/modules/SetupBuildFlags.cmake
--- cmake/modules/SetupBuildFlags.cmake.orig
+++ cmake/modules/SetupBuildFlags.cmake
@@ -20,7 +20,6 @@ macro(setup_build_flags _maintainer_mode)
-Wundef
-Wwrite-strings
-Wno-cast-function-type
- -Wl,--no-undefined
-fno-strict-aliasing
)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.58 2020/11/06 14:45:58 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.59 2021/05/13 10:21:53 ajacoutot Exp $
include/evolution-data-server/
include/evolution-data-server/camel/
include/evolution-data-server/camel/camel-address.h
@ -90,6 +90,7 @@ include/evolution-data-server/camel/camel-sasl-plain.h
include/evolution-data-server/camel/camel-sasl-popb4smtp.h
include/evolution-data-server/camel/camel-sasl-xoauth2-google.h
include/evolution-data-server/camel/camel-sasl-xoauth2-outlook.h
include/evolution-data-server/camel/camel-sasl-xoauth2-yahoo.h
include/evolution-data-server/camel/camel-sasl-xoauth2.h
include/evolution-data-server/camel/camel-sasl.h
include/evolution-data-server/camel/camel-search-private.h
@ -264,6 +265,7 @@ include/evolution-data-server/libedataserver/e-network-monitor.h
include/evolution-data-server/libedataserver/e-oauth2-service-base.h
include/evolution-data-server/libedataserver/e-oauth2-service-google.h
include/evolution-data-server/libedataserver/e-oauth2-service-outlook.h
include/evolution-data-server/libedataserver/e-oauth2-service-yahoo.h
include/evolution-data-server/libedataserver/e-oauth2-service.h
include/evolution-data-server/libedataserver/e-oauth2-services.h
include/evolution-data-server/libedataserver/e-operation-pool.h