diff options
author | Allen Winter <allen.winter@kdab.com> | 2022-04-27 10:45:21 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2022-04-27 10:45:21 -0400 |
commit | 130a2634f459bc86b5d92d13082ef8d3b807181d (patch) | |
tree | 1adf9a95a82efe8f042bee89d3e822977fed331d | |
parent | 7ac64a1047cdc9786e5f9a163159a59c60e831db (diff) | |
parent | cc179999936389d528a440f5effe05ad7334e8d5 (diff) | |
download | libical-git-130a2634f459bc86b5d92d13082ef8d3b807181d.tar.gz |
Merge branch '3.0'
-rw-r--r-- | .pre-commit-config.yaml | 24 | ||||
-rw-r--r-- | ReleaseNotes.txt | 4 | ||||
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | src/libical-glib/api/i-cal-derived-parameter.xml | 107 |
4 files changed, 134 insertions, 3 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..6c956eb6 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,24 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-added-large-files + - id: check-case-conflict + - id: check-yaml + - id: check-json +- repo: https://github.com/pre-commit/mirrors-clang-format + rev: v13.0.0 + hooks: + - id: clang-format +- repo: https://github.com/PyCQA/pylint + rev: v2.12.2 + hooks: + - id: pylint +- repo: https://github.com/codespell-project/codespell + rev: v2.1.0 + hooks: + - id: codespell diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 57a95536..da0598f3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,7 +4,7 @@ Release Highlights Version 3.1.0 (NOT RELEASED YET): -------------------------------- * MSVC 2013 or higher (when building on Windows with MSVC) - * For the C++ bindings, a C++11 compliant complier is required + * For the C++ bindings, a C++11 compliant compiler is required * Requires CMake v3.11.0 or higher * libical-glib requires glib 2.38 or higher * libical-glib requires a C11 compliant compiler @@ -46,7 +46,7 @@ Version 3.1.0 (NOT RELEASED YET): Version 3.0.15 (UNRELEASED): ---------------------------- - * + * Add missing property parameters into libical-glib Version 3.0.14 (05 February 2022): ---------------------------------- diff --git a/appveyor.yml b/appveyor.yml index bcb85b28..5264c1b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ configuration: - Debug install: - - sh: if [ "`uname -s`" = "Darwin" ]; then export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig; export XML_CATALOG_FILES=/usr/local/etc/xml/catalog; brew install pkg-config ninja gtk-doc glib libxml2 icu4c berkeley-db; else sudo apt-get -y install gtk-doc-tools xml-core libdb-dev gobject-introspection libgirepository1.0-dev valac; fi + - sh: if [ "`uname -s`" = "Darwin" ]; then export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig; export XML_CATALOG_FILES=/usr/local/etc/xml/catalog; rm -f /usr/local/include/X11; brew install pkg-config ninja gtk-doc glib libxml2 icu4c berkeley-db; else sudo apt-get -y install gtk-doc-tools xml-core libdb-dev gobject-introspection libgirepository1.0-dev valac; fi before_build: - cmd: call scripts\set_compiler_env.bat diff --git a/src/libical-glib/api/i-cal-derived-parameter.xml b/src/libical-glib/api/i-cal-derived-parameter.xml index 54122a0d..a0799a74 100644 --- a/src/libical-glib/api/i-cal-derived-parameter.xml +++ b/src/libical-glib/api/i-cal-derived-parameter.xml @@ -24,13 +24,17 @@ <element name="ICAL_DELEGATEDFROM_PARAMETER"/> <element name="ICAL_DELEGATEDTO_PARAMETER"/> <element name="ICAL_DIR_PARAMETER"/> + <element name="ICAL_DISPLAY_PARAMETER"/> + <element name="ICAL_EMAIL_PARAMETER"/> <element name="ICAL_ENABLE_PARAMETER"/> <element name="ICAL_ENCODING_PARAMETER"/> <element name="ICAL_FBTYPE_PARAMETER"/> + <element name="ICAL_FEATURE_PARAMETER"/> <element name="ICAL_FILENAME_PARAMETER"/> <element name="ICAL_FMTTYPE_PARAMETER"/> <element name="ICAL_IANA_PARAMETER"/> <element name="ICAL_ID_PARAMETER"/> + <element name="ICAL_LABEL_PARAMETER"/> <element name="ICAL_LANGUAGE_PARAMETER"/> <element name="ICAL_LATENCY_PARAMETER"/> <element name="ICAL_LOCAL_PARAMETER"/> @@ -40,6 +44,7 @@ <element name="ICAL_MODIFIED_PARAMETER"/> <element name="ICAL_OPTIONS_PARAMETER"/> <element name="ICAL_PARTSTAT_PARAMETER"/> + <element name="ICAL_PATCHACTION_PARAMETER"/> <element name="ICAL_PUBLICCOMMENT_PARAMETER"/> <element name="ICAL_RANGE_PARAMETER"/> <element name="ICAL_REASON_PARAMETER"/> @@ -78,6 +83,14 @@ <element name="ICAL_CUTYPE_UNKNOWN"/> <element name="ICAL_CUTYPE_NONE"/> </enum> + <enum name="ICalParameterDisplay" native_name="icalparameter_display" default_native="I_CAL_DISPLAY_NONE"> + <element name="ICAL_DISPLAY_X"/> + <element name="ICAL_DISPLAY_BADGE"/> + <element name="ICAL_DISPLAY_GRAPHIC"/> + <element name="ICAL_DISPLAY_FULLSIZE"/> + <element name="ICAL_DISPLAY_THUMBNAIL"/> + <element name="ICAL_DISPLAY_NONE"/> + </enum> <enum name="ICalParameterEnable" native_name="icalparameter_enable" default_native="I_CAL_ENABLE_NONE"> <element name="ICAL_ENABLE_X"/> <element name="ICAL_ENABLE_TRUE"/> @@ -98,6 +111,17 @@ <element name="ICAL_FBTYPE_BUSYTENTATIVE"/> <element name="ICAL_FBTYPE_NONE"/> </enum> + <enum name="ICalParameterFeature" native_name="icalparameter_feature" default_native="I_CAL_FEATURE_NONE"> + <element name="ICAL_FEATURE_X"/> + <element name="ICAL_FEATURE_AUDIO"/> + <element name="ICAL_FEATURE_CHAT"/> + <element name="ICAL_FEATURE_FEED"/> + <element name="ICAL_FEATURE_MODERATOR"/> + <element name="ICAL_FEATURE_PHONE"/> + <element name="ICAL_FEATURE_SCREEN"/> + <element name="ICAL_FEATURE_VIDEO"/> + <element name="ICAL_FEATURE_NONE"/> + </enum> <enum name="ICalParameterLocal" native_name="icalparameter_local" default_native="I_CAL_LOCAL_NONE"> <element name="ICAL_LOCAL_X"/> <element name="ICAL_LOCAL_TRUE"/> @@ -116,6 +140,14 @@ <element name="ICAL_PARTSTAT_FAILED"/> <element name="ICAL_PARTSTAT_NONE"/> </enum> + <enum name="ICalParameterPatchaction" native_name="icalparameter_patchaction" default_native="I_CAL_PATCHACTION_NONE"> + <element name="ICAL_PATCHACTION_X"/> + <element name="ICAL_PATCHACTION_CREATE"/> + <element name="ICAL_PATCHACTION_BYNAME"/> + <element name="ICAL_PATCHACTION_BYVALUE"/> + <element name="ICAL_PATCHACTION_BYPARAM"/> + <element name="ICAL_PATCHACTION_NONE"/> + </enum> <enum name="ICalParameterRange" native_name="icalparameter_range" default_native="I_CAL_RANGE_NONE"> <element name="ICAL_RANGE_X"/> <element name="ICAL_RANGE_THISANDPRIOR"/> @@ -345,6 +377,36 @@ <parameter type="const gchar *" name="v" comment="The string used to set into the @value"/> <comment xml:space="preserve"></comment> </method> + <method name="i_cal_parameter_new_display" corresponds="icalparameter_new_display" kind="constructor" since="3.0.15"> + <parameter type="ICalParameterDisplay" name="value" comment="The #ICalParameterDisplay value of the new #ICalParameter"/> + <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter" /> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_get_display" corresponds="icalparameter_get_display" kind="get" since="3.0.15"> + <parameter type="const ICalParameter *" name="param" comment="The #ICalParameter to be queried"/> + <returns type="ICalParameterDisplay" comment="The #ICalParameterDisplay value of the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_set_display" corresponds="icalparameter_set_display" kind="set" since="3.0.15"> + <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be set"/> + <parameter type="ICalParameterDisplay" name="value" comment="The #ICalParameterDisplay to set into the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_new_email" corresponds="icalparameter_new_email" kind="constructor" since="3.0.15"> + <parameter type="const gchar *" name="value" comment="The string value of the new #ICalParameter"/> + <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter" /> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_get_email" corresponds="icalparameter_get_email" kind="get" since="3.0.15"> + <parameter type="const ICalParameter *" name="param" comment="The #ICalParameter to be queried"/> + <returns type="const gchar *" annotation="nullable" comment="The string value of the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_set_email" corresponds="icalparameter_set_email" kind="set" since="3.0.15"> + <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be set"/> + <parameter type="const gchar *" name="value" comment="The string value to set into the @param"/> + <comment xml:space="preserve"></comment> + </method> <method name="i_cal_parameter_new_enable" corresponds="icalparameter_new_enable" kind="constructor" since="1.0"> <parameter type="ICalParameterEnable" name="v" comment="The type of #ICalParameter to be created"/> <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter." /> @@ -390,6 +452,21 @@ <parameter type="ICalParameterFbtype" name="v" comment="The type of #ICalParameter to be set in the @value"/> <comment xml:space="preserve"></comment> </method> + <method name="i_cal_parameter_new_feature" corresponds="icalparameter_new_feature" kind="constructor" since="3.0.15"> + <parameter type="ICalParameterFeature" name="value" comment="The #ICalParameterFeature value of the new #ICalParameter"/> + <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter" /> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_get_feature" corresponds="icalparameter_get_feature" kind="get" since="3.0.15"> + <parameter type="const ICalParameter *" name="param" comment="The #ICalParameter to be queried"/> + <returns type="ICalParameterFeature" comment="The #ICalParameterFeature value of the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_set_feature" corresponds="icalparameter_set_feature" kind="set" since="3.0.15"> + <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be set"/> + <parameter type="ICalParameterFeature" name="value" comment="The #ICalParameterFeature to set into the @param"/> + <comment xml:space="preserve"></comment> + </method> <method name="i_cal_parameter_new_filename" corresponds="icalparameter_new_filename" kind="constructor" since="2.0"> <parameter type="const gchar *" name="v" comment="The string used to create the new #ICalParameter"/> <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter." /> @@ -450,6 +527,21 @@ <parameter type="const gchar *" name="v" comment="The string used to set into the @value"/> <comment xml:space="preserve"></comment> </method> + <method name="i_cal_parameter_new_label" corresponds="icalparameter_new_label" kind="constructor" since="3.0.15"> + <parameter type="const gchar *" name="value" comment="The string value of the new #ICalParameter"/> + <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter" /> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_get_label" corresponds="icalparameter_get_label" kind="get" since="3.0.15"> + <parameter type="const ICalParameter *" name="param" comment="The #ICalParameter to be queried"/> + <returns type="const gchar *" annotation="nullable" comment="The string value of the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_set_label" corresponds="icalparameter_set_label" kind="set" since="3.0.15"> + <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be set"/> + <parameter type="const gchar *" name="value" comment="The string value to set into the @param"/> + <comment xml:space="preserve"></comment> + </method> <method name="i_cal_parameter_new_language" corresponds="icalparameter_new_language" kind="constructor" since="1.0"> <parameter type="const gchar *" name="v" comment="The string used to create the new #ICalParameter"/> <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter." /> @@ -585,6 +677,21 @@ <parameter type="ICalParameterPartstat" name="v" comment="The type of #ICalParameter to be set in the @value"/> <comment xml:space="preserve"></comment> </method> + <method name="i_cal_parameter_new_patchaction" corresponds="icalparameter_new_patchaction" kind="constructor" since="3.0.15"> + <parameter type="ICalParameterPatchaction" name="value" comment="The #ICalParameterPatchaction value of the new #ICalParameter"/> + <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter" /> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_get_patchaction" corresponds="icalparameter_get_patchaction" kind="get" since="3.0.15"> + <parameter type="const ICalParameter *" name="param" comment="The #ICalParameter to be queried"/> + <returns type="ICalParameterPatchaction" comment="The #ICalParameterPatchaction value of the @param"/> + <comment xml:space="preserve"></comment> + </method> + <method name="i_cal_parameter_set_patchaction" corresponds="icalparameter_set_patchaction" kind="set" since="3.0.15"> + <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be set"/> + <parameter type="ICalParameterPatchaction" name="value" comment="The #ICalParameterPatchaction to set into the @param"/> + <comment xml:space="preserve"></comment> + </method> <method name="i_cal_parameter_new_publiccomment" corresponds="icalparameter_new_publiccomment" kind="constructor" since="2.0"> <parameter type="const gchar *" name="v" comment="The string used to create the new #ICalParameter"/> <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter." /> |