diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-01-10 19:52:57 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-01-10 19:52:57 +0000 |
commit | 7ee9c5458dda4991240994211e1a4995e513352d (patch) | |
tree | 44aad7259410d273738422c8ddb0bda08461b4b1 /deskutils | |
parent | f83f55b02eed7b69b69b6b79fb27dd2b2fed89b2 (diff) | |
download | ports-7ee9c5458dda4991240994211e1a4995e513352d.tar.gz ports-7ee9c5458dda4991240994211e1a4995e513352d.zip |
Notes
Diffstat (limited to 'deskutils')
31 files changed, 88 insertions, 1181 deletions
diff --git a/deskutils/akonadi-calendar-tools/distinfo b/deskutils/akonadi-calendar-tools/distinfo index cfbe3a7cc1d2..67a94d64397c 100644 --- a/deskutils/akonadi-calendar-tools/distinfo +++ b/deskutils/akonadi-calendar-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225578 -SHA256 (KDE/applications/18.12.0/akonadi-calendar-tools-18.12.0.tar.xz) = 17aa8c1b6629663e65266fe059dd3a010f3201c45971c01259910def287a5670 -SIZE (KDE/applications/18.12.0/akonadi-calendar-tools-18.12.0.tar.xz) = 225048 +TIMESTAMP = 1546985125 +SHA256 (KDE/applications/18.12.1/akonadi-calendar-tools-18.12.1.tar.xz) = f4a9d950173cdc2cd8978cd54394e93ad445d1d1274fb29b68237e0dd494a428 +SIZE (KDE/applications/18.12.1/akonadi-calendar-tools-18.12.1.tar.xz) = 224972 diff --git a/deskutils/akonadi-import-wizard/distinfo b/deskutils/akonadi-import-wizard/distinfo index 4a73affea4a6..87581cda446a 100644 --- a/deskutils/akonadi-import-wizard/distinfo +++ b/deskutils/akonadi-import-wizard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225580 -SHA256 (KDE/applications/18.12.0/akonadi-import-wizard-18.12.0.tar.xz) = cd51da5ac6607cd08d8bb5b96e14c052ba10acfdf9f28530f918a7b5cd3f87e8 -SIZE (KDE/applications/18.12.0/akonadi-import-wizard-18.12.0.tar.xz) = 439196 +TIMESTAMP = 1546985126 +SHA256 (KDE/applications/18.12.1/akonadi-import-wizard-18.12.1.tar.xz) = b2dc7882d394610ce42a17290d41f0ef4dae4de4bdd82e6f0c11d1b0afb62527 +SIZE (KDE/applications/18.12.1/akonadi-import-wizard-18.12.1.tar.xz) = 438996 diff --git a/deskutils/akonadiconsole/distinfo b/deskutils/akonadiconsole/distinfo index 32f18c7ffb5d..61a796ba6359 100644 --- a/deskutils/akonadiconsole/distinfo +++ b/deskutils/akonadiconsole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225581 -SHA256 (KDE/applications/18.12.0/akonadiconsole-18.12.0.tar.xz) = 65c53c7b938dca80919b97b3329d3764a722e7f3e8f3c6378f8505155e42e8e1 -SIZE (KDE/applications/18.12.0/akonadiconsole-18.12.0.tar.xz) = 193828 +TIMESTAMP = 1546985127 +SHA256 (KDE/applications/18.12.1/akonadiconsole-18.12.1.tar.xz) = 932360ab89aec5006ba40cd44244dd9ca6b1a5ad6ca0e89699674c66ccbcb01a +SIZE (KDE/applications/18.12.1/akonadiconsole-18.12.1.tar.xz) = 193828 diff --git a/deskutils/akregator/distinfo b/deskutils/akregator/distinfo index f7cc5e1d4084..e5ec413d1e96 100644 --- a/deskutils/akregator/distinfo +++ b/deskutils/akregator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225580 -SHA256 (KDE/applications/18.12.0/akregator-18.12.0.tar.xz) = 0dfa2a20c6a6118cfbcec409315b3fe5d8d08ee509f5204e0af6bd7dd945260d -SIZE (KDE/applications/18.12.0/akregator-18.12.0.tar.xz) = 2189036 +TIMESTAMP = 1546985127 +SHA256 (KDE/applications/18.12.1/akregator-18.12.1.tar.xz) = 299393c71ece1e774502c496d615d5e55535b12a81ceb18eacabdde2de364c7e +SIZE (KDE/applications/18.12.1/akregator-18.12.1.tar.xz) = 2189848 diff --git a/deskutils/grantlee-editor/distinfo b/deskutils/grantlee-editor/distinfo index 2df84038ccdd..85574ad98358 100644 --- a/deskutils/grantlee-editor/distinfo +++ b/deskutils/grantlee-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225580 -SHA256 (KDE/applications/18.12.0/grantlee-editor-18.12.0.tar.xz) = 365e25e91c4ef6b77c9f73d962f26568966827d11f08632dc3f32138ad66b040 -SIZE (KDE/applications/18.12.0/grantlee-editor-18.12.0.tar.xz) = 110700 +TIMESTAMP = 1546985127 +SHA256 (KDE/applications/18.12.1/grantlee-editor-18.12.1.tar.xz) = 442acac2eec2d92d2ffeac8ce7dc9491561a8a054b5acf8a929b359273e40565 +SIZE (KDE/applications/18.12.1/grantlee-editor-18.12.1.tar.xz) = 110696 diff --git a/deskutils/grantleetheme/distinfo b/deskutils/grantleetheme/distinfo index aebc824b2c78..7ac15c090208 100644 --- a/deskutils/grantleetheme/distinfo +++ b/deskutils/grantleetheme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225578 -SHA256 (KDE/applications/18.12.0/grantleetheme-18.12.0.tar.xz) = fdffe9bbfef0e0f25be1dd3a63073834b58eb598fd156a11239d6f1f3718b8cc -SIZE (KDE/applications/18.12.0/grantleetheme-18.12.0.tar.xz) = 51580 +TIMESTAMP = 1546985125 +SHA256 (KDE/applications/18.12.1/grantleetheme-18.12.1.tar.xz) = 8c3a62510efcc054f50b0800be378bb5d20eb3f889bbe9ad81d6dfbfd41196b0 +SIZE (KDE/applications/18.12.1/grantleetheme-18.12.1.tar.xz) = 51524 diff --git a/deskutils/kaddressbook/distinfo b/deskutils/kaddressbook/distinfo index 7aee661eaa23..cb02a6a24da8 100644 --- a/deskutils/kaddressbook/distinfo +++ b/deskutils/kaddressbook/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225579 -SHA256 (KDE/applications/18.12.0/kaddressbook-18.12.0.tar.xz) = f2568b8a5ae47502af82583fe49d934655f751165289026308d528ae8de5d535 -SIZE (KDE/applications/18.12.0/kaddressbook-18.12.0.tar.xz) = 471032 +TIMESTAMP = 1546985126 +SHA256 (KDE/applications/18.12.1/kaddressbook-18.12.1.tar.xz) = 53197384850ac7022d7c3de3bec504d92668747ef0cdef7b52564581995c8a58 +SIZE (KDE/applications/18.12.1/kaddressbook-18.12.1.tar.xz) = 471084 diff --git a/deskutils/kalarm/distinfo b/deskutils/kalarm/distinfo index c714d314b465..2141edab5627 100644 --- a/deskutils/kalarm/distinfo +++ b/deskutils/kalarm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225576 -SHA256 (KDE/applications/18.12.0/kalarm-18.12.0.tar.xz) = 228e40edf6cdeacb04113b7dde32838b7d236c4bb788d95c1e5f83421035b3b2 -SIZE (KDE/applications/18.12.0/kalarm-18.12.0.tar.xz) = 1812392 +TIMESTAMP = 1546985124 +SHA256 (KDE/applications/18.12.1/kalarm-18.12.1.tar.xz) = 34d2f00f8aa8f7e7b0de5fea0d8c4b0bb5b6f3bc09c499189b348ba6c07059fc +SIZE (KDE/applications/18.12.1/kalarm-18.12.1.tar.xz) = 1811976 diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index 5733e4ca060a..a51b178fbf79 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225581 -SHA256 (KDE/applications/18.12.0/kcharselect-18.12.0.tar.xz) = 1cbfd369085a57659716a050d8a145f664b216720f6936f4a10fcac2a8c79e68 -SIZE (KDE/applications/18.12.0/kcharselect-18.12.0.tar.xz) = 355688 +TIMESTAMP = 1546985128 +SHA256 (KDE/applications/18.12.1/kcharselect-18.12.1.tar.xz) = a64647ede6c0a8e4e75a11891f290d33a5ef4c670686f3497ea9d9a0f7b98adc +SIZE (KDE/applications/18.12.1/kcharselect-18.12.1.tar.xz) = 333572 diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile index 777f891fc373..ea5b85c44955 100644 --- a/deskutils/kdepim-addons/Makefile +++ b/deskutils/kdepim-addons/Makefile @@ -9,6 +9,8 @@ COMMENT= KDE PIM addons LICENSE= LGPL21 +BUILD_DEPENDS= markdown:textproc/discount +RUN_DEPENDS= markdown:textproc/discount LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ diff --git a/deskutils/kdepim-addons/distinfo b/deskutils/kdepim-addons/distinfo index 239236a91c89..e5223c90b903 100644 --- a/deskutils/kdepim-addons/distinfo +++ b/deskutils/kdepim-addons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225575 -SHA256 (KDE/applications/18.12.0/kdepim-addons-18.12.0.tar.xz) = 7766eb2af244bd45140a9d27b13fbaadbc16af0f52f481aa8e1d00cb0ad17e35 -SIZE (KDE/applications/18.12.0/kdepim-addons-18.12.0.tar.xz) = 2038112 +TIMESTAMP = 1546985123 +SHA256 (KDE/applications/18.12.1/kdepim-addons-18.12.1.tar.xz) = 575308fe132500a2757ba87cfb63ef5e07db4fbe5913a37f5682ee341ecee6bf +SIZE (KDE/applications/18.12.1/kdepim-addons-18.12.1.tar.xz) = 2039288 diff --git a/deskutils/kdepim-addons/pkg-plist b/deskutils/kdepim-addons/pkg-plist index 3b3617bc2904..64ed23e19aa4 100644 --- a/deskutils/kdepim-addons/pkg-plist +++ b/deskutils/kdepim-addons/pkg-plist @@ -1,6 +1,3 @@ -bin/akonadimailreader -bin/coisceim -bin/etm_usage bin/kmail_antivir.sh bin/kmail_clamav.sh bin/kmail_fprot.sh @@ -12,15 +9,12 @@ etc/xdg/kmail.antivirusrc lib/contacteditor/editorpageplugins/cryptopageplugin.so lib/libadblocklibprivate.so.5 lib/libadblocklibprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% -lib/libcoisceim_widget.so.5 -lib/libcoisceim_widget.so.%%KDE_APPLICATIONS_SHLIB_VER%% lib/libkaddressbookimportexportlibprivate.so.5 lib/libkaddressbookimportexportlibprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% lib/libkaddressbookmergelibprivate.so.5 lib/libkaddressbookmergelibprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% lib/libshorturlpluginprivate.so.5 lib/libshorturlpluginprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% -%%QT_PLUGINDIR%%/coisceimpart.so %%QT_PLUGINDIR%%/contacteditor/addresslocationeditorplugin.so %%QT_PLUGINDIR%%/importwizard/evolutionv1importerplugin.so %%QT_PLUGINDIR%%/importwizard/evolutionv2importerplugin.so @@ -50,6 +44,7 @@ lib/libshorturlpluginprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% %%QT_PLUGINDIR%%/kmail/kmail_insertshorturleditorplugin.so %%QT_PLUGINDIR%%/kmail/kmail_insertspecialcharactereditorplugin.so %%QT_PLUGINDIR%%/kmail/kmail_logactivitiesplugin.so +%%QT_PLUGINDIR%%/kmail/kmail_markdownplugin.so %%QT_PLUGINDIR%%/kmail/kmail_nonbreakingspaceeditorplugin.so %%QT_PLUGINDIR%%/kmail/kmail_sharetexteditorplugin.so %%QT_PLUGINDIR%%/kmail/kmail_zoomtexteditorplugin.so @@ -90,18 +85,14 @@ lib/libshorturlpluginprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%% %%QT_PLUGINDIR%%/webengineviewer/webengineviewer_donottrackplugin.so %%QT_QMLDIR%%/org/kde/plasma/PimCalendars/libpimcalendarsplugin.so %%QT_QMLDIR%%/org/kde/plasma/PimCalendars/qmldir -share/applications/org.kde.akonadimailreader.desktop -share/config.kcfg/mailreader.kcfg share/contacteditor/grantleetheme/default/addresseslocation.css share/contacteditor/grantleetheme/default/addresseslocation.html share/kconf_update/webengineurlinterceptoradblock.upd share/kmail2/pics/kmwizard.png share/kmail2/pics/kmwizard.svg -share/kservices5/coisceimpart.desktop share/kservices5/korganizer/datenums.desktop share/kservices5/korganizer/picoftheday.desktop share/kservices5/korganizer/thisdayinhistory.desktop -share/kxmlgui5/akonadimailreader/akonadimailreaderui.rc share/locale/ar/LC_MESSAGES/cryptopageplugin.mo share/locale/ar/LC_MESSAGES/customtoolsplugin.mo share/locale/ar/LC_MESSAGES/importwizard_plugins.mo @@ -894,12 +885,19 @@ share/locale/zh_CN/LC_MESSAGES/sieveeditor_plugins.mo share/locale/zh_CN/LC_MESSAGES/webengineurlinterceptor.mo share/locale/zh_TW/LC_MESSAGES/cryptopageplugin.mo share/locale/zh_TW/LC_MESSAGES/customtoolsplugin.mo +share/locale/zh_TW/LC_MESSAGES/importwizard_plugins.mo +share/locale/zh_TW/LC_MESSAGES/kaddressbook_contacteditor.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook_importexportplugins.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook_plugins.mo share/locale/zh_TW/LC_MESSAGES/kmail_editor_plugins.mo share/locale/zh_TW/LC_MESSAGES/kmail_editorsendcheck_plugins.mo share/locale/zh_TW/LC_MESSAGES/kmail_plugins.mo +share/locale/zh_TW/LC_MESSAGES/kmail_editorconvertertext_plugins.mo +share/locale/zh_TW/LC_MESSAGES/kmail_editorinit_plugins.mo +share/locale/zh_TW/LC_MESSAGES/kmailtransport_plugins.mo share/locale/zh_TW/LC_MESSAGES/korganizer_plugins.mo +share/locale/zh_TW/LC_MESSAGES/messageviewer_bodypartformatter_pkpass.mo +share/locale/zh_TW/LC_MESSAGES/messageviewer_semantic_plugin.mo share/locale/zh_TW/LC_MESSAGES/mailreader.mo share/locale/zh_TW/LC_MESSAGES/messageviewer_application_gnupgwks_plugin.mo share/locale/zh_TW/LC_MESSAGES/messageviewer_application_mstnef_plugin.mo @@ -907,14 +905,9 @@ share/locale/zh_TW/LC_MESSAGES/messageviewer_text_calendar_plugin.mo share/locale/zh_TW/LC_MESSAGES/messageviewer_text_vcard_plugin.mo share/locale/zh_TW/LC_MESSAGES/messageviewerheaderplugins.mo share/locale/zh_TW/LC_MESSAGES/messageviewerplugins.mo +share/locale/zh_TW/LC_MESSAGES/pimeventsplugin.mo share/locale/zh_TW/LC_MESSAGES/sieveeditor_plugins.mo share/locale/zh_TW/LC_MESSAGES/webengineurlinterceptor.mo -share/messageviewer/themes/example/header.desktop -share/messageviewer/themes/example/header.html -share/messageviewer/themes/example/header_row.html -share/messageviewer/themes/example_fancy/header.desktop -share/messageviewer/themes/example_fancy/header.html -share/messageviewerplugins/externalscriptexample.desktop share/qtcreator/templates/kmaileditorconvertertextplugins/CMakeLists.txt share/qtcreator/templates/kmaileditorconvertertextplugins/plugin.json.impl share/qtcreator/templates/kmaileditorconvertertextplugins/plugineditor.cpp diff --git a/deskutils/kdepim-apps-libs/distinfo b/deskutils/kdepim-apps-libs/distinfo index f40e6ad64e81..cc687f5270d6 100644 --- a/deskutils/kdepim-apps-libs/distinfo +++ b/deskutils/kdepim-apps-libs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225578 -SHA256 (KDE/applications/18.12.0/kdepim-apps-libs-18.12.0.tar.xz) = fd181d64229efc00633ad686616949670ba71555785314a897619b2580b1c3a3 -SIZE (KDE/applications/18.12.0/kdepim-apps-libs-18.12.0.tar.xz) = 84724 +TIMESTAMP = 1546985126 +SHA256 (KDE/applications/18.12.1/kdepim-apps-libs-18.12.1.tar.xz) = 7160d7cf38b77d07250fc3e94d3b2482f4805c5c808fce0894c69804aa01031b +SIZE (KDE/applications/18.12.1/kdepim-apps-libs-18.12.1.tar.xz) = 84832 diff --git a/deskutils/kdepim-apps-libs/pkg-plist b/deskutils/kdepim-apps-libs/pkg-plist index 416e9e2525f5..b67b88181034 100644 --- a/deskutils/kdepim-apps-libs/pkg-plist +++ b/deskutils/kdepim-apps-libs/pkg-plist @@ -181,4 +181,5 @@ share/locale/zh_CN/LC_MESSAGES/libkaddressbookgrantlee.mo share/locale/zh_CN/LC_MESSAGES/libkaddressbookimportexport.mo share/locale/zh_CN/LC_MESSAGES/libsendlater.mo share/locale/zh_TW/LC_MESSAGES/libkaddressbookgrantlee.mo +share/locale/zh_TW/LC_MESSAGES/libkaddressbookimportexport.mo share/locale/zh_TW/LC_MESSAGES/libsendlater.mo diff --git a/deskutils/kdepim-runtime/distinfo b/deskutils/kdepim-runtime/distinfo index d6012fb8d446..e46b138ad09d 100644 --- a/deskutils/kdepim-runtime/distinfo +++ b/deskutils/kdepim-runtime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544478483 -SHA256 (KDE/applications/18.12.0/kdepim-runtime-18.12.0.tar.xz) = a1505916e503ac79b52dafc483e8e82f3f4f5abba2f8c89430f1466ed77abc6e -SIZE (KDE/applications/18.12.0/kdepim-runtime-18.12.0.tar.xz) = 1772412 +TIMESTAMP = 1546985124 +SHA256 (KDE/applications/18.12.1/kdepim-runtime-18.12.1.tar.xz) = 6c5963d47becb0ba39b2ab8a6ec35b41c7a3e7205c8937d8a48773e93fce69ed +SIZE (KDE/applications/18.12.1/kdepim-runtime-18.12.1.tar.xz) = 1772996 diff --git a/deskutils/kdepim-runtime/pkg-plist b/deskutils/kdepim-runtime/pkg-plist index 37426d33f8f9..0faa8bdbdb0c 100644 --- a/deskutils/kdepim-runtime/pkg-plist +++ b/deskutils/kdepim-runtime/pkg-plist @@ -1743,6 +1743,7 @@ share/locale/zh_CN/LC_MESSAGES/kio_akonadi.mo share/locale/zh_CN/LC_MESSAGES/kio_pop3.mo share/locale/zh_CN/LC_MESSAGES/libfolderarchivesettings.mo share/locale/zh_TW/LC_MESSAGES/accountwizard_contacts.mo +share/locale/zh_TW/LC_MESSAGES/accountwizard_ews.mo share/locale/zh_TW/LC_MESSAGES/accountwizard_ical.mo share/locale/zh_TW/LC_MESSAGES/accountwizard_imap.mo share/locale/zh_TW/LC_MESSAGES/accountwizard_kolab.mo @@ -1755,6 +1756,8 @@ share/locale/zh_TW/LC_MESSAGES/akonadi-filestore.mo share/locale/zh_TW/LC_MESSAGES/akonadi_birthdays_resource.mo share/locale/zh_TW/LC_MESSAGES/akonadi_contacts_resource.mo share/locale/zh_TW/LC_MESSAGES/akonadi_davgroupware_resource.mo +share/locale/zh_TW/LC_MESSAGES/akonadi_facebook_resource.mo +share/locale/zh_TW/LC_MESSAGES/akonadi_ews_resource.mo share/locale/zh_TW/LC_MESSAGES/akonadi_gmail_resource.mo share/locale/zh_TW/LC_MESSAGES/akonadi_googlecalendar_resource.mo share/locale/zh_TW/LC_MESSAGES/akonadi_googlecontacts_resource.mo diff --git a/deskutils/keditbookmarks/distinfo b/deskutils/keditbookmarks/distinfo index 7e83be7581f3..14a385fc7e29 100644 --- a/deskutils/keditbookmarks/distinfo +++ b/deskutils/keditbookmarks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225577 -SHA256 (KDE/applications/18.12.0/keditbookmarks-18.12.0.tar.xz) = b526e4cdb88cc896b6e600ac15af16010d0782ea2709dc9f6bd13583ab4a46c5 -SIZE (KDE/applications/18.12.0/keditbookmarks-18.12.0.tar.xz) = 184712 +TIMESTAMP = 1546985124 +SHA256 (KDE/applications/18.12.1/keditbookmarks-18.12.1.tar.xz) = 418eaadd5044cb3c4091bd137bc9c64228eefb28519d779e360d41fbdcabdd3a +SIZE (KDE/applications/18.12.1/keditbookmarks-18.12.1.tar.xz) = 184732 diff --git a/deskutils/kfind/distinfo b/deskutils/kfind/distinfo index 992540c53bfd..532e15d44c54 100644 --- a/deskutils/kfind/distinfo +++ b/deskutils/kfind/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225578 -SHA256 (KDE/applications/18.12.0/kfind-18.12.0.tar.xz) = f3bfc2fc34420d282e6e54e92cfc02d10211e674fc0eaafbc2d6277e1172a24e -SIZE (KDE/applications/18.12.0/kfind-18.12.0.tar.xz) = 267448 +TIMESTAMP = 1546985125 +SHA256 (KDE/applications/18.12.1/kfind-18.12.1.tar.xz) = ab90ee3694cbea7dfa1b770c731606c127de3d8df739474c2cac42e9b53111ee +SIZE (KDE/applications/18.12.1/kfind-18.12.1.tar.xz) = 267472 diff --git a/deskutils/kmail-account-wizard/distinfo b/deskutils/kmail-account-wizard/distinfo index d470aa0258d9..44274c650e00 100644 --- a/deskutils/kmail-account-wizard/distinfo +++ b/deskutils/kmail-account-wizard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225577 -SHA256 (KDE/applications/18.12.0/kmail-account-wizard-18.12.0.tar.xz) = 4f1258d6d1fb919c350593af6c26f209903549634a298e1a2f1ce3ac56f60313 -SIZE (KDE/applications/18.12.0/kmail-account-wizard-18.12.0.tar.xz) = 155964 +TIMESTAMP = 1546985124 +SHA256 (KDE/applications/18.12.1/kmail-account-wizard-18.12.1.tar.xz) = 438af7737e0e1443acb6f6977bf57797d1047e99268f53cc7e0f8c35e6e3746c +SIZE (KDE/applications/18.12.1/kmail-account-wizard-18.12.1.tar.xz) = 155856 diff --git a/deskutils/kmail/distinfo b/deskutils/kmail/distinfo index 3eb129882bc7..4aadd8b3e466 100644 --- a/deskutils/kmail/distinfo +++ b/deskutils/kmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225577 -SHA256 (KDE/applications/18.12.0/kmail-18.12.0.tar.xz) = 5d1018d901faa4c72910f1214fb3b3dbe1335f6a4e96b696c75b3179d9a17f47 -SIZE (KDE/applications/18.12.0/kmail-18.12.0.tar.xz) = 4723296 +TIMESTAMP = 1546985124 +SHA256 (KDE/applications/18.12.1/kmail-18.12.1.tar.xz) = 87f75a63a07073361ed0b33b440d390d0e6546b888890e479a608fdb69ce53f1 +SIZE (KDE/applications/18.12.1/kmail-18.12.1.tar.xz) = 4723532 diff --git a/deskutils/kmail/files/patch-agents_unifiedmailboxagent_boost__optional.h b/deskutils/kmail/files/patch-agents_unifiedmailboxagent_boost__optional.h deleted file mode 100644 index 5e6e08be5f76..000000000000 --- a/deskutils/kmail/files/patch-agents_unifiedmailboxagent_boost__optional.h +++ /dev/null @@ -1,1082 +0,0 @@ -Copyright (C) 2011-2016 Andrzej Krzemienski - -Distributed under the Boost Software License, Version 1.0 -(see accompanying file LICENSE_1_0.txt or a copy at -http://www.boost.org/LICENSE_1_0.txt) - -The idea and interface is based on Boost.Optional library -authored by Fernando Luis Cacciola Carballal - -Home at https://github.com/akrzemi1/Optional - - ---- agents/unifiedmailboxagent/boost_optional.h.orig 2018-12-29 21:08:10 UTC -+++ agents/unifiedmailboxagent/boost_optional.h -@@ -0,0 +1,1067 @@ -+// Copyright (C) 2011 - 2012 Andrzej Krzemienski. -+// -+// Use, modification, and distribution is subject to the Boost Software -+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt) -+// -+// The idea and interface is based on Boost.Optional library -+// authored by Fernando Luis Cacciola Carballal -+ -+# ifndef ___OPTIONAL_HPP___ -+# define ___OPTIONAL_HPP___ -+ -+# include <utility> -+# include <type_traits> -+# include <initializer_list> -+# include <cassert> -+# include <functional> -+# include <string> -+# include <stdexcept> -+ -+# define TR2_OPTIONAL_REQUIRES(...) typename enable_if<__VA_ARGS__::value, bool>::type = false -+ -+# if defined __GNUC__ // NOTE: GNUC is also defined for Clang -+# if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8) -+# define TR2_OPTIONAL_GCC_4_8_AND_HIGHER___ -+# elif (__GNUC__ > 4) -+# define TR2_OPTIONAL_GCC_4_8_AND_HIGHER___ -+# endif -+# -+# if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 7) -+# define TR2_OPTIONAL_GCC_4_7_AND_HIGHER___ -+# elif (__GNUC__ > 4) -+# define TR2_OPTIONAL_GCC_4_7_AND_HIGHER___ -+# endif -+# -+# if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8) && (__GNUC_PATCHLEVEL__ >= 1) -+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ -+# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9) -+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ -+# elif (__GNUC__ > 4) -+# define TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ -+# endif -+# endif -+# -+# if defined __clang_major__ -+# if (__clang_major__ == 3 && __clang_minor__ >= 5) -+# define TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_ -+# elif (__clang_major__ > 3) -+# define TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_ -+# endif -+# if defined TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_ -+# define TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_ -+# elif (__clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ >= 2) -+# define TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_ -+# endif -+# endif -+# -+# if defined _MSC_VER -+# if (_MSC_VER >= 1900) -+# define TR2_OPTIONAL_MSVC_2015_AND_HIGHER___ -+# endif -+# endif -+ -+# if defined __clang__ -+# if (__clang_major__ > 2) || (__clang_major__ == 2) && (__clang_minor__ >= 9) -+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1 -+# else -+# define OPTIONAL_HAS_THIS_RVALUE_REFS 0 -+# endif -+# elif defined TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ -+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1 -+# elif defined TR2_OPTIONAL_MSVC_2015_AND_HIGHER___ -+# define OPTIONAL_HAS_THIS_RVALUE_REFS 1 -+# else -+# define OPTIONAL_HAS_THIS_RVALUE_REFS 0 -+# endif -+ -+ -+# if defined TR2_OPTIONAL_GCC_4_8_1_AND_HIGHER___ -+# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 1 -+# define OPTIONAL_CONSTEXPR_INIT_LIST constexpr -+# else -+# define OPTIONAL_HAS_CONSTEXPR_INIT_LIST 0 -+# define OPTIONAL_CONSTEXPR_INIT_LIST -+# endif -+ -+# if defined TR2_OPTIONAL_CLANG_3_5_AND_HIGHTER_ && (defined __cplusplus) && (__cplusplus != 201103L) -+# define OPTIONAL_HAS_MOVE_ACCESSORS 1 -+# else -+# define OPTIONAL_HAS_MOVE_ACCESSORS 0 -+# endif -+ -+# // In C++11 constexpr implies const, so we need to make non-const members also non-constexpr -+# if (defined __cplusplus) && (__cplusplus == 201103L) -+# define OPTIONAL_MUTABLE_CONSTEXPR -+# else -+# define OPTIONAL_MUTABLE_CONSTEXPR constexpr -+# endif -+ -+namespace std{ -+ -+namespace experimental{ -+ -+// BEGIN workaround for missing is_trivially_destructible -+# if defined TR2_OPTIONAL_GCC_4_8_AND_HIGHER___ -+ // leave it: it is already there -+# elif defined TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_ -+ // leave it: it is already there -+# elif defined TR2_OPTIONAL_MSVC_2015_AND_HIGHER___ -+ // leave it: it is already there -+# elif defined TR2_OPTIONAL_DISABLE_EMULATION_OF_TYPE_TRAITS -+ // leave it: the user doesn't want it -+# else -+ template <typename T> -+ using is_trivially_destructible = std::has_trivial_destructor<T>; -+# endif -+// END workaround for missing is_trivially_destructible -+ -+# if (defined TR2_OPTIONAL_GCC_4_7_AND_HIGHER___) -+ // leave it; our metafunctions are already defined. -+# elif defined TR2_OPTIONAL_CLANG_3_4_2_AND_HIGHER_ -+ // leave it; our metafunctions are already defined. -+# elif defined TR2_OPTIONAL_MSVC_2015_AND_HIGHER___ -+ // leave it: it is already there -+# elif defined TR2_OPTIONAL_DISABLE_EMULATION_OF_TYPE_TRAITS -+ // leave it: the user doesn't want it -+# else -+ -+ -+// workaround for missing traits in GCC and CLANG -+template <class T> -+struct is_nothrow_move_constructible -+{ -+ constexpr static bool value = std::is_nothrow_constructible<T, T&&>::value; -+}; -+ -+ -+template <class T, class U> -+struct is_assignable -+{ -+ template <class X, class Y> -+ constexpr static bool has_assign(...) { return false; } -+ -+ template <class X, class Y, size_t S = sizeof((std::declval<X>() = std::declval<Y>(), true)) > -+ // the comma operator is necessary for the cases where operator= returns void -+ constexpr static bool has_assign(bool) { return true; } -+ -+ constexpr static bool value = has_assign<T, U>(true); -+}; -+ -+ -+template <class T> -+struct is_nothrow_move_assignable -+{ -+ template <class X, bool has_any_move_assign> -+ struct has_nothrow_move_assign { -+ constexpr static bool value = false; -+ }; -+ -+ template <class X> -+ struct has_nothrow_move_assign<X, true> { -+ constexpr static bool value = noexcept( std::declval<X&>() = std::declval<X&&>() ); -+ }; -+ -+ constexpr static bool value = has_nothrow_move_assign<T, is_assignable<T&, T&&>::value>::value; -+}; -+// end workaround -+ -+ -+# endif -+ -+ -+ -+// 20.5.4, optional for object types -+template <class T> class optional; -+ -+// 20.5.5, optional for lvalue reference types -+template <class T> class optional<T&>; -+ -+ -+// workaround: std utility functions aren't constexpr yet -+template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type& t) noexcept -+{ -+ return static_cast<T&&>(t); -+} -+ -+template <class T> inline constexpr T&& constexpr_forward(typename std::remove_reference<T>::type&& t) noexcept -+{ -+ static_assert(!std::is_lvalue_reference<T>::value, "!!"); -+ return static_cast<T&&>(t); -+} -+ -+template <class T> inline constexpr typename std::remove_reference<T>::type&& constexpr_move(T&& t) noexcept -+{ -+ return static_cast<typename std::remove_reference<T>::type&&>(t); -+} -+ -+ -+#if defined NDEBUG -+# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) (EXPR) -+#else -+# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(!#CHECK);}(), (EXPR))) -+#endif -+ -+ -+namespace detail_ -+{ -+ -+// static_addressof: a constexpr version of addressof -+template <typename T> -+struct has_overloaded_addressof -+{ -+ template <class X> -+ constexpr static bool has_overload(...) { return false; } -+ -+ template <class X, size_t S = sizeof(std::declval<X&>().operator&()) > -+ constexpr static bool has_overload(bool) { return true; } -+ -+ constexpr static bool value = has_overload<T>(true); -+}; -+ -+template <typename T, TR2_OPTIONAL_REQUIRES(!has_overloaded_addressof<T>)> -+constexpr T* static_addressof(T& ref) -+{ -+ return &ref; -+} -+ -+template <typename T, TR2_OPTIONAL_REQUIRES(has_overloaded_addressof<T>)> -+T* static_addressof(T& ref) -+{ -+ return std::addressof(ref); -+} -+ -+ -+// the call to convert<A>(b) has return type A and converts b to type A iff b decltype(b) is implicitly convertible to A -+template <class U> -+constexpr U convert(U v) { return v; } -+ -+ -+namespace swap_ns -+{ -+ using std::swap; -+ -+ template <class T> -+ void adl_swap(T& t, T& u) noexcept(noexcept(swap(t, u))) -+ { -+ swap(t, u); -+ } -+ -+} // namespace swap_ns -+ -+} // namespace detail -+ -+ -+constexpr struct trivial_init_t{} trivial_init{}; -+ -+ -+// 20.5.6, In-place construction -+constexpr struct in_place_t{} in_place{}; -+ -+ -+// 20.5.7, Disengaged state indicator -+struct nullopt_t -+{ -+ struct init{}; -+ constexpr explicit nullopt_t(init){} -+}; -+constexpr nullopt_t nullopt{nullopt_t::init()}; -+ -+ -+// 20.5.8, class bad_optional_access -+class bad_optional_access : public logic_error { -+public: -+ explicit bad_optional_access(const string& what_arg) : logic_error{what_arg} {} -+ explicit bad_optional_access(const char* what_arg) : logic_error{what_arg} {} -+}; -+ -+ -+template <class T> -+union storage_t -+{ -+ unsigned char dummy_; -+ T value_; -+ -+ constexpr storage_t( trivial_init_t ) noexcept : dummy_() {}; -+ -+ template <class... Args> -+ constexpr storage_t( Args&&... args ) : value_(constexpr_forward<Args>(args)...) {} -+ -+ ~storage_t(){} -+}; -+ -+ -+template <class T> -+union constexpr_storage_t -+{ -+ unsigned char dummy_; -+ T value_; -+ -+ constexpr constexpr_storage_t( trivial_init_t ) noexcept : dummy_() {}; -+ -+ template <class... Args> -+ constexpr constexpr_storage_t( Args&&... args ) : value_(constexpr_forward<Args>(args)...) {} -+ -+ ~constexpr_storage_t() = default; -+}; -+ -+ -+template <class T> -+struct optional_base -+{ -+ bool init_; -+ storage_t<T> storage_; -+ -+ constexpr optional_base() noexcept : init_(false), storage_(trivial_init) {}; -+ -+ explicit constexpr optional_base(const T& v) : init_(true), storage_(v) {} -+ -+ explicit constexpr optional_base(T&& v) : init_(true), storage_(constexpr_move(v)) {} -+ -+ template <class... Args> explicit optional_base(in_place_t, Args&&... args) -+ : init_(true), storage_(constexpr_forward<Args>(args)...) {} -+ -+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(is_constructible<T, std::initializer_list<U>>)> -+ explicit optional_base(in_place_t, std::initializer_list<U> il, Args&&... args) -+ : init_(true), storage_(il, std::forward<Args>(args)...) {} -+ -+ ~optional_base() { if (init_) storage_.value_.T::~T(); } -+}; -+ -+ -+template <class T> -+struct constexpr_optional_base -+{ -+ bool init_; -+ constexpr_storage_t<T> storage_; -+ -+ constexpr constexpr_optional_base() noexcept : init_(false), storage_(trivial_init) {}; -+ -+ explicit constexpr constexpr_optional_base(const T& v) : init_(true), storage_(v) {} -+ -+ explicit constexpr constexpr_optional_base(T&& v) : init_(true), storage_(constexpr_move(v)) {} -+ -+ template <class... Args> explicit constexpr constexpr_optional_base(in_place_t, Args&&... args) -+ : init_(true), storage_(constexpr_forward<Args>(args)...) {} -+ -+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(is_constructible<T, std::initializer_list<U>>)> -+ OPTIONAL_CONSTEXPR_INIT_LIST explicit constexpr_optional_base(in_place_t, std::initializer_list<U> il, Args&&... args) -+ : init_(true), storage_(il, std::forward<Args>(args)...) {} -+ -+ ~constexpr_optional_base() = default; -+}; -+ -+template <class T> -+using OptionalBase = typename std::conditional< -+ is_trivially_destructible<T>::value, // if possible -+ constexpr_optional_base<typename std::remove_const<T>::type>, // use base with trivial destructor -+ optional_base<typename std::remove_const<T>::type> -+>::type; -+ -+ -+ -+template <class T> -+class optional : private OptionalBase<T> -+{ -+ static_assert( !std::is_same<typename std::decay<T>::type, nullopt_t>::value, "bad T" ); -+ static_assert( !std::is_same<typename std::decay<T>::type, in_place_t>::value, "bad T" ); -+ -+ -+ constexpr bool initialized() const noexcept { return OptionalBase<T>::init_; } -+ typename std::remove_const<T>::type* dataptr() { return std::addressof(OptionalBase<T>::storage_.value_); } -+ constexpr const T* dataptr() const { return detail_::static_addressof(OptionalBase<T>::storage_.value_); } -+ -+# if OPTIONAL_HAS_THIS_RVALUE_REFS == 1 -+ constexpr const T& contained_val() const& { return OptionalBase<T>::storage_.value_; } -+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1 -+ OPTIONAL_MUTABLE_CONSTEXPR T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); } -+ OPTIONAL_MUTABLE_CONSTEXPR T& contained_val() & { return OptionalBase<T>::storage_.value_; } -+# else -+ T& contained_val() & { return OptionalBase<T>::storage_.value_; } -+ T&& contained_val() && { return std::move(OptionalBase<T>::storage_.value_); } -+# endif -+# else -+ constexpr const T& contained_val() const { return OptionalBase<T>::storage_.value_; } -+ T& contained_val() { return OptionalBase<T>::storage_.value_; } -+# endif -+ -+ void clear() noexcept { -+ if (initialized()) dataptr()->T::~T(); -+ OptionalBase<T>::init_ = false; -+ } -+ -+ template <class... Args> -+ void initialize(Args&&... args) noexcept(noexcept(T(std::forward<Args>(args)...))) -+ { -+ assert(!OptionalBase<T>::init_); -+ ::new (static_cast<void*>(dataptr())) T(std::forward<Args>(args)...); -+ OptionalBase<T>::init_ = true; -+ } -+ -+ template <class U, class... Args> -+ void initialize(std::initializer_list<U> il, Args&&... args) noexcept(noexcept(T(il, std::forward<Args>(args)...))) -+ { -+ assert(!OptionalBase<T>::init_); -+ ::new (static_cast<void*>(dataptr())) T(il, std::forward<Args>(args)...); -+ OptionalBase<T>::init_ = true; -+ } -+ -+public: -+ typedef T value_type; -+ -+ // 20.5.5.1, constructors -+ constexpr optional() noexcept : OptionalBase<T>() {}; -+ constexpr optional(nullopt_t) noexcept : OptionalBase<T>() {}; -+ -+ optional(const optional& rhs) -+ : OptionalBase<T>() -+ { -+ if (rhs.initialized()) { -+ ::new (static_cast<void*>(dataptr())) T(*rhs); -+ OptionalBase<T>::init_ = true; -+ } -+ } -+ -+ optional(optional&& rhs) noexcept(is_nothrow_move_constructible<T>::value) -+ : OptionalBase<T>() -+ { -+ if (rhs.initialized()) { -+ ::new (static_cast<void*>(dataptr())) T(std::move(*rhs)); -+ OptionalBase<T>::init_ = true; -+ } -+ } -+ -+ constexpr optional(const T& v) : OptionalBase<T>(v) {} -+ -+ constexpr optional(T&& v) : OptionalBase<T>(constexpr_move(v)) {} -+ -+ template <class... Args> -+ explicit constexpr optional(in_place_t, Args&&... args) -+ : OptionalBase<T>(in_place_t{}, constexpr_forward<Args>(args)...) {} -+ -+ template <class U, class... Args, TR2_OPTIONAL_REQUIRES(is_constructible<T, std::initializer_list<U>>)> -+ OPTIONAL_CONSTEXPR_INIT_LIST explicit optional(in_place_t, std::initializer_list<U> il, Args&&... args) -+ : OptionalBase<T>(in_place_t{}, il, constexpr_forward<Args>(args)...) {} -+ -+ // 20.5.4.2, Destructor -+ ~optional() = default; -+ -+ // 20.5.4.3, assignment -+ optional& operator=(nullopt_t) noexcept -+ { -+ clear(); -+ return *this; -+ } -+ -+ optional& operator=(const optional& rhs) -+ { -+ if (initialized() == true && rhs.initialized() == false) clear(); -+ else if (initialized() == false && rhs.initialized() == true) initialize(*rhs); -+ else if (initialized() == true && rhs.initialized() == true) contained_val() = *rhs; -+ return *this; -+ } -+ -+ optional& operator=(optional&& rhs) -+ noexcept(is_nothrow_move_assignable<T>::value && is_nothrow_move_constructible<T>::value) -+ { -+ if (initialized() == true && rhs.initialized() == false) clear(); -+ else if (initialized() == false && rhs.initialized() == true) initialize(std::move(*rhs)); -+ else if (initialized() == true && rhs.initialized() == true) contained_val() = std::move(*rhs); -+ return *this; -+ } -+ -+ template <class U> -+ auto operator=(U&& v) -+ -> typename enable_if -+ < -+ is_same<typename decay<U>::type, T>::value, -+ optional& -+ >::type -+ { -+ if (initialized()) { contained_val() = std::forward<U>(v); } -+ else { initialize(std::forward<U>(v)); } -+ return *this; -+ } -+ -+ -+ template <class... Args> -+ void emplace(Args&&... args) -+ { -+ clear(); -+ initialize(std::forward<Args>(args)...); -+ } -+ -+ template <class U, class... Args> -+ void emplace(initializer_list<U> il, Args&&... args) -+ { -+ clear(); -+ initialize<U, Args...>(il, std::forward<Args>(args)...); -+ } -+ -+ // 20.5.4.4, Swap -+ void swap(optional<T>& rhs) noexcept(is_nothrow_move_constructible<T>::value -+ && noexcept(detail_::swap_ns::adl_swap(declval<T&>(), declval<T&>()))) -+ { -+ if (initialized() == true && rhs.initialized() == false) { rhs.initialize(std::move(**this)); clear(); } -+ else if (initialized() == false && rhs.initialized() == true) { initialize(std::move(*rhs)); rhs.clear(); } -+ else if (initialized() == true && rhs.initialized() == true) { using std::swap; swap(**this, *rhs); } -+ } -+ -+ // 20.5.4.5, Observers -+ -+ explicit constexpr operator bool() const noexcept { return initialized(); } -+ constexpr bool has_value() const noexcept { return initialized(); } -+ -+ constexpr T const* operator ->() const { -+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), dataptr()); -+ } -+ -+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1 -+ -+ OPTIONAL_MUTABLE_CONSTEXPR T* operator ->() { -+ assert (initialized()); -+ return dataptr(); -+ } -+ -+ constexpr T const& operator *() const& { -+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val()); -+ } -+ -+ OPTIONAL_MUTABLE_CONSTEXPR T& operator *() & { -+ assert (initialized()); -+ return contained_val(); -+ } -+ -+ OPTIONAL_MUTABLE_CONSTEXPR T&& operator *() && { -+ assert (initialized()); -+ return constexpr_move(contained_val()); -+ } -+ -+ constexpr T const& value() const& { -+ return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val()); -+ } -+ -+ OPTIONAL_MUTABLE_CONSTEXPR T& value() & { -+ return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val()); -+ } -+ -+ OPTIONAL_MUTABLE_CONSTEXPR T&& value() && { -+ if (!initialized()) throw bad_optional_access("bad optional access"); -+ return std::move(contained_val()); -+ } -+ -+# else -+ -+ T* operator ->() { -+ assert (initialized()); -+ return dataptr(); -+ } -+ -+ constexpr T const& operator *() const { -+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val()); -+ } -+ -+ T& operator *() { -+ assert (initialized()); -+ return contained_val(); -+ } -+ -+ constexpr T const& value() const { -+ return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val()); -+ } -+ -+ T& value() { -+ return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val()); -+ } -+ -+# endif -+ -+# if OPTIONAL_HAS_THIS_RVALUE_REFS == 1 -+ -+ template <class V> -+ constexpr T value_or(V&& v) const& -+ { -+ return *this ? **this : detail_::convert<T>(constexpr_forward<V>(v)); -+ } -+ -+# if OPTIONAL_HAS_MOVE_ACCESSORS == 1 -+ -+ template <class V> -+ OPTIONAL_MUTABLE_CONSTEXPR T value_or(V&& v) && -+ { -+ return *this ? constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(constexpr_forward<V>(v)); -+ } -+ -+# else -+ -+ template <class V> -+ T value_or(V&& v) && -+ { -+ return *this ? constexpr_move(const_cast<optional<T>&>(*this).contained_val()) : detail_::convert<T>(constexpr_forward<V>(v)); -+ } -+ -+# endif -+ -+# else -+ -+ template <class V> -+ constexpr T value_or(V&& v) const -+ { -+ return *this ? **this : detail_::convert<T>(constexpr_forward<V>(v)); -+ } -+ -+# endif -+ -+ // 20.6.3.6, modifiers -+ void reset() noexcept { clear(); } -+}; -+ -+ -+template <class T> -+class optional<T&> -+{ -+ static_assert( !std::is_same<T, nullopt_t>::value, "bad T" ); -+ static_assert( !std::is_same<T, in_place_t>::value, "bad T" ); -+ T* ref; -+ -+public: -+ -+ // 20.5.5.1, construction/destruction -+ constexpr optional() noexcept : ref(nullptr) {} -+ -+ constexpr optional(nullopt_t) noexcept : ref(nullptr) {} -+ -+ constexpr optional(T& v) noexcept : ref(detail_::static_addressof(v)) {} -+ -+ optional(T&&) = delete; -+ -+ constexpr optional(const optional& rhs) noexcept : ref(rhs.ref) {} -+ -+ explicit constexpr optional(in_place_t, T& v) noexcept : ref(detail_::static_addressof(v)) {} -+ -+ explicit optional(in_place_t, T&&) = delete; -+ -+ ~optional() = default; -+ -+ // 20.5.5.2, mutation -+ optional& operator=(nullopt_t) noexcept { -+ ref = nullptr; -+ return *this; -+ } -+ -+ // optional& operator=(const optional& rhs) noexcept { -+ // ref = rhs.ref; -+ // return *this; -+ // } -+ -+ // optional& operator=(optional&& rhs) noexcept { -+ // ref = rhs.ref; -+ // return *this; -+ // } -+ -+ template <typename U> -+ auto operator=(U&& rhs) noexcept -+ -> typename enable_if -+ < -+ is_same<typename decay<U>::type, optional<T&>>::value, -+ optional& -+ >::type -+ { -+ ref = rhs.ref; -+ return *this; -+ } -+ -+ template <typename U> -+ auto operator=(U&& rhs) noexcept -+ -> typename enable_if -+ < -+ !is_same<typename decay<U>::type, optional<T&>>::value, -+ optional& -+ >::type -+ = delete; -+ -+ void emplace(T& v) noexcept { -+ ref = detail_::static_addressof(v); -+ } -+ -+ void emplace(T&&) = delete; -+ -+ -+ void swap(optional<T&>& rhs) noexcept -+ { -+ std::swap(ref, rhs.ref); -+ } -+ -+ // 20.5.5.3, observers -+ constexpr T* operator->() const { -+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, ref); -+ } -+ -+ constexpr T& operator*() const { -+ return TR2_OPTIONAL_ASSERTED_EXPRESSION(ref, *ref); -+ } -+ -+ constexpr T& value() const { -+ return ref ? *ref : (throw bad_optional_access("bad optional access"), *ref); -+ } -+ -+ explicit constexpr operator bool() const noexcept { -+ return ref != nullptr; -+ } -+ -+ constexpr bool has_value() const noexcept { -+ return ref != nullptr; -+ } -+ -+ template <class V> -+ constexpr typename decay<T>::type value_or(V&& v) const -+ { -+ return *this ? **this : detail_::convert<typename decay<T>::type>(constexpr_forward<V>(v)); -+ } -+ -+ // x.x.x.x, modifiers -+ void reset() noexcept { ref = nullptr; } -+}; -+ -+ -+template <class T> -+class optional<T&&> -+{ -+ static_assert( sizeof(T) == 0, "optional rvalue references disallowed" ); -+}; -+ -+ -+// 20.5.8, Relational operators -+template <class T> constexpr bool operator==(const optional<T>& x, const optional<T>& y) -+{ -+ return bool(x) != bool(y) ? false : bool(x) == false ? true : *x == *y; -+} -+ -+template <class T> constexpr bool operator!=(const optional<T>& x, const optional<T>& y) -+{ -+ return !(x == y); -+} -+ -+template <class T> constexpr bool operator<(const optional<T>& x, const optional<T>& y) -+{ -+ return (!y) ? false : (!x) ? true : *x < *y; -+} -+ -+template <class T> constexpr bool operator>(const optional<T>& x, const optional<T>& y) -+{ -+ return (y < x); -+} -+ -+template <class T> constexpr bool operator<=(const optional<T>& x, const optional<T>& y) -+{ -+ return !(y < x); -+} -+ -+template <class T> constexpr bool operator>=(const optional<T>& x, const optional<T>& y) -+{ -+ return !(x < y); -+} -+ -+ -+// 20.5.9, Comparison with nullopt -+template <class T> constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept -+{ -+ return (!x); -+} -+ -+template <class T> constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept -+{ -+ return (!x); -+} -+ -+template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept -+{ -+ return bool(x); -+} -+ -+template <class T> constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept -+{ -+ return bool(x); -+} -+ -+template <class T> constexpr bool operator<(const optional<T>&, nullopt_t) noexcept -+{ -+ return false; -+} -+ -+template <class T> constexpr bool operator<(nullopt_t, const optional<T>& x) noexcept -+{ -+ return bool(x); -+} -+ -+template <class T> constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept -+{ -+ return (!x); -+} -+ -+template <class T> constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept -+{ -+ return true; -+} -+ -+template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept -+{ -+ return bool(x); -+} -+ -+template <class T> constexpr bool operator>(nullopt_t, const optional<T>&) noexcept -+{ -+ return false; -+} -+ -+template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept -+{ -+ return true; -+} -+ -+template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept -+{ -+ return (!x); -+} -+ -+ -+ -+// 20.5.10, Comparison with T -+template <class T> constexpr bool operator==(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x == v : false; -+} -+ -+template <class T> constexpr bool operator==(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v == *x : false; -+} -+ -+template <class T> constexpr bool operator!=(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x != v : true; -+} -+ -+template <class T> constexpr bool operator!=(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v != *x : true; -+} -+ -+template <class T> constexpr bool operator<(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x < v : true; -+} -+ -+template <class T> constexpr bool operator>(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v > *x : true; -+} -+ -+template <class T> constexpr bool operator>(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x > v : false; -+} -+ -+template <class T> constexpr bool operator<(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v < *x : false; -+} -+ -+template <class T> constexpr bool operator>=(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x >= v : false; -+} -+ -+template <class T> constexpr bool operator<=(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v <= *x : false; -+} -+ -+template <class T> constexpr bool operator<=(const optional<T>& x, const T& v) -+{ -+ return bool(x) ? *x <= v : true; -+} -+ -+template <class T> constexpr bool operator>=(const T& v, const optional<T>& x) -+{ -+ return bool(x) ? v >= *x : true; -+} -+ -+ -+// Comparison of optional<T&> with T -+template <class T> constexpr bool operator==(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x == v : false; -+} -+ -+template <class T> constexpr bool operator==(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v == *x : false; -+} -+ -+template <class T> constexpr bool operator!=(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x != v : true; -+} -+ -+template <class T> constexpr bool operator!=(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v != *x : true; -+} -+ -+template <class T> constexpr bool operator<(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x < v : true; -+} -+ -+template <class T> constexpr bool operator>(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v > *x : true; -+} -+ -+template <class T> constexpr bool operator>(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x > v : false; -+} -+ -+template <class T> constexpr bool operator<(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v < *x : false; -+} -+ -+template <class T> constexpr bool operator>=(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x >= v : false; -+} -+ -+template <class T> constexpr bool operator<=(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v <= *x : false; -+} -+ -+template <class T> constexpr bool operator<=(const optional<T&>& x, const T& v) -+{ -+ return bool(x) ? *x <= v : true; -+} -+ -+template <class T> constexpr bool operator>=(const T& v, const optional<T&>& x) -+{ -+ return bool(x) ? v >= *x : true; -+} -+ -+// Comparison of optional<T const&> with T -+template <class T> constexpr bool operator==(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x == v : false; -+} -+ -+template <class T> constexpr bool operator==(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v == *x : false; -+} -+ -+template <class T> constexpr bool operator!=(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x != v : true; -+} -+ -+template <class T> constexpr bool operator!=(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v != *x : true; -+} -+ -+template <class T> constexpr bool operator<(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x < v : true; -+} -+ -+template <class T> constexpr bool operator>(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v > *x : true; -+} -+ -+template <class T> constexpr bool operator>(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x > v : false; -+} -+ -+template <class T> constexpr bool operator<(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v < *x : false; -+} -+ -+template <class T> constexpr bool operator>=(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x >= v : false; -+} -+ -+template <class T> constexpr bool operator<=(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v <= *x : false; -+} -+ -+template <class T> constexpr bool operator<=(const optional<const T&>& x, const T& v) -+{ -+ return bool(x) ? *x <= v : true; -+} -+ -+template <class T> constexpr bool operator>=(const T& v, const optional<const T&>& x) -+{ -+ return bool(x) ? v >= *x : true; -+} -+ -+ -+// 20.5.12, Specialized algorithms -+template <class T> -+void swap(optional<T>& x, optional<T>& y) noexcept(noexcept(x.swap(y))) -+{ -+ x.swap(y); -+} -+ -+ -+template <class T> -+constexpr optional<typename decay<T>::type> make_optional(T&& v) -+{ -+ return optional<typename decay<T>::type>(constexpr_forward<T>(v)); -+} -+ -+template <class X> -+constexpr optional<X&> make_optional(reference_wrapper<X> v) -+{ -+ return optional<X&>(v.get()); -+} -+ -+ -+} // namespace experimental -+} // namespace std -+ -+namespace std -+{ -+ template <typename T> -+ struct hash<std::experimental::optional<T>> -+ { -+ typedef typename hash<T>::result_type result_type; -+ typedef std::experimental::optional<T> argument_type; -+ -+ constexpr result_type operator()(argument_type const& arg) const { -+ return arg ? std::hash<T>{}(*arg) : result_type{}; -+ } -+ }; -+ -+ template <typename T> -+ struct hash<std::experimental::optional<T&>> -+ { -+ typedef typename hash<T>::result_type result_type; -+ typedef std::experimental::optional<T&> argument_type; -+ -+ constexpr result_type operator()(argument_type const& arg) const { -+ return arg ? std::hash<T>{}(*arg) : result_type{}; -+ } -+ }; -+} -+ -+# undef TR2_OPTIONAL_REQUIRES -+# undef TR2_OPTIONAL_ASSERTED_EXPRESSION -+ -+# endif //___OPTIONAL_HPP___ -+ diff --git a/deskutils/kmail/files/patch-agents_unifiedmailboxagent_utils.h b/deskutils/kmail/files/patch-agents_unifiedmailboxagent_utils.h deleted file mode 100644 index e4c610c8ca47..000000000000 --- a/deskutils/kmail/files/patch-agents_unifiedmailboxagent_utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agents/unifiedmailboxagent/utils.h.orig 2018-12-29 21:15:58 UTC -+++ agents/unifiedmailboxagent/utils.h -@@ -24,7 +24,7 @@ - #include <QHash> - #include <QString> - --#include <experimental/optional> -+#include "boost_optional.h" - namespace stdx { - // Injects content of std::experimental namespace into "exp" namespace. - // C++ is magical. diff --git a/deskutils/kmail/pkg-plist b/deskutils/kmail/pkg-plist index dd3ed49a80fb..827aa61e8767 100644 --- a/deskutils/kmail/pkg-plist +++ b/deskutils/kmail/pkg-plist @@ -355,6 +355,7 @@ share/locale/zh_TW/LC_MESSAGES/akonadi_archivemail_agent.mo share/locale/zh_TW/LC_MESSAGES/akonadi_followupreminder_agent.mo share/locale/zh_TW/LC_MESSAGES/akonadi_mailfilter_agent.mo share/locale/zh_TW/LC_MESSAGES/akonadi_sendlater_agent.mo +share/locale/zh_TW/LC_MESSAGES/akonadi_unifiedmailbox_agent.mo share/locale/zh_TW/LC_MESSAGES/kmail.mo share/locale/zh_TW/LC_MESSAGES/ktnef.mo share/metainfo/org.kde.kmail2.appdata.xml diff --git a/deskutils/knotes/distinfo b/deskutils/knotes/distinfo index 99381adb19b8..45fa35fb6a2e 100644 --- a/deskutils/knotes/distinfo +++ b/deskutils/knotes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225579 -SHA256 (KDE/applications/18.12.0/knotes-18.12.0.tar.xz) = 196f28ee5ece912cda477b802cc63725f391bac995b52446a5afa967cc2c17e4 -SIZE (KDE/applications/18.12.0/knotes-18.12.0.tar.xz) = 319620 +TIMESTAMP = 1546985126 +SHA256 (KDE/applications/18.12.1/knotes-18.12.1.tar.xz) = bf192d7d44ad0a1a63ac5ac5408f6c59c8c5bbfe44ba5edcda9fede4ec07c48a +SIZE (KDE/applications/18.12.1/knotes-18.12.1.tar.xz) = 319668 diff --git a/deskutils/kontact/distinfo b/deskutils/kontact/distinfo index 78db382b95f9..47fcafeeeff6 100644 --- a/deskutils/kontact/distinfo +++ b/deskutils/kontact/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225576 -SHA256 (KDE/applications/18.12.0/kontact-18.12.0.tar.xz) = 8b25cf72071e5293e5deebb0816d4c66be3ff76906957be0ffbb289eb3903045 -SIZE (KDE/applications/18.12.0/kontact-18.12.0.tar.xz) = 792068 +TIMESTAMP = 1546985123 +SHA256 (KDE/applications/18.12.1/kontact-18.12.1.tar.xz) = 4fc12e1fa9e0e86f2ded2101d14d19358639465da2c144839ef3f272e04e162f +SIZE (KDE/applications/18.12.1/kontact-18.12.1.tar.xz) = 792032 diff --git a/deskutils/korganizer/distinfo b/deskutils/korganizer/distinfo index 076b72de7f83..cf68a6333e3b 100644 --- a/deskutils/korganizer/distinfo +++ b/deskutils/korganizer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225579 -SHA256 (KDE/applications/18.12.0/korganizer-18.12.0.tar.xz) = 0cf10cf20e5c8c17038005d030a8bc29e335cbc8ea2008bc01ab7690a8be685e -SIZE (KDE/applications/18.12.0/korganizer-18.12.0.tar.xz) = 2232952 +TIMESTAMP = 1546985126 +SHA256 (KDE/applications/18.12.1/korganizer-18.12.1.tar.xz) = 4f7fd1ab1e2de93d9dfeccc530d21674eb82694f1f2587614ffdf50f5f961cbd +SIZE (KDE/applications/18.12.1/korganizer-18.12.1.tar.xz) = 2232976 diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo index 34a8f687d33c..cca514acfc99 100644 --- a/deskutils/kruler/distinfo +++ b/deskutils/kruler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225581 -SHA256 (KDE/applications/18.12.0/kruler-18.12.0.tar.xz) = 0781366f7b55d0c88f57b0638726b98492f6d692f2e0baf6a629e48c6c394857 -SIZE (KDE/applications/18.12.0/kruler-18.12.0.tar.xz) = 295872 +TIMESTAMP = 1546985127 +SHA256 (KDE/applications/18.12.1/kruler-18.12.1.tar.xz) = 26072113f0b302484cb78e98af7fab37d36d1d52de3ba33830a8e767f855ddf1 +SIZE (KDE/applications/18.12.1/kruler-18.12.1.tar.xz) = 254564 diff --git a/deskutils/libkdepim/distinfo b/deskutils/libkdepim/distinfo index 95bf160502e0..779eac1a01b8 100644 --- a/deskutils/libkdepim/distinfo +++ b/deskutils/libkdepim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225576 -SHA256 (KDE/applications/18.12.0/libkdepim-18.12.0.tar.xz) = 0d969f1c0e2c3fac5d277905f9caa56232d2b579adb5fa3fc039c3d8c67012a1 -SIZE (KDE/applications/18.12.0/libkdepim-18.12.0.tar.xz) = 336228 +TIMESTAMP = 1546985123 +SHA256 (KDE/applications/18.12.1/libkdepim-18.12.1.tar.xz) = d71db3ad43403371e7c180557514f32598e6021eee6ccf9dfa150c7391917fe3 +SIZE (KDE/applications/18.12.1/libkdepim-18.12.1.tar.xz) = 336208 diff --git a/deskutils/mbox-importer/distinfo b/deskutils/mbox-importer/distinfo index 4f39bbe6800c..5c5aafb28370 100644 --- a/deskutils/mbox-importer/distinfo +++ b/deskutils/mbox-importer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225578 -SHA256 (KDE/applications/18.12.0/mbox-importer-18.12.0.tar.xz) = 55931099051ed6e7f04d7c7a766c83adbdfceb8c5ec88c4e83db5cf68b7b2e23 -SIZE (KDE/applications/18.12.0/mbox-importer-18.12.0.tar.xz) = 33364 +TIMESTAMP = 1546985125 +SHA256 (KDE/applications/18.12.1/mbox-importer-18.12.1.tar.xz) = 56b8920935ee3b08c5743ef455864b102ea58fe461adb4f5ae796cb38f5c4ac0 +SIZE (KDE/applications/18.12.1/mbox-importer-18.12.1.tar.xz) = 33380 diff --git a/deskutils/pim-data-exporter/distinfo b/deskutils/pim-data-exporter/distinfo index 8d79aed88e1d..883d9e8dfa30 100644 --- a/deskutils/pim-data-exporter/distinfo +++ b/deskutils/pim-data-exporter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225580 -SHA256 (KDE/applications/18.12.0/pim-data-exporter-18.12.0.tar.xz) = 4c96bd35fad10c03a51e0f3785fffe23fdd05f266cce883ace92672640639d7b -SIZE (KDE/applications/18.12.0/pim-data-exporter-18.12.0.tar.xz) = 270888 +TIMESTAMP = 1546985127 +SHA256 (KDE/applications/18.12.1/pim-data-exporter-18.12.1.tar.xz) = abfedbb9b1cdf9755320558ba8502ea15c843400f3980df1f95fb5f113253684 +SIZE (KDE/applications/18.12.1/pim-data-exporter-18.12.1.tar.xz) = 270928 diff --git a/deskutils/pim-sieve-editor/distinfo b/deskutils/pim-sieve-editor/distinfo index 57957f67710a..65a1d611ea52 100644 --- a/deskutils/pim-sieve-editor/distinfo +++ b/deskutils/pim-sieve-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544225577 -SHA256 (KDE/applications/18.12.0/pim-sieve-editor-18.12.0.tar.xz) = 85509a35cd726bdcecdd39e37bcb8e8951d59d49eb885255dc01dfe0edca8e90 -SIZE (KDE/applications/18.12.0/pim-sieve-editor-18.12.0.tar.xz) = 450536 +TIMESTAMP = 1546985125 +SHA256 (KDE/applications/18.12.1/pim-sieve-editor-18.12.1.tar.xz) = c7687b2af42e24c4bfabbe9c3ca6b7e0f5d3b1eb3121f5aeba4c7a467ecd1244 +SIZE (KDE/applications/18.12.1/pim-sieve-editor-18.12.1.tar.xz) = 450572 |