Version bumps
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Sat, 8 Aug 2020 18:59:25 +0300
|
||||
Subject: [PATCH] I#158 - Workaround build error with gtk-doc-1.32
|
||||
|
||||
---
|
||||
src/calendar/libecal/e-cal-time-util.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
|
||||
index 8acb13061..11c9d3369 100644
|
||||
--- a/src/calendar/libecal/e-cal-time-util.h
|
||||
+++ b/src/calendar/libecal/e-cal-time-util.h
|
||||
@@ -150,6 +150,7 @@ void time_to_gdate_with_zone (GDate *date,
|
||||
* struct tm manipulation
|
||||
**************************************************************************/
|
||||
|
||||
+#ifndef __GTK_DOC_IGNORE__
|
||||
struct tm e_cal_util_icaltime_to_tm
|
||||
(const ICalTime *itt);
|
||||
struct tm e_cal_util_icaltime_to_tm_with_zone
|
||||
@@ -159,6 +160,7 @@ struct tm e_cal_util_icaltime_to_tm_with_zone
|
||||
ICalTime * e_cal_util_tm_to_icaltime
|
||||
(struct tm *tm,
|
||||
gboolean is_date);
|
||||
+#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Wed, 14 Apr 2021 16:58:08 +0200
|
||||
Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
|
||||
|
||||
CMake 3.20.1 errors out with:
|
||||
|
||||
CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
|
||||
variable name cannot be empty
|
||||
Call Stack (most recent call first):
|
||||
CMakeLists.txt:152 (add_printable_variable)
|
||||
|
||||
Change how the parameter value is compared, to fix it.
|
||||
---
|
||||
cmake/modules/PrintableOptions.cmake | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
|
||||
index ba1c9d0b7..339f1da4b 100644
|
||||
--- a/cmake/modules/PrintableOptions.cmake
|
||||
+++ b/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()
|
||||
--
|
||||
2.26.3
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
# RFC2739 calEntry schema for OpenLDAP 2.x
|
||||
|
||||
#
|
||||
# From https://bugs.gentoo.org/show_bug.cgi?id=83988
|
||||
# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
|
||||
#
|
||||
|
||||
# Version of RFC 2739 schema translated by Terrelle Shaw
|
||||
# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
|
||||
# <peter.marschall@adpm.de> # Nov. 9, 2002
|
||||
|
||||
# Notes:
|
||||
# * RFC2739 seems to be a bit sloppy about attribute type and
|
||||
# objectclass definitions syntax and also about attribute syntax
|
||||
# and matching rules.
|
||||
# (It even counts the attributes in the calEntry objectclass wrong ;-)
|
||||
# * The following changes have been applied to correct the schema
|
||||
# - added description to each attributetype definition
|
||||
# - changed SYNTAX from 'IA5String' to corresponding OID
|
||||
# to make matching rules and syntax consistent
|
||||
# - replaced illegal keyword SUBSTRING by SUBSTR
|
||||
# - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
|
||||
# - removed illegal keyword MULTI-VALUE
|
||||
# - added keyword SINGLE-VALUE where appropriate
|
||||
# - removed USAGE since cwuserApplications is the default
|
||||
# - added description to the objectclass defintion
|
||||
# - corrected typo in objectclass definition
|
||||
# - added the attributetypes defined but not used to the objectclass
|
||||
|
||||
|
||||
# 2.4.4.1 calCalURI
|
||||
attributetype ( 1.2.840.113556.1.4.478
|
||||
NAME 'calCalURI'
|
||||
DESC 'URI to a snapshot of the users entire default calendar'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
||||
SINGLE-VALUE )
|
||||
|
||||
# 2.4.4.2 calFBURL
|
||||
attributetype ( 1.2.840.113556.1.4.479
|
||||
NAME 'calFBURL'
|
||||
DESC 'URI to the users default free/busy time data'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
||||
SINGLE-VALUE )
|
||||
|
||||
# 2.4.4.3 calCAPURI
|
||||
attributetype ( 1.2.840.113556.1.4.480
|
||||
NAME 'calCAPURI'
|
||||
DESC 'URI used to communicate with the users calendar'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
||||
SINGLE-VALUE )
|
||||
|
||||
# 2.4.4.4 calCalAdrURI
|
||||
attributetype ( 1.2.840.113556.1.4.481
|
||||
NAME 'calCalAdrURI'
|
||||
DESC 'URI to which event requests should be sent for the user'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
|
||||
SINGLE-VALUE )
|
||||
|
||||
# 2.4.4.5 calOtherCalURIs
|
||||
attributetype ( 1.2.840.113556.1.4.482
|
||||
NAME 'calOtherCalURIs'
|
||||
DESC 'URIs to snapshots of non-default calendars belonging to the user'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
|
||||
|
||||
# 2.4.4.6 calOtherFBURLs
|
||||
attributetype ( 1.2.840.113556.1.4.483
|
||||
NAME 'calOtherFBURLs'
|
||||
DESC 'URIs to non-default free/busy data belonging to the user'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
|
||||
|
||||
# 2.4.4.7 calOtherCAPURIs
|
||||
attributetype ( 1.2.840.113556.1.4.484
|
||||
NAME 'calOtherCAPURIs'
|
||||
DESC 'URIs to non-default calendars belonging to the user'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
|
||||
|
||||
# 2.4.4.8 calOtherCalAdrURIs
|
||||
attributetype ( 1.2.840.113556.1.4.485
|
||||
NAME 'calOtherCalAdrURIs'
|
||||
DESC 'URIs of destinations for event requests to non-default calendars'
|
||||
EQUALITY caseIgnoreIA5Match
|
||||
SUBSTR caseIgnoreIA5SubstringsMatch
|
||||
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
|
||||
|
||||
# 2.4.3.1 calEntry
|
||||
objectclass ( 1.2.840.113556.1.5.87
|
||||
NAME 'calEntry'
|
||||
DESC 'Calendering and free/busy information'
|
||||
SUP top AUXILIARY
|
||||
MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
|
||||
calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $
|
||||
calOtherCalAdrURIs ) )
|
||||
|
||||
# EOF
|
||||
Reference in New Issue
Block a user