[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-1-g55c41d1
jonathan at claws-mail.org
jonathan at claws-mail.org
Sun May 22 06:00:15 CEST 2022
The branch, master has been updated
discards 317643716020af44700bdedf5183250812ff19d8 (commit)
discards 3986dd900377a9065539c0764c93f49309b46666 (commit)
discards ed857d451c0d0674022f527aea34563996616e03 (commit)
discards 39a4ab14e2482df490a695d3f2bdb7904250b76e (commit)
discards 5e4365b024eba5b2921912f0438f20d4b373e19d (commit)
discards ef5c04dfcde595c77a30f34a5ce2f3c22123e409 (commit)
discards db1f5cb90a858f4184775b27f07b5bfb88f01593 (commit)
discards 60fc4c8a8c4aae8eb248a73257dc389b36491a75 (commit)
discards 213f17fb580034decd097d034b67099b09135caf (commit)
discards 30889fedf925cdd99e3661e33fae6504222619c1 (commit)
discards 8f2f4ad710df1caf37a35d60c412016bda41c41b (commit)
discards c483f8576a00300c4577c1da220056be616a2cb1 (commit)
discards 5c7916fe4beb0274091c71d5e85114e0e6899af4 (commit)
discards 94d1a61c90012e1318fd0da445a24784a77169ee (commit)
discards b32dc153b45d5743aaff4c885aced385ee75225e (commit)
discards f311fb360f0a183ba230a9df101bf44a568de07e (commit)
discards 7cb36ded74f8302ce0d8fea0db266cca4da46c6b (commit)
discards 04badb7ca1f4ac16116f42127d397180d7a278ee (commit)
discards 8306eca54d06bd2c2c197d4357726006d07ee36c (commit)
discards 6e07cacce6f1309b0010f816746641ecd5224b0b (commit)
discards 259944c305e87651166073847e552781b17ac493 (commit)
discards 7cc160a73a24afae0d75a3f68515a33c956e33e6 (commit)
discards 47b5bca8814261eb19bfbd2c173f99644aab15b8 (commit)
discards 1d4eeddae4ed8f100fb33385731be45ab775628d (commit)
discards 0819260b5c55928e70e0ab610ba084779cfea965 (commit)
discards 885219447bbf43c49bc8824f4cc5b982f767c8a9 (commit)
discards 7467c2a3d188f1cdc32feee650a3cb6684d8b498 (commit)
discards 24c662bf4981dabe0c90726b73fce444ae8a2db8 (commit)
discards 05ddaaa653d5d220c2d37f97ff0dbce1c03122f8 (commit)
discards bda723af61a189215439baf8475911a3ad55ee43 (commit)
discards a03ce6d126a592c49a75164bc6387cdf14bd9375 (commit)
discards a825e121469f4a550e315db968b7ea153b037dc8 (commit)
discards 09e2d548bf2dd13079efcf1c0e003a6f054db7f9 (commit)
discards 1f8e93c40bdc8644c4eab2369bd9f72d7494f1f4 (commit)
discards 6816f1bd32a48cd5bb6262a5cb4f793d3cdee49a (commit)
discards 1f698335c302908111e1a3e918443ae5dffbc900 (commit)
via 55c41d1eab790363ceb8c49874baacc0db43f1db (commit)
via 1e37b6dc5098ad7555fffa9f471a085629044f73 (commit)
via 9fb7cf195f19d86f4eecd6a875887e6d1f9c0f52 (commit)
via c1d6f02da2bbec72c852a3794100bc3f8312d82b (commit)
via c69ab1aebbee8560bf88cba1fae47e8e119bc752 (commit)
via 5cad7768ac27a43aa68c0dd520bf59d00669560c (commit)
via b2cf492eb111fb3803f8c8c0fcb071b62ffc6c46 (commit)
via 6f4561f3e86b248f0efa5cae8f61f822e3266d71 (commit)
via dacb382149a15d0f7b23789ddf1b61d0ab913d4e (commit)
via aaac604f9f0e4bc33a525c466f1272883a14e1c1 (commit)
via c8a3e6d93b75563bcf31cdfc00962d3d69848873 (commit)
via 794a8514e76bdd86241d4a7b2857a89897aef93a (commit)
via a28133f67d2a2ea65c70a8d8c7aea24c2fd939e4 (commit)
via 01ced3ffc30f9100b7c57a82309bfd0b4059a0bf (commit)
via 784445a88d5912d4c02bf4b578003c5d839e8838 (commit)
via f9fc89f2f63c8a896fb06aebb540d088576557b8 (commit)
via bbbaaadbddc8c7a52745c84063a6724a872fdab5 (commit)
via 7fe7de103b4269cab4fcb391f5bc51ca8c3595be (commit)
via 6b43e6eaf28e9d16a6541674e2f4099a1b2afabd (commit)
via f2796b8d2048d0181bd9ee559a7275f68b1f0959 (commit)
via 13fc28ffdca1d129d50584f823570f5b0b3a055d (commit)
via ebbe2fe142ee1f548aad87c15d72ad85654f5127 (commit)
via 32860079f55a9379d5b5f9ad3fdf0461a8771bac (commit)
via 208e7398275267a0d91479207599acfbc2e4d7fe (commit)
via 37c1296fa0d690e2e87e71a8f9b531ecf2752ed4 (commit)
via e4a8b9757d135b70c26b5c7ae06e020f903a98e3 (commit)
via 3b02cb69a6aee3d94638d6445683c788e131797c (commit)
via 4d12386aa904cf421c4bdf79447c00dc08ce9347 (commit)
via d4b90807d9096bb70958cf900c882312d9518256 (commit)
via 9484924e3d0e557c1208a8cd5d4cd0804bf2bd16 (commit)
via adabef3ceda799b67eee39c31b3421640bb436f7 (commit)
via a4cf619dc6a77de3ac4ecbf99e429f434f6fb4ad (commit)
via 21e38e6765799cca256cd2385e4a199536923171 (commit)
via a3d5d273728b96e351ba897676c70ee097904ab7 (commit)
via 5cf60ad73992f1e3ae421a5d61181e6f7ca9adc1 (commit)
via 570bfbb6a536c7d9bc4d6bb6ac101ca051c348be (commit)
via 5d1772471211186d72c911c1421a36e8c56453f9 (commit)
via 4c458eb0525feedd016acea5560f51929f76f05c (commit)
via c9fbffd073f6c96af0cfd24690bbd834792f651e (commit)
via 416ba0165f1c9d6685fdf33a4541970ceb3a7c34 (commit)
via 3e1329d04ad5415fcbeecd90ac90b0bddf3f9abe (commit)
via eaab79230d6e05ff9f591df9114f6993ae5e97d2 (commit)
via c3742720af0c8dcddcfe6c0751cd0f4611589b11 (commit)
via 63875efb0271f0dad8d45fe7c1143fdd7f66bf13 (commit)
via e672eb82a932c40d4d3ef93aa8c95fb9c1fc9f3a (commit)
via 4968b92d8589018fee527968c6059c83e21b5ada (commit)
via dd397766cfb413dbacc64233980c0fad4facad1c (commit)
via dd49600010f09408416a8812fa4454e814474331 (commit)
via 9c03c65d446dd51fba81ba1f7d3431e0da3068db (commit)
via 6c3074b4d85c1d79325345ad0df9739ee611d642 (commit)
via 644340d17ed8b61e7a0c5edd7692ce08b9e38d77 (commit)
via 96c698b0351c640507cbb2b65cffe09c10b76c22 (commit)
via 6254812688bfba07e3128dff3d57698977fd092c (commit)
via 4d136236c6d897c71ab2f5d9eef8ce6667bf8dd2 (commit)
via 20d78437dae274c84dce9c332471bc8a213ff64e (commit)
via dac70578e73bc9d443d409e516a565fc10a2075f (commit)
via 18d853b5d1bbc152b2e78fc2fc19d9172d157f19 (commit)
via fbe2ae42364cb4d1ec3e42ec3b03e3a325d63583 (commit)
via 4b50188bc6b748a46750a2ae3b262cca7d49e934 (commit)
via 35811b96f4d0934260f0e509f8ffa1fcbfc73e5e (commit)
via bc14472b839ea75e392b6bc87b4aacee3e90f603 (commit)
via e8649eb47b007cc5015da5b0299223de0098df4c (commit)
via 499d62575d428f07fb99844f99156bf72922d673 (commit)
via 6051e469bd314c2ed1fdcc417c16b8313b01783b (commit)
via 4796440bee46386be9d9b533fd3faa247e5e9db4 (commit)
via cdfd57a307aaa0978bf07e679327747100c14475 (commit)
via cd362daf4b7f50dc8d0eab8df7066266564028c4 (commit)
via 4bdec4dbecdb065518717ec4e4ecce4a46d8a444 (commit)
via 1811c015d976a2ab11271aee64768a0d52ed2601 (commit)
via 5ba7e3d3878be2df5df0b5730f2fa20e87e11c7d (commit)
via 9eb12c8552527fc1b606f95da24f9dd17a6676b6 (commit)
via e9bd850767b100deb2d553f0cfc9492cf25971e7 (commit)
via 8a55ea4f61cf969c4ce057aa2e4f91afed2cfc29 (commit)
via 69049915682864c9ec2ce7c2a6cee778c7eccf98 (commit)
via d8aad92dab3d50202dd2d00d41d97b927b8d9338 (commit)
via 82a40e22f3866d13924dce4123cf3be4ac92c41e (commit)
via a415b247892a1bb0f57d63d3a074d3f4722ba35c (commit)
via c2295c1f56045a9807fd877374533aa4b9a3adaf (commit)
via 0d3445251b660f8f82ffa2900655bb7a2c0908b7 (commit)
via f7f205e7f88e7766cdc7c44b58f612201026fb57 (commit)
via e04e6033335192edd819c3a66d6962d92cedc246 (commit)
via e5e35c88b0ad1ccd17f392ea297052064a5d1bc3 (commit)
via bf9a6253db953bc944f73904590f4d26af0a7e69 (commit)
via 9d13eb6a798a9345d8edfbe14ccf171118832850 (commit)
via 92d61a00a94143996bda448dc96452830ab1ddf1 (commit)
via 55b49b6957d800c656f4a89c6321c58ecb93ef3b (commit)
via 77c5a45f041f010f58b0f92383437a8662e9f11d (commit)
via 88bb80afa67bb73c3e85c6fab088be61f9cbe3f2 (commit)
via cfb68591c727f79e99731fd511e6c2a1b1aa7e40 (commit)
via aa47886ca949afa8fbfc47dc009e907eb59588a3 (commit)
via befc2059edf59342b33857c3a7f920f2b77ef18c (commit)
via 08a639779f68c11c5ee31bf0daf6b15b81b05a60 (commit)
via 43040d54ecca43adb97927e2ba1a8e68ea7fdff5 (commit)
via 2ad4860a3b10bc51d31cabcada8333feb7b74573 (commit)
via 5268a7c9994b9297d397360ca9afa91965974bd9 (commit)
via 50aa47bae04b367a8ad879ae26130ac9e4a123b0 (commit)
via 482f34f07cd12412c03bee19575262effad8696f (commit)
via 6c5bcf25c00ad8e4d0d94b256de0c40053948f7c (commit)
via 27966d0244ab89e4e2a4551c7f7e3fe6de18857c (commit)
via 59d9897b9496cf07a578a89801746dfc736264da (commit)
via 4dbfd63dd6041b0f28fb92f805804d1db6acfe96 (commit)
via 82fe9762b72568ff6523fe78862306a364d0b0de (commit)
via 5730081f3592ffb7537a301f7b175572aa2eb7eb (commit)
via 4119579f31661fd1f44108370c3c0efb9b7dd2d2 (commit)
via 82329d51de5e3a10cc8bfbdbd017525fcab00e35 (commit)
via 8bf6554539b1a500f106038b15007fb89b8fc289 (commit)
via 3ed4174faaafe2fb0712d56542a16dacf2bf1723 (commit)
via 2d3c63714327c2ba13d3c0fe7281db08c69ce35d (commit)
via 05ead8e23338cc390bd6ba3011a910b5d3b8a4a7 (commit)
via b20eeff2e6db0149d155bb92ce8278b7786293b6 (commit)
via 409cb0d2ee03fcbffb9c007528133aa40c20fe91 (commit)
via 4b0fdfecbf80fef35227157a31940c61bb9a515d (commit)
via a3121a653dda42dc8759028909b2a3e2d8a79f77 (commit)
via d8dad317c2965178db2d15dd4c2c3919a37ef0ab (commit)
via aecb51592471d486acda902cf831ebf3eeab4276 (commit)
via 332f68c8f55312125cf0b8172821c9ae31381f57 (commit)
via abf3f7d01e0d0863168ceec75ab501caec6c8f12 (commit)
via f6f1e38cd69657118b8287c87c72a52835be6929 (commit)
via d2eaa34f797d63f3104f626d6270bab27eea55da (commit)
via af11845d7e5a9ca05146a3e2b33dc2720b0b4a39 (commit)
via f8c40eca5b5c91dcb0fd9d01c4d2d12fa124690b (commit)
via 7470b310be8bb9b9b41b223cc03d58ae5eeecf52 (commit)
via 74f9361a4dd2895a02cfca0587228d8ca9058154 (commit)
via 851a27bb2df22b18d21ec0526497316dadb16595 (commit)
via 9d414e9db5a2f1f512db18aea01f81ec1c9d515e (commit)
via 582896a9800bcc77ece7458aea993c8c8792d619 (commit)
via 3fa95ed855957ebaefe0943de89460a3163bf763 (commit)
via 33f57624814cfa2e91cd9d8fd221f282d9b58b9f (commit)
via 74f43d075d813db0a90787a508b66161c10bfffc (commit)
via 59d3cb0a0c1c57c61cace31d8f6d69ad886edb4a (commit)
via 96b22cdb2dc2c6e7a24efd50d02124fd7343085c (commit)
via 53b8b0fdb7194d32d077adeb8d06682cd57f27b5 (commit)
via 6b308ae94067865c1cafe6a8ab726f0adfa783e5 (commit)
via 6ec598a4ed8319581c3bdc68c70fc4c0c259362f (commit)
via 558d2bf25ad1fd95247957225500f5fde574f9a7 (commit)
via db7e79e2ec6d130d7c6f6cb0c73a3ffc35c6d8cb (commit)
via 8e4f1a266321e683431ddad2b4cfd69218952577 (commit)
via ff4f8cf52efaa3c527de8094987ea72d5b8e9945 (commit)
via 64c5398655196efa566cd5a5d378823b44bf899f (commit)
via 9543ffd932c2648bcd54329fe78a0b5391836172 (commit)
via b30fdb410e55f677ae45e40e6c94baef7fbfb570 (commit)
via c95b79e755beeb4631d08b81f31d3d4f708ac1da (commit)
via c26609e0239cdd897174e5e25124a86ca3b6225f (commit)
via 9c24c3fc31fc778868aa366f0bfaee82600bb534 (commit)
via c4e6c459b6b650493904b14cc3b3e6427a0ec9d0 (commit)
via b2fb821263c61c529a5fb2b7dc28feec1aa90196 (commit)
via 67fd815b4595a6f00c38bb01fe5d73d5d502f674 (commit)
via 85b879722016cf958a5670b59e3fda319069ee8f (commit)
via d7743e7e8c67826668850017d05537566ee4cd05 (commit)
via 52904a015fe74903e4f8d1647b7e24e8453db605 (commit)
via 0ec15a3e3d58538b07b4ecba3359195b713f0f9c (commit)
via 8dee6a5e417a38cb418d9222ca0ca801d7c42ac7 (commit)
via 6e5f7a1ed5f2300540f714d77cf062c550f5f4ef (commit)
via 5450390f349c4d7281e865da8dc896a41fe2c866 (commit)
via e39ba6289af3c987a8b4bc074c6f40a63082da52 (commit)
via 0836523472c56124fc13dd90d44e47d610af1bed (commit)
via 8c635c906e15a4d0211375c896f22f003d1d6958 (commit)
via fe071398889b9f63635b1b7cbba2555142f531c0 (commit)
via bc117fac34fcdaec43316bc67cef716da1d1f718 (commit)
via 14dba6006ffe2465388320b0dd68c867394996dc (commit)
via 0ffca3f606a2d838646cc2d6a71151b816d2f6dd (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (317643716020af44700bdedf5183250812ff19d8)
\
N -- N -- N (55c41d1eab790363ceb8c49874baacc0db43f1db)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
.gitignore | 2 +-
Makefile.am | 4 +-
configure.ac | 18 +-
packages/packages.current | 14 +-
patches/gtk-2.24.33/01-no-tests-demos.patch | 36 -
patches/gtk/01-theme.patch | 11 +
patches/gtk/02-csd.patch | 34 +
patches/gtk/03-keyboard-hook.patch | 37 +
patches/gtk/04-scrollbar-button.patch | 17 +
patches/gtk/50-win71-theme-prepare.sh | 15 +
patches/gtk/53-win32-theme-Fix-notebook-tabs.patch | 284 +
...-win32-theme-make-separator-visible-again.patch | 41 +
.../gtk/60-win32-theme-claws-consolidated.patch | 177 +
patches/gtk/69-win71-theme-finalize.sh | 22 +
patches/icu4c-58.3/01-libnames.patch | 54 -
patches/icu4c-58.3/02-float128-clang.patch | 12 -
patches/icu4c-58.3/03-no-xlocale.patch | 16 -
patches/icu4c/01-mingw-std-threads.patch.linux | 23 +
patches/{icu4c-58.3 => icu4c}/99-build.sh.in | 21 +-
patches/libsoup/01-extern-c.patch | 26 -
.../webkitgtk-2.4.11/01-mingw-std-threads.patch | 459 --
.../webkitgtk-2.4.11/02-no-class-size-check.patch | 16 -
.../03-missing-RenderBox-include.patch | 11 -
.../webkitgtk-2.4.11/04-LLIntAssembly-hack.patch | 6491 --------------------
patches/webkitgtk-2.4.11/05-print-size.patch | 17 -
patches/webkitgtk-2.4.11/06-flags.patch | 45 -
patches/webkitgtk-2.4.11/07-misc.patch | 47 -
.../08-missing-RenderElement-include.patch | 11 -
.../webkitgtk-2.4.11/09-no-fortify-source.patch | 18 -
patches/webkitgtk-2.4.11/99-autoreconf.sh | 3 -
po/ar.po | 63 +-
po/cz.po | 48 +-
po/de.po | 31 +-
po/es.po | 45 +-
po/fr.po | 39 +-
po/it.po | 12 +-
po/pt.po | 39 +-
po/ru.po | 142 +-
src/Makefile.am | 52 +-
src/config.nsi.in | 3 +
src/meson-cross.txt.in | 1 +
src/sections-installer.nsi | 188 +-
src/sections-uninstaller.nsi | 195 +-
43 files changed, 1307 insertions(+), 7533 deletions(-)
delete mode 100644 patches/gtk-2.24.33/01-no-tests-demos.patch
create mode 100644 patches/gtk/01-theme.patch
create mode 100644 patches/gtk/02-csd.patch
create mode 100644 patches/gtk/03-keyboard-hook.patch
create mode 100644 patches/gtk/04-scrollbar-button.patch
create mode 100755 patches/gtk/50-win71-theme-prepare.sh
create mode 100644 patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
create mode 100644 patches/gtk/55-win32-theme-make-separator-visible-again.patch
create mode 100644 patches/gtk/60-win32-theme-claws-consolidated.patch
create mode 100755 patches/gtk/69-win71-theme-finalize.sh
delete mode 100644 patches/icu4c-58.3/01-libnames.patch
delete mode 100644 patches/icu4c-58.3/02-float128-clang.patch
delete mode 100644 patches/icu4c-58.3/03-no-xlocale.patch
create mode 100644 patches/icu4c/01-mingw-std-threads.patch.linux
rename patches/{icu4c-58.3 => icu4c}/99-build.sh.in (63%)
delete mode 100644 patches/libsoup/01-extern-c.patch
delete mode 100644 patches/webkitgtk-2.4.11/01-mingw-std-threads.patch
delete mode 100644 patches/webkitgtk-2.4.11/02-no-class-size-check.patch
delete mode 100644 patches/webkitgtk-2.4.11/03-missing-RenderBox-include.patch
delete mode 100644 patches/webkitgtk-2.4.11/04-LLIntAssembly-hack.patch
delete mode 100644 patches/webkitgtk-2.4.11/05-print-size.patch
delete mode 100644 patches/webkitgtk-2.4.11/06-flags.patch
delete mode 100644 patches/webkitgtk-2.4.11/07-misc.patch
delete mode 100644 patches/webkitgtk-2.4.11/08-missing-RenderElement-include.patch
delete mode 100644 patches/webkitgtk-2.4.11/09-no-fortify-source.patch
delete mode 100755 patches/webkitgtk-2.4.11/99-autoreconf.sh
- Log -----------------------------------------------------------------
commit 55c41d1eab790363ceb8c49874baacc0db43f1db
Author: Thorsten Maerz <info at netztorte.de>
Date: Wed Apr 6 09:11:17 2022 +0200
Avoid stow conflicts (for "share/info/dir")
If the package "install-info" is installed on the build system,
stow will run into conflicts, because multiple packages install the
"dir" file into the same location.
diff --git a/src/claws-mail.mk.in b/src/claws-mail.mk.in
index de3e242..099fd2d 100644
--- a/src/claws-mail.mk.in
+++ b/src/claws-mail.mk.in
@@ -177,7 +177,7 @@ stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
- $(STOW) --dir=$(ipdir) $(pkg_ver)
+ $(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
@@ -237,7 +237,7 @@ stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
- $(STOW) --dir=$(ipdir) $(pkg_ver)
+ $(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
@@ -263,7 +263,7 @@ stamps/stamp-$(1)-00-install: stamps/stamp-directories $(call GETDEPS,$(1))
touch stamps/stamp-$(1)-00-install
stamps/stamp-$(1)-01-stow: stamps/stamp-$(1)-00-install
- $(STOW) --dir=$(ipdir) $(pkg_ver)
+ $(STOW) --ignore='share/info/dir' --dir=$(ipdir) $(pkg_ver)
touch stamps/stamp-$(1)-01-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-01-stow
commit 1e37b6dc5098ad7555fffa9f471a085629044f73
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:06:49 2022 -0700
update to claws-mail-4.1.0
diff --git a/packages/packages.current b/packages/packages.current
index ce4111a..ab0e1bf 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -1,6 +1,6 @@
# package name,version,type,url,sha256 hash,branch,ref
-claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
+claws_mail,4.1.0,file,https://www.claws-mail.org/releases/claws-mail-4.1.0.tar.xz,0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e,,
adwaita_icon_theme,41.0,file,https://download.gnome.org/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz,ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba,,
atk,2.38.0,file,https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz,ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36,,
diff --git a/patches/claws_mail/02-define-WIN32-for-litehtml.sh b/patches/claws_mail/02-define-WIN32-for-litehtml.sh
deleted file mode 100755
index 8ea2d72..0000000
--- a/patches/claws_mail/02-define-WIN32-for-litehtml.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-ret=$?
-NOCONFIGURE=1 ./autogen.sh
-exit $ret
-
-From 4ec95b1335e1683e2d21061eed7e726ffa6c1164 Mon Sep 17 00:00:00 2001
-From: Jonathan Boeing <jonathan.n.boeing at gmail.com>
-Date: Wed, 25 Nov 2020 20:33:19 -0700
-Subject: [PATCH 2/2] Define WIN32 for litehtml
-
-Litehtml has an #ifdef WIN32 for defining the t_xxx string functions.
-The Windows build still gets the desired definitions without it, but
-building claws with -DLITEHTML_UTF8 gives the warning:
-
-warning: "LITEHTML_UTF8" redefined
----
- src/plugins/litehtml_viewer/Makefile.am | 7 ++++++-
- src/plugins/litehtml_viewer/litehtml/Makefile.am | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/litehtml_viewer/Makefile.am b/src/plugins/litehtml_viewer/Makefile.am
-index f91ea5926..c1edfc54e 100644
---- a/src/plugins/litehtml_viewer/Makefile.am
-+++ b/src/plugins/litehtml_viewer/Makefile.am
-@@ -40,10 +40,14 @@ endif
-
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-+lh_def_win32 = -DWIN32
- else
- no_undefined =
-+lh_def_win32 =
- endif
-
-+export lh_def_win32
-+
- if CYGWIN
- cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
- else
-@@ -98,7 +102,8 @@ litehtml_viewer_la_CPPFLAGS = \
- $(FONTCONFIG_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(CURL_CFLAGS) \
-- $(LIBGUMBO_CFLAGS)
-+ $(LIBGUMBO_CFLAGS) \
-+ $(lh_def_win32)
-
- .PHONY: test
-
-diff --git a/src/plugins/litehtml_viewer/litehtml/Makefile.am b/src/plugins/litehtml_viewer/litehtml/Makefile.am
-index 025e3152b..cf71613bb 100644
---- a/src/plugins/litehtml_viewer/litehtml/Makefile.am
-+++ b/src/plugins/litehtml_viewer/litehtml/Makefile.am
-@@ -57,7 +57,7 @@ liblitehtml_la_LDFLAGS = \
- -avoid-version -module \
- $(LIBGUMBO_LIBS)
-
--liblitehtml_la_CPPFLAGS = \
-+liblitehtml_la_CPPFLAGS = $(lh_def_win32) \
- $(LIBGUMBO_CFLAGS)
-
- EXTRA_DIST = \
---
-2.20.1
-
diff --git a/patches/claws_mail/03-fancy-prefs.patch b/patches/claws_mail/03-fancy-prefs.patch
deleted file mode 100644
index 232942d..0000000
--- a/patches/claws_mail/03-fancy-prefs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
---- a/src/plugins/fancy/fancy_viewer.c
-+++ b/src/plugins/fancy/fancy_viewer.c
-@@ -99,7 +99,7 @@ static void fancy_apply_prefs(FancyViewer *viewer)
- #endif
- NULL);
- if (fancy_prefs.stylesheet == NULL || strlen(fancy_prefs.stylesheet) == 0) {
-- gchar **msg_font_params = g_strsplit(prefs_common.textfont, " ", 0);
-+ gchar **msg_font_params = g_strsplit(prefs_common_get_prefs()->textfont, " ", 0);
- guint params_len = g_strv_length(msg_font_params);
-
- if (params_len > 0) {
diff --git a/patches/claws_mail/04-validate-utf8.patch b/patches/claws_mail/04-validate-utf8.patch
deleted file mode 100644
index 5200ca4..0000000
--- a/patches/claws_mail/04-validate-utf8.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 959eacc1c7bd4dadbfbabe1502c678ae92f21640 Mon Sep 17 00:00:00 2001
-From: Jonathan Boeing <jonathan.n.boeing at gmail.com>
-Date: Mon, 29 Mar 2021 19:42:53 -0700
-Subject: [PATCH] check if string is valid UTF-8 before collating
-
----
- src/common/utils.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/common/utils.c b/src/common/utils.c
-index b8cf669ee..cd01eb530 100644
---- a/src/common/utils.c
-+++ b/src/common/utils.c
-@@ -452,6 +452,14 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
- trim_subject_for_sort(str1);
- trim_subject_for_sort(str2);
-
-+ if (!g_utf8_validate(str1, -1, NULL)) {
-+ g_warning("message subject \"%s\" failed UTF-8 validation", str1);
-+ return 0;
-+ } else if (!g_utf8_validate(str2, -1, NULL)) {
-+ g_warning("message subject \"%s\" failed UTF-8 validation", str2);
-+ return 0;
-+ }
-+
- return g_utf8_collate(str1, str2);
- }
-
---
-2.20.1
-
diff --git a/patches/claws_mail/05-ca-certificates.patch b/patches/claws_mail/05-ca-certificates.patch
deleted file mode 100644
index f49852d..0000000
--- a/patches/claws_mail/05-ca-certificates.patch
+++ /dev/null
@@ -1,4398 +0,0 @@
-diff --git a/src/plugins/fancy/claws.def b/src/plugins/fancy/claws.def
-index 9a6ff503a..b417d8368 100644
---- a/src/plugins/fancy/claws.def
-+++ b/src/plugins/fancy/claws.def
-@@ -9,6 +9,7 @@ claws_fopen
- claws_fdopen
- claws_fclose
- claws_safe_fclose
-+claws_ssl_get_cert_file
- combobox_get_active_data
- combobox_select_by_data
- combobox_text_new
-diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
-index 15fe8ab95..423c209fd 100644
---- a/src/plugins/fancy/fancy_viewer.c
-+++ b/src/plugins/fancy/fancy_viewer.c
-@@ -677,6 +677,9 @@ static void *download_file_curl (void *data)
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, viewer);
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
- curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- res = curl_easy_perform(curl);
- curl_easy_cleanup(curl);
-
-diff --git a/src/plugins/libravatar/claws.def b/src/plugins/libravatar/claws.def
-index e6dad0fa3..42b5e1de7 100644
---- a/src/plugins/libravatar/claws.def
-+++ b/src/plugins/libravatar/claws.def
-@@ -10,6 +10,7 @@ claws_fopen
- claws_fdopen
- claws_fclose
- claws_safe_fclose
-+claws_ssl_get_cert_file
- extract_address
- get_locale_dir
- check_plugin_version
-diff --git a/src/plugins/libravatar/libravatar_image.c b/src/plugins/libravatar/libravatar_image.c
-index 4b0bf5643..6d62076a4 100644
---- a/src/plugins/libravatar/libravatar_image.c
-+++ b/src/plugins/libravatar/libravatar_image.c
-@@ -111,6 +111,9 @@ static GdkPixbuf *pixbuf_from_url(const gchar *url, const gchar *md5, const gcha
- }
- curl_easy_setopt(curl, CURLOPT_FILE, file);
- curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); /* fail on HTTP error */
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- debug_print("retrieving URL to file: %s -> %s\n", url, filename);
- res = curl_easy_perform(curl);
- if (res != CURLE_OK) {
-diff --git a/src/plugins/litehtml_viewer/claws.def b/src/plugins/litehtml_viewer/claws.def
-index 30dada9e5..3ca37594a 100644
---- a/src/plugins/litehtml_viewer/claws.def
-+++ b/src/plugins/litehtml_viewer/claws.def
-@@ -1,5 +1,6 @@
- LIBRARY CLAWS-MAIL.EXE
- EXPORTS
-+claws_ssl_get_cert_file
- debug_print_real
- debug_srcname
- get_rc_dir
-diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
-index dba8e6d6e..f846aef8c 100644
---- a/src/plugins/litehtml_viewer/http.cpp
-+++ b/src/plugins/litehtml_viewer/http.cpp
-@@ -22,7 +22,10 @@
- #include <string.h>
- #include "http.h"
-
-+extern "C" {
-+#include "ssl.h"
- #include "utils.h"
-+}
-
- struct Data {
- GInputStream *memory;
-@@ -51,6 +54,9 @@ http::http()
- curl_easy_setopt(curl, CURLOPT_TCP_KEEPIDLE, 120L);
- curl_easy_setopt(curl, CURLOPT_TCP_KEEPINTVL, 60L);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- stream = NULL;
- }
-
-diff --git a/src/plugins/spam_report/claws.def b/src/plugins/spam_report/claws.def
-index 28bbdc78e..6af3b0d1e 100644
---- a/src/plugins/spam_report/claws.def
-+++ b/src/plugins/spam_report/claws.def
-@@ -3,6 +3,7 @@ EXPORTS
- alertpanel
- base64_encode
- check_plugin_version
-+claws_ssl_get_cert_file
- compose_entry_append
- compose_forward
- compose_send
-diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c
-index 50f0c104a..0362cb760 100644
---- a/src/plugins/spam_report/spam_report.c
-+++ b/src/plugins/spam_report/spam_report.c
-@@ -240,6 +240,9 @@ static void report_spam(gint id, ReportInterface *intf, MsgInfo *msginfo, gchar
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, prefs_common_get_prefs()->io_timeout_secs);
- curl_easy_setopt(curl, CURLOPT_USERAGENT,
- SPAM_REPORT_USERAGENT "(" PLUGINS_URI ")");
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- res = curl_easy_perform(curl);
- if (res != CURLE_OK)
- debug_print("curl_easy_perfom failed: %s", curl_easy_strerror(res));
-@@ -258,19 +261,22 @@ static void report_spam(gint id, ReportInterface *intf, MsgInfo *msginfo, gchar
- }
- break;
- case INTF_HTTP_GET:
-- curl = curl_easy_init();
-- curl_easy_setopt(curl, CURLOPT_URL, geturl);
-+ curl = curl_easy_init();
-+ curl_easy_setopt(curl, CURLOPT_URL, geturl);
- curl_easy_setopt(curl, CURLOPT_USERAGENT,
- SPAM_REPORT_USERAGENT "(" PLUGINS_URI ")");
-- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_writefunction_cb);
-- curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
-+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_writefunction_cb);
-+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- res = curl_easy_perform(curl);
- if (res != CURLE_OK)
- debug_print("curl_easy_perfom failed: %s", curl_easy_strerror(res));
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
-- curl_easy_cleanup(curl);
-+ curl_easy_cleanup(curl);
- spamreport_http_response_log(geturl, response);
-- /* On success the page should return "OK: nominated <msgid>" */
-+ /* On success the page should return "OK: nominated <msgid>" */
- if (chunk.size < 13 || strstr(chunk.data, "OK: nominated") == NULL) {
- if (chunk.size > 0) {
- log_error(LOG_PROTOCOL, "%s: response was %s\n", geturl, chunk.data);
-diff --git a/src/plugins/vcalendar/claws.def b/src/plugins/vcalendar/claws.def
-index 419b19d1e..54d288d33 100644
---- a/src/plugins/vcalendar/claws.def
-+++ b/src/plugins/vcalendar/claws.def
-@@ -21,6 +21,7 @@ claws_fopen
- claws_fdopen
- claws_fclose
- claws_safe_fclose
-+claws_ssl_get_cert_file
- cm_menu_create_action_group_full
- cm_menu_set_sensitive_full
- cm_toggle_menu_set_active_full
-diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
-index 8ea78e510..305d1e94b 100644
---- a/src/plugins/vcalendar/vcal_folder.c
-+++ b/src/plugins/vcalendar/vcal_folder.c
-@@ -1595,6 +1595,9 @@ void *url_read_thread(void *data)
- curl_easy_setopt(curl_ctx, CURLOPT_WRITEDATA, &buffer);
- curl_easy_setopt(curl_ctx, CURLOPT_TIMEOUT, prefs_common_get_prefs()->io_timeout_secs);
- curl_easy_setopt(curl_ctx, CURLOPT_NOSIGNAL, 1);
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl_ctx, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- #if LIBCURL_VERSION_NUM >= 0x070a00
- if(vcalprefs.ssl_verify_peer == FALSE) {
- curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
-@@ -1718,6 +1721,9 @@ gboolean vcal_curl_put(gchar *url, FILE *fp, gint filesize, const gchar *user, c
- curl_easy_setopt(curl_ctx, CURLOPT_READFUNCTION, NULL);
- curl_easy_setopt(curl_ctx, CURLOPT_READDATA, fp);
- curl_easy_setopt(curl_ctx, CURLOPT_HTTPHEADER, headers);
-+#ifdef G_OS_WIN32
-+ curl_easy_setopt(curl_ctx, CURLOPT_CAINFO, claws_ssl_get_cert_file());
-+#endif
- #if LIBCURL_VERSION_NUM >= 0x070a00
- if(vcalprefs.ssl_verify_peer == FALSE) {
- curl_easy_setopt(curl_ctx, CURLOPT_SSL_VERIFYPEER, 0);
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index d474e3189..ccb969340 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -40,7 +40,6 @@ EXTRA_TOOLS = \
-
- EXTRA_DIST = \
- README \
-- ca-certificates.crt \
- multiwebsearch.conf \
- kdeservicemenu/README \
- kdeservicemenu/claws-mail-attach-files.desktop.template \
-@@ -75,10 +74,4 @@ distclean-local:
- fi; \
- fi
-
--if PLATFORM_WIN32
--install-data-local:
-- mkdir -p ${pkgdatadir}
-- cp ${top_srcdir}/tools/ca-certificates.crt ${pkgdatadir}/
--endif
--
- .PHONY: test
-diff --git a/tools/ca-certificates.crt b/tools/ca-certificates.crt
-deleted file mode 100644
-index c208b12d0..000000000
---- a/tools/ca-certificates.crt
-+++ /dev/null
-@@ -1,4190 +0,0 @@
-------BEGIN CERTIFICATE-----
--MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
--VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
--bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
--dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
--MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
--dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
--ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
--EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
--AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
--lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
--znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
--2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
--k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
--2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
--VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
--AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
--KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
--8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
--FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
--mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
--DNuxUCAKGkq6ahq97BvIxYSazQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
--AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
--CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
--MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
--RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
--AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
--09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
--XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
--Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
--t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
--X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
--MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
--fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
--2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
--K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
--ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
--BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
--MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
--RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
--bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
--fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
--gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
--I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
--5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
--ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
--MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
--o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
--zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
--GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
--r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
--Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
--CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
--ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
--QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
--NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
--ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
--QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
--hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
--qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
--fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
--Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
--Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
--54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
--MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
--ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
--YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
--A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
--rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
--pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
--AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
--lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
--YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
--7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
--YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
--xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
--unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
--Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
--ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
--gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
--jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
--XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
--W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
--RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
--MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
--BYn8eNZcLCZDqQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
--IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
--MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
--FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
--bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
--dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
--H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
--uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
--mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
--a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
--E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
--WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
--VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
--Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
--cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
--IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
--AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
--YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
--6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
--Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
--c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
--mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
--b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
--MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
--QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
--VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
--A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
--CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
--tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
--dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
--PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
--+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
--BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
--BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
--MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
--ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
--IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
--7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
--43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
--eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
--pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
--WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
--b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
--MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
--ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
--BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
--AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
--6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
--GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
--dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
--1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
--62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
--BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
--AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
--MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
--cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
--b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
--IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
--iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
--GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
--4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
--XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
--b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
--MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
--EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
--BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
--AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
--xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
--87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
--2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
--WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
--0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
--A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
--AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
--pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
--ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
--aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
--hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
--hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
--dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
--P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
--iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
--xqE=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
--BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
--dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
--MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
--cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
--AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
--Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
--ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
--MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
--yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
--VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
--nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
--KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
--XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
--vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
--Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
--N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
--nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
--BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
--dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
--MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
--cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
--AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
--YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
--kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
--QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
--6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
--yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
--QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
--KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
--tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
--QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
--Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
--olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
--x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
--BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
--dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
--A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
--cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
--qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
--JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
--+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
--s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
--HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
--70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
--V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
--qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
--5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
--C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
--OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
--FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
--BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
--KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
--Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
--8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
--MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
--0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
--u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
--u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
--YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
--GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
--RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
--KeC2uAloGRwYQw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
--VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
--cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
--BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
--VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
--0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
--ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
--A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
--A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
--aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
--flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
--MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
--bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
--MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
--ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
--Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
--ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
--hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
--1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
--OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
--2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
--O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
--AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
--AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
--BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
--Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
--LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
--oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
--MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
--sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
--MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
--bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
--MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
--ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
--Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
--ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
--206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
--KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
--JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
--BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
--Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
--PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
--Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
--Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
--o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
--+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
--YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
--FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
--AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
--xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
--LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
--obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
--CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
--IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
--DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
--AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
--Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
--AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
--Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
--RY8mkaKO/qk=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
--MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
--b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
--AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
--aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
--j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
--f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
--IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
--FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
--QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
--/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
--k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
--MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
--seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
--ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
--hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
--eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
--DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
--B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
--rosot4LKGAfmt1t06SAZf7IbiVQ=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
--BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
--cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
--MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
--Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
--MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
--thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
--cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
--L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
--NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
--X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
--m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
--Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
--EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
--KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
--6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
--OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
--VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
--VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
--cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
--ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
--AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
--661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
--am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
--ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
--PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
--3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
--SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
--3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
--ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
--StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
--Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
--jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
--RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
--VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
--DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
--ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
--VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
--mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
--IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
--mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
--XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
--dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
--jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
--BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
--DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
--9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
--jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
--Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
--ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
--R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
--MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
--Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
--MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
--VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
--ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
--ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
--l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
--HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
--5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
--WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
--AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
--AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
--gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
--DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
--BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
--h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
--LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
--MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
--Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
--MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
--VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
--ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
--isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
--NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
--+MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
--hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
--mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
--AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
--AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
--Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
--EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
--mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
--e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
--dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
--MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
--AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
--CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
--YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
--ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
--Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
--mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
--XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
--S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
--FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
--AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
--AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
--ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
--ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
--Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
--DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
--yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
--EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
--CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
--EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
--PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
--TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
--MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
--Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
--DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
--IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
--dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
--V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
--GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
--v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
--AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
--Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
--76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
--OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
--ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
--yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
--buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
--2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
--gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
--A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
--BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
--MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
--YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
--RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
--aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
--UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
--2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
--Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
--+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
--DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
--nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
--/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
--PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
--QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
--SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
--IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
--RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
--zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
--BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
--ZQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
--MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
--BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
--IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
--MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
--ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
--T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
--biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
--FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
--cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
--BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
--BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
--fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
--GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
--MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
--ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
--b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
--MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
--ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
--IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
--AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
--unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
--BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
--7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
--0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
--roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
--A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
--aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
--26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
--BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
--EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
--BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
--aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
--AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
--p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
--1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
--XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
--eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
--tGWaIZDgqtCYvDi1czyL+Nw=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
--MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
--ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
--YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
--MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
--NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
--A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
--A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
--Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
--QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
--eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
--B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
--z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
--AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
--ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
--TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
--MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
--VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
--VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
--bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
--AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
--bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
--ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
--VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
--ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
--AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
--BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
--DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
--BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
--DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
--QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
--gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
--zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
--130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
--JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
--DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
--ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
--AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
--AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
--9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
--bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
--fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
--HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
--t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
--WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
--MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
--BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
--Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
--cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
--aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
--ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
--F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
--8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
--rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
--/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
--7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
--28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
--lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
--nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
--0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
--5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
--WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
--jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
--KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
--ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
--OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
--619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
--2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
--o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
--nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
--5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
--pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
--dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
--BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
--PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
--cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
--MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
--IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
--ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
--VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
--kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
--EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
--H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
--HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
--DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
--QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
--Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
--AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
--yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
--FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
--ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
--kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
--l7+ijrRU
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
--MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
--QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
--MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
--QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
--jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
--ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
--ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
--Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
--AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
--HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
--uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
--TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
--xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
--CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
--O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
--6GAqm4VKQPNriiTsBhYscw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
--MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
--ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
--cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
--WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
--Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
--IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
--AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
--UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
--TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
--BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
--kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
--AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
--HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
--HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
--sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
--I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
--J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
--VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
--03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
--VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
--IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
--MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
--IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
--MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
--dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
--EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
--MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
--CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
--28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
--VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
--DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
--5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
--ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
--Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
--UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
--+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
--Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
--ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
--hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
--HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
--+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
--YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
--L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
--ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
--IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
--HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
--DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
--PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
--5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
--glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
--FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
--pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
--xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
--tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
--jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
--fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
--OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
--d0jQ
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0
--MRMwEQYDVQQDEwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQG
--EwJJTDAeFw0wNDAzMjQxMTMyMThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMT
--CkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNpZ24xCzAJBgNVBAYTAklMMIIBIjAN
--BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49qROR+WCf4C9DklBKK
--8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTyP2Q2
--98CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb
--2CEJKHxNGGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxC
--ejVb7Us6eva1jsz/D3zkYDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7Kpi
--Xd3DTKaCQeQzC6zJMw9kglcq/QytNuEMrkvF7zuZ2SOzW120V+x0cAwqTwIDAQAB
--o4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2Zl
--ZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0PAQH/BAQD
--AgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRL
--AZs+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWd
--foPPbrxHbvUanlR2QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0M
--cXS6hMTXcpuEfDhOZAYnKuGntewImbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq
--8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb/627HOkthIDYIb6FUtnUdLlp
--hbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VGzT2ouvDzuFYk
--Res3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
--AGegcQCCSA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
--PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
--MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
--GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
--MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
--HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
--gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
--v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
--Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
--9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
--6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
--MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
--Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
--ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
--hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
--iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
--dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
--kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
--hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
--OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
--MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
--GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
--YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
--MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
--BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
--GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
--ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
--BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
--3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
--YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
--rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
--ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
--oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
--MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
--QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
--b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
--AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
--GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
--Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
--G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
--l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
--smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
--MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
--GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
--ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
--fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
--A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
--BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
--BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
--cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
--HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
--CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
--3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
--6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
--HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
--EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
--Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
--Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
--DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
--5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
--Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
--gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
--aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
--izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
--MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
--GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
--aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
--MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
--BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
--VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
--AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
--fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
--TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
--fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
--1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
--kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
--A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
--VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
--ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
--dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
--Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
--HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
--pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
--jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
--xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
--dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
--A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
--bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
--ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
--b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
--7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
--J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
--HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
--t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
--FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
--XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
--MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
--hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
--MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
--A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
--Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
--XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
--omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
--A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
--WL1WMRJOEcgh4LMRkWXbtKaIOM5V
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
--MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
--ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
--MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
--VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
--FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
--MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
--ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
--gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
--fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
--ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
--ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
--MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
--c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
--dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
--aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
--hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
--QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
--h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
--nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
--rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
--9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
--MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
--DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
--PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
--Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
--AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
--rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
--OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
--xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
--7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
--aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
--HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
--SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
--ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
--AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
--R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
--JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
--Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
--MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
--IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
--IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
--RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
--U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
--IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
--ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
--QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
--rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
--NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
--QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
--txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
--BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
--AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
--tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
--IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
--6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
--xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
--Cm26OWMohpLzGITY+9HPBVZkVw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
--MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
--d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
--b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
--EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
--cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
--MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
--JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
--mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
--wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
--VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
--AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
--AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
--BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
--pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
--dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
--fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
--NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
--H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
--+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
--MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
--d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
--QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
--MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
--b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
--9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
--CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
--nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
--43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
--T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
--gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
--BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
--TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
--DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
--hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
--06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
--PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
--YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
--CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
--MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
--d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
--ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
--MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
--LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
--RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
--+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
--PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
--xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
--Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
--hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
--EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
--MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
--FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
--nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
--eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
--hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
--Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
--vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
--+OkuE6N36B9K
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
--UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
--EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ
--BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
--ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg
--bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ
--j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV
--Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG
--SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
--JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
--RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw
--MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5
--fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i
--+DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
--SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN
--QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+
--gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
--UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
--EwhEU1RDQSBFMjAeFw05ODEyMDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJ
--BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
--ETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC/
--k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGODVvso
--LeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3o
--TQPMx7JSxhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCG
--SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
--JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
--RFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxOTE3
--MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFB6C
--TShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5
--WzAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
--SIb3DQEBBQUAA4GBAEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHR
--xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL
--B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
--MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
--Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
--a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
--MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
--R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
--U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
--ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
--MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
--L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
--5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
--90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
--c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
--BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
--VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
--qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
--/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
--/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
--KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
--fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
--BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
--c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
--ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
--MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
--SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
--a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
--MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
--4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
--tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
--tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
--dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
--c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
--TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
--+kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
--Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
--OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
--fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
--l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
--/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
--FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
--8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
--6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
--TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
--wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
--Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
--xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
--DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
--Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
--hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
--7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
--QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
--RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
--bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
--IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
--ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
--MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
--LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
--YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
--A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
--MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
--K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
--sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
--MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
--XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
--HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
--4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
--HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
--j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
--U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
--zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
--u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
--bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
--fF6adulZkMV8gzURZVE=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
--VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
--ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
--KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
--ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
--MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
--ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
--b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
--bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
--U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
--A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
--I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
--wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
--AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
--oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
--BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
--dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
--MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
--b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
--dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
--MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
--E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
--MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
--hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
--95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
--2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
--VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
--Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
--KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
--cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
--NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
--NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
--ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
--BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
--KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
--Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
--4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
--KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
--rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
--94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
--sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
--gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
--kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
--vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
--A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
--O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
--AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
--9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
--eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
--0vdXcDazv/wor3ElhVsT/h5/WrQ8
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
--UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
--dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
--MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
--dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
--AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
--BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
--cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
--AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
--MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
--aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
--ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
--IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
--MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
--A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
--7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
--1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
--MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
--ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
--MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
--dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
--c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
--UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
--58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
--o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
--MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
--aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
--A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
--Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
--8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
--MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
--ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
--MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
--LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
--KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
--RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
--WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
--Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
--AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
--eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
--zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
--WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
--/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
--IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
--dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
--MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
--HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
--IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
--dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
--MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
--ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
--Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
--rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
--hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
--BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
--iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
--AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
--bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
--MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
--FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
--VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
--u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
--hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
--ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
--QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
--quGnM/b9Sh/22WA=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
--VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
--bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
--b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
--UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
--cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
--b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
--iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
--r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
--04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
--GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
--3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
--lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
--MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
--YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
--EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
--R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
--9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
--fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
--iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
--1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
--bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
--MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
--ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
--uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
--Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
--tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
--PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
--hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
--5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
--MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
--IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
--EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
--R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
--PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
--Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
--TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
--5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
--S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
--2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
--FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
--EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
--EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
--/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
--A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
--abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
--I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
--4iIprn2DQKi6bA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
--MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
--R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
--MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
--Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
--ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
--AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
--AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
--ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
--7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
--kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
--mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
--A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
--KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
--6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
--4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
--oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
--UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
--AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
--MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
--KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
--MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
--eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
--BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
--NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
--BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
--MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
--So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
--tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
--BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
--CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
--qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
--rD6ogRLQy7rQkgu2npaqBA+K
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
--mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
--MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
--eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
--cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
--BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
--MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
--BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
--LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
--+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
--hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
--5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
--JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
--DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
--huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
--HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
--AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
--zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
--kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
--AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
--SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
--spki4cErx5z481+oghLrGREt
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
--MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
--c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
--BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
--IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
--VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
--cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
--QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
--F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
--c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
--mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
--VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
--teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
--f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
--Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
--nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
--/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
--MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
--9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
--aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
--IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
--ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
--uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
--Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
--QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
--koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
--ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
--DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
--bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
--MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
--c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
--VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
--c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
--AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
--WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
--FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
--XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
--se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
--KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
--IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
--y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
--hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
--QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
--Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
--HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
--HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
--KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
--dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
--L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
--Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
--ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
--T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
--GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
--1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
--OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
--6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
--QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
--A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
--b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
--MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
--YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
--aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
--jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
--xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
--1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
--snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
--U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
--9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
--BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
--AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
--yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
--38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
--AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
--DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
--HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
--A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
--Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
--MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
--A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
--v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
--eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
--tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
--C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
--zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
--mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
--V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
--bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
--3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
--J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
--291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
--ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
--AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
--TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
--A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
--Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
--MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
--A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
--RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
--gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
--KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
--QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
--XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
--DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
--LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
--RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
--jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
--6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
--mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
--Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
--WD9f
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
--VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
--IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
--MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
--aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
--MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
--cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
--A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
--BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
--hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
--KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
--G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
--zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
--ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
--HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
--Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
--yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
--beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
--6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
--wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
--zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
--BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
--ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
--ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
--cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
--YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
--CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
--KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
--hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
--UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
--X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
--fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
--a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
--Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
--SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
--AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
--M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
--v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
--09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
--MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
--YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
--MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
--ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
--MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
--ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
--PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
--wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
--EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
--avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
--YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
--sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
--/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
--IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
--YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
--ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
--OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
--TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
--HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
--dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
--ReYNnyicsbkqWletNw+vHX/bvZ8=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
--EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
--EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
--ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
--NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
--EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
--AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
--DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
--E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
--/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
--DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
--GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
--tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
--AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
--FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
--WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
--9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
--gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
--2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
--LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
--4uJEvlz36hz1
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
--FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
--Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
--A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
--b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
--AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
--jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
--PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
--ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
--nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
--q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
--MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
--mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
--7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
--oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
--EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
--fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
--AmvZWg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
--AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
--TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
--9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
--MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
--BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
--MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
--LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
--s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
--xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
--u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
--F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
--Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
--PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
--HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
--NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
--AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
--L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
--YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
--Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
--NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
--0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
--MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
--ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
--VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
--b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
--scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
--xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
--LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
--uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
--yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
--JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
--rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
--BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
--hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
--QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
--HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
--Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
--QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
--BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
--MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
--AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
--A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
--laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
--awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
--JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
--LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
--VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
--LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
--UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
--QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
--naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
--QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
--AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
--dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
--MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
--CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
--MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
--AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
--SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
--ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
--LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
--PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
--2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
--ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
--MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
--AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
--AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
--AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
--AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
--BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
--FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
--P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
--CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
--kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
--HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
--na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
--qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
--TbvGRNs2yyqcjg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
--cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
--b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
--ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
--NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
--TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
--Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
--ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
--uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
--LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
--vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
--Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
--62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
--AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
--LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
--BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
--AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
--MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
--ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
--AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
--AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
--ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
--AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
--AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
--bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
--Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
--PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
--Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
--EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
--w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
--cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
--HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
--VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
--BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
--b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
--8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
--ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
--7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
--86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
--hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
--MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
--VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
--ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
--CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
--OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
--FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
--Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
--dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
--kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
--cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
--fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
--N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
--xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
--+rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
--A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
--Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
--SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
--mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
--ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
--tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
--2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
--HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
--EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
--MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
--cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
--dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
--pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
--b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
--aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
--IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
--MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
--lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
--AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
--VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
--ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
--BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
--AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
--U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
--bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
--+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
--bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
--uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
--XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
--ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
--b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
--EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
--OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
--A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
--Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
--dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
--SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
--gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
--iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
--Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
--BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
--SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
--b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
--bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
--Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
--aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
--IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
--c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
--biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
--ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
--UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
--YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
--dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
--bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
--sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
--n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
--NitjrFgBazMpUIaD8QFI
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
--ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
--b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
--EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
--DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
--DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
--c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
--TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
--BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
--OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
--2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
--RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
--AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
--ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
--YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
--b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
--ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
--IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
--b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
--ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
--YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
--a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
--SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
--aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
--YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
--Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
--ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
--pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
--Fp1hBWeAyNDYpQcCNJgEjTME1A==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
--MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
--TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
--dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
--KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
--N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
--dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
--MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
--b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
--9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
--zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
--3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
--WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
--Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
--NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
--ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
--QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
--YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
--aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
--IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
--ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
--ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
--amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
--IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
--Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
--ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
--YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
--dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
--b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
--CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
--xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
--0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
--QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
--f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
--8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx
--ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
--b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD
--EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz
--aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w
--MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G
--A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
--Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l
--dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh
--bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq
--hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq
--eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe
--r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5
--3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd
--vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l
--mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC
--wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg
--hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0
--TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
--biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg
--ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg
--dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6
--b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl
--c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0
--ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3
--dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu
--ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh
--bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo
--ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3
--Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u
--ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA
--A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ
--MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+
--NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR
--VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY
--83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3
--macqaJVmlaut74nLYKkGEsaUR+ko
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
--MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
--MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
--dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
--UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
--ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
--SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
--c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
--OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
--mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
--BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
--qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
--gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
--BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
--bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
--dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
--6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
--h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
--/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
--wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
--pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
--ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
--aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
--ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
--NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
--A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
--VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
--SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
--MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
--VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
--w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
--mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
--4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
--4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
--DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
--EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
--SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
--ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
--vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
--hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
--Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
--/L7fCg0=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
--TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
--aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
--aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
--MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
--IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
--dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
--9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
--li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
--rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
--WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
--F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
--xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
--Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
--dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
--ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
--IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
--c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
--ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
--Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
--KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
--KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
--y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
--dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
--VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
--MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
--fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
--7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
--cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
--mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
--xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
--SnQ2+Q==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
--GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
--b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
--BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
--YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
--GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
--Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
--WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
--rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
--+ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
--ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
--Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
--PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
--/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
--oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
--yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
--EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
--A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
--MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
--ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
--BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
--g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
--fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
--WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
--B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
--hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
--TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
--mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
--ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
--4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
--8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
--GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
--b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
--BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
--YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
--V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
--4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
--H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
--8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
--vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
--mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
--btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
--T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
--WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
--c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
--4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
--VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
--CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
--aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
--aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
--dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
--czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
--A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
--TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
--Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
--7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
--d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
--+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
--4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
--t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
--DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
--k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
--zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
--Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
--mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
--4SVhM7JZG+Ju1zdXtg2pEto=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
--IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
--BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
--aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
--9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
--NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
--azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
--YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
--Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
--cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
--cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
--2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
--JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
--Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
--n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
--PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
--MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
--dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
--BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
--MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
--eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
--/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
--wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
--AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
--PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
--AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
--BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
--MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
--HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
--Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
--f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
--rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
--6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
--7CAFYd4=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
--UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
--R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
--MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
--A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
--JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
--SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
--WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
--SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
--u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
--A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
--Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
--MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
--aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
--IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
--cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
--YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
--bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
--bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
--aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
--aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
--ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
--YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
--ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
--LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
--Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
--eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
--CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
--A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
--Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
--lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
--b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
--9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
--ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
--IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCB
--rjELMAkGA1UEBhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcp
--MRIwEAYDVQQHEwlTdHV0dGdhcnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fz
--c2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVTLVRSVVNUIEF1dGhlbnRpY2F0aW9u
--IGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0wNTA2MjIwMDAwMDBa
--Fw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4t
--V3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMg
--RGV1dHNjaGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJV
--U1QgQXV0aGVudGljYXRpb24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBO
--MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1
--toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob4QSwI7+Vio5bG0F/WsPo
--TUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXLg3KSwlOy
--ggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1
--XgqfeN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteF
--hy+S8dF2g08LOlk3KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm
--7QIDAQABo4GSMIGPMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEG
--MCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJvbmxpbmUxLTIwNDgtNTAdBgNV
--HQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAUD8oeXHngovMp
--ttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
--pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFo
--LtU96G7m1R08P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersF
--iXOMy6ZNwPv2AtawB6MDwidAnwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0y
--h9WUUpY6RsZxlj33mA6ykaqP2vROJAA5VeitF7nTNCtKqUDMFypVZUF0Qn71wK/I
--k63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8bHz2eBIPdltkdOpQ=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
--MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
--A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
--MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
--Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
--QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
--i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
--h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
--MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
--UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
--8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
--h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
--VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
--AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
--KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
--X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
--QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
--pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
--QSdJQO7e5iNEOdyhIta6A/I=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
--MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
--FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
--MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
--cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
--AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
--Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
--0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
--wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
--7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
--8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
--BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
--/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
--JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
--NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
--6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
--3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
--D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
--CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
--3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
--MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
--GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
--MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
--Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
--SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
--iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
--/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
--jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
--HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
--sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
--gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
--MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
--KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
--AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
--URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
--H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
--I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
--iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
--f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
--MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
--U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
--MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
--IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
--bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
--ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
--RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
--zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
--bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
--MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
--VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
--OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
--CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
--tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
--q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
--EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
--Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
--VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
--MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
--dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
--WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
--VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
--DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
--9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
--DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
--Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
--QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
--xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
--A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
--AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
--kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
--Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
--Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
--JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
--RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
--MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx
--MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV
--BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG
--29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk
--oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk
--3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL
--qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN
--nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw
--DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG
--MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX
--ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H
--DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO
--TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv
--kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w
--zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
--MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
--MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
--BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
--Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
--5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
--3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
--vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
--8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
--DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
--MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
--zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
--3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
--FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
--Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
--ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
--TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
--dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
--MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
--ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
--MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
--ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
--9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
--hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
--tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
--BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
--SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
--OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
--cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
--7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
--/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
--eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
--u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
--7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
--iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
--TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
--dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
--DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
--ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
--b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
--qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
--uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
--Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
--pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
--5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
--UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
--GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
--5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
--6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
--eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
--B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
--BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
--L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
--HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
--SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
--CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
--5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
--IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
--gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
--+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
--vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
--bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
--N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
--Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
--ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
--MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
--U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
--NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
--ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
--ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
--DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
--8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
--+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
--X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
--K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
--1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
--A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
--zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
--YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
--bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
--DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
--L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
--eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
--xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
--VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
--WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
--EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
--HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
--ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
--MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
--b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
--aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
--Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
--ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
--nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
--HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
--Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
--dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
--HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
--BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
--CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
--sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
--4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
--8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
--pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
--mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
--EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
--HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
--ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
--MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
--VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
--ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
--dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
--OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
--8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
--Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
--hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
--6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
--DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
--AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
--bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
--ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
--qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
--iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
--0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
--sSi6
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
--MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
--Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
--dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
--MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
--U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
--cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
--A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
--pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
--OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
--Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
--Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
--HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
--Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
--+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
--Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
--Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
--26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
--AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
--FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
--ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
--LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
--BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
--Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
--dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
--cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
--YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
--dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
--bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
--YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
--TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
--9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
--jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
--FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
--ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
--ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
--EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
--L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
--yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
--O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
--um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
--NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
--BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
--biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
--MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
--d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
--CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
--76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
--bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
--6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
--emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
--MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
--MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
--MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
--FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
--aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
--gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
--qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
--lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
--8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
--L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
--45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
--UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
--O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
--bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
--GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
--77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
--hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
--92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
--Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
--ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
--Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
--BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
--IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
--WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
--ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
--ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
--IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
--IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
--6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
--jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
--izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
--+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
--zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
--pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
--KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
--ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
--AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
--BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
--ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
--IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
--A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
--uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
--FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
--jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
--u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
--YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
--puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
--icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
--DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
--kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
--Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
--BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
--IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
--RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
--U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
--MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
--Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
--YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
--nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
--6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
--eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
--c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
--MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
--HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
--jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
--5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
--rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
--F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
--wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
--cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
--AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
--WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
--xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
--2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
--IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
--aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
--em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
--dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
--OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
--hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
--tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
--MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
--YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
--Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
--AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
--Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
--BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
--m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
--FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
--TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
--EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
--kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
--HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
--vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
--19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
--L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
--bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
--JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
--FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
--BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
--K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
--ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
--Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
--sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
--3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
--ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
--mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
--b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
--rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
--hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
--zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
--MBr1mmz0DlP5OlvRHA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
--MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
--BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
--Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
--OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
--SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
--VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
--ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
--tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
--uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
--XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
--8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
--5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
--EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
--kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
--dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
--Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
--JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
--Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
--TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
--GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
--ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
--au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
--hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
--dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
--MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
--BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
--Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
--OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
--SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
--VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
--ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
--Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
--Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
--1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
--ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
--Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
--EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
--XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
--dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
--Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
--JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
--Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
--TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
--irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
--TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
--g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
--95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
--S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
--MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
--BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
--c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
--MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
--R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
--VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
--AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
--JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
--fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
--jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
--wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
--fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
--VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
--BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
--CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
--7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
--8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
--ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
--ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
--2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
--SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
--Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
--BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
--cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
--vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
--Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
--0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
--4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
--eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
--R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
--A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
--dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
--Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
--WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
--HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
--KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
--Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
--wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
--2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
--9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
--jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
--aQNiuJkFBT1reBK9sG9l
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE
--SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw
--ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU
--REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
--MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr
--2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s
--2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU
--GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj
--dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r
--TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/
--BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB
--AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv
--c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl
--ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu
--MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg
--T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud
--HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD
--VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny
--bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
--MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ
--J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG
--SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom
--JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO
--inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y
--caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB
--mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ
--YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9
--BKNDLdr8C2LqL19iUw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
--UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
--c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
--MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
--dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
--MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
--dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
--VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
--xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
--xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
--XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
--heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
--YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
--urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
--JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
--b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
--9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
--kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
--fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
--B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
--aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
--RGQDJereW26fyfJOrN3H
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
--UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
--c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
--S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
--SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
--WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
--bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
--UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
--bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
--LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
--AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
--J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
--R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
--Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
--JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
--zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
--Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
--KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
--ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
--Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
--gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
--uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
--y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
--MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
--V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
--WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
--LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
--aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
--AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
--AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
--K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
--RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
--rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
--3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
--HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
--hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
--MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
--XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
--lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
--aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
--YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
--MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
--YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
--PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
--Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
--AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
--IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
--gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
--yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
--F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
--jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
--ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
--VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
--YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
--EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
--Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
--DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
--MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
--UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
--TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
--qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
--ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
--JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
--hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
--EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
--nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
--udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
--ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
--LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
--pYYsfPQS
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
--FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
--VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
--biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
--dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
--MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
--MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
--A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
--b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
--cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
--bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
--VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
--ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
--uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
--9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
--hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
--pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
--FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
--VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
--biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
--MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
--MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
--DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
--dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
--cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
--DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
--gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
--yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
--L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
--EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
--7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
--QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
--qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
--MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
--bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
--VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
--YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
--dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
--ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
--Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
--GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
--aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
--QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
--xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
--aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
--IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
--IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
--gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
--O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
--fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
--lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
--hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
--AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
--BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
--NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
--wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
--7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
--gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
--oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
--yZyQ2uypQjyttgI=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
--kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
--Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
--dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
--IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
--EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
--VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
--dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
--BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
--E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
--D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
--4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
--lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
--bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
--o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
--MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
--LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
--BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
--AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
--Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
--j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
--KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
--2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
--mfnGV/TJVTl4uix5yaaIK/QI
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB
--rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
--Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
--dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt
--Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa
--Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV
--BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l
--dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE
--AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls
--MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B
--YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9
--hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l
--L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm
--SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM
--1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws
--6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
--DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw
--Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50
--aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
--AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u
--7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0
--xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ
--rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim
--eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk
--USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
--lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
--Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
--dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
--SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
--A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
--MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
--d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
--cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
--0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
--M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
--MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
--oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
--DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
--oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
--VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
--dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
--bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
--BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
--//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
--CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
--CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
--3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
--KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
--IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
--BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
--aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
--9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
--NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
--azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
--YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
--Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
--cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
--LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
--TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
--TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
--LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
--I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
--nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
--IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
--BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
--aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
--9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
--NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
--azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
--YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
--Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
--cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
--dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
--WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
--v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
--UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
--IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
--W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
--MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
--ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
--biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
--U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
--aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
--A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
--U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
--SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
--biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
--IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
--GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
--fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
--AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
--aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
--aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
--kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
--4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
--FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
--yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
--ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
--U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
--ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
--aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
--MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
--ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
--biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
--U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
--aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
--nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
--t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
--SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
--BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
--rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
--NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
--BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
--BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
--aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
--MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
--p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
--5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
--WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
--4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
--hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
--vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
--ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
--U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
--ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
--Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
--MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
--IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
--IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
--bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
--AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
--9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
--H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
--LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
--/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
--rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
--EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
--WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
--exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
--DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
--sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
--seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
--4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
--BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
--lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
--7M2CYfE45k+XmCpajQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG
--A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
--cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
--MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
--BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt
--YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
--ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f
--zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi
--TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G
--CSqGSIb3DQEBBQUAA4GBAFgVKTk8d6PaXCUDfGD67gmZPCcQcMgMCeazh88K4hiW
--NWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n0a3hUKw8fGJLj7qE1xIV
--Gx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZRjXZ+Hxb
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
--BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
--c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
--MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
--emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
--DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
--FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg
--UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
--YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
--MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
--AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK
--VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm
--Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID
--AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J
--h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul
--uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68
--DzFc6PLZ
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
--CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
--cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
--LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
--aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
--dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
--VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
--aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
--bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
--IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
--LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
--nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
--8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
--ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
--PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
--6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
--n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
--qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
--wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
--ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
--pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
--E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
--CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
--YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
--MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
--aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
--Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
--MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
--IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
--KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
--eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
--AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
--HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
--DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
--AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
--nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
--rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
--jBJ7xUS0rg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
--BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
--aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
--IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
--Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
--eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
--BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
--Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
--Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
--Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
--IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
--J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
--JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
--wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
--koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
--qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
--Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
--xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
--7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
--sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
--sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
--cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
--A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
--cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
--MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
--BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
--YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
--ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
--BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
--I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
--CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
--lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
--AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
--BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
--c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
--MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
--emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
--DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
--FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
--UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
--YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
--MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
--AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
--pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
--13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
--AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
--U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
--F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
--oJ2daZH9
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
--CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
--cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
--LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
--aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
--dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
--VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
--aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
--bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
--IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
--LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
--N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
--KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
--kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
--CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
--Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
--imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
--2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
--DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
--/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
--F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
--TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
--CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
--cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
--LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
--aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
--dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
--VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
--aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
--bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
--IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
--LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
--GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
--+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
--U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
--NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
--ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
--ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
--CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
--g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
--fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
--2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
--bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
--MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
--cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
--bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
--CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
--dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
--cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
--2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
--lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
--ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
--299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
--vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
--dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
--AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
--AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
--zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
--LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
--7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
--++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
--398znM/jra6O1I7mT1GvFpLgXPYHDw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
--IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
--cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
--dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
--MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
--bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
--DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
--ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
--WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
--Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
--HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
--z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
--SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
--AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
--KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
--AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
--BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
--VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
--ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
--Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
--ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
--/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
--A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
--k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
--iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
--2G0xffX8oRAHh84vWdw+WNs=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
--VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD
--ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v
--dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0
--MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww
--KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G
--A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
--MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13
--5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE
--SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O
--JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu
--ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE
--AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB
--AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB
--CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw
--b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo
--7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/
--0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7
--nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
--x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ
--33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
--gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
--MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
--UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
--NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
--dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
--dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
--dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
--38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
--KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
--DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
--qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
--JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
--PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
--BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
--jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
--eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
--ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
--vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
--qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
--IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
--i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
--O+7ETPTsJ3xCwnR8gooJybQDJbw=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
--AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
--QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
--MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
--ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
--0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
--UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
--RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
--OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
--JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
--AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
--BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
--LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
--MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
--44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
--Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
--i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
--9u6wWk5JRFRYX0KD
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
--MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
--ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
--Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
--IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
--SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
--AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
--SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
--ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
--DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
--TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
--fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
--sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
--WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
--nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
--dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
--NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
--AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
--MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
--ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
--uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
--PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
--JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
--gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
--j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
--5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
--o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
--/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
--Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
--W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
--hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
--qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
--Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
--MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
--BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
--NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
--LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
--A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
--IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
--SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
--W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
--3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
--6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
--Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
--NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
--MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
--r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
--DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
--YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
--xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
--/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
--LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
--jVaMaA==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
--MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
--IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
--BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
--MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
--d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
--YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
--dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
--BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
--papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
--BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
--DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
--KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
--XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
--rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
--Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
--MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
--BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
--Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
--LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
--MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
--ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
--MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
--gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
--YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
--b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
--9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
--zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
--OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
--HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
--2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
--oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
--t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
--KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
--m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
--MdRAGmI0Nj81Aa6sY6A=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIIDjCCBfagAwIBAgIJAOiOtsn4KhQoMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
--VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlz
--MSgwJgYDVQQKEx9Tb2Z0d2FyZSBpbiB0aGUgUHVibGljIEludGVyZXN0MRMwEQYD
--VQQLEwpob3N0bWFzdGVyMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkx
--JTAjBgkqhkiG9w0BCQEWFmhvc3RtYXN0ZXJAc3BpLWluYy5vcmcwHhcNMDgwNTEz
--MDgwNzU2WhcNMTgwNTExMDgwNzU2WjCBvDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
--B0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMfU29mdHdh
--cmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1hc3RlcjEe
--MBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcNAQkBFhZo
--b3N0bWFzdGVyQHNwaS1pbmMub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
--CgKCAgEA3DbmR0LCxFF1KYdAw9iOIQbSGE7r7yC9kDyFEBOMKVuUY/b0LfEGQpG5
--GcRCaQi/izZF6igFM0lIoCdDkzWKQdh4s/Dvs24t3dHLfer0dSbTPpA67tfnLAS1
--fOH1fMVO73e9XKKTM5LOfYFIz2u1IiwIg/3T1c87Lf21SZBb9q1NE8re06adU1Fx
--Y0b4ShZcmO4tbZoWoXaQ4mBDmdaJ1mwuepiyCwMs43pPx93jzONKao15Uvr0wa8u
--jyoIyxspgpJyQ7zOiKmqp4pRQ1WFmjcDeJPI8L20QcgHQprLNZd6ioFl3h1UCAHx
--ZFy3FxpRvB7DWYd2GBaY7r/2Z4GLBjXFS21ZGcfSxki+bhQog0oQnBv1b7ypjvVp
--/rLBVcznFMn5WxRTUQfqzj3kTygfPGEJ1zPSbqdu1McTCW9rXRTunYkbpWry9vjQ
--co7qch8vNGopCsUK7BxAhRL3pqXTT63AhYxMfHMgzFMY8bJYTAH1v+pk1Vw5xc5s
--zFNaVrpBDyXfa1C2x4qgvQLCxTtVpbJkIoRRKFauMe5e+wsWTUYFkYBE7axt8Feo
--+uthSKDLG7Mfjs3FIXcDhB78rKNDCGOM7fkn77SwXWfWT+3Qiz5dW8mRvZYChD3F
--TbxCP3T9PF2sXEg2XocxLxhsxGjuoYvJWdAY4wCAs1QnLpnwFVMCAwEAAaOCAg8w
--ggILMB0GA1UdDgQWBBQ0cdE41xU2g0dr1zdkQjuOjVKdqzCB8QYDVR0jBIHpMIHm
--gBQ0cdE41xU2g0dr1zdkQjuOjVKdq6GBwqSBvzCBvDELMAkGA1UEBhMCVVMxEDAO
--BgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMf
--U29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1h
--c3RlcjEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcN
--AQkBFhZob3N0bWFzdGVyQHNwaS1pbmMub3JnggkA6I62yfgqFCgwDwYDVR0TAQH/
--BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwCQYDVR0SBAIwADAuBglghkgBhvhC
--AQ0EIRYfU29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDAwBglghkgBhvhC
--AQQEIxYhaHR0cHM6Ly9jYS5zcGktaW5jLm9yZy9jYS1jcmwucGVtMDIGCWCGSAGG
--+EIBAwQlFiNodHRwczovL2NhLnNwaS1pbmMub3JnL2NlcnQtY3JsLnBlbTAhBgNV
--HREEGjAYgRZob3N0bWFzdGVyQHNwaS1pbmMub3JnMA4GA1UdDwEB/wQEAwIBBjAN
--BgkqhkiG9w0BAQUFAAOCAgEAtM294LnqsgMrfjLp3nI/yUuCXp3ir1UJogxU6M8Y
--PCggHam7AwIvUjki+RfPrWeQswN/2BXja367m1YBrzXU2rnHZxeb1NUON7MgQS4M
--AcRb+WU+wmHo0vBqlXDDxm/VNaSsWXLhid+hoJ0kvSl56WEq2dMeyUakCHhBknIP
--qxR17QnwovBc78MKYiC3wihmrkwvLo9FYyaW8O4x5otVm6o6+YI5HYg84gd1GuEP
--sTC8cTLSOv76oYnzQyzWcsR5pxVIBcDYLXIC48s9Fmq6ybgREOJJhcyWR2AFJS7v
--dVkz9UcZFu/abF8HyKZQth3LZjQl/GaD68W2MEH4RkRiqMEMVObqTFoo5q7Gt/5/
--O5aoLu7HaD7dAD0prypjq1/uSSotxdz70cbT0ZdWUoa2lOvUYFG3/B6bzAKb1B+P
--+UqPti4oOxfMxaYF49LTtcYDyeFIQpvLP+QX4P4NAZUJurgNceQJcHdC2E3hQqlg
--g9cXiUPS1N2nGLar1CQlh7XU4vwuImm9rWgs/3K1mKoGnOcqarihk3bOsPN/nOHg
--T7jYhkalMwIsJWE3KpLIrIF0aGOHM3a9BX9e1dUCbb2v/ypaqknsmHlHU5H2DjRa
--yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE
--o2A=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
--8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
--dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
--YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
--dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
--IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
--LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
--EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
--KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
--ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
--bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
--ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
--BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
--85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
--4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
--HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
--QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
--lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
--o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
--BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
--opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
--dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
--ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
--AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
--/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
--SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
--Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
--Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
--nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
--RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
--dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
--YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
--NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
--EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
--cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
--c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
--BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
--dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
--fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
--bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
--75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
--FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
--HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
--5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
--b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
--A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
--6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
--TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
--dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
--Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
--l7WdmplNsDz4SgCbZN2fOUvRJ9e4
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
--MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
--U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
--DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
--dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
--YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
--OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
--zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
--VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
--hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
--ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
--awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
--OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
--DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
--coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
--okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
--t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
--1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
--SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
--BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
--MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
--IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
--SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
--ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
--MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
--UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
--4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
--KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
--gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
--rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
--51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
--be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
--KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
--v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
--fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
--jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
--ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
--ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
--e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
--jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
--WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
--SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
--pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
--X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
--fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
--K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
--ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
--LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
--LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
--MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
--Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
--TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
--HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
--BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
--6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
--L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
--1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
--MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
--QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
--arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
--Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
--FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
--P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
--9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
--AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
--uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
--9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
--A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
--OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
--+fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
--KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
--DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
--H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
--I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
--5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
--3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
--Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
--MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
--Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
--TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
--HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
--BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
--ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
--N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
--tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
--0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
--/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
--KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
--zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
--O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
--34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
--K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
--AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
--Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
--QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
--cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
--IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
--HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
--O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
--033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
--dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
--kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
--3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
--u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
--4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
--BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
--MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
--MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
--EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
--ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
--D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
--OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
--fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
--IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
--oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
--/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
--rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
--3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
--7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
--yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
--qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
--DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
--hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
--xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
--SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
--HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
--emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
--AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
--7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
--DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
--F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
--a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
--Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
--BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
--MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
--MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
--EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
--ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
--NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
--PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
--x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
--QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
--yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
--QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
--H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
--QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
--i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
--nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
--rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
--DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
--hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
--tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
--GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
--lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
--+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
--TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
--nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
--gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
--G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
--zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
--L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
--Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
--Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
--aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
--Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
--SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
--aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
--ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
--7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
--DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
--zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
--hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
--4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
--gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
--NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
--FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
--j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
--52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
--echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
--ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
--zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
--wy39FCqQmbkHzJ8=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
--MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
--bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
--ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
--HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
--BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
--UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
--tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
--ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
--lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
--/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
--A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
--A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
--dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
--MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
--cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
--L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
--BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
--acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
--o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
--zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
--PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
--Johw1+qRzT65ysCQblrGXnRl11z+o+I=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
--MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
--bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
--NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
--BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
--hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
--ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
--3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
--qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
--p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
--HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
--ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
--HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
--Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
--c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
--RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
--dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
--Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
--3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
--nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
--CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
--xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
--KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
--MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
--czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
--CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
--MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
--ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
--b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
--AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
--euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
--bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
--WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
--MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
--1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
--VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
--zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
--BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
--BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
--v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
--E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
--uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
--iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
--GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
--dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
--YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
--dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
--aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
--IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
--KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
--MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
--b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
--KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
--A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
--aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
--hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
--7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
--BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
--ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
--JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
--PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
--0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
--0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
--6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
--v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
--K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
--bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
--MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
--MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
--gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
--b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
--bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
--cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
--ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
--ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
--hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
--AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
--MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
--RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
--UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
--cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
--Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
--AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
--AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
--1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
--3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
--Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
--HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
--pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
--sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
--qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
--mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
--opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
--YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
--MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
--Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
--dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
--MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
--U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
--cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
--A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
--pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
--OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
--Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
--Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
--HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
--Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
--+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
--Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
--Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
--26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
--AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
--VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
--F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
--ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
--ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
--aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
--YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
--c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
--aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
--d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
--CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
--dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
--wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
--Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
--0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
--pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
--CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
--P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
--1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
--KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
--JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
--8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
--fyWl8kgAwKQB2j8=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
--MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
--aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
--OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
--A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
--CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
--JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
--vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
--D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
--Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
--RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
--HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
--nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
--0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
--UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
--Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
--TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
--AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
--BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
--2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
--UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
--6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
--9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
--HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
--wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
--XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
--IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
--hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
--so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
--MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
--YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
--Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
--AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
--Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
--BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
--jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
--0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
--2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
--ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
--y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
--tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
--6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
--uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
--acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
--k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
--VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
--FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
--BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
--b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
--fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
--/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
--REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
--srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
--aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
--woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
--Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
--t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
--8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
--9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
--wSsSnqaeG8XmDtkx2Q==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
--ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
--dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
--IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
--VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
--dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
--MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
--UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
--1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
--oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
--HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
--5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
--idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
--OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
--NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
--46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
--UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
--7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
--A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
--MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
--bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
--XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
--PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
--Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
--WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
--Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
--7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
--nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
--vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
--WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
--fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
--I+2ksx0WckNLIOFZfsLorSa/ovc=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
--MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
--ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
--MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
--MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
--ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
--AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
--iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
--vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
--0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
--OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
--BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
--FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
--GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
--zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
--1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
--f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
--jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
--ZetX2fNXlrtIzYE=
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
--KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
--BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
--YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
--OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
--aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
--ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
--CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
--8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
--RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
--hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
--ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
--EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
--QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
--A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
--WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
--1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
--6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
--91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
--e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
--TpPDpFQUWw==
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
--UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
--c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
--S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
--SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
--OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
--b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
--VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
--sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
--ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
--ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
--KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
--+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
--HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
--IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
--733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
--Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
--CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
--AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
--aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
--mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
--XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
--qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
-------END CERTIFICATE-----
-------BEGIN CERTIFICATE-----
--MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
--A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
--cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
--MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
--BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
--YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
--ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
--BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
--I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
--CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
--2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
--2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
-------END CERTIFICATE-----
diff --git a/patches/claws_mail/06-litehtml.patch b/patches/claws_mail/06-litehtml.patch
deleted file mode 100644
index 04b2a2a..0000000
--- a/patches/claws_mail/06-litehtml.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-# Commits 6fce79c9 -> 8eaf132b from claws.git
-
-diff --git a/src/plugins/litehtml_viewer/container_linux.cpp b/src/plugins/litehtml_viewer/container_linux.cpp
-index ac0f40e0e..4a455696f 100644
---- a/src/plugins/litehtml_viewer/container_linux.cpp
-+++ b/src/plugins/litehtml_viewer/container_linux.cpp
-@@ -127,21 +127,12 @@ void container_linux::draw_background( litehtml::uint_ptr hdc, const litehtml::b
- litehtml::tstring url;
- make_url(bg.image.c_str(), bg.baseurl.c_str(), url);
-
-- const image *img_i = NULL;
--
- lock_images_cache();
-
-- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
-- const image *i = &(*ii);
-- if (i->first == url) {
-- img_i = i;
-- break;
-- }
-- }
--
-- if(img_i != NULL && img_i->second)
-+ auto i = m_images.find(url);
-+ if(i != m_images.end() && i->second.first)
- {
-- GdkPixbuf *bgbmp = img_i->second;
-+ GdkPixbuf *bgbmp = i->second.first;
-
- GdkPixbuf *new_img;
- if(bg.image_size.width != gdk_pixbuf_get_width(bgbmp) || bg.image_size.height != gdk_pixbuf_get_height(bgbmp))
-diff --git a/src/plugins/litehtml_viewer/container_linux.h b/src/plugins/litehtml_viewer/container_linux.h
-index f35ffeab1..05c66ce4f 100644
---- a/src/plugins/litehtml_viewer/container_linux.h
-+++ b/src/plugins/litehtml_viewer/container_linux.h
-@@ -20,6 +20,7 @@
- #include <vector>
- #include <list>
- #include <string>
-+#include <sys/time.h>
-
- #include <cairo.h>
- #include <gtk/gtk.h>
-@@ -54,8 +55,8 @@ struct cairo_clip_box
-
- class container_linux : public litehtml::document_container
- {
-- typedef std::pair<litehtml::tstring, GdkPixbuf*> image;
-- typedef std::list<image> images_map;
-+ typedef std::pair<GdkPixbuf*, struct timeval> img_cache_entry;
-+ typedef std::map<litehtml::tstring, img_cache_entry> images_map;
-
- protected:
- cairo_surface_t* m_temp_surface;
-@@ -92,10 +93,10 @@ public:
-
- /* Trim down images cache to less than desired_size [bytes],
- * starting from oldest stored. */
-- gint clear_images(gint desired_size);
-+ gint clear_images(gsize desired_size);
-
-- void add_image_to_cache(const gchar *url, GdkPixbuf *image);
-- virtual void redraw(gboolean force_render) = 0;
-+ void update_image_cache(const gchar *url, GdkPixbuf *image);
-+ virtual void rerender() = 0;
- virtual GdkPixbuf *get_local_image(const litehtml::tstring url) const = 0;
-
- protected:
-diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
-index 5ef7c0ced..1e0d70f83 100644
---- a/src/plugins/litehtml_viewer/container_linux_images.cpp
-+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
-@@ -20,12 +20,15 @@
- #include "claws-features.h"
- #endif
-
-+#include <set>
- #include "common/utils.h"
-
- #include "container_linux.h"
- #include "http.h"
- #include "lh_prefs.h"
-
-+typedef std::pair<litehtml::tstring, struct timeval> lru_entry;
-+
- static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
- {
- GError *error = NULL;
-@@ -37,8 +40,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
-
- if (error || !image) {
- if (error) {
-- g_warning("lh_get_image: Could not create pixbuf %s",
-- error->message);
-+ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
-+ url, error->message);
- g_clear_error(&error);
- }
- goto theend;
-@@ -46,8 +49,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
-
- pixbuf = gdk_pixbuf_new_from_stream(image, NULL, &error);
- if (error) {
-- g_warning("lh_get_image: Could not create pixbuf %s",
-- error->message);
-+ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
-+ url, error->message);
- pixbuf = NULL;
- g_clear_error(&error);
- }
-@@ -80,10 +83,8 @@ static void get_image_callback(GObject *source, GAsyncResult *res, gpointer user
-
- pixbuf = GDK_PIXBUF(g_task_propagate_pointer(G_TASK(res), NULL));
-
-- if (pixbuf != NULL) {
-- ctx->container->add_image_to_cache(ctx->url, pixbuf);
-- ctx->container->redraw(true);
-- }
-+ ctx->container->update_image_cache(ctx->url, pixbuf);
-+ ctx->container->rerender();
-
- g_free(ctx->url);
- g_free(ctx);
-@@ -93,33 +94,36 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
- {
- litehtml::tstring url;
- make_url(src, baseurl, url);
-- bool found = false;
--
-- lock_images_cache();
-+ bool request = false;
-+ struct timeval last;
-
-- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
-- const image *i = &(*ii);
-+ gettimeofday(&last, NULL);
-
-- if (!strcmp(i->first.c_str(), url.c_str())) {
-- found = true;
-- break;
-- }
-- }
--
-- unlock_images_cache();
--
-- if (!found) {
-- struct FetchCtx *ctx;
-+ lock_images_cache();
-
-+ auto i = m_images.find(url);
-+ if(i == m_images.end()) {
- /* Attached images can be loaded into cache right here. */
- if (!strncmp(src, "cid:", 4)) {
- GdkPixbuf *pixbuf = get_local_image(src);
-
- if (pixbuf != NULL)
-- add_image_to_cache(src, pixbuf);
-+ m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
-
- return;
-+ } else {
-+ request = true;
-+ m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
- }
-+ } else {
-+ debug_print("found image cache entry: %p '%s'\n", i->second.first, url.c_str());
-+ i->second.second = last;
-+ }
-+
-+ unlock_images_cache();
-+
-+ if (request) {
-+ struct FetchCtx *ctx;
-
- if (!lh_prefs_get()->enable_remote_content) {
- debug_print("blocking download of image from '%s'\n", src);
-@@ -132,11 +136,9 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
- ctx->url = g_strdup(url.c_str());
- ctx->container = this;
-
-- GTask *task = g_task_new(this, NULL, get_image_callback, ctx);
-+ GTask *task = g_task_new(NULL, NULL, get_image_callback, ctx);
- g_task_set_task_data(task, ctx, NULL);
- g_task_run_in_thread(task, get_image_threaded);
-- } else {
-- debug_print("found image in cache: '%s'\n", url.c_str());
- }
- }
-
-@@ -144,43 +146,54 @@ void container_linux::get_image_size( const litehtml::tchar_t* src, const liteht
- {
- litehtml::tstring url;
- make_url(src, baseurl, url);
-- bool found = false;
-- const image *img = NULL;
-+ const GdkPixbuf *img = NULL;
-
- lock_images_cache();
-
-- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
-- const image *i = &(*ii);
-- if (i->first == url) {
-- img = i;
-- found = true;
-- break;
-- }
-- }
--
-- if(img != NULL)
-- {
-- sz.width = gdk_pixbuf_get_width(img->second);
-- sz.height = gdk_pixbuf_get_height(img->second);
-- } else
-- {
-- sz.width = 0;
-- sz.height = 0;
-+ auto i = m_images.find(url);
-+ if (i != m_images.end() && i->second.first) {
-+ img = i->second.first;
-+ sz.width = gdk_pixbuf_get_width(img);
-+ sz.height = gdk_pixbuf_get_height(img);
-+ } else {
-+ sz.width = 0;
-+ sz.height = 0;
- }
-
- unlock_images_cache();
- }
-
--void container_linux::add_image_to_cache(const gchar *url, GdkPixbuf *image)
-+void container_linux::update_image_cache(const gchar *url, GdkPixbuf *image)
- {
- g_return_if_fail(url != NULL);
-- g_return_if_fail(image != NULL);
-
-- debug_print("adding image to cache: '%s'\n", url);
-+ debug_print("updating image cache: %p '%s'\n", image, url);
- lock_images_cache();
-- m_images.push_back(std::make_pair(url, image));
-+ auto i = m_images.find(url);
-+ if(i == m_images.end()) {
-+ g_warning("image '%s' was not found in pixbuf cache\n", url);
-+ unlock_images_cache();
-+ return;
-+ }
-+
-+ if(i->second.first != NULL && i->second.first != image) {
-+ g_warning("pixbuf pointer for image '%s' changed\n", url);
-+ g_object_unref(i->second.first);
-+ }
-+
-+ if(image == NULL) {
-+ /* A null pixbuf pointer presumably means the download failed,
-+ * so remove the cache entry to allow for future retries. */
-+ debug_print("warning - new pixbuf for '%s' is null\n", url);
-+ m_images.erase(i);
-+ unlock_images_cache();
-+ return;
-+ }
-+
-+ i->second.first = image;
- unlock_images_cache();
- }
-+
- void container_linux::lock_images_cache(void)
- {
- g_rec_mutex_lock(&m_images_lock);
-@@ -196,10 +209,8 @@ void container_linux::clear_images()
- lock_images_cache();
-
- for(auto i = m_images.begin(); i != m_images.end(); ++i) {
-- image *img = &(*i);
--
-- if (img->second) {
-- g_object_unref(img->second);
-+ if (i->second.first) {
-+ g_object_unref(i->second.first);
- }
- }
-
-@@ -208,54 +219,71 @@ void container_linux::clear_images()
- unlock_images_cache();
- }
-
--gint container_linux::clear_images(gint desired_size)
-+gint container_linux::clear_images(gsize desired_size)
- {
-- gint size = 0;
-+ gsize size = 0;
- gint num = 0;
-
- lock_images_cache();
-
-- /* First, remove all local images - the ones with "cid:"
-- * URL. We will remove their list elements later. */
-- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
-- image *img = &(*i);
--
-- if (!strncmp(img->first.c_str(), "cid:", 4)) {
-- g_object_unref(img->second);
-- img->second = NULL;
-+ /* First, remove all local images - the ones with "cid:" URL. */
-+ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
-+ if (!strncmp(i->first.c_str(), "cid:", 4)) {
-+ g_object_unref(i->second.first);
-+ i = m_images.erase(i);
- num++;
- }
- }
-
-- /* Now tally up size of all the stored GdkPixbufs and
-- * deallocate those which make the total size be above
-- * the desired_size limit. We will remove their list
-- * elements later. */
-- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
-- image *img = &(*i);
-- gint cursize;
-+ /* Second, build an LRU list */
-+ auto lru_comp_func = [](const lru_entry& l1, const lru_entry& l2) {
-+ return timercmp(&l1.second, &l2.second, <);
-+ };
-+ std::set<lru_entry, decltype(lru_comp_func)> lru(lru_comp_func);
-
-- if (img->second == NULL)
-+ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
-+ lru.insert(std::make_pair(i->first, i->second.second));
-+ }
-+
-+ /*
-+ for (auto l = lru.begin(); l != lru.end(); l++) {
-+ debug_print("lru dump: %d %d %s\n", l->second.tv_sec, l->second.tv_usec, l->first.c_str());
-+ }
-+ */
-+
-+ /* Last, walk the LRU list and remove the oldest entries that push it over
-+ * the desired size limit */
-+ for (auto l = lru.rbegin(); l != lru.rend(); ++l) {
-+ gsize cursize;
-+
-+ auto i = m_images.find(l->first);
-+
-+ if(i == m_images.end()) {
-+ g_warning("failed to find '%s' in m_images\n", l->first.c_str());
- continue;
-+ }
-
-- cursize = gdk_pixbuf_get_byte_length(img->second);
-+ if(i->second.first == NULL) {
-+ /* This should mean that the download is still in progress */
-+ debug_print("warning - trying to prune a null pixbuf for %s\n", i->first.c_str());
-+ continue;
-+ }
-
-+ cursize = gdk_pixbuf_get_byte_length(i->second.first);
-+ /*
-+ debug_print("clear_images: desired_size %d - size %d - cursize %d - %d %d %s\n",
-+ desired_size, size, cursize, l->second.tv_sec, l->second.tv_usec, l->first.c_str());
-+ */
- if (size + cursize > desired_size) {
-- g_object_unref(img->second);
-- img->second = NULL;
-+ debug_print("pruning %s from image cache\n", i->first.c_str());
-+ g_object_unref(i->second.first);
-+ m_images.erase(i);
- num++;
- } else {
- size += cursize;
- }
- }
-
-- /* Remove elements whose GdkPixbuf pointers point to NULL. */
-- m_images.remove_if([&](image _img) -> bool {
-- if (_img.second == NULL)
-- return true;
-- return false;
-- });
--
- unlock_images_cache();
-
- return num;
-diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
-index f846aef8c..453a56c7b 100644
---- a/src/plugins/litehtml_viewer/http.cpp
-+++ b/src/plugins/litehtml_viewer/http.cpp
-@@ -33,15 +33,20 @@ struct Data {
- };
-
- static size_t write_data(char* ptr, size_t size, size_t nmemb, void* data_ptr) {
-- struct Data* data = (struct Data *) data_ptr;
-- size_t realsize = size * nmemb;
--
-- g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
-- g_memdup(ptr, realsize), realsize,
-- g_free);
-- data->size += realsize;
-+ struct Data* data = (struct Data *) data_ptr;
-+ size_t realsize = size * nmemb;
-+
-+ g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
-+#if !GLIB_CHECK_VERSION (2, 68, 0)
-+ g_memdup(ptr, realsize),
-+#else
-+ g_memdup2(ptr, realsize),
-+#endif
-+ realsize,
-+ g_free);
-+ data->size += realsize;
-
-- return realsize;
-+ return realsize;
- }
-
- http::http()
-diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
-index ae33dfb9e..7c73346c5 100644
---- a/src/plugins/litehtml_viewer/lh_widget.cpp
-+++ b/src/plugins/litehtml_viewer/lh_widget.cpp
-@@ -60,6 +60,9 @@ lh_widget::lh_widget()
- {
- GtkWidget *item;
-
-+ m_force_render = false;
-+ m_blank = false;
-+
- /* scrolled window */
- m_scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_scrolled_window),
-@@ -193,11 +196,17 @@ void lh_widget::open_html(const gchar *contents)
- adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(m_scrolled_window));
- gtk_adjustment_set_value(adj, 0.0);
-- redraw(false);
-+ m_blank = false;
- }
- lh_widget_statusbar_pop();
- }
-
-+void lh_widget::rerender()
-+{
-+ m_force_render = true;
-+ gtk_widget_queue_draw(m_drawing_area);
-+}
-+
- void lh_widget::draw(cairo_t *cr)
- {
- double x1, x2, y1, y2;
-@@ -220,7 +229,7 @@ void lh_widget::draw(cairo_t *cr)
- m_html->draw((litehtml::uint_ptr)cr, 0, 0, &pos);
- }
-
--void lh_widget::redraw(gboolean force_render)
-+void lh_widget::redraw()
- {
- GtkAllocation rect;
- gint width;
-@@ -229,18 +238,16 @@ void lh_widget::redraw(gboolean force_render)
- cairo_region_t *creg;
- GdkDrawingContext *gdkctx;
-
-- paint_white();
--
- if (m_html == NULL)
- return;
-
- /* Get width of the viewport. */
-- gdkwin = gtk_viewport_get_view_window(GTK_VIEWPORT(m_viewport));
-- width = gdk_window_get_width(gdkwin);
-- m_height = gdk_window_get_height(gdkwin);
-+ gtk_widget_get_allocation(GTK_WIDGET(m_viewport), &rect);
-+ width = rect.width;
-+ m_height = rect.height;
-
- /* If the available width has changed, rerender the HTML content. */
-- if (m_rendered_width != width || force_render) {
-+ if (m_rendered_width != width || std::atomic_exchange(&m_force_render, false)) {
- debug_print("lh_widget::redraw: width changed: %d != %d\n",
- m_rendered_width, width);
-
-@@ -268,12 +275,18 @@ void lh_widget::redraw(gboolean force_render)
- g_warning("lh_widget::redraw: No GdkWindow to draw on!");
- return;
- }
-- creg = gdk_window_get_clip_region(gdkwin);
-+ creg = cairo_region_create_rectangle(&rect);
- gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
- cr = gdk_drawing_context_get_cairo_context(gdkctx);
- }
-
-- draw(cr);
-+ if(!std::atomic_exchange(&m_blank, false)) {
-+ draw(cr);
-+ } else {
-+ cairo_rectangle(cr, rect.x, rect.y, rect.width, rect.height);
-+ cairo_set_source_rgb(cr, 255, 255, 255);
-+ cairo_fill(cr);
-+ }
-
- /* Only destroy the used cairo context if we created it earlier. */
- if (m_cairo_context == NULL) {
-@@ -282,40 +295,10 @@ void lh_widget::redraw(gboolean force_render)
- }
- }
-
--void lh_widget::paint_white()
--{
-- GdkWindow *gdkwin = gtk_widget_get_window(m_drawing_area);
-- cairo_region_t *creg;
-- cairo_t *cr;
-- GdkDrawingContext *gdkctx;
--
-- if (gdkwin == NULL) {
-- g_warning("lh_widget::clear: No GdkWindow to draw on!");
-- return;
-- }
--
-- creg = gdk_window_get_clip_region(gdkwin);
-- gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
-- cr = gdk_drawing_context_get_cairo_context(gdkctx);
--
-- /* Paint white background. */
-- gint width, height;
-- width = gdk_window_get_width(gdkwin);
-- height = gdk_window_get_height(gdkwin);
-- cairo_rectangle(cr, 0, 0,
-- gdk_window_get_width(gdkwin),
-- gdk_window_get_height(gdkwin));
-- cairo_set_source_rgb(cr, 255, 255, 255);
-- cairo_fill(cr);
--
-- gdk_window_end_draw_frame(gdkwin, gdkctx);
-- cairo_region_destroy(creg);
--}
--
- void lh_widget::clear()
- {
- m_html = nullptr;
-- paint_white();
-+ m_blank = true;
- m_rendered_width = 0;
- m_base_url.clear();
- m_clicked_url.clear();
-@@ -324,7 +307,6 @@ void lh_widget::clear()
- void lh_widget::set_cursor(const litehtml::tchar_t* cursor)
- {
- litehtml::element::ptr over_el = m_html->over_element();
-- gint x, y;
-
- if (m_showing_url &&
- (over_el == NULL || over_el != m_over_element)) {
-@@ -508,7 +490,7 @@ static gboolean draw_cb(GtkWidget *widget, cairo_t *cr,
- {
- lh_widget *w = (lh_widget *)user_data;
- w->set_cairo_context(cr);
-- w->redraw(false);
-+ w->redraw();
- w->set_cairo_context(NULL);
- return FALSE;
- }
-@@ -520,13 +502,13 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
- lh_widget *w = (lh_widget *)user_data;
-
- if (w->m_html == NULL)
-- return false;
-+ return FALSE;
-
- //debug_print("lh_widget on_button_press_event\n");
-
- if (event->type == GDK_2BUTTON_PRESS ||
- event->type == GDK_3BUTTON_PRESS)
-- return true;
-+ return TRUE;
-
- /* Right-click */
- if (event->button == 3) {
-@@ -535,7 +517,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
- if (url != NULL)
- w->popup_context_menu(url, event);
-
-- return true;
-+ return TRUE;
- }
-
- if(w->m_html->on_lbutton_down((int) event->x, (int) event->y,
-@@ -546,7 +528,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
- }
- }
-
-- return true;
-+ return TRUE;
- }
-
- static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
-@@ -569,7 +551,7 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
- }
- }
-
-- return true;
-+ return TRUE;
- }
-
- static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
-@@ -577,20 +559,19 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
- {
- litehtml::position::vector redraw_boxes;
- lh_widget *w = (lh_widget *)user_data;
-- GError* error = NULL;
-
- if (w->m_html == NULL)
-- return false;
-+ return FALSE;
-
- //debug_print("lh_widget on_button_release_event\n");
-
- if (event->type == GDK_2BUTTON_PRESS ||
- event->type == GDK_3BUTTON_PRESS)
-- return true;
-+ return TRUE;
-
- /* Right-click */
- if (event->button == 3)
-- return true;
-+ return TRUE;
-
- w->m_clicked_url.clear();
-
-@@ -609,7 +590,7 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
- open_uri(w->m_clicked_url.c_str(), prefs_common_get_uri_cmd());
- }
-
-- return true;
-+ return TRUE;
- }
-
- static void open_link_cb(GtkMenuItem *item, gpointer user_data)
-diff --git a/src/plugins/litehtml_viewer/lh_widget.h b/src/plugins/litehtml_viewer/lh_widget.h
-index 378d80a71..827fad49e 100644
---- a/src/plugins/litehtml_viewer/lh_widget.h
-+++ b/src/plugins/litehtml_viewer/lh_widget.h
-@@ -18,6 +18,7 @@
- #include <gtk/gtk.h>
- #include <glib.h>
- #include <gio/gio.h>
-+#include <atomic>
-
- #include "procmime.h"
-
-@@ -54,7 +55,8 @@ class lh_widget : public container_linux
- void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos);
-
- void draw(cairo_t *cr);
-- void redraw(gboolean force_render);
-+ void rerender();
-+ void redraw();
- void open_html(const gchar *contents);
- void clear();
- void update_cursor(const litehtml::tchar_t* cursor);
-@@ -76,8 +78,6 @@ class lh_widget : public container_linux
- litehtml::tstring m_base_url;
-
- private:
-- void paint_white();
--
- gint m_rendered_width;
- GtkWidget *m_drawing_area;
- GtkWidget *m_scrolled_window;
-@@ -92,4 +92,6 @@ class lh_widget : public container_linux
-
- litehtml::tchar_t *m_font_name;
- int m_font_size;
-+ std::atomic<bool> m_force_render;
-+ std::atomic<bool> m_blank;
- };
diff --git a/patches/claws_mail/07-hexpand.patch b/patches/claws_mail/07-hexpand.patch
deleted file mode 100644
index 01a4371..0000000
--- a/patches/claws_mail/07-hexpand.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9674154cb67aa8c9fe672a285730233ab7df68d8 Mon Sep 17 00:00:00 2001
-From: Jonathan Boeing <jonathan at claws-mail.org>
-Date: Thu, 29 Jul 2021 17:26:33 -0700
-Subject: [PATCH] Set hexpand on toolbars
-
-Depending on the Windows version and theme, a non-horizontally expanded
-toolbar has a sharp visual discontinuity between the toolbar button
-backgrounds and the background next to the toolbar.
-
-Enabling horizontal expansion gives a seamless background across the width
-of the window.
----
- src/toolbar.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/toolbar.c b/src/toolbar.c
-index 682b7b964..c2fe7de0c 100644
---- a/src/toolbar.c
-+++ b/src/toolbar.c
-@@ -2262,6 +2262,7 @@ Toolbar *toolbar_create(ToolbarType type,
-
- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
- gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
-+ gtk_widget_set_hexpand(toolbar, TRUE);
-
- for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-
---
-2.20.1
-
diff --git a/patches/claws_mail/08-lh-remote-content.patch b/patches/claws_mail/08-lh-remote-content.patch
deleted file mode 100644
index 8bf3464..0000000
--- a/patches/claws_mail/08-lh-remote-content.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
-index 1e0d70f83..072192e47 100644
---- a/src/plugins/litehtml_viewer/container_linux_images.cpp
-+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
-@@ -110,8 +110,15 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
- if (pixbuf != NULL)
- m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
-
-+ unlock_images_cache();
- return;
- } else {
-+ if (!lh_prefs_get()->enable_remote_content) {
-+ debug_print("blocking download of image from '%s'\n", src);
-+ unlock_images_cache();
-+ return;
-+ }
-+
- request = true;
- m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
- }
-@@ -125,11 +132,6 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
- if (request) {
- struct FetchCtx *ctx;
-
-- if (!lh_prefs_get()->enable_remote_content) {
-- debug_print("blocking download of image from '%s'\n", src);
-- return;
-- }
--
- debug_print("allowing download of image from '%s'\n", src);
-
- ctx = g_new(struct FetchCtx, 1);
diff --git a/patches/claws_mail/09-widget-names.patch b/patches/claws_mail/09-widget-names.patch
deleted file mode 100644
index 22f8608..0000000
--- a/patches/claws_mail/09-widget-names.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff --git a/src/folderview.c b/src/folderview.c
-index 9b2e364e9..a3f549236 100644
---- a/src/folderview.c
-+++ b/src/folderview.c
-@@ -455,6 +455,8 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
- titles);
-
-+ gtk_widget_set_name(GTK_WIDGET(ctree), "folderview_sctree");
-+
- if (prefs_common.show_col_headers == FALSE)
- gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
-
-@@ -608,6 +610,7 @@ FolderView *folderview_create(MainWindow *mainwin)
- folderview = g_new0(FolderView, 1);
-
- scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-+ gtk_widget_set_name(GTK_WIDGET(scrolledwin), "folderview");
- gtk_scrolled_window_set_policy
- (GTK_SCROLLED_WINDOW(scrolledwin),
- GTK_POLICY_AUTOMATIC,
-diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
-index 3512e97cd..da8325717 100644
---- a/src/gtk/gtkutils.c
-+++ b/src/gtk/gtkutils.c
-@@ -1524,6 +1524,7 @@ GtkWidget *gtkut_window_new (GtkWindowType type,
- {
- GtkWidget *window = gtk_window_new(type);
- gtk_window_set_role(GTK_WINDOW(window), class);
-+ gtk_widget_set_name(GTK_WIDGET(window), class);
- return window;
- }
-
-diff --git a/src/headerview.c b/src/headerview.c
-index 69d0d407c..433c26386 100644
---- a/src/headerview.c
-+++ b/src/headerview.c
-@@ -72,6 +72,7 @@ HeaderView *headerview_create(void)
- headerview = g_new0(HeaderView, 1);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-+ gtk_widget_set_name(GTK_WIDGET(hbox), "headerview");
- gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
- gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
-diff --git a/src/mainwindow.c b/src/mainwindow.c
-index d8d0388de..440bc28b9 100644
---- a/src/mainwindow.c
-+++ b/src/mainwindow.c
-@@ -1916,6 +1916,7 @@ MainWindow *main_window_create()
-
- #ifndef GENERIC_UMPC
- hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
-+ gtk_widget_set_name(GTK_WIDGET(hbox_stat), "hbox_stat");
- gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
-
- warning_icon = gtkut_stock_button("dialog-warning", NULL);
-diff --git a/src/messageview.c b/src/messageview.c
-index 36dad2799..6b187d619 100644
---- a/src/messageview.c
-+++ b/src/messageview.c
-@@ -416,6 +416,7 @@ MessageView *messageview_create(MainWindow *mainwin)
- mimeview->messageview = messageview;
-
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-+ gtk_widget_set_name(GTK_WIDGET(vbox), "messageview");
- gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(headerview),
- FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(noticeview),
-diff --git a/src/mimeview.c b/src/mimeview.c
-index 83b103a5f..9b2fa0ec1 100644
---- a/src/mimeview.c
-+++ b/src/mimeview.c
-@@ -362,6 +362,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
- G_CALLBACK(mimeview_drag_data_get), mimeview);
-
- mime_notebook = gtk_notebook_new();
-+ gtk_widget_set_name(GTK_WIDGET(mime_notebook), "mime_notebook");
- gtk_widget_show(mime_notebook);
- gtk_widget_set_can_focus(mime_notebook, FALSE);
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
-@@ -401,6 +402,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
- G_CALLBACK(mime_toggle_button_cb), mimeview);
-
- icon_mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-+ gtk_widget_set_name(GTK_WIDGET(icon_mainbox), "mimeview_icon_mainbox");
- gtk_widget_show(icon_mainbox);
- gtk_widget_set_size_request(icon_mainbox, 32, -1);
- gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
-@@ -410,6 +412,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
- G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
-
- ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-+ gtk_widget_set_name(GTK_WIDGET(ctree_mainbox), "mimeview_ctree_mainbox");
- gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
- g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
- G_CALLBACK(ctree_size_allocate_cb), mimeview);
-@@ -459,6 +462,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_show(vbox);
- siginfoview = noticeview_create(mainwin);
-+ gtk_widget_set_name(GTK_WIDGET(siginfoview->vgrid), "siginfoview");
- noticeview_hide(siginfoview);
- noticeview_set_icon_clickable(siginfoview, TRUE);
- gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
-@@ -470,6 +474,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
- gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-+ gtk_widget_set_name(GTK_WIDGET(hbox), "mimeview");
- gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
-
-diff --git a/src/noticeview.c b/src/noticeview.c
-index 60c51b037..1b7e925be 100644
---- a/src/noticeview.c
-+++ b/src/noticeview.c
-@@ -86,6 +86,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
- noticeview->window = mainwin->window;
-
- vgrid = gtk_grid_new();
-+ gtk_widget_set_name(GTK_WIDGET(vgrid), "noticeview");
- gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid),
- GTK_ORIENTATION_VERTICAL);
- gtk_grid_set_row_spacing(GTK_GRID(vgrid), 4);
-diff --git a/src/summaryview.c b/src/summaryview.c
-index 9d0b9a433..ada78d7e3 100644
---- a/src/summaryview.c
-+++ b/src/summaryview.c
-@@ -570,6 +570,7 @@ SummaryView *summary_create(MainWindow *mainwin)
-
- #define SUMMARY_VBOX_SPACING 3
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, SUMMARY_VBOX_SPACING);
-+ gtk_widget_set_name(GTK_WIDGET(vbox), "summaryview");
-
- /* create status label */
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-@@ -6692,6 +6693,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
- ctree = gtk_sctree_new_with_titles
- (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
-
-+ gtk_widget_set_name(GTK_WIDGET(ctree), "summaryview_sctree");
-+
- if (prefs_common.show_col_headers == FALSE)
- gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
-
-diff --git a/src/textview.c b/src/textview.c
-index 74ba34dfa..9bd0c9a78 100644
---- a/src/textview.c
-+++ b/src/textview.c
-@@ -1959,6 +1959,7 @@ static void textview_show_avatar(TextView *textview)
- avatarr->image = NULL; /* avoid destroying */
- avatars_avatarrender_free(avatarr);
-
-+ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_avatar");
- gtk_widget_show(textview->image);
-
- gtk_widget_get_allocation(textview->text, &allocation);
-@@ -1989,6 +1990,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
- textview->image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_DIALOG);
- cm_return_if_fail(textview->image != NULL);
-
-+ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_icon");
- gtk_widget_show(textview->image);
-
- gtk_widget_get_allocation(textview->text, &allocation);
-@@ -2090,6 +2092,7 @@ static void textview_show_contact_pic(TextView *textview)
- }
- cm_return_if_fail(textview->image != NULL);
-
-+ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_contact_pic");
- gtk_widget_show(textview->image);
-
- gtk_widget_get_allocation(textview->text, &allocation);
commit 9fb7cf195f19d86f4eecd6a875887e6d1f9c0f52
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:58:01 2022 -0700
update to zlib-1.2.12
diff --git a/packages/packages.current b/packages/packages.current
index 5c34e32..ce4111a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -53,4 +53,4 @@ regex,20220313,git,git://git.savannah.gnu.org/gnulib.git,466b513e25e938fc70c47c1
sqlite,3.38.2,file,https://sqlite.org/2022/sqlite-autoconf-3380200.tar.gz,e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
-zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
+zlib,1.2.12,file,https://zlib.net/zlib-1.2.12.tar.gz,91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9,,
diff --git a/patches/zlib-1.2.11/01-no-strip.patch b/patches/zlib/01-no-strip.patch
similarity index 52%
rename from patches/zlib-1.2.11/01-no-strip.patch
rename to patches/zlib/01-no-strip.patch
index f73b55f..38fa46c 100644
--- a/patches/zlib-1.2.11/01-no-strip.patch
+++ b/patches/zlib/01-no-strip.patch
@@ -1,18 +1,7 @@
-diff -ruN zlib-1.2.11-orig/configure.log zlib-1.2.11/configure.log
---- zlib-1.2.11-orig/configure.log 1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.11/configure.log 2018-01-08 18:25:06.722905564 +0100
-@@ -0,0 +1,7 @@
-+--------------------
-+./configure --help
-+Po jan 8 18:25:06 CET 2018
-+usage:
-+ configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]
-+ [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]
-+ [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]
-diff -ruN zlib-1.2.11-orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
---- zlib-1.2.11-orig/win32/Makefile.gcc 2015-07-29 07:44:31.000000000 +0200
-+++ zlib-1.2.11/win32/Makefile.gcc 2018-01-08 18:26:23.221515186 +0100
-@@ -57,8 +57,6 @@
+diff -Naur a/win32/Makefile.gcc b/win32/Makefile.gcc
+--- a/win32/Makefile.gcc 2022-03-27 16:39:42.000000000 -0700
++++ b/win32/Makefile.gcc 2022-04-03 06:03:59.204806923 -0700
+@@ -52,8 +52,6 @@
RC = $(PREFIX)windres
RCFLAGS = --define GCC_WINDRES
@@ -21,7 +10,7 @@ diff -ruN zlib-1.2.11-orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
CP = cp -fp
# If GNU install is available, replace $(CP) with install.
INSTALL = $(CP)
-@@ -95,23 +93,18 @@
+@@ -90,23 +88,18 @@
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
commit c1d6f02da2bbec72c852a3794100bc3f8312d82b
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:57:50 2022 -0700
update to sqlite-3.38.2
diff --git a/packages/packages.current b/packages/packages.current
index 34e3f60..5c34e32 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,7 @@ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200
poppler,22.04.0,file,https://poppler.freedesktop.org/poppler-22.04.0.tar.xz,813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220313,git,git://git.savannah.gnu.org/gnulib.git,466b513e25e938fc70c47c14b04d12c678ce06728201026bcfc9059ab2cc2ff7,master,5cec46dbdee95a93da3aa721384f541d1a342c9f
-sqlite,3.38.1,file,https://sqlite.org/2022/sqlite-autoconf-3380100.tar.gz,8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4,,
+sqlite,3.38.2,file,https://sqlite.org/2022/sqlite-autoconf-3380200.tar.gz,e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
commit c69ab1aebbee8560bf88cba1fae47e8e119bc752
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:54:38 2022 -0700
update to poppler-22.04.0
diff --git a/packages/packages.current b/packages/packages.current
index 2f8e07a..34e3f60 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1
pango,1.50.6,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.6.tar.xz,a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
+poppler,22.04.0,file,https://poppler.freedesktop.org/poppler-22.04.0.tar.xz,813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220313,git,git://git.savannah.gnu.org/gnulib.git,466b513e25e938fc70c47c14b04d12c678ce06728201026bcfc9059ab2cc2ff7,master,5cec46dbdee95a93da3aa721384f541d1a342c9f
sqlite,3.38.1,file,https://sqlite.org/2022/sqlite-autoconf-3380100.tar.gz,8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index f3bca15..aced189 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -520,7 +520,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-119.dll
+File ${prefix}/bin/libpoppler-120.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 77f0c48..0df4317 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -37,7 +37,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-119.dll"
+Delete "$INSTDIR\libpoppler-120.dll"
#######################################
### gumbo-parser
commit 5cad7768ac27a43aa68c0dd520bf59d00669560c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:54:26 2022 -0700
update to harfbuzz-4.2.0
diff --git a/packages/packages.current b/packages/packages.current
index 06bae9f..2f8e07a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -24,7 +24,7 @@ gnutls,3.7.4,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.4.tar.
gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
gtk,3.24.33,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.tar.xz,588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
-harfbuzz,4.0.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.1/harfbuzz-4.0.1.tar.xz,98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49,,
+harfbuzz,4.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.2.0/harfbuzz-4.2.0.tar.xz,f2200f177768bdc21445aa09703326f3bbe8114ac083d081fe1a79d305c7ae73,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
commit b2cf492eb111fb3803f8c8c0fcb071b62ffc6c46
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:49:40 2022 -0700
update to freetype-2.12.0
diff --git a/packages/packages.current b/packages/packages.current
index 398836b..06bae9f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -13,7 +13,7 @@ cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.8,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz,f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25,,
fontconfig,2.14.0,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.xz,dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac,,
-freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
+freetype,2.12.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.12.0.tar.xz,ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.8,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz,84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
commit 6f4561f3e86b248f0efa5cae8f61f822e3266d71
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:49:09 2022 -0700
update to fontconfig-2.14.0
diff --git a/packages/packages.current b/packages/packages.current
index d697e8d..398836b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -12,7 +12,7 @@ curl,7.82.0,file,https://curl.se/download/curl-7.82.0.tar.xz,0aaa12d7bd04b096625
cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.8,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz,f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25,,
-fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
+fontconfig,2.14.0,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.xz,dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.8,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz,84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6,,
commit dacb382149a15d0f7b23789ddf1b61d0ab913d4e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:45:51 2022 -0700
update to expat-2.4.8
diff --git a/packages/packages.current b/packages/packages.current
index 3292980..d697e8d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -11,7 +11,7 @@ certdata,20220215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/
curl,7.82.0,file,https://curl.se/download/curl-7.82.0.tar.xz,0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c,,
cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
-expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz,9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d,,
+expat,2.4.8,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz,f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25,,
fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
commit aaac604f9f0e4bc33a525c466f1272883a14e1c1
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:44:50 2022 -0700
update to certdata-20220215
diff --git a/packages/packages.current b/packages/packages.current
index 0addb85..3292980 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -7,7 +7,7 @@ atk,2.38.0,file,https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz,ac
bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
-certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/d7c8bc02bda4c5cbeacf2b165e24db7e0ba345c2/security/nss/lib/ckfw/builtins/certdata.txt,187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c,,
+certdata,20220215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/8e3a124602d0da9cec272df4ca05b3a34d03b995/security/nss/lib/ckfw/builtins/certdata.txt,d59c5c83ce7a7635fa95521d8d245677949b86d5574bfcc6f855b6a48f2d5566,,
curl,7.82.0,file,https://curl.se/download/curl-7.82.0.tar.xz,0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c,,
cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
commit c8a3e6d93b75563bcf31cdfc00962d3d69848873
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Apr 3 05:42:15 2022 -0700
update to atk-2.38.0
diff --git a/packages/packages.current b/packages/packages.current
index 00f2bc3..0addb85 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -3,7 +3,7 @@
claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
adwaita_icon_theme,41.0,file,https://download.gnome.org/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz,ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba,,
-atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
+atk,2.38.0,file,https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz,ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36,,
bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
commit 794a8514e76bdd86241d4a7b2857a89897aef93a
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Mar 19 16:22:57 2022 -0700
update to pango-1.50.6
diff --git a/packages/packages.current b/packages/packages.current
index 5a4fe37..00f2bc3 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
-pango,1.50.5,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.5.tar.xz,6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5,,
+pango,1.50.6,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.6.tar.xz,a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
commit a28133f67d2a2ea65c70a8d8c7aea24c2fd939e4
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Mar 19 16:22:02 2022 -0700
update to libepoxy-1.5.10
diff --git a/packages/packages.current b/packages/packages.current
index b7fc634..5a4fe37 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -29,7 +29,7 @@ hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-
icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
-libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
+libepoxy,1.5.10,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.10.tar.xz,072cda4b59dd098bba8c2363a6247299db1fa89411dc221c8b81b8ee8192e623,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
libgpg_error,1.44,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.44.tar.bz2,8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9,,
commit 01ced3ffc30f9100b7c57a82309bfd0b4059a0bf
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Mar 19 16:19:10 2022 -0700
update to gnutls-3.7.4
diff --git a/packages/packages.current b/packages/packages.current
index 4a3af11..b7fc634 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -20,7 +20,7 @@ gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcb
glib,2.70.5,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz,f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e,,
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
-gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
+gnutls,3.7.4,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.4.tar.xz,e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f,,
gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
gtk,3.24.33,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.tar.xz,588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
commit 784445a88d5912d4c02bf4b578003c5d839e8838
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Mar 19 16:10:25 2022 -0700
update to glib-2.70.5
diff --git a/packages/packages.current b/packages/packages.current
index cd3d404..4a3af11 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.8,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz,84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
-glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz,ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33,,
+glib,2.70.5,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz,f70bf76ebcc84e0705722f038be8e2f9a58d17e1a700810c635fcc18b8974b7e,,
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
commit f9fc89f2f63c8a896fb06aebb540d088576557b8
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Mar 19 16:07:10 2022 -0700
update to gdk-pixbuf-2.42.8
diff --git a/packages/packages.current b/packages/packages.current
index 66f20f2..cd3d404 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -15,7 +15,7 @@ expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/
fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
-gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
+gdk_pixbuf,2.42.8,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz,84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz,ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33,,
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
commit bbbaaadbddc8c7a52745c84063a6724a872fdab5
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 17:39:12 2022 -0700
Add keyword_warner plugin to the installer
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index fc3fb3b..f3bca15 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -540,6 +540,7 @@ File ${prefix}/lib/claws-mail/plugins/bsfilter.dll
File ${prefix}/lib/claws-mail/plugins/fancy.dll
!endif
File ${prefix}/lib/claws-mail/plugins/fetchinfo.dll
+File ${prefix}/lib/claws-mail/plugins/keyword_warner.dll
File ${prefix}/lib/claws-mail/plugins/libravatar.dll
File ${prefix}/lib/claws-mail/plugins/litehtml_viewer.dll
File ${prefix}/lib/claws-mail/plugins/managesieve.dll
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 1a82817..77f0c48 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -14,6 +14,7 @@ Delete "$INSTDIR\lib\claws-mail\plugins\att_remover.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\bsfilter.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\fancy.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\fetchinfo.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\keyword_warner.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\libravatar.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\litehtml_viewer.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\managesieve.dll"
commit 7fe7de103b4269cab4fcb391f5bc51ca8c3595be
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:34:26 2022 -0700
update regex from gnulib HEAD
diff --git a/packages/packages.current b/packages/packages.current
index 7cfebce..66f20f2 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -49,7 +49,7 @@ pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
-regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
+regex,20220313,git,git://git.savannah.gnu.org/gnulib.git,466b513e25e938fc70c47c14b04d12c678ce06728201026bcfc9059ab2cc2ff7,master,5cec46dbdee95a93da3aa721384f541d1a342c9f
sqlite,3.38.1,file,https://sqlite.org/2022/sqlite-autoconf-3380100.tar.gz,8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
diff --git a/src/regex/ChangeLog b/src/regex/ChangeLog
index bbcca49..dc4770b 100644
--- a/src/regex/ChangeLog
+++ b/src/regex/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-13 Jonathan Boeing
+
+ Update to build gnulib HEAD
+
2022-01-16 Jonathan Boeing
Update to build gnulib HEAD
diff --git a/src/regex/NEWS b/src/regex/NEWS
index 82770d8..77de0a1 100644
--- a/src/regex/NEWS
+++ b/src/regex/NEWS
@@ -1,3 +1,7 @@
+20220313:
+ Update to gnulib from 20220313
+ 5cec46dbdee95a93da3aa721384f541d1a342c9f
+
20220116:
Update to gnulib from 20220116
1eae0f7ea3c220d054025f2c9211700665f9f4a0
diff --git a/src/regex/configure.ac b/src/regex/configure.ac
index d0cc508..754fa06 100644
--- a/src/regex/configure.ac
+++ b/src/regex/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.69)
-AC_INIT([regex], [20220116], [jonathan at claws-mail.org])
+AC_INIT([regex], [20220313], [jonathan at claws-mail.org])
AC_CONFIG_SRCDIR([lib/regex.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
commit 6b43e6eaf28e9d16a6541674e2f4099a1b2afabd
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:16:14 2022 -0700
update to sqlite-3.38.1
diff --git a/packages/packages.current b/packages/packages.current
index 352b71c..7cfebce 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,7 @@ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200
poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
-sqlite,3.38.0,file,https://sqlite.org/2022/sqlite-autoconf-3380000.tar.gz,1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68,,
+sqlite,3.38.1,file,https://sqlite.org/2022/sqlite-autoconf-3380100.tar.gz,8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
commit f2796b8d2048d0181bd9ee559a7275f68b1f0959
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:14:46 2022 -0700
update to pango-1.50.5
diff --git a/packages/packages.current b/packages/packages.current
index 9dc55a0..352b71c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
-pango,1.50.4,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.4.tar.xz,f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162,,
+pango,1.50.5,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.5.tar.xz,6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
commit 13fc28ffdca1d129d50584f823570f5b0b3a055d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:13:04 2022 -0700
update to harfbuzz-4.0.1
diff --git a/packages/packages.current b/packages/packages.current
index 18a172b..9dc55a0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -24,7 +24,7 @@ gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.
gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
gtk,3.24.33,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.tar.xz,588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
-harfbuzz,4.0.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.0/harfbuzz-4.0.0.tar.xz,ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7,,
+harfbuzz,4.0.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.1/harfbuzz-4.0.1.tar.xz,98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
commit ebbe2fe142ee1f548aad87c15d72ad85654f5127
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:12:05 2022 -0700
update to gtk-3.24.33
diff --git a/packages/packages.current b/packages/packages.current
index 6a6d29d..18a172b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -22,7 +22,7 @@ glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
-gtk,3.24.32,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.32.tar.xz,a667e13f8f86ea44455b0443f4870bf23f53f6707c1df436eb2b516c62496bff,,
+gtk,3.24.33,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.33.tar.xz,588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,4.0.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.0/harfbuzz-4.0.0.tar.xz,ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
commit 32860079f55a9379d5b5f9ad3fdf0461a8771bac
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:10:45 2022 -0700
update to gpgme-1.17.1
diff --git a/packages/packages.current b/packages/packages.current
index 3802e47..6a6d29d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -21,7 +21,7 @@ glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
-gpgme,1.17.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.0.tar.bz2,4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5,,
+gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
gtk,3.24.32,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.32.tar.xz,a667e13f8f86ea44455b0443f4870bf23f53f6707c1df436eb2b516c62496bff,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,4.0.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.0/harfbuzz-4.0.0.tar.xz,ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7,,
commit 208e7398275267a0d91479207599acfbc2e4d7fe
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Mar 13 16:08:56 2022 -0700
update to curl-7.82.0
diff --git a/packages/packages.current b/packages/packages.current
index fc7e0c2..3802e47 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -8,7 +8,7 @@ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/d7c8bc02bda4c5cbeacf2b165e24db7e0ba345c2/security/nss/lib/ckfw/builtins/certdata.txt,187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c,,
-curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
+curl,7.82.0,file,https://curl.se/download/curl-7.82.0.tar.xz,0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c,,
cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz,9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d,,
commit 37c1296fa0d690e2e87e71a8f9b531ecf2752ed4
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 19:13:14 2022 -0700
update to cyrus-sasl-2.1.28
diff --git a/packages/packages.current b/packages/packages.current
index cc37d1c..fc7e0c2 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -9,7 +9,7 @@ bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/d7c8bc02bda4c5cbeacf2b165e24db7e0ba345c2/security/nss/lib/ckfw/builtins/certdata.txt,187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c,,
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
-cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
+cyrus_sasl,2.1.28,file,https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz,7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz,9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d,,
fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
diff --git a/patches/cyrus_sasl-2.1.27/03-exports.patch b/patches/cyrus_sasl-2.1.27/03-exports.patch
deleted file mode 100644
index 88ee01c..0000000
--- a/patches/cyrus_sasl-2.1.27/03-exports.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN a/plugins/Makefile.am b/plugins/Makefile.am
---- a/plugins/Makefile.am 2020-10-10 00:14:17.294172264 -0700
-+++ b/plugins/Makefile.am 2020-10-10 00:10:34.080155060 -0700
-@@ -49,7 +49,7 @@
- # CURRENT:REVISION:AGE
- plugin_version = 3:0:0
-
--AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -I$(top_builddir)/include
-+AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) -no-undefined
-
- if BUILD_LIBOBJ
-
-diff -urN a/sasldb/Makefile.am b/sasdb/Makefile.am
---- a/sasldb/Makefile.am 2020-10-10 00:14:30.421916638 -0700
-+++ b/sasldb/Makefile.am 2020-10-10 00:12:35.972446463 -0700
-@@ -44,7 +44,7 @@
- # Note that this doesn't necessaraly follow the libsasl2 verison info
- sasl_version = 1:25:0
-
--AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
-+AM_CPPFLAGS=-fPIC -DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
-
- extra_common_sources = db_none.c db_lmdb.c db_ndbm.c db_gdbm.c db_berkeley.c
-
-diff -urN a/utils/Makefile.am b/utils/Makefile.am
---- a/utils/Makefile.am 2020-10-10 00:14:44.173656942 -0700
-+++ b/utils/Makefile.am 2020-10-10 00:13:20.103384196 -0700
-@@ -89,7 +89,7 @@
- libsfsasl2_la_LIBADD = sfsasl.lo
- libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir)
-
--AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ -DPLUGINDIR='"${plugindir}"'
-+AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ -DPLUGINDIR='"${plugindir}"'
-
- EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile
-
diff --git a/patches/cyrus_sasl-2.1.27/01-md5-typedef.patch b/patches/cyrus_sasl-2.1.28/01-md5-typedef.patch
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/01-md5-typedef.patch
rename to patches/cyrus_sasl-2.1.28/01-md5-typedef.patch
diff --git a/patches/cyrus_sasl-2.1.27/02-tchar.patch b/patches/cyrus_sasl-2.1.28/02-tchar.patch
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/02-tchar.patch
rename to patches/cyrus_sasl-2.1.28/02-tchar.patch
diff --git a/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch b/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch
new file mode 100644
index 0000000..90693b6
--- /dev/null
+++ b/patches/cyrus_sasl-2.1.28/03-fix-time.h-check.patch
@@ -0,0 +1,60 @@
+From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001
+From: Sam James <sam at gentoo.org>
+Date: Wed, 23 Feb 2022 00:45:15 +0000
+Subject: [PATCH] Fix <time.h> check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're conditionally including based on HAVE_TIME_H in a bunch of places,
+but we're not actually checking for time.h, so that's never going to be defined.
+
+While at it, add in a missing include in the cram plugin.
+
+This fixes a bunch of implicit declaration warnings:
+```
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James <sam at gentoo.org>
+---
+ configure.ac | 2 +-
+ plugins/cram.c | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1bf53b6..ad781830 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
+
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
++AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
+
+ IPv6_CHECK_SS_FAMILY()
+ IPv6_CHECK_SA_LEN()
+diff --git a/plugins/cram.c b/plugins/cram.c
+index d02e9baa..695aaa91 100644
+--- a/plugins/cram.c
++++ b/plugins/cram.c
+@@ -53,6 +53,10 @@
+ #endif
+ #include <fcntl.h>
+
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
+ #include <sasl.h>
+ #include <saslplug.h>
+ #include <saslutil.h>
+--
+2.30.2
+
diff --git a/patches/cyrus_sasl-2.1.27/04-paths-relocation.patch b/patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
similarity index 89%
rename from patches/cyrus_sasl-2.1.27/04-paths-relocation.patch
rename to patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
index afae2d7..c32cbdf 100644
--- a/patches/cyrus_sasl-2.1.27/04-paths-relocation.patch
+++ b/patches/cyrus_sasl-2.1.28/90-paths-relocation.patch
@@ -1,32 +1,41 @@
-diff -Naur a/m4/varexpand.m4 b/m4/varexpand.m4
---- a/m4/varexpand.m4 1970-01-01 03:00:00.000000000 +0300
-+++ b/m4/varexpand.m4 2014-12-16 00:22:11.487600000 +0300
-@@ -0,0 +1,8 @@
-+AC_DEFUN([FULL_EXPAND_VARIABLE], [
-+ $1=$2
-+ $1=`(
-+ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-+ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-+ eval echo \""[$]$1"\"
-+ )`
-+])
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2020-10-14 00:27:40.365807986 -0700
-+++ b/configure.ac 2020-10-14 00:28:44.526450417 -0700
-@@ -1103,6 +1103,9 @@
+From 929dea0603335b519d0812c84893dc847544e89c Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing <jonathan at claws-mail.org>
+Date: Fri, 4 Mar 2022 19:34:26 -0700
+Subject: [PATCH] Recreate paths-relocation patch against cyrus-sasl-2.1.28
+
+---
+ configure.ac | 3 +
+ include/sasl.h | 2 +
+ lib/Makefile.am | 4 +-
+ lib/common.c | 48 ++++
+ lib/pathtools.c | 538 +++++++++++++++++++++++++++++++++++++++++++
+ lib/pathtools.h | 53 +++++
+ m4/varexpand.m4 | 8 +
+ utils/pluginviewer.c | 2 +-
+ 8 files changed, 655 insertions(+), 3 deletions(-)
+ create mode 100644 lib/pathtools.c
+ create mode 100644 lib/pathtools.h
+ create mode 100644 m4/varexpand.m4
+
+diff --git a/configure.ac b/configure.ac
+index 2d89fdaa..307a430b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1054,6 +1054,9 @@ AC_ARG_WITH(configdir, [ --with-configdir=DIR set the directory where confi
configdir='${plugindir}:${sysconfdir}/sasl2')
AC_SUBST(configdir)
+FULL_EXPAND_VARIABLE(sasl_bindir, "$bindir")
+AC_DEFINE_UNQUOTED(BINDIR, "$sasl_bindir", [Runtime executables location])
+
- dnl look for rc4 libraries. we accept the CMU one or one from openSSL
- AC_ARG_WITH(rc4, [ --with-rc4 use internal rc4 routines [[yes]] ],
+ AC_ARG_WITH(rc4, [ --with-rc4 use rc4 routines [[yes]] ],
with_rc4=$withval,
-diff -Naur a/include/sasl.h b/include/sasl.h
---- a/include/sasl.h 2014-12-15 23:10:22.454600000 +0300
-+++ b/include/sasl.h 2014-12-15 23:43:10.374600000 +0300
-@@ -669,6 +669,8 @@
+ with_rc4=yes)
+diff --git a/include/sasl.h b/include/sasl.h
+index dc04ca47..aa7f935e 100755
+--- a/include/sasl.h
++++ b/include/sasl.h
+@@ -676,6 +676,8 @@ typedef int sasl_canon_user_t(sasl_conn_t *conn,
#define SASL_PATH_TYPE_PLUGIN 0
#define SASL_PATH_TYPE_CONFIG 1
@@ -35,10 +44,26 @@ diff -Naur a/include/sasl.h b/include/sasl.h
/* a simpler way to set plugin path or configuration file path
* without the need to set sasl_getpath_t callback.
*
-diff -Naur a/lib/common.c b/lib/common.c
---- a/lib/common.c 2014-12-15 23:10:22.953800000 +0300
-+++ b/lib/common.c 2014-12-15 23:46:29.514400000 +0300
-@@ -62,6 +62,7 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 9a43ae0d..4590ceb1 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -62,8 +62,8 @@ else
+ DLOPEN_C = dlopen.c
+ endif
+
+-common_headers = saslint.h
+-common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c $(DLOPEN_C)
++common_headers = saslint.h pathtools.h
++common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c pathtools.c saslutil.c server.c seterror.c $(DLOPEN_C)
+
+ LTLIBOBJS = @LTLIBOBJS@
+ LIB_DOOR= @LIB_DOOR@
+diff --git a/lib/common.c b/lib/common.c
+index d9104c89..b86df732 100644
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -59,6 +59,7 @@
#include <saslutil.h>
#include <saslplug.h>
#include "saslint.h"
@@ -46,7 +71,7 @@ diff -Naur a/lib/common.c b/lib/common.c
#ifdef HAVE_UNISTD_H
#include <unistd.h>
-@@ -89,6 +90,45 @@
+@@ -86,6 +87,45 @@ static char * _sasl_get_default_win_path(void *context __attribute__((unused)),
#endif
@@ -92,7 +117,7 @@ diff -Naur a/lib/common.c b/lib/common.c
/* It turns out to be convenient to have a shared sasl_utils_t */
const sasl_utils_t *sasl_global_utils = NULL;
-@@ -1589,9 +1629,13 @@
+@@ -1586,9 +1626,13 @@ _sasl_getpath(void *context __attribute__((unused)),
#if defined(WIN32)
/* NB: On Windows platforms this value is always allocated */
@@ -106,7 +131,7 @@ diff -Naur a/lib/common.c b/lib/common.c
#else
/* NB: On Unix platforms this value is never allocated */
path = _sasl_get_default_unix_path(context,
-@@ -1644,9 +1688,13 @@
+@@ -1641,9 +1685,13 @@ _sasl_getconfpath(void *context __attribute__((unused)),
#if defined(WIN32)
/* NB: On Windows platforms this value is always allocated */
@@ -120,23 +145,11 @@ diff -Naur a/lib/common.c b/lib/common.c
#else
/* NB: On Unix platforms this value is never allocated */
path = _sasl_get_default_unix_path(context,
-diff -Naur a/lib/Makefile.am b/lib/Makefile.am
---- a/lib/Makefile.am 2014-12-15 23:10:23.094200000 +0300
-+++ b/lib/Makefile.am 2020-10-14 01:24:27.604686796 -0700
-@@ -62,8 +62,8 @@
- DLOPEN_C = dlopen.c
- endif
-
--common_headers = saslint.h
--common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c $(DLOPEN_C)
-+common_headers = saslint.h pathtools.h
-+common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c pathtools.c saslutil.c server.c seterror.c $(DLOPEN_C)
-
- LTLIBOBJS = @LTLIBOBJS@
- LIB_DOOR= @LIB_DOOR@
-diff -Naur a/lib/pathtools.c b/lib/pathtools.c
---- a/lib/pathtools.c 1970-01-01 03:00:00.000000000 +0300
-+++ b/lib/pathtools.c 1970-01-01 03:00:00.000000000 +0300
+diff --git a/lib/pathtools.c b/lib/pathtools.c
+new file mode 100644
+index 00000000..9291ffd8
+--- /dev/null
++++ b/lib/pathtools.c
@@ -0,0 +1,538 @@
+/*
+ .Some useful path tools.
@@ -676,9 +689,11 @@ diff -Naur a/lib/pathtools.c b/lib/pathtools.c
+ return (to_path_list);
+#endif
+}
-diff -Naur a/lib/pathtools.h b/lib/pathtools.h
---- a/lib/pathtools.h 1970-01-01 03:00:00.000000000 +0300
-+++ b/lib/pathtools.h 1970-01-01 03:00:00.000000000 +0300
+diff --git a/lib/pathtools.h b/lib/pathtools.h
+new file mode 100644
+index 00000000..139b7c20
+--- /dev/null
++++ b/lib/pathtools.h
@@ -0,0 +1,53 @@
+/*
+ .Some useful path tools.
@@ -733,10 +748,25 @@ diff -Naur a/lib/pathtools.h b/lib/pathtools.h
+char * pathlist_relocation(const char *from_path, const char *to_path_list);
+
+#endif /* PATHTOOLS_H */
-diff -Naur a/utils/pluginviewer.c b/utils/pluginviewer.c
---- a/utils/pluginviewer.c 2014-12-15 23:10:22.407800000 +0300
-+++ b/utils/pluginviewer.c 2014-12-15 23:45:36.037600000 +0300
-@@ -197,7 +197,7 @@
+diff --git a/m4/varexpand.m4 b/m4/varexpand.m4
+new file mode 100644
+index 00000000..b8303a46
+--- /dev/null
++++ b/m4/varexpand.m4
+@@ -0,0 +1,8 @@
++AC_DEFUN([FULL_EXPAND_VARIABLE], [
++ $1=$2
++ $1=`(
++ test "x$prefix" = xNONE && prefix="$ac_default_prefix"
++ test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
++ eval echo \""[$]$1"\"
++ )`
++])
+diff --git a/utils/pluginviewer.c b/utils/pluginviewer.c
+index f8ae7c09..8805b26a 100644
+--- a/utils/pluginviewer.c
++++ b/utils/pluginviewer.c
+@@ -197,7 +197,7 @@ getpath(void *context,
if (searchpath) {
*path = searchpath;
} else {
@@ -745,4 +775,6 @@ diff -Naur a/utils/pluginviewer.c b/utils/pluginviewer.c
}
return SASL_OK;
+--
+2.30.2
diff --git a/patches/cyrus_sasl-2.1.27/99-reautomagic.sh b/patches/cyrus_sasl-2.1.28/99-reautomagic.sh
similarity index 100%
rename from patches/cyrus_sasl-2.1.27/99-reautomagic.sh
rename to patches/cyrus_sasl-2.1.28/99-reautomagic.sh
commit e4a8b9757d135b70c26b5c7ae06e020f903a98e3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 19:08:36 2022 -0700
update to harfbuzz-4.0.0
diff --git a/packages/packages.current b/packages/packages.current
index b8e06fd..cc37d1c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -24,7 +24,7 @@ gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.
gpgme,1.17.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.0.tar.bz2,4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5,,
gtk,3.24.32,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.32.tar.xz,a667e13f8f86ea44455b0443f4870bf23f53f6707c1df436eb2b516c62496bff,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
-harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
+harfbuzz,4.0.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/4.0.0/harfbuzz-4.0.0.tar.xz,ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
commit 3b02cb69a6aee3d94638d6445683c788e131797c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 18:57:30 2022 -0700
update to gtk-3.24.32
diff --git a/packages/packages.current b/packages/packages.current
index cb6ba24..b8e06fd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -22,7 +22,7 @@ glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
gpgme,1.17.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.0.tar.bz2,4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5,,
-gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
+gtk,3.24.32,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.32.tar.xz,a667e13f8f86ea44455b0443f4870bf23f53f6707c1df436eb2b516c62496bff,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
diff --git a/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch b/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
deleted file mode 100644
index a275f92..0000000
--- a/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
+++ /dev/null
@@ -1,171 +0,0 @@
---- a/gdk/win32/gdkkeys-win32.h 2022-01-02 13:05:43.284701904 -0700
-+++ b/gdk/win32/gdkkeys-win32.h 2022-01-02 13:04:57.244227175 -0700
-@@ -0,0 +1,168 @@
-+/*
-+ * Copyright (c) 2021 Philip Zander
-+ * Copyright (c) 2018 Microsoft
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in all
-+ * copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#include <glib.h>
-+#include <Windows.h>
-+
-+/* For lookup table VK -> chars */
-+typedef struct
-+{
-+ int table;
-+ int index;
-+} GdkWin32KeymapTableAndIndex;
-+
-+/* For reverse lookup char -> VKs */
-+typedef struct
-+{
-+ BYTE mod_bits;
-+ BYTE vk;
-+
-+ /* Index of next KeyEntry. -1 if there is no next entry. */
-+ int next;
-+} GdkWin32KeymapKeyEntry;
-+
-+typedef struct
-+{
-+ HKL handle;
-+
-+ /* Keyboard layout identifier */
-+ char name[KL_NAMELENGTH];
-+
-+ /* Path of the layout DLL */
-+ char *file;
-+
-+ /* Handle of the layout DLL */
-+ HINSTANCE lib;
-+
-+ /* The actual conversion tables provided by the layout DLL.
-+ *
-+ * This is a pointer to a KBDTABLES structure. The exact definition
-+ * of this structure depends on the kernel on which the executable
-+ * run and can in general only be determined at runtime. That's why
-+ * we have to use a generic gpointer instead of the actual type here.
-+ *
-+ * See comment on GdkWin32KeymapImpl below for more information. */
-+ gpointer tables;
-+
-+ /* VK -> chars lookup table so we don't have to do a linear scan
-+ * every time we look up a key. */
-+ GdkWin32KeymapTableAndIndex vk_lookup_table[256];
-+
-+ /* List of entries for reverse (char ->VKs) lookup. */
-+ GArray *key_entries;
-+
-+ /* Reverse lookup table (char -> VKs). Key: Unichar. Value: int.
-+ * The value is used to index into the key_entries array. The key_entries
-+ * array can contain multiple consecutive entries for a given char.
-+ * The end of the list for the char is marked by a key entry that has
-+ * mod_bits and vk set to 0xFF. */
-+ GHashTable *reverse_lookup_table;
-+
-+ /* Map level to modbits */
-+ BYTE level_to_modbits[256];
-+
-+ /* Max Number of levels */
-+ BYTE max_level;
-+
-+ /* Maximum possible value of a modbits bitset. */
-+ BYTE max_modbit_value;
-+
-+} GdkWin32KeymapLayoutInfo;
-+
-+/* Some keyboard driver constants
-+ * See https://github.com/microsoft/windows-rs/blob/0.28.0/crates/deps/sys/src/Windows/Win32/UI/Input/KeyboardAndMouse/mod.rs
-+ */
-+
-+/* Modifier bits */
-+#define KBDBASE 0x00
-+#define KBDSHIFT 0x01
-+#define KBDCTRL 0x02
-+#define KBDALT 0x04
-+#define KBDKANA 0x08
-+#define KBDROYA 0x10
-+#define KBDLOYA 0x20
-+#define KBDGRPSELTAP 0x80
-+
-+#define KBDALTGR (KBDCTRL| KBDALT)
-+
-+/* */
-+#define SHFT_INVALID 0x0F
-+
-+/* Char table constants */
-+#define WCH_NONE 0xF000
-+#define WCH_DEAD 0xF001
-+#define WCH_LGTR 0xF002
-+
-+/* Char table flags */
-+#define CAPLOK 0x01
-+#define SGCAPS 0x02
-+#define CAPLOKALTGR 0x04
-+#define KANALOK 0x08
-+#define GRPSELTAP 0x80
-+
-+/* IMPORTANT:
-+ *
-+ * Keyboard layout DLLs are dependent on the host architecture.
-+ *
-+ * - 32 bit systems have just one 32 bit DLL in System32.
-+ * - 64 bit systems contain two versions of each layout DLL: One in System32
-+ * for 64-bit applications, and one in SysWOW64 for 32-bit applications.
-+ *
-+ * Here comes the tricky part:
-+ *
-+ * The 32-bit DLL in SysWOW64 is *not* identical to the DLL you would find
-+ * on a true 32 bit system, because all the pointers there are declared with
-+ * the attribute `__ptr64` (which means they are 64 bits wide, but only the
-+ * lower 32 bits are used).
-+ *
-+ * This leads to the following problems:
-+ *
-+ * (1) GCC does not support `__ptr64`
-+ * (2) When compiling the 32-bit library, we need two versions of the same code
-+ * and decide at run-time which one to execute, because we can't know at
-+ * compile time whether we will be running on a true 32-bit system, or on
-+ * WOW64.
-+ *
-+ * To solve this problem, we generate code for both cases (see
-+ * gdkkeys-win32-impl.c + gdkkeys-win32-impl-wow64.c) and encapsulate
-+ * the resulting functions in a struct of type GdkWin32KeymapImpl,
-+ * allowing us to select the correct implementation at runtime.
-+ *
-+ */
-+
-+typedef struct
-+{
-+ gboolean (*load_layout_dll) (const char *dll,
-+ GdkWin32KeymapLayoutInfo *info);
-+ void (*init_vk_lookup_table) (GdkWin32KeymapLayoutInfo *info);
-+ BYTE (*keystate_to_modbits) (GdkWin32KeymapLayoutInfo *info,
-+ const BYTE keystate[256]);
-+ BYTE (*modbits_to_level) (GdkWin32KeymapLayoutInfo *info,
-+ BYTE modbits);
-+ WCHAR (*vk_to_char_fuzzy) (GdkWin32KeymapLayoutInfo *info,
-+ const BYTE keystate[256],
-+ BYTE extra_mod_bits,
-+ BYTE *consumed_mod_bits,
-+ gboolean *is_dead,
-+ BYTE vk);
-+} GdkWin32KeymapImpl;
diff --git a/patches/gtk-3.24.31/02-windows-h.patch b/patches/gtk-3.24.31/02-windows-h.patch
deleted file mode 100644
index d45273b..0000000
--- a/patches/gtk-3.24.31/02-windows-h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4090306fd7216cb102590262b444de7127242725 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy at melroy.org>
-Date: Tue, 28 Dec 2021 00:47:28 +0100
-Subject: [PATCH] Lowercaps Windows.h -> windows.h
-
----
- gdk/win32/gdkkeys-win32.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/win32/gdkkeys-win32.h b/gdk/win32/gdkkeys-win32.h
-index 14a69d8081..17b7d7125c 100644
---- a/gdk/win32/gdkkeys-win32.h
-+++ b/gdk/win32/gdkkeys-win32.h
-@@ -22,7 +22,7 @@
- */
-
- #include <glib.h>
--#include <Windows.h>
-+#include <windows.h>
-
- /* For lookup table VK -> chars */
- typedef struct
---
-2.30.2
diff --git a/patches/gtk-3.24.31/03-gc-allgestures.patch b/patches/gtk-3.24.31/03-gc-allgestures.patch
deleted file mode 100644
index 0e8fcbb..0000000
--- a/patches/gtk-3.24.31/03-gc-allgestures.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 37f9af58059252c27197444f13fd9fe5b65ef4b4 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy at melroy.org>
-Date: Tue, 28 Dec 2021 00:50:17 +0100
-Subject: [PATCH] Add define for GC_ALLGESTURES, in-case WINVER is not set.
-
----
- gdk/win32/winpointer.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h
-index ee3e42e063..786f6016c7 100644
---- a/gdk/win32/winpointer.h
-+++ b/gdk/win32/winpointer.h
-@@ -138,6 +138,10 @@
- #define PA_ACTIVATE MA_ACTIVATE
- #define PA_NOACTIVATE MA_NOACTIVATE
-
-+#ifndef GC_ALLGESTURES
-+#define GC_ALLGESTURES 0x1
-+#endif
-+
- typedef DWORD POINTER_INPUT_TYPE;
- typedef UINT32 POINTER_FLAGS;
- typedef UINT32 TOUCH_FLAGS;
---
-2.30.2
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 6336fe4..fc3fb3b 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -257,11 +257,11 @@ SetOutPath "$INSTDIR\share\locale\"
File /r ${prefix}/share/locale/
SetOutPath "$INSTDIR\share\glib-2.0\schemas"
-File ${prefix}/share/glib-2.0/schemas/gschemas.compiled
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
+ExecShell "open" "$INSTDIR\glib-compile-schemas.exe" '"$INSTDIR\share\glib-2.0\schemas"' SW_HIDE
SetOutPath "$INSTDIR"
#######################################
@@ -380,7 +380,7 @@ File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
-ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
+ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-q -t -f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
SetOutPath "$INSTDIR"
#######################################
commit 4d12386aa904cf421c4bdf79447c00dc08ce9347
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 18:45:47 2022 -0700
update to sqlite-3.38.0
diff --git a/packages/packages.current b/packages/packages.current
index 4e30751..cb6ba24 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,7 @@ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200
poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
-sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
+sqlite,3.38.0,file,https://sqlite.org/2022/sqlite-autoconf-3380000.tar.gz,1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
commit d4b90807d9096bb70958cf900c882312d9518256
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 18:39:26 2022 -0700
update to poppler-22.03.0
diff --git a/packages/packages.current b/packages/packages.current
index a8dda66..4e30751 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1
pango,1.50.4,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.4.tar.xz,f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,22.02.0,file,https://poppler.freedesktop.org/poppler-22.02.0.tar.xz,e390c8b806f6c9f0e35c8462033e0a738bb2460ebd660bdb8b6dca01556193e1,,
+poppler,22.03.0,file,https://poppler.freedesktop.org/poppler-22.03.0.tar.xz,728c78ba94d75a55f6b6355d4fbdaa6f49934d9616be58e5e679a9cfd0980e1e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c9c2f2..0705ad1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,8 +411,8 @@ cm_pkg_poppler_configure = \
-DENABLE_QT6=OFF \
-DENABLE_LIBCURL=OFF \
-DENABLE_LIBOPENJPEG=none \
- -DCMAKE_C_FLAGS="$(CM_CFLAGS)" \
- -DCMAKE_CXX_FLAGS="$(CM_CXXFLAGS) -fexceptions"
+ -DCMAKE_C_FLAGS="-I$(idir)/include $(CM_CFLAGS)" \
+ -DCMAKE_CXX_FLAGS="-I$(idir)/include $(CM_CXXFLAGS) -fexceptions"
cm_pkg_gumbo_parser_configure = \
LDFLAGS=-L$(idir)/lib \
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 4f1395d..6336fe4 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -520,7 +520,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-118.dll
+File ${prefix}/bin/libpoppler-119.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 2908808..1a82817 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-118.dll"
+Delete "$INSTDIR\libpoppler-119.dll"
#######################################
### gumbo-parser
commit 9484924e3d0e557c1208a8cd5d4cd0804bf2bd16
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 18:34:47 2022 -0700
update to expat-2.4.7
diff --git a/packages/packages.current b/packages/packages.current
index fb24268..a8dda66 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -11,7 +11,7 @@ certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
-expat,2.4.4,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_4/expat-2.4.4.tar.xz,b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8,,
+expat,2.4.7,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_7/expat-2.4.7.tar.xz,9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d,,
fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
commit adabef3ceda799b67eee39c31b3421640bb436f7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:34:23 2022 -0700
update to poppler-22.02.0
diff --git a/packages/packages.current b/packages/packages.current
index 825e278..fb24268 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1
pango,1.50.4,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.4.tar.xz,f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
+poppler,22.02.0,file,https://poppler.freedesktop.org/poppler-22.02.0.tar.xz,e390c8b806f6c9f0e35c8462033e0a738bb2460ebd660bdb8b6dca01556193e1,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index ac6595d..4f1395d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -520,7 +520,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-117.dll
+File ${prefix}/bin/libpoppler-118.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 349ca12..2908808 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-117.dll"
+Delete "$INSTDIR\libpoppler-118.dll"
#######################################
### gumbo-parser
commit a4cf619dc6a77de3ac4ecbf99e429f434f6fb4ad
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:33:42 2022 -0700
update to pango-1.50.4
diff --git a/packages/packages.current b/packages/packages.current
index b3dc059..825e278 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
-pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
+pango,1.50.4,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.4.tar.xz,f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
commit 21e38e6765799cca256cd2385e4a199536923171
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:31:27 2022 -0700
update to p11-kit-0.24.1
diff --git a/packages/packages.current b/packages/packages.current
index 20fb9d6..b3dc059 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -43,7 +43,7 @@ libwebp,1.2.2,file,https://storage.googleapis.com/downloads.webmproject.org/rele
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
-p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
+p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
commit a3d5d273728b96e351ba897676c70ee097904ab7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:30:10 2022 -0700
update to libwebp-1.2.2
diff --git a/packages/packages.current b/packages/packages.current
index caed358..20fb9d6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -39,7 +39,7 @@ libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
libsoup,2.74.2,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.2.tar.xz,f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159,,
libtasn1,4.18.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.18.0.tar.gz,4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898,,
-libwebp,1.2.1,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz,808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018,,
+libwebp,1.2.2,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.2.tar.gz,7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
commit 5cf60ad73992f1e3ae421a5d61181e6f7ca9adc1
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:26:38 2022 -0700
update to libical-3.0.14
diff --git a/packages/packages.current b/packages/packages.current
index 567638e..caed358 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -33,7 +33,7 @@ libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
libgpg_error,1.44,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.44.tar.bz2,8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9,,
-libical,3.0.12,file,https://github.com/libical/libical/releases/download/v3.0.12/libical-3.0.12.tar.gz,35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830,,
+libical,3.0.14,file,https://github.com/libical/libical/releases/download/v3.0.14/libical-3.0.14.tar.gz,4284b780356f1dc6a01f16083e7b836e63d3815e27ed0eaaad684712357ccc8f,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
commit 570bfbb6a536c7d9bc4d6bb6ac101ca051c348be
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:25:26 2022 -0700
update to libgpg-error-1.44
diff --git a/packages/packages.current b/packages/packages.current
index 1c41955..567638e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -32,7 +32,7 @@ libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.
libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
-libgpg_error,1.43,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2,a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf,,
+libgpg_error,1.44,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.44.tar.bz2,8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9,,
libical,3.0.12,file,https://github.com/libical/libical/releases/download/v3.0.12/libical-3.0.12.tar.gz,35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
commit 5d1772471211186d72c911c1421a36e8c56453f9
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:23:03 2022 -0700
update to gpgme-1.17.0
diff --git a/packages/packages.current b/packages/packages.current
index 01ed28e..1c41955 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -21,7 +21,7 @@ glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
-gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
+gpgme,1.17.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.0.tar.bz2,4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5,,
gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
commit 4c458eb0525feedd016acea5560f51929f76f05c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:21:58 2022 -0700
update to gnutls-3.7.3
diff --git a/packages/packages.current b/packages/packages.current
index ba6de10..01ed28e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -20,7 +20,7 @@ gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcb
glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz,ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33,,
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
-gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
+gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
commit c9fbffd073f6c96af0cfd24690bbd834792f651e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:20:31 2022 -0700
update to glib-2.70.4
diff --git a/packages/packages.current b/packages/packages.current
index 8c71714..ba6de10 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
-glib,2.70.2,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.2.tar.xz,0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f,,
+glib,2.70.4,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.4.tar.xz,ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33,,
glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
commit 416ba0165f1c9d6685fdf33a4541970ceb3a7c34
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:19:10 2022 -0700
update to fontconfig-2.13.96
diff --git a/packages/packages.current b/packages/packages.current
index 3a273bb..8c71714 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -12,7 +12,7 @@ curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183feb
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.4,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_4/expat-2.4.4.tar.xz,b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8,,
-fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
+fontconfig,2.13.96,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.96.tar.xz,d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
commit 3e1329d04ad5415fcbeecd90ac90b0bddf3f9abe
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:17:57 2022 -0700
update to expat-2.4.4
diff --git a/packages/packages.current b/packages/packages.current
index 89d7205..3a273bb 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -11,7 +11,7 @@ certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
-expat,2.4.3,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_3/expat-2.4.3.tar.xz,b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a,,
+expat,2.4.4,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_4/expat-2.4.4.tar.xz,b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
commit eaab79230d6e05ff9f591df9114f6993ae5e97d2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:16:44 2022 -0700
update to certdata-20211215
diff --git a/packages/packages.current b/packages/packages.current
index 6d5313b..89d7205 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -7,7 +7,7 @@ atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb
bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
-certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/330c22fc463e2de39cae6b9f4c7e91dd6c255931/security/nss/lib/ckfw/builtins/certdata.txt,bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f,,
+certdata,20211215,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/d7c8bc02bda4c5cbeacf2b165e24db7e0ba345c2/security/nss/lib/ckfw/builtins/certdata.txt,187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c,,
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
commit c3742720af0c8dcddcfe6c0751cd0f4611589b11
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 13 15:40:49 2022 -0700
update to adwaita-icon-theme-41.0
diff --git a/packages/packages.current b/packages/packages.current
index fdd0384..6d5313b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -2,7 +2,7 @@
claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
-adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
+adwaita_icon_theme,41.0,file,https://download.gnome.org/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz,ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba,,
atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index ed02388..ac6595d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -278,6 +278,7 @@ File ${prefix}/share/icons/Adwaita/16x16/actions/media-eject-symbolic.symbolic.p
File ${prefix}/share/icons/Adwaita/16x16/actions/media-playback-pause-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/media-record-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/object-select-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/tab-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/view-list-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\categories"
@@ -348,7 +349,6 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/selection-end-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/selection-end-symbolic-rtl.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/selection-start-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/selection-start-symbolic-rtl.symbolic.png
-File ${prefix}/share/icons/Adwaita/16x16/ui/tab-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-close-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-maximize-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-minimize-symbolic.symbolic.png
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 0e9af0c..349ca12 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -146,6 +146,7 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-eject-symbolic.symbolic
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-playback-pause-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-record-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\object-select-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\tab-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\view-list-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\actions"
@@ -216,7 +217,6 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-end-symbolic.symbolic.pn
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-end-symbolic-rtl.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-start-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-start-symbolic-rtl.symbolic.png"
-Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\tab-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-close-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-maximize-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-minimize-symbolic.symbolic.png"
commit 63875efb0271f0dad8d45fe7c1143fdd7f66bf13
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Feb 6 19:12:28 2022 -0700
Revert "Merge branch 'master' into gtk3"
This reverts commits 4968b92d8589018fee527968c6059c83e21b5ada and
e672eb82a932c40d4d3ef93aa8c95fb9c1fc9f3a, reversing changes made
to dd397766cfb413dbacc64233980c0fad4facad1c.
diff --git a/configure.ac b/configure.ac
index f1790d5..615d0bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,8 @@ CM_SPKG([libiconv])
CM_SPKG([gettext], [libiconv])
CM_SPKG([libffi])
-CM_SPKG([glib], [libiconv gettext libffi zlib])
+CM_SPKG([pcre])
+CM_SPKG([glib], [libiconv gettext libffi pcre zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
diff --git a/packages/packages.current b/packages/packages.current
index 45a80bf..fdd0384 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,6 +45,7 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
+pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
diff --git a/patches/libsoup/01-extern-c.patch b/patches/libsoup/01-extern-c.patch
deleted file mode 100644
index 5f5c2ff..0000000
--- a/patches/libsoup/01-extern-c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Revert libsoup commit b5e4f15a09d197b6a9b4b2d78b33779f27d828af
-# old webkitgtk fails to link against libsoup with an undefined reference
-
-diff -u a/libsoup/soup.h b/libsoup/soup.h
---- a/libsoup/soup.h 2021-08-22 15:32:34.238970300 -0700
-+++ b/libsoup/soup.h 2021-09-10 20:44:04.968600007 -0700
-@@ -6,6 +6,10 @@
- #ifndef __SOUP_H__
- #define __SOUP_H__ 1
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #define __SOUP_H_INSIDE__
-
- #include <libsoup/soup-address.h>
-@@ -64,4 +68,8 @@
-
- #undef __SOUP_H_INSIDE__
-
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* __SOUP_H__ */
diff --git a/patches/webkitgtk-2.4.11/09-no-fortify-source.patch b/patches/webkitgtk-2.4.11/09-no-fortify-source.patch
deleted file mode 100644
index d3e3a34..0000000
--- a/patches/webkitgtk-2.4.11/09-no-fortify-source.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Remove -D_FORTIFY_SOURCE=2 for mingw gcc-10
-diff -u a/Source/autotools/SetupCompilerFlags.m4 b/Source/autotools/bSetupCompilerFlags.m4
---- a/Source/autotools/SetupCompilerFlags.m4
-+++ b/Source/autotools/SetupCompilerFlags.m4
-@@ -46,13 +46,6 @@ fi
- if test "$enable_optimizations" = "yes"; then
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
--
-- if test "$c_compiler" = "gcc"; then
-- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-- fi
-- if test "$cxx_compiler" = "g++"; then
-- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
-- fi
- else
- CXXFLAGS="$CXXFLAGS -Og"
- CFLAGS="$CFLAGS -Og"
diff --git a/patches/webkitgtk-2.4.11/99-autoreconf.sh b/patches/webkitgtk-2.4.11/99-autoreconf.sh
deleted file mode 100755
index 1540ea4..0000000
--- a/patches/webkitgtk-2.4.11/99-autoreconf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-autoreconf -fvi
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c467af..9c9c2f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,8 +72,17 @@ cm_pkg_regex_configure = \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
-cm_pkg_glib_configure = \
- -Dinternal_pcre=true
+cm_pkg_pcre_configure = \
+ --disable-shared \
+ --enable-static \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --disable-cpp \
+ --enable-utf \
+ --enable-unicode-properties \
+ --enable-newline-is-anycrlf \
+ --disable-stack-for-recursion
+
if ENABLE_DEBUG_OPTS
cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
else
@@ -328,9 +337,6 @@ cm_pkg_libsoup_configure = \
-Dsysprof=disabled \
-Dtls_check=false \
-Dintrospection=disabled
-# -fcommon works around libsoup failing to link with GCC 10 due to multiple
-# definition errors
-cm_pkg_libsoup_cflags = $(CM_CFLAGS) -fcommon
cm_pkg_libsoup_meson_cppflags = -I$(idir)/include
cm_pkg_libsoup_meson_ldflags = -L$(idir)/lib
commit e672eb82a932c40d4d3ef93aa8c95fb9c1fc9f3a
Author: Thorsten Maerz <info at netztorte.de>
Date: Sat Feb 5 07:16:30 2022 +0100
Missing from last merge
diff --git a/configure.ac b/configure.ac
index 615d0bd..f1790d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,8 +249,7 @@ CM_SPKG([libiconv])
CM_SPKG([gettext], [libiconv])
CM_SPKG([libffi])
-CM_SPKG([pcre])
-CM_SPKG([glib], [libiconv gettext libffi pcre zlib])
+CM_SPKG([glib], [libiconv gettext libffi zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
commit 4968b92d8589018fee527968c6059c83e21b5ada
Merge: dd39776 f97679f
Author: Thorsten Maerz <info at netztorte.de>
Date: Fri Feb 4 16:00:45 2022 +0100
Merge branch 'master' into gtk3
diff --cc packages/packages.current
index fdd0384,d5d2722..45a80bf
--- a/packages/packages.current
+++ b/packages/packages.current
@@@ -43,9 -41,7 +43,8 @@@ libwebp,1.2.1,file,https://storage.goog
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
+p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
- pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
commit dd397766cfb413dbacc64233980c0fad4facad1c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 18:47:40 2022 -0700
update copyright year
diff --git a/src/claws-mail.nsi b/src/claws-mail.nsi
index 6f93285..183c464 100644
--- a/src/claws-mail.nsi
+++ b/src/claws-mail.nsi
@@ -11,7 +11,7 @@
!define PRETTY_PACKAGE_SHORT "ClawsMail"
!define COMPANY "claws-mail.org"
!define WEBSITE "https://www.claws-mail.org"
-!define COPYRIGHT "Copyright (C) 1999-2021 Hiroyuki Yamamoto and the Claws Mail team"
+!define COPYRIGHT "Copyright (C) 1999-2022 The Claws Mail Team and Hiroyuki Yamamoto"
!define DESCRIPTION "Claws Mail for Windows Installation Package"
# Admin privileges are required for installation
commit dd49600010f09408416a8812fa4454e814474331
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 17:52:43 2022 -0700
update regex from gnulib HEAD
diff --git a/packages/packages.current b/packages/packages.current
index 4690855..fdd0384 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -49,7 +49,7 @@ pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
-regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
+regex,20220116,git,git://git.savannah.gnu.org/gnulib.git,d2696e1aa0c47701e88cf29b528bd0123a8d4b010ba37f6f142b9aef80d76950,master,1eae0f7ea3c220d054025f2c9211700665f9f4a0
sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
diff --git a/src/regex/ChangeLog b/src/regex/ChangeLog
index f096b7a..bbcca49 100644
--- a/src/regex/ChangeLog
+++ b/src/regex/ChangeLog
@@ -1,3 +1,7 @@
+2022-01-16 Jonathan Boeing
+
+ Update to build gnulib HEAD
+
2021-07-02 Jonathan Boeing
Update to build gnulib HEAD
diff --git a/src/regex/NEWS b/src/regex/NEWS
index 4f42dbd..82770d8 100644
--- a/src/regex/NEWS
+++ b/src/regex/NEWS
@@ -1,3 +1,7 @@
+20220116:
+ Update to gnulib from 20220116
+ 1eae0f7ea3c220d054025f2c9211700665f9f4a0
+
20210702:
Update to gnulib from 20210702
901694b904cd861adc2529b2e05a3fb33f9b534f
diff --git a/src/regex/configure.ac b/src/regex/configure.ac
index c4f7eaf..d0cc508 100644
--- a/src/regex/configure.ac
+++ b/src/regex/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.69)
-AC_INIT([regex], [20210702], [jonathan at claws-mail.org])
+AC_INIT([regex], [20220116], [jonathan at claws-mail.org])
AC_CONFIG_SRCDIR([lib/regex.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
commit 9c03c65d446dd51fba81ba1f7d3431e0da3068db
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 17:34:04 2022 -0700
update to sqlite-3.37.2
diff --git a/packages/packages.current b/packages/packages.current
index aa6270d..4690855 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,7 @@ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200
poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
-sqlite,3.37.1,file,https://sqlite.org/2021/sqlite-autoconf-3370100.tar.gz,40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e,,
+sqlite,3.37.2,file,https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz,4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
commit 6c3074b4d85c1d79325345ad0df9739ee611d642
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 17:32:29 2022 -0700
update to jpeg-9e
diff --git a/packages/packages.current b/packages/packages.current
index adb99dc..aa6270d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -27,7 +27,7 @@ gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.
harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
-jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
+jpeg,9e,file,https://ijg.org/files/jpegsrc.v9e.tar.gz,4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d,,
libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
commit 644340d17ed8b61e7a0c5edd7692ce08b9e38d77
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 17:31:32 2022 -0700
update to expat-2.4.3
diff --git a/packages/packages.current b/packages/packages.current
index c5c6de1..adb99dc 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -11,7 +11,7 @@ certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/
curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
-expat,2.4.2,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_2/expat-2.4.2.tar.xz,bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199,,
+expat,2.4.3,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_3/expat-2.4.3.tar.xz,b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
commit 96c698b0351c640507cbb2b65cffe09c10b76c22
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 16 17:30:28 2022 -0700
update to curl-7.81.0
diff --git a/packages/packages.current b/packages/packages.current
index 8dfb94d..c5c6de1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -8,7 +8,7 @@ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/330c22fc463e2de39cae6b9f4c7e91dd6c255931/security/nss/lib/ckfw/builtins/certdata.txt,bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f,,
-curl,7.80.0,file,https://curl.se/download/curl-7.80.0.tar.xz,a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab,,
+curl,7.81.0,file,https://curl.se/download/curl-7.81.0.tar.xz,a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.2,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_2/expat-2.4.2.tar.xz,bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199,,
commit 6254812688bfba07e3128dff3d57698977fd092c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Jan 10 12:12:36 2022 -0700
fix status bar height bouncing when text appears
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 3a5c27c..ac6df7a 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,148 @@
+@@ -272,3 +277,153 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -170,3 +170,8 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+#mime_notebook viewport {
+ background-color: white;
+}
++
++/* Fix status bar height bouncing when text toggles visibility */
++#hbox_stat > statusbar label {
++ min-height: 17px;
++}
commit 4d136236c6d897c71ab2f5d9eef8ce6667bf8dd2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Jan 5 11:05:58 2022 -0700
update to poppler-22.01.0
diff --git a/packages/packages.current b/packages/packages.current
index 2da238f..8dfb94d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -47,7 +47,7 @@ p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0
pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
+poppler,22.01.0,file,https://poppler.freedesktop.org/poppler-22.01.0.tar.xz,7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.37.1,file,https://sqlite.org/2021/sqlite-autoconf-3370100.tar.gz,40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e,,
diff --git a/patches/poppler/02-jpeg-include-order.patch b/patches/poppler/02-jpeg-include-order.patch
new file mode 100644
index 0000000..111a403
--- /dev/null
+++ b/patches/poppler/02-jpeg-include-order.patch
@@ -0,0 +1,29 @@
+--- a/poppler/ImageEmbeddingUtils.cc 2022-01-05 05:53:41.000000000 -0700
++++ b/poppler/ImageEmbeddingUtils.cc 2022-01-05 10:53:20.286543287 -0700
+@@ -13,12 +13,6 @@
+ #include <config.h>
+
+ #include <memory>
+-#ifdef ENABLE_LIBJPEG
+-extern "C" {
+-# include <jpeglib.h>
+-}
+-# include <csetjmp>
+-#endif
+ #ifdef ENABLE_LIBPNG
+ # include <png.h>
+ #endif
+@@ -31,6 +25,13 @@
+ #include "Error.h"
+ #include "PDFDoc.h"
+
++#ifdef ENABLE_LIBJPEG
++extern "C" {
++# include <jpeglib.h>
++}
++# include <csetjmp>
++#endif
++
+ namespace ImageEmbeddingUtils {
+
+ static const uint8_t PNG_MAGIC_NUM[] = { 0x89, 0x50, 0x4e, 0x47 };
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 51a6d4c..ed02388 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -520,7 +520,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-115.dll
+File ${prefix}/bin/libpoppler-117.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 4812ff8..0e9af0c 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-115.dll"
+Delete "$INSTDIR\libpoppler-117.dll"
#######################################
### gumbo-parser
commit 20d78437dae274c84dce9c332471bc8a213ff64e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 14:57:51 2022 -0700
Add patches for libetpan CVE-2020-19593
diff --git a/patches/libetpan-1.9.4/07-starttls-imap.patch b/patches/libetpan-1.9.4/07-starttls-imap.patch
new file mode 100644
index 0000000..436bf79
--- /dev/null
+++ b/patches/libetpan-1.9.4/07-starttls-imap.patch
@@ -0,0 +1,27 @@
+From 1002a0121a8f5a9aee25357769807f2c519fa50b Mon Sep 17 00:00:00 2001
+From: Damian Poddebniak <duesee at users.noreply.github.com>
+Date: Fri, 24 Jul 2020 19:39:53 +0200
+Subject: [PATCH] Detect extra data after STARTTLS response and exit (#387)
+
+---
+ src/low-level/imap/mailimap.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/low-level/imap/mailimap.c b/src/low-level/imap/mailimap.c
+index bb17119d..4ffcf55d 100644
+--- a/src/low-level/imap/mailimap.c
++++ b/src/low-level/imap/mailimap.c
+@@ -2428,6 +2428,13 @@ int mailimap_starttls(mailimap * session)
+
+ mailimap_response_free(response);
+
++ // Detect if the server send extra data after the STARTTLS response.
++ // This *may* be a "response injection attack".
++ if (session->imap_stream->read_buffer_len != 0) {
++ // Since it is also an IMAP protocol violation, exit.
++ return MAILIMAP_ERROR_STARTTLS;
++ }
++
+ switch (error_code) {
+ case MAILIMAP_RESP_COND_STATE_OK:
+ return MAILIMAP_NO_ERROR;
diff --git a/patches/libetpan-1.9.4/08-starttls-smtp-pop3.patch b/patches/libetpan-1.9.4/08-starttls-smtp-pop3.patch
new file mode 100644
index 0000000..afa3022
--- /dev/null
+++ b/patches/libetpan-1.9.4/08-starttls-smtp-pop3.patch
@@ -0,0 +1,52 @@
+From 298460a2adaabd2f28f417a0f106cb3b68d27df9 Mon Sep 17 00:00:00 2001
+From: Fabian Ising <Murgeye at users.noreply.github.com>
+Date: Fri, 24 Jul 2020 19:40:48 +0200
+Subject: [PATCH] Detect extra data after STARTTLS responses in SMTP and POP3
+ and exit (#388)
+
+* Detect extra data after STLS response and return error
+
+* Detect extra data after SMTP STARTTLS response and return error
+---
+ src/low-level/pop3/mailpop3.c | 8 ++++++++
+ src/low-level/smtp/mailsmtp.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/low-level/pop3/mailpop3.c b/src/low-level/pop3/mailpop3.c
+index ab9535be..e2124bf8 100644
+--- a/src/low-level/pop3/mailpop3.c
++++ b/src/low-level/pop3/mailpop3.c
+@@ -959,6 +959,14 @@ int mailpop3_stls(mailpop3 * f)
+
+ if (r != RESPONSE_OK)
+ return MAILPOP3_ERROR_STLS_NOT_SUPPORTED;
++
++ // Detect if the server send extra data after the STLS response.
++ // This *may* be a "response injection attack".
++ if (f->pop3_stream->read_buffer_len != 0) {
++ // Since it is also protocol violation, exit.
++ // There is no error type for STARTTLS errors in POP3
++ return MAILPOP3_ERROR_SSL;
++ }
+
+ return MAILPOP3_NO_ERROR;
+ }
+diff --git a/src/low-level/smtp/mailsmtp.c b/src/low-level/smtp/mailsmtp.c
+index b7fc459e..3145cadf 100644
+--- a/src/low-level/smtp/mailsmtp.c
++++ b/src/low-level/smtp/mailsmtp.c
+@@ -1111,6 +1111,14 @@ int mailesmtp_starttls(mailsmtp * session)
+ return MAILSMTP_ERROR_STREAM;
+ r = read_response(session);
+
++ // Detect if the server send extra data after the STARTTLS response.
++ // This *may* be a "response injection attack".
++ if (session->stream->read_buffer_len != 0) {
++ // Since it is also protocol violation, exit.
++ // There is no general error type for STARTTLS errors in SMTP
++ return MAILSMTP_ERROR_SSL;
++ }
++
+ switch (r) {
+ case 220:
+ return MAILSMTP_NO_ERROR;
commit dac70578e73bc9d443d409e516a565fc10a2075f
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:10:34 2022 -0700
update to sqlite-3.37.1
diff --git a/packages/packages.current b/packages/packages.current
index c50c54f..2da238f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,7 @@ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200
poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
-sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
+sqlite,3.37.1,file,https://sqlite.org/2021/sqlite-autoconf-3370100.tar.gz,40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
commit 18d853b5d1bbc152b2e78fc2fc19d9172d157f19
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:08:38 2022 -0700
update to pango-1.50.3
diff --git a/packages/packages.current b/packages/packages.current
index 9d784b6..c50c54f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
+pango,1.50.3,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz,4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
diff --git a/patches/pango/01-rounding.patch b/patches/pango/01-rounding.patch
deleted file mode 100644
index bb721eb..0000000
--- a/patches/pango/01-rounding.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From df0217a3f46c77b743fa1ae1ddfc2bb321ba91e8 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei at src.gnome.org>
-Date: Mon, 9 Aug 2021 16:22:22 +0800
-Subject: [PATCH] pango/shape.c: Use the former rounding code as needed
-
-The careful rounding code that was brought back as a result of commit
-d4356779 only had effect if we are using a backend that supported font
-hinting, so on other backends, use the former rounding code that was
-dropped in favor of the careful rounding code that unfortunately did not
-apply for all backends.
-
-Should fix #578.
----
- pango/shape.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/pango/shape.c b/pango/shape.c
-index f8ac3691..aed028b7 100644
---- a/pango/shape.c
-+++ b/pango/shape.c
-@@ -341,5 +341,17 @@ pango_shape_with_flags (const gchar *item_text,
- #undef HINT
- }
- }
-+ else
-+ {
-+ for (i = 0; i < glyphs->num_glyphs; i++)
-+ {
-+ glyphs->glyphs[i].geometry.width =
-+ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.width);
-+ glyphs->glyphs[i].geometry.x_offset =
-+ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.x_offset);
-+ glyphs->glyphs[i].geometry.y_offset =
-+ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.y_offset);
-+ }
-+ }
- }
- }
---
-GitLab
-
commit fbe2ae42364cb4d1ec3e42ec3b03e3a325d63583
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:05:23 2022 -0700
update to libsoup-2.74.2
diff --git a/packages/packages.current b/packages/packages.current
index 9f14a49..9d784b6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -37,7 +37,7 @@ libical,3.0.12,file,https://github.com/libical/libical/releases/download/v3.0.12
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-libsoup,2.74.1,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.1.tar.xz,dc27a3b8fa30bc8ff950b5a75958757d2242e3e51e4e2d9c4e623ef75f793bf8,,
+libsoup,2.74.2,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.2.tar.xz,f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159,,
libtasn1,4.18.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.18.0.tar.gz,4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898,,
libwebp,1.2.1,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz,808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
commit 4b50188bc6b748a46750a2ae3b262cca7d49e934
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:03:56 2022 -0700
update to libical-3.0.12
diff --git a/packages/packages.current b/packages/packages.current
index 76d2515..9f14a49 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -33,7 +33,7 @@ libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
libgpg_error,1.43,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2,a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf,,
-libical,3.0.11,file,https://github.com/libical/libical/releases/download/v3.0.11/libical-3.0.11.tar.gz,1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1,,
+libical,3.0.12,file,https://github.com/libical/libical/releases/download/v3.0.12/libical-3.0.12.tar.gz,35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
commit 35811b96f4d0934260f0e509f8ffa1fcbfc73e5e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:02:16 2022 -0700
update to icu-70.1
diff --git a/packages/packages.current b/packages/packages.current
index d5e8c7a..76d2515 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -26,7 +26,7 @@ gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.x
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
-icu4c,69.1,file,https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz,4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745,,
+icu4c,70.1,file,https://github.com/unicode-org/icu/releases/download/release-70-1/icu4c-70_1-src.tgz,8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5,,
jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 12fdbe6..51a6d4c 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -437,9 +437,9 @@ File ${prefix}/bin/libwebp-7.dll
#######################################
### icu4c
!insertmacro SetPrefix icu4c
-File ${prefix}/bin/icudt69.dll
-File ${prefix}/bin/icuin69.dll
-File ${prefix}/bin/icuuc69.dll
+File ${prefix}/bin/icudt70.dll
+File ${prefix}/bin/icuin70.dll
+File ${prefix}/bin/icuuc70.dll
#######################################
### libepoxy
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index e507a77..4812ff8 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -92,9 +92,9 @@ Delete "$INSTDIR\libwebp-7.dll"
#######################################
### icu4c
-Delete "$INSTDIR\icudt69.dll"
-Delete "$INSTDIR\icuin69.dll"
-Delete "$INSTDIR\icuuc69.dll"
+Delete "$INSTDIR\icudt70.dll"
+Delete "$INSTDIR\icuin70.dll"
+Delete "$INSTDIR\icuuc70.dll"
#######################################
### libepoxy
commit bc14472b839ea75e392b6bc87b4aacee3e90f603
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 11:01:41 2022 -0700
update to harfbuzz-3.2.0
diff --git a/packages/packages.current b/packages/packages.current
index f8cd0a6..d5e8c7a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -24,7 +24,7 @@ gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.ta
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
-harfbuzz,2.9.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.9.1/harfbuzz-2.9.1.tar.xz,0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf,,
+harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,69.1,file,https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz,4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745,,
jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
commit e8649eb47b007cc5015da5b0299223de0098df4c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:57:06 2022 -0700
update to gtk-3.24.31
diff --git a/packages/packages.current b/packages/packages.current
index e35a564..f8cd0a6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -22,7 +22,7 @@ glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
-gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
+gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,2.9.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.9.1/harfbuzz-2.9.1.tar.xz,0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
diff --git a/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch b/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
new file mode 100644
index 0000000..a275f92
--- /dev/null
+++ b/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
@@ -0,0 +1,171 @@
+--- a/gdk/win32/gdkkeys-win32.h 2022-01-02 13:05:43.284701904 -0700
++++ b/gdk/win32/gdkkeys-win32.h 2022-01-02 13:04:57.244227175 -0700
+@@ -0,0 +1,168 @@
++/*
++ * Copyright (c) 2021 Philip Zander
++ * Copyright (c) 2018 Microsoft
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all
++ * copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#include <glib.h>
++#include <Windows.h>
++
++/* For lookup table VK -> chars */
++typedef struct
++{
++ int table;
++ int index;
++} GdkWin32KeymapTableAndIndex;
++
++/* For reverse lookup char -> VKs */
++typedef struct
++{
++ BYTE mod_bits;
++ BYTE vk;
++
++ /* Index of next KeyEntry. -1 if there is no next entry. */
++ int next;
++} GdkWin32KeymapKeyEntry;
++
++typedef struct
++{
++ HKL handle;
++
++ /* Keyboard layout identifier */
++ char name[KL_NAMELENGTH];
++
++ /* Path of the layout DLL */
++ char *file;
++
++ /* Handle of the layout DLL */
++ HINSTANCE lib;
++
++ /* The actual conversion tables provided by the layout DLL.
++ *
++ * This is a pointer to a KBDTABLES structure. The exact definition
++ * of this structure depends on the kernel on which the executable
++ * run and can in general only be determined at runtime. That's why
++ * we have to use a generic gpointer instead of the actual type here.
++ *
++ * See comment on GdkWin32KeymapImpl below for more information. */
++ gpointer tables;
++
++ /* VK -> chars lookup table so we don't have to do a linear scan
++ * every time we look up a key. */
++ GdkWin32KeymapTableAndIndex vk_lookup_table[256];
++
++ /* List of entries for reverse (char ->VKs) lookup. */
++ GArray *key_entries;
++
++ /* Reverse lookup table (char -> VKs). Key: Unichar. Value: int.
++ * The value is used to index into the key_entries array. The key_entries
++ * array can contain multiple consecutive entries for a given char.
++ * The end of the list for the char is marked by a key entry that has
++ * mod_bits and vk set to 0xFF. */
++ GHashTable *reverse_lookup_table;
++
++ /* Map level to modbits */
++ BYTE level_to_modbits[256];
++
++ /* Max Number of levels */
++ BYTE max_level;
++
++ /* Maximum possible value of a modbits bitset. */
++ BYTE max_modbit_value;
++
++} GdkWin32KeymapLayoutInfo;
++
++/* Some keyboard driver constants
++ * See https://github.com/microsoft/windows-rs/blob/0.28.0/crates/deps/sys/src/Windows/Win32/UI/Input/KeyboardAndMouse/mod.rs
++ */
++
++/* Modifier bits */
++#define KBDBASE 0x00
++#define KBDSHIFT 0x01
++#define KBDCTRL 0x02
++#define KBDALT 0x04
++#define KBDKANA 0x08
++#define KBDROYA 0x10
++#define KBDLOYA 0x20
++#define KBDGRPSELTAP 0x80
++
++#define KBDALTGR (KBDCTRL| KBDALT)
++
++/* */
++#define SHFT_INVALID 0x0F
++
++/* Char table constants */
++#define WCH_NONE 0xF000
++#define WCH_DEAD 0xF001
++#define WCH_LGTR 0xF002
++
++/* Char table flags */
++#define CAPLOK 0x01
++#define SGCAPS 0x02
++#define CAPLOKALTGR 0x04
++#define KANALOK 0x08
++#define GRPSELTAP 0x80
++
++/* IMPORTANT:
++ *
++ * Keyboard layout DLLs are dependent on the host architecture.
++ *
++ * - 32 bit systems have just one 32 bit DLL in System32.
++ * - 64 bit systems contain two versions of each layout DLL: One in System32
++ * for 64-bit applications, and one in SysWOW64 for 32-bit applications.
++ *
++ * Here comes the tricky part:
++ *
++ * The 32-bit DLL in SysWOW64 is *not* identical to the DLL you would find
++ * on a true 32 bit system, because all the pointers there are declared with
++ * the attribute `__ptr64` (which means they are 64 bits wide, but only the
++ * lower 32 bits are used).
++ *
++ * This leads to the following problems:
++ *
++ * (1) GCC does not support `__ptr64`
++ * (2) When compiling the 32-bit library, we need two versions of the same code
++ * and decide at run-time which one to execute, because we can't know at
++ * compile time whether we will be running on a true 32-bit system, or on
++ * WOW64.
++ *
++ * To solve this problem, we generate code for both cases (see
++ * gdkkeys-win32-impl.c + gdkkeys-win32-impl-wow64.c) and encapsulate
++ * the resulting functions in a struct of type GdkWin32KeymapImpl,
++ * allowing us to select the correct implementation at runtime.
++ *
++ */
++
++typedef struct
++{
++ gboolean (*load_layout_dll) (const char *dll,
++ GdkWin32KeymapLayoutInfo *info);
++ void (*init_vk_lookup_table) (GdkWin32KeymapLayoutInfo *info);
++ BYTE (*keystate_to_modbits) (GdkWin32KeymapLayoutInfo *info,
++ const BYTE keystate[256]);
++ BYTE (*modbits_to_level) (GdkWin32KeymapLayoutInfo *info,
++ BYTE modbits);
++ WCHAR (*vk_to_char_fuzzy) (GdkWin32KeymapLayoutInfo *info,
++ const BYTE keystate[256],
++ BYTE extra_mod_bits,
++ BYTE *consumed_mod_bits,
++ gboolean *is_dead,
++ BYTE vk);
++} GdkWin32KeymapImpl;
diff --git a/patches/gtk-3.24.31/02-windows-h.patch b/patches/gtk-3.24.31/02-windows-h.patch
new file mode 100644
index 0000000..d45273b
--- /dev/null
+++ b/patches/gtk-3.24.31/02-windows-h.patch
@@ -0,0 +1,24 @@
+From 4090306fd7216cb102590262b444de7127242725 Mon Sep 17 00:00:00 2001
+From: Melroy van den Berg <melroy at melroy.org>
+Date: Tue, 28 Dec 2021 00:47:28 +0100
+Subject: [PATCH] Lowercaps Windows.h -> windows.h
+
+---
+ gdk/win32/gdkkeys-win32.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdk/win32/gdkkeys-win32.h b/gdk/win32/gdkkeys-win32.h
+index 14a69d8081..17b7d7125c 100644
+--- a/gdk/win32/gdkkeys-win32.h
++++ b/gdk/win32/gdkkeys-win32.h
+@@ -22,7 +22,7 @@
+ */
+
+ #include <glib.h>
+-#include <Windows.h>
++#include <windows.h>
+
+ /* For lookup table VK -> chars */
+ typedef struct
+--
+2.30.2
diff --git a/patches/gtk-3.24.31/03-gc-allgestures.patch b/patches/gtk-3.24.31/03-gc-allgestures.patch
new file mode 100644
index 0000000..0e8fcbb
--- /dev/null
+++ b/patches/gtk-3.24.31/03-gc-allgestures.patch
@@ -0,0 +1,26 @@
+From 37f9af58059252c27197444f13fd9fe5b65ef4b4 Mon Sep 17 00:00:00 2001
+From: Melroy van den Berg <melroy at melroy.org>
+Date: Tue, 28 Dec 2021 00:50:17 +0100
+Subject: [PATCH] Add define for GC_ALLGESTURES, in-case WINVER is not set.
+
+---
+ gdk/win32/winpointer.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h
+index ee3e42e063..786f6016c7 100644
+--- a/gdk/win32/winpointer.h
++++ b/gdk/win32/winpointer.h
+@@ -138,6 +138,10 @@
+ #define PA_ACTIVATE MA_ACTIVATE
+ #define PA_NOACTIVATE MA_NOACTIVATE
+
++#ifndef GC_ALLGESTURES
++#define GC_ALLGESTURES 0x1
++#endif
++
+ typedef DWORD POINTER_INPUT_TYPE;
+ typedef UINT32 POINTER_FLAGS;
+ typedef UINT32 TOUCH_FLAGS;
+--
+2.30.2
diff --git a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
deleted file mode 100644
index 35a60c3..0000000
--- a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 56ec8b1af54e43682fbe4c57a12b83de2f43e0af Mon Sep 17 00:00:00 2001
-From: Jaime Velasco Juan <jsagarribay at gmail.com>
-Date: Thu, 20 Oct 2016 09:58:19 +0100
-Subject: [PATCH 1/7] win32 theme: Fix levelbar and tweak progressbar
-
-Both have a similar look now
----
- gtk/theme/win32/gtk-win32-base.css | 46 +++++++++++++++++++++++++++-----------
- 1 file changed, 33 insertions(+), 13 deletions(-)
-
-diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
-index 8ea3104..f9255cd 100644
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -998,39 +998,59 @@ scale value {
- }
-
-
--/* Progress bars */
-+/* Progress bars and level bars */
-
--progressbar {
-- background-color: transparent;
-- padding: 0;
-+progressbar.horizontal trough,
-+levelbar.horizontal trough {
-+ min-height: -gtk-win32-part-height(progress, 1, 1);
-+ background-image: -gtk-win32-theme-part(progress, 1, 1);
-+}
-+progressbar.vertical trough,
-+levelbar.vertical trough {
-+ min-width: -gtk-win32-part-width(progress, 1, 1);
-+ background-image: -gtk-win32-theme-part(progress, 2, 1);
- }
-
--progressbar trough {
-- border-width: 0;
-- background-image: -gtk-win32-theme-part(progress, 1, 1);
-+progressbar.horizontal progress, levelbar.horizontal block {
-+ min-height: -gtk-win32-part-height(progress, 5, 1);
- }
-
- progressbar progress,
-+levelbar block.filled,
- entry progress,
- entry progress:focus {
-- border-width: 0;
- background-image: -gtk-win32-theme-part(progress, 5, 1);
- }
-
--progressbar progress.pulse,
-+/* We use here PBFS_PAUSED (yellow by default) and PBFS_PARTIAL (blue) */
-+levelbar block.low {
-+ background-image: -gtk-win32-theme-part(progress, 5, 3);
-+}
-+levelbar block.full {
-+ background-image: -gtk-win32-theme-part(progress, 5, 4);
-+}
-+
-+progressbar.horizontal progress.pulse,
- entry progress.pulse,
- entry progress.pulse:focus {
-- background-color: transparent;
- background-image: -gtk-win32-theme-part(progress, 8, 1);
- }
-
--progressbar.vertical trough {
-- background-image: -gtk-win32-theme-part(progress, 2, 1);
-+progressbar.vertical progress,
-+levelbar.vertical block {
-+ min-width: -gtk-win32-part-width(progress, 6, 1);
- }
-
--progressbar.vertical progress {
-+progressbar.vertical progress,
-+levelbar.vertical block.filled {
- background-image: -gtk-win32-theme-part(progress, 6, 1);
- }
-+levelbar.vertical block.low {
-+ background-image: -gtk-win32-theme-part(progress, 6, 3);
-+}
-+levelbar.vertical block.full {
-+ background-image: -gtk-win32-theme-part(progress, 6, 4);
-+}
-
- progressbar.vertical progress.pulse {
- background-image: -gtk-win32-theme-part(progress, 10, 1);
---
-2.9.1
-
diff --git a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
deleted file mode 100644
index cd7e38a..0000000
--- a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4627b31437db1b7d1b413bb6b9bd434e30c748d7 Mon Sep 17 00:00:00 2001
-From: Jaime Velasco Juan <jsagarribay at gmail.com>
-Date: Thu, 20 Oct 2016 11:00:09 +0100
-Subject: [PATCH 2/7] win32 theme: fix disabled GtkEntry style
-
----
- gtk/theme/win32/gtk-win32-base.css | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
-index f9255cd..3038452 100644
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -690,7 +690,9 @@ entry:focus {
-
- textview.view:disabled,
- entry:disabled {
-- background-image: -gtk-win32-theme-part(edit, 1, 4);
-+ /* This theme part feels wrong here, but it looks as one would expect,
-+ whereas (edit, 5, 3) BACKGROUNDWITHBORDER, EBS_DISABLED is just white */
-+ background-image: -gtk-win32-theme-part(combobox, 5, 4);
- color: -gtk-win32-color(edit, graytext);
- }
-
---
-2.9.1
-
diff --git a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
deleted file mode 100644
index 0587fc8..0000000
--- a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 6441ce083826a8526bfd17d3807939e63f90ffba Mon Sep 17 00:00:00 2001
-From: Jaime Velasco Juan <jsagarribay at gmail.com>
-Date: Fri, 21 Oct 2016 12:35:07 +0100
-Subject: [PATCH 4/7] win32 theme: Fix unfocused window buttons
-
----
- gtk/theme/win32/gtk.css | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
-index 218875e..cd9b859 100644
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -183,9 +183,18 @@ decoration:disabled {
- margin: -3px;
- }
-
-+.titlebar .close image,
-+.titlebar .maximize image,
-+.titlebar .minimize image {
-+ color: transparent;
-+}
-+
- .titlebar button.close {
- background-image: -gtk-win32-theme-part(window, 18, 1);
-- color: transparent;
-+}
-+
-+.titlebar button.close:backdrop {
-+ background-image: -gtk-win32-theme-part(window, 18, 5);
- }
-
- .titlebar button.close:hover {
-@@ -202,7 +211,10 @@ decoration:disabled {
-
- .titlebar button.minimize {
- background-image: -gtk-win32-theme-part(window, 15, 1);
-- color: transparent;
-+}
-+
-+.titlebar button.minimize:backdrop {
-+ background-image: -gtk-win32-theme-part(window, 15, 5);
- }
-
- .titlebar button.minimize:hover {
-@@ -219,7 +231,10 @@ decoration:disabled {
-
- .titlebar button.maximize {
- background-image: -gtk-win32-theme-part(window, 17, 1);
-- color: transparent;
-+}
-+
-+.titlebar button.maximize:backdrop {
-+ background-image: -gtk-win32-theme-part(window, 17, 5);
- }
-
- .titlebar button.maximize:hover {
-@@ -238,6 +253,10 @@ decoration:disabled {
- background-image: -gtk-win32-theme-part(window, 21, 1);
- }
-
-+.maximized .titlebar button.maximize:backdrop {
-+ background-image: -gtk-win32-theme-part(window, 21, 5);
-+}
-+
- .maximized .titlebar button.maximize:hover {
- background-image: -gtk-win32-theme-part(window, 21, 2);
- }
---
-2.9.1
-
diff --git a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
deleted file mode 100644
index 9abbaa4..0000000
--- a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From be59f5bc95d9fd18fba250282021c96d2b9254f1 Mon Sep 17 00:00:00 2001
-From: Jaime Velasco Juan <jsagarribay at gmail.com>
-Date: Mon, 31 Oct 2016 14:00:16 +0000
-Subject: [PATCH 7/7] win32 theme: Draw expander arrow
-
-Better than nothing.
----
- gtk/theme/win32/gtk-win32-base.css | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
-index 0cbaa3c..9be7dc0 100644
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -1176,6 +1176,21 @@ statusbar > frame {
- background-image: none;
- }
-
-+/* Expander */
-+
-+expander title arrow {
-+ background-image: -gtk-win32-theme-part(explorerbar, 7, 1);
-+}
-+expander title arrow:checked {
-+ background-image: -gtk-win32-theme-part(explorerbar, 6, 1);
-+}
-+expander title:hover arrow {
-+ background-image: -gtk-win32-theme-part(explorerbar, 7, 2);
-+}
-+expander title:hover arrow:checked {
-+ background-image: -gtk-win32-theme-part(explorerbar, 6, 2);
-+}
-+
- /* Spinner */
-
- @keyframes spin {
---
-2.9.1
-
commit 499d62575d428f07fb99844f99156bf72922d673
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:56:45 2022 -0700
update to glib-networking-2.70.1
diff --git a/packages/packages.current b/packages/packages.current
index bb1f7d4..e35a564 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -18,7 +18,7 @@ fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
glib,2.70.2,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.2.tar.xz,0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f,,
-glib_networking,2.70.0,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.0.tar.xz,66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35,,
+glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.tar.xz,2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
commit 6051e469bd314c2ed1fdcc417c16b8313b01783b
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:54:05 2022 -0700
update to glib-2.70.2
diff --git a/packages/packages.current b/packages/packages.current
index 05177f4..bb1f7d4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
-glib,2.70.1,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.1.tar.xz,f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0,,
+glib,2.70.2,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.2.tar.xz,0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f,,
glib_networking,2.70.0,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.0.tar.xz,66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
commit 4796440bee46386be9d9b533fd3faa247e5e9db4
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:53:00 2022 -0700
update to fribidi-1.0.11
diff --git a/packages/packages.current b/packages/packages.current
index f3324ce..05177f4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -14,7 +14,7 @@ enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/e
expat,2.4.2,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_2/expat-2.4.2.tar.xz,bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
-fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
+fribidi,1.0.11,file,https://github.com/fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz,30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
glib,2.70.1,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.1.tar.xz,f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0,,
commit cdfd57a307aaa0978bf07e679327747100c14475
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:50:28 2022 -0700
update to freetype 2.11.1
diff --git a/packages/packages.current b/packages/packages.current
index 89cc761..f3324ce 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -13,7 +13,7 @@ cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.2,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_2/expat-2.4.2.tar.xz,bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
-freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
+freetype,2.11.1,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz,3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8,,
fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
commit cd362daf4b7f50dc8d0eab8df7066266564028c4
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:46:08 2022 -0700
update to expat-2.4.2
diff --git a/packages/packages.current b/packages/packages.current
index ef65d31..89cc761 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -11,7 +11,7 @@ certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/
curl,7.80.0,file,https://curl.se/download/curl-7.80.0.tar.xz,a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
-expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
+expat,2.4.2,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_2/expat-2.4.2.tar.xz,bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
commit 4bdec4dbecdb065518717ec4e4ecce4a46d8a444
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jan 2 10:44:42 2022 -0700
update to enchant-2.3.2
diff --git a/packages/packages.current b/packages/packages.current
index 8994332..ef65d31 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -10,7 +10,7 @@ cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c
certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/330c22fc463e2de39cae6b9f4c7e91dd6c255931/security/nss/lib/ckfw/builtins/certdata.txt,bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f,,
curl,7.80.0,file,https://curl.se/download/curl-7.80.0.tar.xz,a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
-enchant,2.3.1,file,https://github.com/AbiWord/enchant/releases/download/v2.3.1/enchant-2.3.1.tar.gz,7b4b1afcf2cd8bfa691deea6188404d337f23174bbc39b9c2add2bf340736e9c,,
+enchant,2.3.2,file,https://github.com/AbiWord/enchant/releases/download/v2.3.2/enchant-2.3.2.tar.gz,ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e,,
expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
commit 1811c015d976a2ab11271aee64768a0d52ed2601
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Nov 19 23:59:17 2021 -0700
Fix 32-bit build with Debian Bullseye
diff --git a/configure.ac b/configure.ac
index 7e3a4d3..615d0bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,7 @@ AS_IF([test -n "$BASH_VERSION"],
gcc_dir=$(dirname $($CC -print-libgcc-file-name))
AS_IF([test "$host" = "i686-w64-mingw32"],
- [libgcc_dll="libgcc_s_sjlj-1.dll"],
+ [libgcc_dll="libgcc_s_dw2-1.dll"],
[libgcc_dll="libgcc_s_seh-1.dll"])
AC_MSG_CHECKING([for libgcc])
commit 5ba7e3d3878be2df5df0b5730f2fa20e87e11c7d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 23:16:20 2021 -0700
add pcre-8.45 for glib-2.70
diff --git a/configure.ac b/configure.ac
index 5095dfe..7e3a4d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,8 @@ CM_SPKG([libiconv])
CM_SPKG([gettext], [libiconv])
CM_SPKG([libffi])
-CM_SPKG([glib], [libiconv gettext libffi zlib])
+CM_SPKG([pcre])
+CM_SPKG([glib], [libiconv gettext libffi pcre zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
diff --git a/packages/packages.current b/packages/packages.current
index b391e0a..8994332 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,6 +45,7 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
+pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
diff --git a/src/Makefile.am b/src/Makefile.am
index fab9540..9c9c2f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,8 +72,17 @@ cm_pkg_regex_configure = \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
-cm_pkg_glib_configure = \
- -Dinternal_pcre=true
+cm_pkg_pcre_configure = \
+ --disable-shared \
+ --enable-static \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --disable-cpp \
+ --enable-utf \
+ --enable-unicode-properties \
+ --enable-newline-is-anycrlf \
+ --disable-stack-for-recursion
+
if ENABLE_DEBUG_OPTS
cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
else
commit 9eb12c8552527fc1b606f95da24f9dd17a6676b6
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 11:20:18 2021 -0700
update to ytnef-2.0
diff --git a/packages/packages.current b/packages/packages.current
index db53aff..b391e0a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -51,5 +51,5 @@ poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
-ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
+ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --git a/patches/ytnef-1.9.3/01-malloc.patch b/patches/ytnef-1.9.3/01-malloc.patch
deleted file mode 100644
index e5457da..0000000
--- a/patches/ytnef-1.9.3/01-malloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN a/configure.ac b/configure.ac
---- a/configure.ac 2020-10-10 01:58:48.980393455 -0700
-+++ b/configure.ac 2020-10-10 01:58:59.280131052 -0700
-@@ -49,7 +49,6 @@
- AC_C_BIGENDIAN
-
- # Checks for library functions.
--AC_FUNC_MALLOC
- AC_CHECK_FUNCS([memset strstr])
-
- AC_SYS_LARGEFILE
diff --git a/patches/ytnef-1.9.3/02-no-undefined.patch b/patches/ytnef/01-no-undefined.patch
similarity index 100%
rename from patches/ytnef-1.9.3/02-no-undefined.patch
rename to patches/ytnef/01-no-undefined.patch
diff --git a/patches/ytnef-1.9.3/99-autotools.sh b/patches/ytnef/99-autotools.sh
similarity index 100%
rename from patches/ytnef-1.9.3/99-autotools.sh
rename to patches/ytnef/99-autotools.sh
commit e9bd850767b100deb2d553f0cfc9492cf25971e7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 11:10:21 2021 -0700
update to poppler-21.11.0
diff --git a/packages/packages.current b/packages/packages.current
index ab35d14..db53aff 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -46,7 +46,7 @@ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b,,
+poppler,21.11.0,file,https://poppler.freedesktop.org/poppler-21.11.0.tar.xz,31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 6b325af..12fdbe6 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -520,7 +520,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-113.dll
+File ${prefix}/bin/libpoppler-115.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 1476be6..e507a77 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-113.dll"
+Delete "$INSTDIR\libpoppler-115.dll"
#######################################
### gumbo-parser
commit 8a55ea4f61cf969c4ce057aa2e4f91afed2cfc29
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 11:08:13 2021 -0700
update to pango-1.48.10
diff --git a/packages/packages.current b/packages/packages.current
index c8ef41f..ab35d14 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
+pango,1.48.10,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.10.tar.xz,21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
diff --git a/patches/pango/02-num-glyphs.patch b/patches/pango/02-num-glyphs.patch
deleted file mode 100644
index b911201..0000000
--- a/patches/pango/02-num-glyphs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 71e39443b5e97fd5e8952c42369c9f59b3f393e3 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Sat, 21 Aug 2021 19:08:32 -0400
-Subject: [PATCH] renderer: Don't divide by zero
-
-Before dividing by num_glyphs in draw_strikethrough,
-make sure it isn't 0. This should fix reported crashes
-in this function.
-
-Fixes: #599
----
- pango/pango-renderer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
-index f575707f..21d09573 100644
---- a/pango/pango-renderer.c
-+++ b/pango/pango-renderer.c
-@@ -284,7 +284,7 @@ draw_strikethrough (PangoRenderer *renderer,
- PangoRectangle *rect = &state->strikethrough_rect;
- int num_glyphs = state->strikethrough_glyphs;
-
-- if (state->strikethrough)
-+ if (state->strikethrough && num_glyphs > 0)
- pango_renderer_draw_rectangle (renderer,
- PANGO_RENDER_PART_STRIKETHROUGH,
- rect->x,
---
-GitLab
-
commit 69049915682864c9ec2ce7c2a6cee778c7eccf98
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 11:02:11 2021 -0700
update to libtasn1-4.18.0
diff --git a/packages/packages.current b/packages/packages.current
index 1e5cce4..c8ef41f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -38,7 +38,7 @@ libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
libsoup,2.74.1,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.1.tar.xz,dc27a3b8fa30bc8ff950b5a75958757d2242e3e51e4e2d9c4e623ef75f793bf8,,
-libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
+libtasn1,4.18.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.18.0.tar.gz,4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898,,
libwebp,1.2.1,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz,808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
commit d8aad92dab3d50202dd2d00d41d97b927b8d9338
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:58:09 2021 -0700
update to libsoup-2.74.1
diff --git a/packages/packages.current b/packages/packages.current
index a352dc6..1e5cce4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -37,7 +37,7 @@ libical,3.0.11,file,https://github.com/libical/libical/releases/download/v3.0.11
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-libsoup,2.74.0,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.0.tar.xz,33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e,,
+libsoup,2.74.1,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.1.tar.xz,dc27a3b8fa30bc8ff950b5a75958757d2242e3e51e4e2d9c4e623ef75f793bf8,,
libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
libwebp,1.2.1,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz,808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
commit 82a40e22f3866d13924dce4123cf3be4ac92c41e
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:57:09 2021 -0700
update to libical-3.0.11
diff --git a/packages/packages.current b/packages/packages.current
index b48385e..a352dc6 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -33,7 +33,7 @@ libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
libgpg_error,1.43,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2,a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf,,
-libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
+libical,3.0.11,file,https://github.com/libical/libical/releases/download/v3.0.11/libical-3.0.11.tar.gz,1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
commit a415b247892a1bb0f57d63d3a074d3f4722ba35c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:55:58 2021 -0700
update to libgpg-error-1.43
diff --git a/packages/packages.current b/packages/packages.current
index 36692b5..b48385e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -32,7 +32,7 @@ libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.
libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
-libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
+libgpg_error,1.43,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2,a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf,,
libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
commit c2295c1f56045a9807fd877374533aa4b9a3adaf
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:54:17 2021 -0700
update to glib-networking-2.70.0
diff --git a/packages/packages.current b/packages/packages.current
index 7720ade..36692b5 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -18,7 +18,7 @@ fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
glib,2.70.1,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.1.tar.xz,f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0,,
-glib_networking,2.68.2,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.2.tar.xz,535ebc054ef697db56a4fffed91bc0e11c8ee1c9acb48aad28c8e1d5c3d5994f,,
+glib_networking,2.70.0,file,https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.0.tar.xz,66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
commit 0d3445251b660f8f82ffa2900655bb7a2c0908b7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:53:05 2021 -0700
update to glib-2.70.1
diff --git a/packages/packages.current b/packages/packages.current
index 283c532..7720ade 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
-glib,2.68.4,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.4.tar.xz,62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b,,
+glib,2.70.1,file,https://download.gnome.org/sources/glib/2.70/glib-2.70.1.tar.xz,f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0,,
glib_networking,2.68.2,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.2.tar.xz,535ebc054ef697db56a4fffed91bc0e11c8ee1c9acb48aad28c8e1d5c3d5994f,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
commit f7f205e7f88e7766cdc7c44b58f612201026fb57
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:48:44 2021 -0700
update to curl-7.80.0
diff --git a/packages/packages.current b/packages/packages.current
index 62731d2..283c532 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -8,7 +8,7 @@ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/330c22fc463e2de39cae6b9f4c7e91dd6c255931/security/nss/lib/ckfw/builtins/certdata.txt,bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f,,
-curl,7.78.0,file,https://curl.se/download/curl-7.78.0.tar.xz,be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5,,
+curl,7.80.0,file,https://curl.se/download/curl-7.80.0.tar.xz,a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.1,file,https://github.com/AbiWord/enchant/releases/download/v2.3.1/enchant-2.3.1.tar.gz,7b4b1afcf2cd8bfa691deea6188404d337f23174bbc39b9c2add2bf340736e9c,,
expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
commit e04e6033335192edd819c3a66d6962d92cedc246
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Nov 10 10:47:15 2021 -0700
update to certdata.txt-20210916
diff --git a/packages/packages.current b/packages/packages.current
index 0d028cc..62731d2 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -7,7 +7,7 @@ atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb
bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
-certdata,20210506,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/4d343134c8a3a46520e41d31e7cb26f718d9daec/security/nss/lib/ckfw/builtins/certdata.txt,c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f,,
+certdata,20210916,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/330c22fc463e2de39cae6b9f4c7e91dd6c255931/security/nss/lib/ckfw/builtins/certdata.txt,bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f,,
curl,7.78.0,file,https://curl.se/download/curl-7.78.0.tar.xz,be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
enchant,2.3.1,file,https://github.com/AbiWord/enchant/releases/download/v2.3.1/enchant-2.3.1.tar.gz,7b4b1afcf2cd8bfa691deea6188404d337f23174bbc39b9c2add2bf340736e9c,,
commit e5e35c88b0ad1ccd17f392ea297052064a5d1bc3
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Nov 10 09:55:52 2021 -0700
Update readme for building webkitgtk
diff --git a/README b/README
index ca64f7b..c3931f7 100644
--- a/README
+++ b/README
@@ -112,7 +112,7 @@ docbook-utils
libglib2.0-dev-bin
git
cmake
-bison
+bison ***
flex
gperf
intltool
@@ -127,6 +127,8 @@ gtk-3-examples **
* only needed for webkitgtk
** only needed for gtk3 builds
+*** webkitgtk-2.4.11 fails to build with bison-3.7. Building bison-3.6.4
+by hand and prepending it to PATH allows the build to succeed
Building in a Docker container
commit bf9a6253db953bc944f73904590f4d26af0a7e69
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Tue Nov 9 18:27:58 2021 -0700
Updates for building on Debian Bullseye
diff --git a/README b/README
index 7f3aed2..ca64f7b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the GUI Installer Builder for Claws Mail W32.
+This is the GUI Installer Builder for Claws Mail for Windows.
Instructions:
=============
@@ -93,18 +93,12 @@ Basic requirements
==================
A decent POSIX system is required for building this software as well
-as GNU make. We are using Debian GNU/Linux 10 (Buster), any other
+as GNU make. We are using Debian GNU/Linux 11 (Bullseye), any other
POSIX system should work as well but you may run into problems due to
-different toolchain versions (MinGW gcc-8 is required, gcc-9 works more
-or less and gcc-10 doesn't work yet).
+different mingw-w64 versions.
To finish the build, following packages need to be installed on a
-Debian Buster system.
-
-Note - at the time of writing, the meson package in Debian Buster
-(currently 0.49.1) is too old, see below for update instructions.
-
-Building the gtk3 version has additional requirements (see below).
+Debian Bullseye system.
build-essential
automake
@@ -128,7 +122,11 @@ meson
python3-distutils
wget
curl
-gtk-3-examples
+ruby *
+gtk-3-examples **
+
+* only needed for webkitgtk
+** only needed for gtk3 builds
Building in a Docker container
@@ -139,8 +137,8 @@ use a Docker container. An image built from following Dockerfile
is sufficient:
--------8<---------8<---------8<--------
-FROM debian:buster
-RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl gtk-3-examples & apt-get clean
+FROM debian:bullseye
+RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl ruby gtk-3-examples & apt-get clean
--------8<---------8<---------8<--------
To build the image locally (run in the directory with Dockerfile
@@ -204,33 +202,12 @@ libetpan provides some way to set the SASL plugin path. I'll consider
submitting the libetpan patch upstream later.
-Updating meson
-==============
-
-Currently, the minimum required version of meson is 0.55.
-Debian 10 (Buster) and Ubuntu 20 (Focal) ship with older versions and need
-additional steps to update to a recent version:
-
-* Debian 10 (Buster):
- Add following line to "/etc/apt/sources.list":
- deb http://deb.debian.org/debian buster-backports main
- Then execute
- sudo apt-get update
- sudo apt-get -y install -t buster-backports meson
-
-* Ubuntu 20 (Focal)
- Manually download and install the meson package:
- wget http://archive.ubuntu.com/ubuntu/pool/universe/m/meson/meson_0.57.0+really0.56.2-0.1_all.deb
- dpkg -i meson_0.57.0+really0.56.2-0.1_all.deb
-
-
Copyright
=========
The entire Claws Mail package is
- Copyright (C) 1999-2017 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp> and the
- Claws Mail Team
+ Copyright (C) 1999-2021 the Claws Mail Team and Hiroyuki Yamamoto
Claws Mail is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
diff --git a/autogen.sh b/autogen.sh
index afbd217..acbf178 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,32 +11,6 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-check_compiler () {
- warn=""
- for prefix in x86_64-w64-mingw32 i686-w64-mingw32 i586-mingw32msvc \
- i386-mingw32msvc mingw32 ; do
- if which $prefix-gcc > /dev/null ; then
- ver=$($prefix-gcc -dumpversion|cut -d "." -f 1)
- if test "$ver" -gt 8 ; then
- warn=" $prefix-gcc $ver\n$warn"
- fi
- fi
- done
- if [ -n "$warn" ] ; then
- echo
- echo "Warning: Unrecommended gcc version found on your system!"
- echo "For building releases, MinGW gcc-8 should be used."
- echo "Using gcc-9 currently produces less hardened binaries."
- echo "Following unrecommended versions have been found:"
- echo "$warn"
- echo "To use gcc-9, please remove the \".off\" extension from"
- echo "./patches/cairo-1.17.4/01-nofortify-hack.patch.off"
- return 1
- else
- return 0
- fi
-}
-
win_rel=1
git_revision=""
tsdir="$(readlink -f $(dirname $0))"
@@ -111,7 +85,4 @@ build=$($tsdir/build-aux/config.guess)
echo "Running configure --host=${host_triplet} --build=${build} --enable-maintainer-mode $@"
if ! $tsdir/configure --host=${host_triplet} --build=${build} --enable-maintainer-mode "$@"; then exit $?; fi
-echo "You may now run make."
-echo
-
-check_compiler
+printf "You may now run make.\n"
diff --git a/patches/cairo-1.17.4/01-nofortify-hack.patch.off b/patches/cairo-1.17.4/01-no-fortify-source.patch
similarity index 83%
rename from patches/cairo-1.17.4/01-nofortify-hack.patch.off
rename to patches/cairo-1.17.4/01-no-fortify-source.patch
index a0c4828..d20b575 100755
--- a/patches/cairo-1.17.4/01-nofortify-hack.patch.off
+++ b/patches/cairo-1.17.4/01-no-fortify-source.patch
@@ -1,8 +1,4 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-# Mingw gcc-9 doesn't provide fortified functions (memmove_chk, memcopy_chk)
+# Mingw gcc doesn't provide fortified functions (memmove_chk, memcopy_chk)
# When defining _FORTIFY_SOURCE to a value greater than 0,
# these functions have to be provided by libssp (-fstack-protector or -lssp).
# Adding -lssp currentyly only creates a static cairo library, so until this
@@ -11,12 +7,11 @@ exit $?
diff -ur cairo-1.17.4-org/build/configure.ac.warnings cairo-1.17.4/build/configure.ac.warnings
--- cairo-1.17.4-org/build/configure.ac.warnings 2010-12-25 15:21:33.000000000 +0100
+++ cairo-1.17.4/build/configure.ac.warnings 2021-03-02 13:45:49.950952181 +0100
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,6 @@
MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
dnl Also to turn various gcc/glibc-specific preprocessor checks
-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
-+MAYBE_WARN="$MAYBE_WARN -Wp"
# invalidate cached value if MAYBE_WARN has changed
if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
commit 9d13eb6a798a9345d8edfbe14ccf171118832850
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Sep 14 22:13:18 2021 -0700
update gtk2 reference
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 86951fa..6b325af 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -592,7 +592,7 @@ skip_default_client:
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "" "Claws Mail"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail" "DLLPath" ""
-WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationDescription" "Fast, lightweight and user-friendly GTK+2 based email client"
+WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationDescription" "Fast, lightweight and user-friendly GTK+3 based email client"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationIcon" "$INSTDIR\claws-mail.exe,0"
WriteRegStr HKLM "SOFTWARE\Clients\Mail\Claws Mail\Capabilities" "ApplicationName" "Claws Mail"
commit 92d61a00a94143996bda448dc96452830ab1ddf1
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Sep 20 02:42:28 2021 -0700
Remove unused w32pth package
diff --git a/configure.ac b/configure.ac
index 092bf65..5095dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,6 @@ CM_MPKG([poppler_data])
CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng zlib])
-CM_SPKG([w32pth])
CM_SPKG([gmp])
CM_SPKG([regex], [gettext])
CM_SPKG([fribidi])
@@ -263,7 +262,7 @@ CM_SPKG([libpng], [zlib])
CM_SPKG([enchant], [glib hunspell])
CM_SPKG([libgpg_error], [libiconv gettext])
-CM_SPKG([libassuan], [libgpg_error w32pth])
+CM_SPKG([libassuan], [libgpg_error])
CM_SPKG([gpgme], [libgpg_error libassuan glib])
CM_SPKG([libtasn1])
CM_SPKG([nettle], [gmp])
diff --git a/packages/packages.current b/packages/packages.current
index 01ec873..0d028cc 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -50,7 +50,6 @@ poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
-w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --git a/patches/w32pth-2.0.5/01-def-fix.patch b/patches/w32pth-2.0.5/01-def-fix.patch
deleted file mode 100644
index 8f1443a..0000000
--- a/patches/w32pth-2.0.5/01-def-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur w32pth-2.0.5.orig/libw32pth.def w32pth-2.0.5/libw32pth.def
---- w32pth-2.0.5.orig/libw32pth.def 2015-05-25 18:30:22.734187106 +0200
-+++ w32pth-2.0.5/libw32pth.def 2015-05-25 18:30:32.838459236 +0200
-@@ -18,7 +18,6 @@
- ;; 02110-1301, USA.
-
-
--EXPORTS
- pth_init @1
- pth_kill @2
- pth_ctrl @3
diff --git a/patches/w32pth-2.0.5/99-autogen.sh b/patches/w32pth-2.0.5/99-autogen.sh
deleted file mode 100755
index f97c38b..0000000
--- a/patches/w32pth-2.0.5/99-autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# We run this primarily for the libtoolize step, so that libtool
-# gets updated to a newer version. The version enchant ships is older
-# and buggy when it comes to generating a DLL for x86_64.
-libtoolize
-./autogen.sh
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 0671c1d..5766e74 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -42,7 +42,6 @@
# The version of each package.
!define cm_pkg_libgpg_error_version @cm_pkg_libgpg_error_version@
-!define cm_pkg_w32pth_version @cm_pkg_w32pth_version@
!define cm_pkg_libassuan_version @cm_pkg_libassuan_version@
!define cm_pkg_gpgme_version @cm_pkg_gpgme_version@
!define cm_pkg_libtasn1_version @cm_pkg_libtasn1_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 9793d6d..86951fa 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -55,11 +55,6 @@ File ${prefix}/bin/libtasn1-6.dll
!insertmacro SetPrefix regex
File ${prefix}/bin/libregex-1.dll
-#######################################
-### w32pth
-!insertmacro SetPrefix w32pth
-File ${prefix}/bin/libw32pth-0.dll
-
#######################################
### zlib
!insertmacro SetPrefix zlib
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 37bcf97..1476be6 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -437,10 +437,6 @@ Delete /REBOOTOK "$INSTDIR\iconv.dll"
### zlib
Delete /REBOOTOK "$INSTDIR\zlib1.dll"
-#######################################
-### w32pth
-Delete "$INSTDIR\libw32pth-0.dll"
-
#######################################
### regex
Delete "$INSTDIR\libregex-1.dll"
commit 55b49b6957d800c656f4a89c6321c58ecb93ef3b
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:50:25 2021 -0700
update to harfbuzz-2.9.1
diff --git a/packages/packages.current b/packages/packages.current
index 63a7ad7..01ec873 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -24,7 +24,7 @@ gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.ta
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
-harfbuzz,2.8.2,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz,d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7,,
+harfbuzz,2.9.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.9.1/harfbuzz-2.9.1.tar.xz,0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
icu4c,69.1,file,https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz,4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745,,
jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
commit 77c5a45f041f010f58b0f92383437a8662e9f11d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:32:33 2021 -0700
update to enchant-2.3.1
diff --git a/packages/packages.current b/packages/packages.current
index 1a23510..63a7ad7 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -10,7 +10,7 @@ cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c
certdata,20210506,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/4d343134c8a3a46520e41d31e7cb26f718d9daec/security/nss/lib/ckfw/builtins/certdata.txt,c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f,,
curl,7.78.0,file,https://curl.se/download/curl-7.78.0.tar.xz,be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5,,
cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
-enchant,2.2.30,file,https://github.com/AbiWord/enchant/releases/download/v2.3.0/enchant-2.3.0.tar.gz,df68063b6c13b245fa7246b0e098a03e74f7a91c6d8947bc5c4f42ce55e2e41d,,
+enchant,2.3.1,file,https://github.com/AbiWord/enchant/releases/download/v2.3.1/enchant-2.3.1.tar.gz,7b4b1afcf2cd8bfa691deea6188404d337f23174bbc39b9c2add2bf340736e9c,,
expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
commit 88bb80afa67bb73c3e85c6fab088be61f9cbe3f2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:29:05 2021 -0700
update to libwebp-1.2.1
diff --git a/packages/packages.current b/packages/packages.current
index 4f17bfd..1a23510 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -39,7 +39,7 @@ libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
libsoup,2.74.0,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.0.tar.xz,33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e,,
libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
-libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
+libwebp,1.2.1,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz,808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
commit cfb68591c727f79e99731fd511e6c2a1b1aa7e40
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:27:13 2021 -0700
update to libsoup-2.74.0
diff --git a/packages/packages.current b/packages/packages.current
index 93c13d9..4f17bfd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -37,7 +37,7 @@ libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-libsoup,2.72.0,file,https://download.gnome.org/sources/libsoup/2.72/libsoup-2.72.0.tar.xz,170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387,,
+libsoup,2.74.0,file,https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.0.tar.xz,33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e,,
libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
commit aa47886ca949afa8fbfc47dc009e907eb59588a3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:25:45 2021 -0700
update to poppler-21.09.0 and poppler-data-0.4.11
diff --git a/packages/packages.current b/packages/packages.current
index 388fb0d..93c13d9 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -46,8 +46,8 @@ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
-poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
+poppler,21.09.0,file,https://poppler.freedesktop.org/poppler-21.09.0.tar.xz,5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b,,
+poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 99aa396..9793d6d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -525,7 +525,7 @@ File ${prefix}/bin/libgumbo-1.dll
### poppler
!insertmacro SetPrefix poppler
File ${prefix}/bin/libpoppler-glib-8.dll
-File ${prefix}/bin/libpoppler-112.dll
+File ${prefix}/bin/libpoppler-113.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 48e1439..37bcf97 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -36,7 +36,7 @@ RMDir "$INSTDIR\lib\claws-mail"
#######################################
### poppler
Delete "$INSTDIR\libpoppler-glib-8.dll"
-Delete "$INSTDIR\libpoppler-112.dll"
+Delete "$INSTDIR\libpoppler-113.dll"
#######################################
### gumbo-parser
commit befc2059edf59342b33857c3a7f920f2b77ef18c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:23:40 2021 -0700
update to pango-1.48.9
diff --git a/packages/packages.current b/packages/packages.current
index 931d4df..388fb0d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-pango,1.48.8,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.8.tar.xz,009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410,,
+pango,1.48.9,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.9.tar.xz,a913657d3fe5aa04c03958a3b5d3fc859e891b75cd81b873a819330f6c0872aa,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
diff --git a/patches/pango/02-num-glyphs.patch b/patches/pango/02-num-glyphs.patch
new file mode 100644
index 0000000..b911201
--- /dev/null
+++ b/patches/pango/02-num-glyphs.patch
@@ -0,0 +1,30 @@
+From 71e39443b5e97fd5e8952c42369c9f59b3f393e3 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 21 Aug 2021 19:08:32 -0400
+Subject: [PATCH] renderer: Don't divide by zero
+
+Before dividing by num_glyphs in draw_strikethrough,
+make sure it isn't 0. This should fix reported crashes
+in this function.
+
+Fixes: #599
+---
+ pango/pango-renderer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
+index f575707f..21d09573 100644
+--- a/pango/pango-renderer.c
++++ b/pango/pango-renderer.c
+@@ -284,7 +284,7 @@ draw_strikethrough (PangoRenderer *renderer,
+ PangoRectangle *rect = &state->strikethrough_rect;
+ int num_glyphs = state->strikethrough_glyphs;
+
+- if (state->strikethrough)
++ if (state->strikethrough && num_glyphs > 0)
+ pango_renderer_draw_rectangle (renderer,
+ PANGO_RENDER_PART_STRIKETHROUGH,
+ rect->x,
+--
+GitLab
+
commit 08a639779f68c11c5ee31bf0daf6b15b81b05a60
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:04:03 2021 -0700
update to libepoxy-1.5.9
diff --git a/packages/packages.current b/packages/packages.current
index 4904870..931d4df 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -29,7 +29,7 @@ hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-
icu4c,69.1,file,https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz,4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745,,
jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
-libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
+libepoxy,1.5.9,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.9.tar.xz,d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
commit 43040d54ecca43adb97927e2ba1a8e68ea7fdff5
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:02:52 2021 -0700
update to glib-networking-2.68.2
diff --git a/packages/packages.current b/packages/packages.current
index e0febbd..4904870 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -18,7 +18,7 @@ fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
glib,2.68.4,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.4.tar.xz,62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b,,
-glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
+glib_networking,2.68.2,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.2.tar.xz,535ebc054ef697db56a4fffed91bc0e11c8ee1c9acb48aad28c8e1d5c3d5994f,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
commit 2ad4860a3b10bc51d31cabcada8333feb7b74573
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Sep 10 14:01:04 2021 -0700
update to glib-2.68.4
diff --git a/packages/packages.current b/packages/packages.current
index 7b37ee1..e0febbd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
-glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
+glib,2.68.4,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.4.tar.xz,62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b,,
glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
diff --git a/patches/glib/01-memcpy-length.patch b/patches/glib/01-memcpy-length.patch
deleted file mode 100644
index 8fb0255..0000000
--- a/patches/glib/01-memcpy-length.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gio/gwin32packageparser.c 2021-08-02 21:23:30.898523365 -0700
-+++ b/gio/gwin32packageparser.c 2021-08-02 21:30:48.908511480 -0700
-@@ -390,7 +390,7 @@
- wcs_path = LoadedWindowsGetStringRawBuffer (path, NULL);
- manifest_filename_size = wcslen (wcs_path) + wcslen (bslash_appmanifest);
- manifest_filename = g_new (wchar_t, manifest_filename_size + 1);
-- memcpy (manifest_filename, wcs_path, manifest_filename_size * sizeof (wchar_t));
-+ memcpy (manifest_filename, wcs_path, wcslen (wcs_path) * sizeof (wchar_t));
- memcpy (&manifest_filename[wcslen (wcs_path)], bslash_appmanifest, (wcslen (bslash_appmanifest) + 1) * sizeof (wchar_t));
-
- memset (sax, 0, sizeof (*sax));
commit 5268a7c9994b9297d397360ca9afa91965974bd9
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Sep 2 17:52:06 2021 -0700
set mimeviewer background to white
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index bb3b62b..3a5c27c 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,143 @@
+@@ -272,3 +277,148 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -165,3 +165,8 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ margin-top: -14px;
+ margin-bottom: 14px;
+}
++
++/* Set mimeviewer background color */
++#mime_notebook viewport {
++ background-color: white;
++}
commit 50aa47bae04b367a8ad879ae26130ac9e4a123b0
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 31 19:53:15 2021 -0700
Move LITEHTML_UTF8 definition to claws makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index faa7eed..fab9540 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -305,7 +305,7 @@ cm_pkg_claws_mail_configure = \
--disable-dillo-plugin \
--enable-tnef_parse-plugin \
--with-password-encryption=gnutls \
- CPPFLAGS="-I$(idir)/include -D_POSIX_C_SOURCE -DLITEHTML_UTF8" \
+ CPPFLAGS="-I$(idir)/include -D_POSIX_C_SOURCE" \
LDFLAGS=-L$(idir)/lib
cm_pkg_sqlite_configure = \
commit 482f34f07cd12412c03bee19575262effad8696f
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Aug 26 17:21:56 2021 -0700
don't link icu against msvcr100
diff --git a/patches/icu4c/99-build.sh.in b/patches/icu4c/99-build.sh.in
index d6b62ba..259b211 100644
--- a/patches/icu4c/99-build.sh.in
+++ b/patches/icu4c/99-build.sh.in
@@ -47,8 +47,7 @@ sh ${builddir}/${icu}/source/configure \
--with-cross-build=${builddir}/${icu}-linux \
CPPFLAGS="-I${incdir}" \
CFLAGS="@CM_CFLAGS@" \
- CXXFLAGS="@CM_CXXFLAGS@" \
- LIBS="-lmsvcr100"
+ CXXFLAGS="@CM_CXXFLAGS@"
ret=$?
if [ $ret -ne 0 ]; then
echo configure for Windows ICU build failed
commit 6c5bcf25c00ad8e4d0d94b256de0c40053948f7c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Aug 6 23:08:40 2021 -0700
update to icu4c-69.1
diff --git a/.gitignore b/.gitignore
index 90f4f37..5d107ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ Makefile.in
/packages/*.zip
/packages/**/*
-/patches/icu4c-58.3/99-build.sh
+/patches/icu4c/99-build.sh
/po/build-cc
/po/POTFILES
diff --git a/Makefile.am b/Makefile.am
index f8a96d0..255ab7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,5 +28,5 @@ EXTRA_DIST = autogen.sh doc patches \
packages/mk-ca-bundle.pl \
packages/packages.current
dist-hook:
- chmod u+w $(distdir)/patches/icu4c-58.3/99-build.sh
- rm -f $(distdir)/patches/icu4c-58.3/99-build.sh
+ chmod u+w $(distdir)/patches/icu4c/99-build.sh
+ rm -f $(distdir)/patches/icu4c/99-build.sh
diff --git a/configure.ac b/configure.ac
index 93b8d30..092bf65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,8 +315,8 @@ AC_CONFIG_FILES(src/Toolchain-mingw32.cmake)
AC_CONFIG_FILES(src/meson-cross.txt)
AC_CONFIG_FILES(po/build-cc)
AC_CONFIG_FILES(src/config.nsi src/claws-mail.mk)
-AC_CONFIG_FILES(patches/icu4c-58.3/99-build.sh,
- [chmod +x patches/icu4c-58.3/99-build.sh])
+AC_CONFIG_FILES(patches/icu4c/99-build.sh,
+ [chmod +x patches/icu4c/99-build.sh])
AC_OUTPUT
echo "
diff --git a/packages/packages.current b/packages/packages.current
index c648e1a..7b37ee1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -26,7 +26,7 @@ gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.x
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,2.8.2,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz,d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
-icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
+icu4c,69.1,file,https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz,4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745,,
jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
diff --git a/patches/icu4c-58.3/01-libnames.patch b/patches/icu4c-58.3/01-libnames.patch
deleted file mode 100644
index 6291415..0000000
--- a/patches/icu4c-58.3/01-libnames.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ruN icu-orig/source/config/mh-mingw icu/source/config/mh-mingw
---- icu-orig/source/config/mh-mingw 2016-09-13 22:29:47.000000000 +0200
-+++ icu/source/config/mh-mingw 2018-01-28 20:35:15.671894185 +0100
-@@ -78,8 +78,8 @@
-
- # Change the stubnames so that poorly working FAT disks and installation programs can work.
- # This is also for backwards compatibility.
--DATA_STUBNAME = dt
--I18N_STUBNAME = in
-+DATA_STUBNAME = data
-+I18N_STUBNAME = i18n
- LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
-
- #SH### copied from Makefile.inc
-diff -ruN icu-orig/source/config/mh-mingw64 icu/source/config/mh-mingw64
---- icu-orig/source/config/mh-mingw64 2016-06-15 20:58:17.000000000 +0200
-+++ icu/source/config/mh-mingw64 2018-01-28 20:35:15.707893486 +0100
-@@ -78,8 +78,8 @@
-
- # Change the stubnames so that poorly working FAT disks and installation programs can work.
- # This is also for backwards compatibility.
--DATA_STUBNAME = dt
--I18N_STUBNAME = in
-+DATA_STUBNAME = data
-+I18N_STUBNAME = i18n
- LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
-
- #SH### copied from Makefile.inc
-diff -ruN icu-orig/source/Makefile.in icu/source/Makefile.in
---- icu-orig/source/Makefile.in 2016-09-09 23:28:18.000000000 +0200
-+++ icu/source/Makefile.in 2018-01-28 20:37:01.833835478 +0100
-@@ -190,6 +190,13 @@
- $(RM) current && ln -s $(VERSION) current; \
- $(RM) Makefile.inc && ln -s current/Makefile.inc Makefile.inc; \
- $(RM) pkgdata.inc && ln -s current/pkgdata.inc pkgdata.inc
-+ cd $(DESTDIR)$(libdir); \
-+ ln -s icudata58.dll libicudata58.dll; \
-+ ln -s icui18n58.dll libicui18n58.dll; \
-+ ln -s icuuc58.dll libicuuc58.dll; \
-+ cp icudata58.dll ../bin; \
-+ cp icui18n58.dll ../bin; \
-+ cp icuuc58.dll ../bin
-
- ifeq ($(DOXYGEN),)
- install-doc:
-@@ -201,7 +208,7 @@
-
- endif
-
--$(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%
-+$(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/data/%
- $(INSTALL_DATA) $< $@
-
- # Build the tests, but don't run them.
diff --git a/patches/icu4c-58.3/02-float128-clang.patch b/patches/icu4c-58.3/02-float128-clang.patch
deleted file mode 100644
index edffa91..0000000
--- a/patches/icu4c-58.3/02-float128-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN icu-orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
---- icu-orig/source/tools/pkgdata/pkgdata.cpp 2017-10-08 18:10:20.520980763 +0200
-+++ icu/source/tools/pkgdata/pkgdata.cpp 2017-10-08 18:15:49.090645113 +0200
-@@ -28,7 +28,7 @@
- #if U_HAVE_POPEN
- #if (U_PF_MINGW <= U_PLATFORM || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
- /* popen/pclose aren't defined in strict ANSI on Cygwin and MinGW */
--#undef __STRICT_ANSI__
-+//#undef __STRICT_ANSI__
- #endif
- #endif
-
diff --git a/patches/icu4c-58.3/03-no-xlocale.patch b/patches/icu4c-58.3/03-no-xlocale.patch
deleted file mode 100644
index 11e551a..0000000
--- a/patches/icu4c-58.3/03-no-xlocale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN icu-orig/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
---- icu-orig/source/i18n/digitlst.cpp 2016-10-27 03:37:56.000000000 +0200
-+++ icu/source/i18n/digitlst.cpp 2018-01-14 00:00:12.283367683 +0100
-@@ -61,11 +61,7 @@
- #endif
-
- #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--# include <locale.h>
--# else
--# include <xlocale.h>
--# endif
-+# include <locale.h>
- #endif
-
- // ***************************************************************************
diff --git a/patches/icu4c/01-mingw-std-threads.patch.linux b/patches/icu4c/01-mingw-std-threads.patch.linux
new file mode 100644
index 0000000..a87d9c6
--- /dev/null
+++ b/patches/icu4c/01-mingw-std-threads.patch.linux
@@ -0,0 +1,23 @@
+--- a/source/common/unifiedcache.cpp 2021-08-06 20:59:14.547838609 -0700
++++ b/source/common/unifiedcache.cpp 2021-08-06 20:57:15.903222124 -0700
+@@ -13,7 +13,7 @@
+ #include "unifiedcache.h"
+
+ #include <algorithm> // For std::max()
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "uassert.h"
+ #include "uhash.h"
+--- a/source/common/umutex.h 2021-08-06 20:59:04.703789366 -0700
++++ b/source/common/umutex.h 2021-08-06 20:57:31.579306636 -0700
+@@ -22,7 +22,7 @@
+
+ #include <atomic>
+-#include <condition_variable>
+-#include <mutex>
++#include "mingw.condition_variable.h"
++#include "mingw.mutex.h"
+ #include <type_traits>
+
+ #include "unicode/utypes.h"
diff --git a/patches/icu4c-58.3/99-build.sh.in b/patches/icu4c/99-build.sh.in
similarity index 66%
rename from patches/icu4c-58.3/99-build.sh.in
rename to patches/icu4c/99-build.sh.in
index 0e92f4a..d6b62ba 100644
--- a/patches/icu4c-58.3/99-build.sh.in
+++ b/patches/icu4c/99-build.sh.in
@@ -1,10 +1,15 @@
#!/bin/bash
-srcdir="$(readlink -f $(dirname $0)/../../src)"
+buildroot="$(readlink -f $(dirname $0)/../..)"
+srcdir="${buildroot}/src"
builddir="${srcdir}/playground/build"
-icu="$(basename $(dirname $0))"
-prefix="${srcdir}/playground/install/pkgs/${icu}"
incdir="${srcdir}/playground/install/include"
+packagedir="${buildroot}/packages"
+patchdir="${buildroot}/patches"
+icu_name="$(basename $(dirname $0))"
+icu_ver="$(grep "^${icu_name}," ${packagedir}/packages.current | cut -f 2 -d ,)"
+icu="${icu_name}-${icu_ver}"
+prefix="${srcdir}/playground/install/pkgs/${icu}"
cd ${builddir}
mkdir ${icu}-linux
@@ -27,6 +32,13 @@ if [ $ret -ne 0 ]; then
fi
# Configure for Windows
+cd ${builddir}/${icu}
+shopt -s nullglob
+for pfile in ${patchdir}/${icu}/*.patch.linux ${patchdir}/${icu_name}/*.patch.linux; do
+ patch -p1 < ${pfile} || exit 1
+done
+shopt -u nullglob
+
cd ${builddir}/${icu}-build
sh ${builddir}/${icu}/source/configure \
--prefix=${prefix} \
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 890c547..99aa396 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -442,9 +442,9 @@ File ${prefix}/bin/libwebp-7.dll
#######################################
### icu4c
!insertmacro SetPrefix icu4c
-File ${prefix}/lib/icui18n58.dll
-File ${prefix}/lib/icuuc58.dll
-File ${prefix}/lib/icudata58.dll
+File ${prefix}/bin/icudt69.dll
+File ${prefix}/bin/icuin69.dll
+File ${prefix}/bin/icuuc69.dll
#######################################
### libepoxy
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 2cac667..48e1439 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -92,9 +92,9 @@ Delete "$INSTDIR\libwebp-7.dll"
#######################################
### icu4c
-Delete "$INSTDIR\icui18n58.dll"
-Delete "$INSTDIR\icuuc58.dll"
-Delete "$INSTDIR\icudata58.dll"
+Delete "$INSTDIR\icudt69.dll"
+Delete "$INSTDIR\icuin69.dll"
+Delete "$INSTDIR\icuuc69.dll"
#######################################
### libepoxy
commit 27966d0244ab89e4e2a4551c7f7e3fe6de18857c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 23 06:29:23 2021 -0700
pdf viewer theme fixes
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index f3f7326..bb3b62b 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,114 @@
+@@ -272,3 +277,143 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -136,3 +136,32 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+#textview_icon {
+ margin-left: -13px;
+}
++
++/* Remove extra border around pdf viewer buttons */
++#mime_notebook > stack {
++ background-image: none;
++}
++
++/* Fix pdf viewer button size */
++#pdf_viewer > #buttons button {
++ min-height: 24px;
++ min-width: 26px;
++}
++
++/* Fix pdf viewer spin button size */
++#pdf_viewer > #buttons spinbutton.horizontal button {
++ min-width: 0px;
++
++ background-size: 15px 15px;
++ background-repeat: no-repeat;
++}
++
++#pdf_viewer > #buttons spinbutton.horizontal button.down {
++ margin-top: 14px;
++ margin-bottom: -14px;
++}
++
++#pdf_viewer > #buttons spinbutton.horizontal button.up {
++ margin-top: -14px;
++ margin-bottom: 14px;
++}
commit 59d9897b9496cf07a578a89801746dfc736264da
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Sat Jul 17 17:36:15 2021 -0700
add pdf_viewer plugin and dependencies
diff --git a/configure.ac b/configure.ac
index cb6804d..93b8d30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,12 +235,16 @@ CM_BPKG([bsfilter])
CM_MPKG([bzip2])
CM_MPKG([zlib])
+CM_MPKG([poppler_data])
+
+CM_SPKG([poppler], [poppler_data cairo freetype gdk_pixbuf glib gtk icu4c jpeg libiconv libpng zlib])
CM_SPKG([w32pth])
CM_SPKG([gmp])
CM_SPKG([regex], [gettext])
CM_SPKG([fribidi])
CM_SPKG([hunspell], [libiconv gettext])
+CM_SPKG([jpeg])
CM_SPKG([libiconv])
CM_SPKG([gettext], [libiconv])
@@ -280,7 +284,6 @@ CM_SPKG([ytnef])
CM_SPKG([gumbo_parser])
if test "$build_fancy" = yes; then
- CM_SPKG([jpeg])
CM_SPKG([sqlite], [zlib])
CM_SPKG([libwebp], [zlib libpng jpeg])
CM_SPKG([libxslt], [libxml2])
@@ -293,7 +296,7 @@ else
AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
fi
-claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib"
+claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib poppler"
claws_mail_deps="$claws_mail_deps gpgme regex libetpan gnutls ytnef gumbo_parser"
claws_mail_deps="$claws_mail_deps libxml2 expat $cm_dep_webkitgtk curl libical nettle"
CM_SPKG([claws_mail], [$claws_mail_deps])
diff --git a/packages/packages.current b/packages/packages.current
index 146314b..c648e1a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -46,6 +46,8 @@ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
pango,1.48.8,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.8.tar.xz,009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
+poppler,21.08.0,file,https://poppler.freedesktop.org/poppler-21.08.0.tar.xz,e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d,,
+poppler_data,0.4.10,file,https://poppler.freedesktop.org/poppler-data-0.4.10.tar.gz,6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
diff --git a/patches/poppler/01-mingw-std-threads.patch b/patches/poppler/01-mingw-std-threads.patch
new file mode 100755
index 0000000..c06e824
--- /dev/null
+++ b/patches/poppler/01-mingw-std-threads.patch
@@ -0,0 +1,84 @@
+diff -aur apoppler-21.08.0/poppler/Annot.h poppler-21.08.0/poppler/Annot.h
+--- apoppler-21.08.0/poppler/Annot.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Annot.h 2021-08-22 17:26:09.443799196 -0700
+@@ -50,7 +50,7 @@
+
+ #include <memory>
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/Array.h poppler-21.08.0/poppler/Array.h
+--- apoppler-21.08.0/poppler/Array.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Array.h 2021-08-22 17:26:00.011882041 -0700
+@@ -29,7 +29,7 @@
+ #define ARRAY_H
+
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ #include "poppler-config.h"
+diff -aur apoppler-21.08.0/poppler/CairoFontEngine.h poppler-21.08.0/poppler/CairoFontEngine.h
+--- apoppler-21.08.0/poppler/CairoFontEngine.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/CairoFontEngine.h 2021-08-22 17:26:19.525249517 -0700
+@@ -30,7 +30,7 @@
+ #ifndef CAIROFONTENGINE_H
+ #define CAIROFONTENGINE_H
+
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+ #include <cairo-ft.h>
+diff -aur apoppler-21.08.0/poppler/Dict.h poppler-21.08.0/poppler/Dict.h
+--- apoppler-21.08.0/poppler/Dict.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Dict.h 2021-08-22 17:26:32.638869326 -0700
+@@ -31,7 +31,7 @@
+ #define DICT_H
+
+ #include <atomic>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <string>
+ #include <vector>
+ #include <utility>
+diff -aur apoppler-21.08.0/poppler/GlobalParams.h poppler-21.08.0/poppler/GlobalParams.h
+--- apoppler-21.08.0/poppler/GlobalParams.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/GlobalParams.h 2021-08-22 17:25:33.690499390 -0700
+@@ -47,7 +47,7 @@
+ #include <unordered_map>
+ #include <string>
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <vector>
+
+ class GooString;
+diff -aur apoppler-21.08.0/poppler/Page.h poppler-21.08.0/poppler/Page.h
+--- apoppler-21.08.0/poppler/Page.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/Page.h 2021-08-22 17:26:41.951851455 -0700
+@@ -36,7 +36,7 @@
+ #define PAGE_H
+
+ #include <memory>
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+ #include "Object.h"
+diff -aur apoppler-21.08.0/poppler/PDFDoc.h poppler-21.08.0/poppler/PDFDoc.h
+--- apoppler-21.08.0/poppler/PDFDoc.h 2021-08-01 08:19:17.000000000 -0700
++++ poppler-21.08.0/poppler/PDFDoc.h 2021-08-22 17:25:50.992805747 -0700
+@@ -46,7 +46,7 @@
+
+ #include <algorithm>
+ #include <cstdio>
+-#include <mutex>
++#include "mingw.mutex.h"
+
+ #include "poppler-config.h"
+
diff --git a/src/Makefile.am b/src/Makefile.am
index fe7c023..faa7eed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ EXTRA_DIST = config.nsi.in claws-mail.nsi \
# We can use $(idir) here for the installation prefix.
cm_pkg_libical_cmake = yes
+cm_pkg_poppler_cmake = yes
cm_pkg_gtk_meson = yes
cm_pkg_libepoxy_meson = yes
@@ -386,6 +387,24 @@ cm_pkg_libical_configure = \
-DICAL_GLIB=OFF \
-DLIBICAL_BUILD_TESTING=OFF
+cm_pkg_poppler_configure = \
+ -DBUILD_GTK_TESTS=OFF \
+ -DBUILD_QT5_TESTS=OFF \
+ -DBUILD_QT6_TESTS=OFF \
+ -DBUILD_CPP_TESTS=OFF \
+ -DBUILD_MANUAL_TESTS=OFF \
+ -DENABLE_BOOST=OFF \
+ -DENABLE_CPP=OFF \
+ -DENABLE_UTILS=OFF \
+ -DENABLE_GOBJECT_INTROSPECTION=OFF \
+ -DENABLE_GTK_DOC=OFF \
+ -DENABLE_QT5=OFF \
+ -DENABLE_QT6=OFF \
+ -DENABLE_LIBCURL=OFF \
+ -DENABLE_LIBOPENJPEG=none \
+ -DCMAKE_C_FLAGS="$(CM_CFLAGS)" \
+ -DCMAKE_CXX_FLAGS="$(CM_CXXFLAGS) -fexceptions"
+
cm_pkg_gumbo_parser_configure = \
LDFLAGS=-L$(idir)/lib \
CPPFLAGS=-I$(idir)/include
@@ -418,6 +437,12 @@ cm_pkg_zlib_make_args_inst = \
LIBRARY_PATH=$(pkg_idir)/lib \
SHARED_MODE=1
+cm_pkg_poppler_data_make_args = \
+ prefix=$(pkg_idir)
+
+cm_pkg_poppler_data_make_args_inst = \
+ prefix=$(pkg_idir)
+
# Now do the bunch of the work. This is a bunch of dirty magic to
# integrate our special makefile into automake, while not actually
# including it (make should include it). This is in turn necessary
diff --git a/src/config.nsi.in b/src/config.nsi.in
index e59e589..0671c1d 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -91,3 +91,4 @@
!define cm_pkg_libical_version @cm_pkg_libical_version@
!define cm_pkg_ytnef_version @cm_pkg_ytnef_version@
!define cm_pkg_gumbo_parser_version @cm_pkg_gumbo_parser_version@
+!define cm_pkg_poppler_version @cm_pkg_poppler_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index fe712d8..890c547 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -469,10 +469,8 @@ File ${prefix}/bin/libjavascriptcoregtk-1.0-0.dll
#######################################
### jpeg
-!ifndef DISABLE_FANCY_PLUGIN
!insertmacro SetPrefix jpeg
File ${prefix}/bin/libjpeg-9.dll
-!endif
#######################################
### glib-networking
@@ -523,6 +521,12 @@ File ${prefix}/bin/libytnef-0.dll
!insertmacro SetPrefix gumbo_parser
File ${prefix}/bin/libgumbo-1.dll
+#######################################
+### poppler
+!insertmacro SetPrefix poppler
+File ${prefix}/bin/libpoppler-glib-8.dll
+File ${prefix}/bin/libpoppler-112.dll
+
#######################################
### claws-mail
!insertmacro SetPrefix claws_mail
@@ -545,6 +549,7 @@ File ${prefix}/lib/claws-mail/plugins/libravatar.dll
File ${prefix}/lib/claws-mail/plugins/litehtml_viewer.dll
File ${prefix}/lib/claws-mail/plugins/managesieve.dll
File ${prefix}/lib/claws-mail/plugins/notification.dll
+File ${prefix}/lib/claws-mail/plugins/pdf_viewer.dll
File ${prefix}/lib/claws-mail/plugins/pgpcore.dll
File ${prefix}/lib/claws-mail/plugins/pgpinline.dll
File ${prefix}/lib/claws-mail/plugins/pgpinline.deps
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index cf7d0d6..2cac667 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -18,6 +18,7 @@ Delete "$INSTDIR\lib\claws-mail\plugins\libravatar.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\litehtml_viewer.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\managesieve.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\notification.dll"
+Delete "$INSTDIR\lib\claws-mail\plugins\pdf_viewer.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
@@ -32,6 +33,11 @@ Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
RMDir "$INSTDIR\lib\claws-mail\plugins"
RMDir "$INSTDIR\lib\claws-mail"
+#######################################
+### poppler
+Delete "$INSTDIR\libpoppler-glib-8.dll"
+Delete "$INSTDIR\libpoppler-112.dll"
+
#######################################
### gumbo-parser
Delete "$INSTDIR\libgumbo-1.dll"
commit 4dbfd63dd6041b0f28fb92f805804d1db6acfe96
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Aug 20 03:03:46 2021 -0700
update readme
diff --git a/README b/README
index a8d9df6..7f3aed2 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ If any parameters are passed to autogen.sh, the first must be either
configure script.
-The configure script has three parameters for developers:
+The configure script has four parameters for developers:
--disable-fancy-plugin will skip building the fancy plugin and its dependencies
@@ -61,6 +61,8 @@ into separate .debug files
--enable-bzip2 will use faster bzip2 compression in the nsis installer instead
of smaller lzma
+--enable-debug will build packages with debug CFLAGS and configure options
+
The configure script looks for four environment variables:
@@ -84,7 +86,7 @@ Build examples
# Build an unstripped, 64-bit debug build suitable for use with cv2pdb
# cv2pdb will generate PDB symbols for use with native Microsoft tools
- $ ./autogen.sh --build-w64 --disable-strip CFLAGS="-Og -ggdb -pipe -mms-bitfields"
+ $ ./autogen.sh --build-w64 --disable-strip --enable-debug
Basic requirements
@@ -179,8 +181,10 @@ This requires editing a couple of files.
cm_pkg_<pkg>_make_args if the package needs special arguments to make
cm_pkg_<pkg>_make_args_inst if the package needs special arguments to make install
-4. Specify what files from the built package should be included in
- the installation (and uninstallation) in src/sections-(un)installer.nsi.
+4. Add a cm_pkg_<pkg>_version entry to src/config.nsi.in
+
+5. Specify what files from the built package should be included in
+the installation (and uninstallation) in src/sections-(un)installer.nsi.
Then follow the standard build instructions listed above.
commit 82fe9762b72568ff6523fe78862306a364d0b0de
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Aug 19 10:05:05 2021 -0700
add configure option to enable package debug flags
diff --git a/configure.ac b/configure.ac
index 92729ea..cb6804d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,14 +95,28 @@ AC_SUBST(STRIP_BINARIES)
AC_ARG_ENABLE([bzip2],
AS_HELP_STRING([--enable-bzip2],[Use faster bzip2 compression for installer (default=no)]),
[nsis_bzip2=$enableval],
- [nsis_bzip2=$no])
+ [nsis_bzip2=no])
AS_IF([test "$nsis_bzip2" = yes],
[NSIS_COMPRESSOR=bzip2],
[NSIS_COMPRESSOR=lzma])
AC_SUBST(NSIS_COMPRESSOR)
-AS_IF([test -z "$CFLAGS"],
- [CM_CFLAGS="-O2 -pipe -ggdb -mms-bitfields"],
+AC_ARG_ENABLE([debug],
+ AS_HELP_STRING([--enable-debug],[Build packages with debug flags and options (default=no)]),
+ [build_debug=$enableval],
+ [build_debug=no])
+AS_IF([test "$build_debug" = yes],
+ [ENABLE_DEBUG_OPTS=yes],
+ [ENABLE_DEBUG_OPTS=no])
+AM_CONDITIONAL([ENABLE_DEBUG_OPTS], [test x$build_debug = xyes])
+
+rel_cflags="-O2 -pipe -ggdb -mms-bitfields"
+deb_cflags="-Og -pipe -ggdb -mms-bitfields"
+AS_IF([test "$ENABLE_DEBUG_OPTS" = yes],
+ [CM_CFLAGS=$deb_cflags],
+ [CM_CFLAGS=$rel_cflags])
+
+AS_IF([test -n "$CFLAGS"],
[CM_CFLAGS=$CFLAGS])
AS_IF([test -z "$CXXFLAGS"],
[CM_CXXFLAGS=$CM_CFLAGS],
@@ -309,6 +323,7 @@ echo "
Fancy plugin: $ENABLE_FANCY_PLUGIN
Strip binaries: $STRIP_BINARIES
NSIS compression: $NSIS_COMPRESSOR
+ Enable debug options: $ENABLE_DEBUG_OPTS
Default package CFLAGS: $CM_CFLAGS
Default package CXXFLAGS: $CM_CXXFLAGS
Default make jobs: $CM_MAKE_JOBS
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ec3f32..fe7c023 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,11 @@ cm_pkg_regex_configure = \
cm_pkg_glib_configure = \
-Dinternal_pcre=true
+if ENABLE_DEBUG_OPTS
+cm_pkg_glib_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
+else
cm_pkg_glib_meson_cppflags = -I$(idir)/include
+endif
cm_pkg_glib_meson_ldflags = -L$(idir)/lib
cm_pkg_gdk_pixbuf_configure = \
@@ -93,7 +97,11 @@ cm_pkg_gtk_configure = \
-Dexamples=false \
-Dtests=false \
-Dintrospection=false
+if ENABLE_DEBUG_OPTS
+cm_pkg_gtk_meson_cppflags = -I$(idir)/include -DG_ENABLE_DEBUG
+else
cm_pkg_gtk_meson_cppflags = -I$(idir)/include
+endif
cm_pkg_gtk_meson_ldflags = -L$(idir)/lib
cm_pkg_libepoxy_configure = \
@@ -327,14 +335,16 @@ cm_pkg_libwebp_configure = \
CPPFLAGS=-I$(idir)/include
# --enable-debug-symbols=yes|full sets -ggdb which causes the ICE below
+if ENABLE_DEBUG_OPTS
webkitgtk_debug = \
--enable-debug \
--enable-debug-symbols=min \
--enable-developer-mode=no \
--enable-optimizations=no
-
-webkitgtk_release = \
+else
+webkitgtk_debug = \
--disable-debug
+endif
cm_pkg_webkitgtk_configure = \
--disable-webkit2 \
@@ -359,7 +369,7 @@ cm_pkg_webkitgtk_configure = \
--disable-gamepad \
--disable-webgl \
--disable-glibtest \
- $(webkitgtk_release) \
+ $(webkitgtk_debug) \
--disable-accelerated-compositing \
--enable-silent-rules \
CPPFLAGS="-I$(idir)/include -Wno-expansion-to-defined -Wno-class-memaccess" \
commit 5730081f3592ffb7537a301f7b175572aa2eb7eb
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 17 13:55:50 2021 -0700
fix gtk warning message
diff --git a/patches/gtk/69-win71-theme-finalize.sh b/patches/gtk/69-win71-theme-finalize.sh
index ba21182..da6829b 100755
--- a/patches/gtk/69-win71-theme-finalize.sh
+++ b/patches/gtk/69-win71-theme-finalize.sh
@@ -14,9 +14,9 @@ cat << GTK_INI_EOF > claws/settings.ini
gtk-theme-name=win71
gtk-auto-mnemonics=true
gtk-button-images=true
-;gtk-application-prefer-dark-theme=1
+#gtk-application-prefer-dark-theme=1
[Doc]
-;= To enable CSD, set following environment variable
-;= GTK_CSD=1
+#= To enable CSD, set following environment variable
+#= GTK_CSD=1
GTK_INI_EOF
commit 4119579f31661fd1f44108370c3c0efb9b7dd2d2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 17 13:22:26 2021 -0700
silence gtk warning for_size smaller than min-size
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 695f308..f3f7326 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,109 @@
+@@ -272,3 +277,114 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -94,6 +94,11 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ margin-top: -3px;
+}
+
++/* Silence Gtk-WARNING message: for_size smaller than min-size */
++spinbutton.horizontal button {
++ min-width: 0px;
++}
++
+/* Make folderview and summaryview background white */
+#folderview,
+#summaryview > notebook > stack > scrolledwindow {
commit 82329d51de5e3a10cc8bfbdbd017525fcab00e35
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 16 23:14:14 2021 -0700
fix messageview attachment icon position
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 0c7d278..695f308 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -21,7 +21,7 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,104 @@
+@@ -272,3 +277,109 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -126,3 +126,8 @@ diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ margin-top: -3px;
+ margin-left: -13px;
+}
++
++/* Fix messageview attachment icon offset */
++#textview_icon {
++ margin-left: -13px;
++}
commit 8bf6554539b1a500f106038b15007fb89b8fc289
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 16 22:15:07 2021 -0700
add more adwaita icons
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index aae063c..fe712d8 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -301,7 +301,11 @@ SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
File ${prefix}/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-password.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-question.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-warning.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-clear.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-copy.png
@@ -359,6 +363,13 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\legacy"
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-error.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-password.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-question.png
+File ${prefix}/share/icons/Adwaita/48x48/legacy/dialog-warning.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 010df0e..cf7d0d6 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -158,7 +158,11 @@ RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
Delete "$INSTDIR\share\icons\Adwaita\16x16\devices\drive-harddisk-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\devices"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-password.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-question.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-warning.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-copy.png"
@@ -221,6 +225,15 @@ RMDir "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
RMDir "$INSTDIR\share\icons\Adwaita\32x32"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-error.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-password.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-question.png"
+Delete "$INSTDIR\share\icons\Adwaita\48x48\legacy\dialog-warning.png"
+RMDir "$INSTDIR\share\icons\Adwaita\48x48\legacy"
+
+RMDir "$INSTDIR\share\icons\Adwaita\48x48"
+
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
commit 3ed4174faaafe2fb0712d56542a16dacf2bf1723
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 03:31:05 2021 -0700
fix messageview avatar position
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 86d31ed..0c7d278 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,6 @@
+diff -aur a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
--- a/gtk/theme/win32/gtk.css 2021-08-03 16:41:08.501811024 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-08-03 16:50:12.553362104 -0700
++++ b/gtk/theme/win32/gtk.css 2021-08-15 03:25:38.858490703 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +21,7 @@
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,97 @@
+@@ -272,3 +277,104 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -118,3 +119,10 @@
+#hbox_stat > progressbar.horizontal > trough > progress {
+ min-height: 9px;
+}
++
++/* Fix messageview avatar offset */
++#textview_avatar,
++#textview_contact_pic {
++ margin-top: -3px;
++ margin-left: -13px;
++}
commit 2d3c63714327c2ba13d3c0fe7281db08c69ce35d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 00:30:26 2021 -0700
use widget names in gtk theme
diff --git a/patches/claws_mail/09-widget-names.patch b/patches/claws_mail/09-widget-names.patch
new file mode 100644
index 0000000..22f8608
--- /dev/null
+++ b/patches/claws_mail/09-widget-names.patch
@@ -0,0 +1,174 @@
+diff --git a/src/folderview.c b/src/folderview.c
+index 9b2e364e9..a3f549236 100644
+--- a/src/folderview.c
++++ b/src/folderview.c
+@@ -455,6 +455,8 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
+ ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
+ titles);
+
++ gtk_widget_set_name(GTK_WIDGET(ctree), "folderview_sctree");
++
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+@@ -608,6 +610,7 @@ FolderView *folderview_create(MainWindow *mainwin)
+ folderview = g_new0(FolderView, 1);
+
+ scrolledwin = gtk_scrolled_window_new(NULL, NULL);
++ gtk_widget_set_name(GTK_WIDGET(scrolledwin), "folderview");
+ gtk_scrolled_window_set_policy
+ (GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_POLICY_AUTOMATIC,
+diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
+index 3512e97cd..da8325717 100644
+--- a/src/gtk/gtkutils.c
++++ b/src/gtk/gtkutils.c
+@@ -1524,6 +1524,7 @@ GtkWidget *gtkut_window_new (GtkWindowType type,
+ {
+ GtkWidget *window = gtk_window_new(type);
+ gtk_window_set_role(GTK_WINDOW(window), class);
++ gtk_widget_set_name(GTK_WIDGET(window), class);
+ return window;
+ }
+
+diff --git a/src/headerview.c b/src/headerview.c
+index 69d0d407c..433c26386 100644
+--- a/src/headerview.c
++++ b/src/headerview.c
+@@ -72,6 +72,7 @@ HeaderView *headerview_create(void)
+ headerview = g_new0(HeaderView, 1);
+
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(hbox), "headerview");
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+diff --git a/src/mainwindow.c b/src/mainwindow.c
+index d8d0388de..440bc28b9 100644
+--- a/src/mainwindow.c
++++ b/src/mainwindow.c
+@@ -1916,6 +1916,7 @@ MainWindow *main_window_create()
+
+ #ifndef GENERIC_UMPC
+ hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
++ gtk_widget_set_name(GTK_WIDGET(hbox_stat), "hbox_stat");
+ gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
+
+ warning_icon = gtkut_stock_button("dialog-warning", NULL);
+diff --git a/src/messageview.c b/src/messageview.c
+index 36dad2799..6b187d619 100644
+--- a/src/messageview.c
++++ b/src/messageview.c
+@@ -416,6 +416,7 @@ MessageView *messageview_create(MainWindow *mainwin)
+ mimeview->messageview = messageview;
+
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(vbox), "messageview");
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(headerview),
+ FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(noticeview),
+diff --git a/src/mimeview.c b/src/mimeview.c
+index 83b103a5f..9b2fa0ec1 100644
+--- a/src/mimeview.c
++++ b/src/mimeview.c
+@@ -362,6 +362,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(mimeview_drag_data_get), mimeview);
+
+ mime_notebook = gtk_notebook_new();
++ gtk_widget_set_name(GTK_WIDGET(mime_notebook), "mime_notebook");
+ gtk_widget_show(mime_notebook);
+ gtk_widget_set_can_focus(mime_notebook, FALSE);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
+@@ -401,6 +402,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(mime_toggle_button_cb), mimeview);
+
+ icon_mainbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(icon_mainbox), "mimeview_icon_mainbox");
+ gtk_widget_show(icon_mainbox);
+ gtk_widget_set_size_request(icon_mainbox, 32, -1);
+ gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
+@@ -410,6 +412,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
+
+ ctree_mainbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(ctree_mainbox), "mimeview_ctree_mainbox");
+ gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
+ G_CALLBACK(ctree_size_allocate_cb), mimeview);
+@@ -459,6 +462,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_show(vbox);
+ siginfoview = noticeview_create(mainwin);
++ gtk_widget_set_name(GTK_WIDGET(siginfoview->vgrid), "siginfoview");
+ noticeview_hide(siginfoview);
+ noticeview_set_icon_clickable(siginfoview, TRUE);
+ gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
+@@ -470,6 +474,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
+ gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
+
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_widget_set_name(GTK_WIDGET(hbox), "mimeview");
+ gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
+
+diff --git a/src/noticeview.c b/src/noticeview.c
+index 60c51b037..1b7e925be 100644
+--- a/src/noticeview.c
++++ b/src/noticeview.c
+@@ -86,6 +86,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
+ noticeview->window = mainwin->window;
+
+ vgrid = gtk_grid_new();
++ gtk_widget_set_name(GTK_WIDGET(vgrid), "noticeview");
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid),
+ GTK_ORIENTATION_VERTICAL);
+ gtk_grid_set_row_spacing(GTK_GRID(vgrid), 4);
+diff --git a/src/summaryview.c b/src/summaryview.c
+index 9d0b9a433..ada78d7e3 100644
+--- a/src/summaryview.c
++++ b/src/summaryview.c
+@@ -570,6 +570,7 @@ SummaryView *summary_create(MainWindow *mainwin)
+
+ #define SUMMARY_VBOX_SPACING 3
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, SUMMARY_VBOX_SPACING);
++ gtk_widget_set_name(GTK_WIDGET(vbox), "summaryview");
+
+ /* create status label */
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+@@ -6692,6 +6693,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
+ ctree = gtk_sctree_new_with_titles
+ (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
+
++ gtk_widget_set_name(GTK_WIDGET(ctree), "summaryview_sctree");
++
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+diff --git a/src/textview.c b/src/textview.c
+index 74ba34dfa..9bd0c9a78 100644
+--- a/src/textview.c
++++ b/src/textview.c
+@@ -1959,6 +1959,7 @@ static void textview_show_avatar(TextView *textview)
+ avatarr->image = NULL; /* avoid destroying */
+ avatars_avatarrender_free(avatarr);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_avatar");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
+@@ -1989,6 +1990,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
+ textview->image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_DIALOG);
+ cm_return_if_fail(textview->image != NULL);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_icon");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
+@@ -2090,6 +2092,7 @@ static void textview_show_contact_pic(TextView *textview)
+ }
+ cm_return_if_fail(textview->image != NULL);
+
++ gtk_widget_set_name(GTK_WIDGET(textview->image), "textview_contact_pic");
+ gtk_widget_show(textview->image);
+
+ gtk_widget_get_allocation(textview->text, &allocation);
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index d231b77..86d31ed 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -94,27 +94,27 @@
+}
+
+/* Make folderview and summaryview background white */
-+box > box > paned > scrolledwindow,
-+paned > box > notebook > stack > scrolledwindow {
++#folderview,
++#summaryview > notebook > stack > scrolledwindow {
+ background-color: white;
+}
+
+/* Shift folderview and summaryview vertical scrollbars up to
+ * fill the corner between the scrollbar and column headers */
-+box > box > paned > scrolledwindow > scrollbar,
-+paned > box > notebook > stack > scrolledwindow > scrollbar {
-+ margin-top: -24px;
++#folderview > scrollbar.vertical,
++#summaryview > notebook > stack > scrolledwindow > scrollbar.vertical {
++ margin-top: -24px;
+}
+
-+/* Make folderview and summaryview buttons closer together */
-+box > box > paned > scrolledwindow button,
-+paned > box > notebook > stack > scrolledwindow > widget > button {
++/* Make folderview and summaryview column headers closer together */
++#folderview_sctree > button,
++#summaryview_sctree > button {
+ margin-left: 0px;
+ margin-right: -1px;
+}
+
+/* Fix status bar height bouncing when progress bar toggles visibility */
-+box > box > box > progressbar.horizontal > trough,
-+box > box > box > progressbar.horizontal > trough > progress {
++#hbox_stat > progressbar.horizontal > trough,
++#hbox_stat > progressbar.horizontal > trough > progress {
+ min-height: 9px;
+}
commit 05ead8e23338cc390bd6ba3011a910b5d3b8a4a7
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Aug 15 01:05:58 2021 -0700
update to pango-1.48.8
also add a patch to fix font spacing issues introduced in 1.48.6
diff --git a/packages/packages.current b/packages/packages.current
index 754ac1c..146314b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c5
libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-pango,1.48.7,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz,28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc,,
+pango,1.48.8,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.8.tar.xz,009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
diff --git a/patches/pango/01-rounding.patch b/patches/pango/01-rounding.patch
new file mode 100644
index 0000000..bb721eb
--- /dev/null
+++ b/patches/pango/01-rounding.patch
@@ -0,0 +1,41 @@
+From df0217a3f46c77b743fa1ae1ddfc2bb321ba91e8 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei at src.gnome.org>
+Date: Mon, 9 Aug 2021 16:22:22 +0800
+Subject: [PATCH] pango/shape.c: Use the former rounding code as needed
+
+The careful rounding code that was brought back as a result of commit
+d4356779 only had effect if we are using a backend that supported font
+hinting, so on other backends, use the former rounding code that was
+dropped in favor of the careful rounding code that unfortunately did not
+apply for all backends.
+
+Should fix #578.
+---
+ pango/shape.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/pango/shape.c b/pango/shape.c
+index f8ac3691..aed028b7 100644
+--- a/pango/shape.c
++++ b/pango/shape.c
+@@ -341,5 +341,17 @@ pango_shape_with_flags (const gchar *item_text,
+ #undef HINT
+ }
+ }
++ else
++ {
++ for (i = 0; i < glyphs->num_glyphs; i++)
++ {
++ glyphs->glyphs[i].geometry.width =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.width);
++ glyphs->glyphs[i].geometry.x_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.x_offset);
++ glyphs->glyphs[i].geometry.y_offset =
++ PANGO_UNITS_ROUND (glyphs->glyphs[i].geometry.y_offset);
++ }
++ }
+ }
+ }
+--
+GitLab
+
commit b20eeff2e6db0149d155bb92ce8278b7786293b6
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 23:11:08 2021 -0700
add patches for glib and enchant
fix issues found by app verifier:
glib reads past the end of a buffer
enchant leaks memory from DllMain
diff --git a/patches/enchant/02-free-library-name.patch b/patches/enchant/02-free-library-name.patch
new file mode 100644
index 0000000..b55efee
--- /dev/null
+++ b/patches/enchant/02-free-library-name.patch
@@ -0,0 +1,23 @@
+--- a/lib/relocatable.c 2021-08-02 22:03:28.502997457 -0700
++++ b/lib/relocatable.c 2021-08-02 22:09:43.269387994 -0700
+@@ -314,7 +314,7 @@
+ #if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+
+ /* Full pathname of shared library, or NULL. */
+-static char *shared_library_fullname;
++static char *shared_library_fullname = NULL;
+
+ #if defined _WIN32 && !defined __CYGWIN__
+ /* Native Windows only.
+@@ -345,6 +345,11 @@
+
+ shared_library_fullname = strdup (location);
+ }
++ else if (event == DLL_PROCESS_DETACH)
++ {
++ if (shared_library_fullname != NULL)
++ free(shared_library_fullname);
++ }
+
+ return TRUE;
+ }
diff --git a/patches/glib/01-memcpy-length.patch b/patches/glib/01-memcpy-length.patch
new file mode 100644
index 0000000..8fb0255
--- /dev/null
+++ b/patches/glib/01-memcpy-length.patch
@@ -0,0 +1,11 @@
+--- a/gio/gwin32packageparser.c 2021-08-02 21:23:30.898523365 -0700
++++ b/gio/gwin32packageparser.c 2021-08-02 21:30:48.908511480 -0700
+@@ -390,7 +390,7 @@
+ wcs_path = LoadedWindowsGetStringRawBuffer (path, NULL);
+ manifest_filename_size = wcslen (wcs_path) + wcslen (bslash_appmanifest);
+ manifest_filename = g_new (wchar_t, manifest_filename_size + 1);
+- memcpy (manifest_filename, wcs_path, manifest_filename_size * sizeof (wchar_t));
++ memcpy (manifest_filename, wcs_path, wcslen (wcs_path) * sizeof (wchar_t));
+ memcpy (&manifest_filename[wcslen (wcs_path)], bslash_appmanifest, (wcslen (bslash_appmanifest) + 1) * sizeof (wchar_t));
+
+ memset (sax, 0, sizeof (*sax));
commit 409cb0d2ee03fcbffb9c007528133aa40c20fe91
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 17:29:59 2021 -0700
add missing dependency on cairo for pixman
diff --git a/configure.ac b/configure.ac
index db0ad87..92729ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ CM_SPKG([libffi])
CM_SPKG([glib], [libiconv gettext libffi zlib])
CM_SPKG([expat])
CM_SPKG([pixman], [libpng])
-CM_SPKG([cairo], [zlib libpng glib freetype fontconfig])
+CM_SPKG([cairo], [zlib libpng glib freetype fontconfig pixman])
CM_SPKG([atk], [glib])
CM_SPKG([libxml2], [zlib])
CM_SPKG([fontconfig], [zlib expat freetype libiconv libxml2])
commit 4b0fdfecbf80fef35227157a31940c61bb9a515d
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Tue Aug 3 16:56:56 2021 -0700
theme fix for progress bar
Fix the status bar height bouncing when the progress bar toggles
visibility
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 9b8a947..d231b77 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,5 @@
---- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-07-29 23:42:22.453515376 -0700
+--- a/gtk/theme/win32/gtk.css 2021-08-03 16:41:08.501811024 -0700
++++ b/gtk/theme/win32/gtk.css 2021-08-03 16:50:12.553362104 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +20,7 @@
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,91 @@
+@@ -272,3 +277,97 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -112,3 +112,9 @@
+ margin-left: 0px;
+ margin-right: -1px;
+}
++
++/* Fix status bar height bouncing when progress bar toggles visibility */
++box > box > box > progressbar.horizontal > trough,
++box > box > box > progressbar.horizontal > trough > progress {
++ min-height: 9px;
++}
commit a3121a653dda42dc8759028909b2a3e2d8a79f77
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 02:18:02 2021 -0700
add icons for gtk inspector
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index a45be30..aae063c 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -273,8 +273,17 @@ SetOutPath "$INSTDIR"
### adwaita-icon-theme
!insertmacro SetPrefix adwaita_icon_theme
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
+File ${prefix}/share/icons/Adwaita/16x16/actions/bookmark-new-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/document-save-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/find-location-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/folder-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-eject-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-playback-pause-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/media-record-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/object-select-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/view-list-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\categories"
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-activities-symbolic.symbolic.png
@@ -288,6 +297,9 @@ File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-recent-symbolic.symbol
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-symbols-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-travel-symbolic.symbolic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
+File ${prefix}/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
@@ -312,6 +324,9 @@ File ${prefix}/share/icons/Adwaita/16x16/legacy/view-refresh.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
File ${prefix}/share/icons/Adwaita/16x16/places/folder.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\ui"
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 4748830..010df0e 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -130,8 +130,17 @@ RMDir "$INSTDIR\share\themes\win71"
#######################################
### adwaita-icon-theme
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\bookmark-new-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\document-save-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\find-location-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\folder-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-eject-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-playback-pause-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\media-record-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\object-select-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\view-list-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\actions"
Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-activities-symbolic.symbolic.png"
@@ -146,6 +155,9 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-symbols-symbolic.sym
Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-travel-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\devices\drive-harddisk-symbolic.symbolic.png"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\devices"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
@@ -169,6 +181,9 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\view-refresh.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\legacy"
Delete "$INSTDIR\share\icons\Adwaita\16x16\places\folder.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-desktop-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-home-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\user-trash-symbolic.symbolic.png"
RMDir "$INSTDIR\share\icons\Adwaita\16x16\places"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-checked-symbolic.symbolic.png"
commit d8dad317c2965178db2d15dd4c2c3919a37ef0ab
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 01:23:15 2021 -0700
add adwaita emoji icons
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 93c89a1..a45be30 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -275,6 +275,19 @@ SetOutPath "$INSTDIR"
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
+
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\categories"
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-activities-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-body-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-flags-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-food-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-nature-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-objects-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-people-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-recent-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-symbols-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/categories/emoji-travel-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
@@ -296,8 +309,10 @@ File ${prefix}/share/icons/Adwaita/16x16/legacy/list-add.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/list-remove.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/system-help.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/view-refresh.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
File ${prefix}/share/icons/Adwaita/16x16/places/folder.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\ui"
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-mixed-symbolic.symbolic.png
@@ -325,20 +340,25 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/window-maximize-symbolic.symbolic.pn
File ${prefix}/share/icons/Adwaita/16x16/ui/window-minimize-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-password.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-question.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-warning.png
+
SetOutPath "$INSTDIR\share\icons\Adwaita\cursors"
File ${prefix}/share/icons/Adwaita/cursors/dnd-copy.cur
File ${prefix}/share/icons/Adwaita/cursors/dnd-move.cur
File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
+
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
+
ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
SetOutPath "$INSTDIR"
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 8f3dc75..4748830 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -132,7 +132,20 @@ RMDir "$INSTDIR\share\themes\win71"
### adwaita-icon-theme
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\actions"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\actions"
+
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-activities-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-body-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-flags-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-food-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-nature-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-objects-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-people-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-recent-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-symbols-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\categories\emoji-travel-symbolic.symbolic.png"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\categories"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
@@ -153,9 +166,11 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-add.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-remove.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\system-help.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\view-refresh.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\places\folder.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\places"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\places"
+
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-checked-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-mixed-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-symbolic.symbolic.png"
@@ -182,26 +197,34 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-maximize-symbolic.symbolic.
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-minimize-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-restore-symbolic.symbolic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16\ui"
-RMDIR "$INSTDIR\share\icons\Adwaita\16x16"
+RMDir "$INSTDIR\share\icons\Adwaita\16x16\ui"
+
+RMDir "$INSTDIR\share\icons\Adwaita\16x16"
+
Delete "$INSTDIR\share\icons\Adwaita\32x32\mimetypes\text-x-generic.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
-RMDIR "$INSTDIR\share\icons\Adwaita\32x32"
+RMDir "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+
+RMDir "$INSTDIR\share\icons\Adwaita\32x32"
+
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-question.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-warning.png"
-RMDIR "$INSTDIR\share\icons\Adwaita\256x256\legacy"
-RMDIR "$INSTDIR\share\icons\Adwaita\256x256"
+RMDir "$INSTDIR\share\icons\Adwaita\256x256\legacy"
+
+RMDir "$INSTDIR\share\icons\Adwaita\256x256"
+
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-copy.cur"
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-move.cur"
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-none.cur"
-RMDIR "$INSTDIR\share\icons\Adwaita\cursors"
+RMDir "$INSTDIR\share\icons\Adwaita\cursors"
+
Delete "$INSTDIR\share\icons\Adwaita\index.theme"
Delete "$INSTDIR\share\icons\Adwaita\icon-theme.cache"
-RMDIR "$INSTDIR\share\icons\Adwaita"
-RMDIR "$INSTDIR\share\icons"
+
+RMDir "$INSTDIR\share\icons\Adwaita"
+RMDir "$INSTDIR\share\icons"
#######################################
### gtk+
commit aecb51592471d486acda902cf831ebf3eeab4276
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Aug 2 00:38:42 2021 -0700
Include gtk schemas in the installer
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 924e04b..93c89a1 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -260,6 +260,13 @@ File ${prefix}/share/themes/Emacs/gtk-3.0/gtk-keys.css
SetOutPath "$INSTDIR\share\locale\"
File /r ${prefix}/share/locale/
+
+SetOutPath "$INSTDIR\share\glib-2.0\schemas"
+File ${prefix}/share/glib-2.0/schemas/gschemas.compiled
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
+File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
SetOutPath "$INSTDIR"
#######################################
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 07d1c88..8f3dc75 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -224,6 +224,14 @@ RMDir "$INSTDIR\share\themes\Emacs"
RMDir "$INSTDIR\share\themes"
+Delete "$INSTDIR\share\glib-2.0\schemas\gschemas.compiled"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.ColorChooser.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.Debug.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.EmojiChooser.gschema.xml"
+Delete "$INSTDIR\share\glib-2.0\schemas\org.gtk.Settings.FileChooser.gschema.xml"
+RMDir "$INSTDIR\share\glib-2.0\schemas"
+RMDir "$INSTDIR\share\glib-2.0"
+
#######################################
### gdk-pixbuf
Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
commit 332f68c8f55312125cf0b8172821c9ae31381f57
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jul 31 20:46:42 2021 -0700
Add litehtml remote content patch
diff --git a/patches/claws_mail/08-lh-remote-content.patch b/patches/claws_mail/08-lh-remote-content.patch
new file mode 100644
index 0000000..8bf3464
--- /dev/null
+++ b/patches/claws_mail/08-lh-remote-content.patch
@@ -0,0 +1,32 @@
+diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
+index 1e0d70f83..072192e47 100644
+--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
++++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
+@@ -110,8 +110,15 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ if (pixbuf != NULL)
+ m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
+
++ unlock_images_cache();
+ return;
+ } else {
++ if (!lh_prefs_get()->enable_remote_content) {
++ debug_print("blocking download of image from '%s'\n", src);
++ unlock_images_cache();
++ return;
++ }
++
+ request = true;
+ m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
+ }
+@@ -125,11 +132,6 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ if (request) {
+ struct FetchCtx *ctx;
+
+- if (!lh_prefs_get()->enable_remote_content) {
+- debug_print("blocking download of image from '%s'\n", src);
+- return;
+- }
+-
+ debug_print("allowing download of image from '%s'\n", src);
+
+ ctx = g_new(struct FetchCtx, 1);
commit abf3f7d01e0d0863168ceec75ab501caec6c8f12
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 23:23:29 2021 -0700
Claws theme fixes
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
index 52315ed..9b8a947 100644
--- a/patches/gtk/60-win32-theme-claws-consolidated.patch
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -1,5 +1,5 @@
--- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
-+++ b/gtk/theme/win32/gtk.css 2021-07-29 20:10:14.150917901 -0700
++++ b/gtk/theme/win32/gtk.css 2021-07-29 23:42:22.453515376 -0700
@@ -1,3 +1,9 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+
@@ -20,7 +20,7 @@
padding-bottom: 0px;
background: -gtk-win32-theme-part(window, 1, 1);
min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-@@ -272,3 +277,45 @@
+@@ -272,3 +277,91 @@
.maximized .titlebar button.maximize:disabled {
background-image: -gtk-win32-theme-part(window, 21, 4);
}
@@ -66,3 +66,49 @@
+ margin-top: 1px;
+ min-height: -gtk-win32-size(combobox, cysize);
+}
++
++/* Make the toolbar separators visible */
++toolbar.horizontal separator {
++ margin: 8px 3px;
++ min-width: 1px;
++ background-color: shade(@bg_color, 0.75);
++}
++
++/* Remove extra border in scrolled windows */
++scrolledwindow.frame {
++ border: 0px;
++}
++
++/* Remove extra border in textview */
++textview {
++ background-image: none;
++}
++
++/* Remove extra padding around scrollbars */
++scrollbar.vertical {
++ margin-left: -3px;
++}
++
++scrollbar.horizontal {
++ margin-top: -3px;
++}
++
++/* Make folderview and summaryview background white */
++box > box > paned > scrolledwindow,
++paned > box > notebook > stack > scrolledwindow {
++ background-color: white;
++}
++
++/* Shift folderview and summaryview vertical scrollbars up to
++ * fill the corner between the scrollbar and column headers */
++box > box > paned > scrolledwindow > scrollbar,
++paned > box > notebook > stack > scrolledwindow > scrollbar {
++ margin-top: -24px;
++}
++
++/* Make folderview and summaryview buttons closer together */
++box > box > paned > scrolledwindow button,
++paned > box > notebook > stack > scrolledwindow > widget > button {
++ margin-left: 0px;
++ margin-right: -1px;
++}
commit f6f1e38cd69657118b8287c87c72a52835be6929
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Jul 29 20:31:27 2021 -0700
consolidate claws theme patches
diff --git a/patches/gtk/50-win71-theme-prepare.sh b/patches/gtk/50-win71-theme-prepare.sh
index 82200a2..fe1337e 100755
--- a/patches/gtk/50-win71-theme-prepare.sh
+++ b/patches/gtk/50-win71-theme-prepare.sh
@@ -4,14 +4,12 @@
# Patches 51..57: Taken from Jamie Velasco / https://gitlab.gnome.org/GNOME/gtk/-/issues/687
# Original numbering changed from 0001..0007 to 51..57
-# Patches 61..66: Added by Thorsten Maerz for Claws-Mail
+# Further patches added by Thorsten Maerz for Claws-Mail
# These patches are meant to directly modify the compiled-in win32 theme
# To keep gtk unchanged, the original files are backed up first.
-# 69-win71-theme-finalize.patch copies the modified files to a new location,
+# The finalize.patch copies the modified files to a new location,
# adds a settings file and finally restores the old directory before build.
-WIN32_THEME_NAME=win32
-WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
-
-cp -a ${WIN32_THEME_DIR} ${WIN32_THEME_DIR}.org
+cd gtk/theme || exit 1
+cp -a win32 win32.bak || exit 1
diff --git a/patches/gtk/60-win32-theme-claws-consolidated.patch b/patches/gtk/60-win32-theme-claws-consolidated.patch
new file mode 100644
index 0000000..52315ed
--- /dev/null
+++ b/patches/gtk/60-win32-theme-claws-consolidated.patch
@@ -0,0 +1,68 @@
+--- a/gtk/theme/win32/gtk.css 2021-07-29 19:54:57.943852906 -0700
++++ b/gtk/theme/win32/gtk.css 2021-07-29 20:10:14.150917901 -0700
+@@ -1,3 +1,9 @@
++/* win71 theme
++ * Based on (internal) win32 theme from gtk+
++ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
++ * Additional changes from Thorsten Maerz <info at netztorte.de>
++ */
++
+ @import url("gtk-win32-base.css");
+
+ /* Menus */
+@@ -133,8 +139,7 @@
+ margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
+ calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
+ margin-bottom: 0px;
+- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
+- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
++ padding: 0px 4px; /* Titlebar took too much space */
+ padding-bottom: 0px;
+ background: -gtk-win32-theme-part(window, 1, 1);
+ min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
+@@ -272,3 +277,45 @@
+ .maximized .titlebar button.maximize:disabled {
+ background-image: -gtk-win32-theme-part(window, 21, 4);
+ }
++
++/* Draw missing arrows for submenu entries */
++menu menuitem arrow, .menu menuitem arrow {
++ min-width: 16px;
++ min-height: 16px;
++}
++
++menu menuitem arrow, .menu menuitem arrow {
++ margin-left: 10px;
++ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
++}
++
++/* Draw missing separator between menu entries */
++menu separator {
++ padding: 0px;
++ background-color: shade(@bg_color, 0.75);
++}
++
++/* Draw native +/- expanders in treeview (instead of arrows) */
++treeview.view.expander:checked {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
++}
++
++treeview.view.expander {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
++}
++
++/* Unfocused treeview selections are hardly visible on MSWin
++ * Use background color instead of light grey (e.g. selected folder
++ * should stay visible, even when focus is changed to a different
++ * widget, e.g. a file selection widget for that folder).
++ * This isn't native MSWin behaviour, but rather resembles the
++ * behaviour of Posix based applications. */
++treeview.view:selected {
++ background-color: @selected_bg_color;
++}
++
++/* Combobox had too little height */
++combobox {
++ margin-top: 1px;
++ min-height: -gtk-win32-size(combobox, cysize);
++}
diff --git a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
deleted file mode 100644
index 3439654..0000000
--- a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Draw missing arrows for submenu entries
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -83,6 +83,16 @@
- border-width: 0;
- }
-
-+menu menuitem arrow, .menu menuitem arrow {
-+ min-width: 16px;
-+ min-height: 16px;
-+}
-+
-+menu menuitem arrow, .menu menuitem arrow {
-+ margin-left: 10px;
-+ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
-+}
-+
- /* Listbox */
-
- /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk/62-win32-theme-Draw-menu-separator.patch b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
deleted file mode 100644
index ba6fc95..0000000
--- a/patches/gtk/62-win32-theme-Draw-menu-separator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Draw missing separator between menu entries
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -93,6 +93,11 @@
- -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
- }
-
-+menu separator {
-+ padding: 0px;
-+ background-color: shade(@bg_color, 0.75);
-+}
-+
- /* Listbox */
-
- /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk/63-win32-theme-Native-treeview-expander.patch b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
deleted file mode 100644
index 7caf9e9..0000000
--- a/patches/gtk/63-win32-theme-Native-treeview-expander.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Draw native +/- expanders in treeview (instead of arrows)
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -287,3 +287,11 @@
- .maximized .titlebar button.maximize:disabled {
- background-image: -gtk-win32-theme-part(window, 21, 4);
- }
-+
-+treeview.view.expander:checked {
-+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
-+}
-+
-+treeview.view.expander {
-+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
-+}
diff --git a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
deleted file mode 100644
index cf0e4cf..0000000
--- a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Titlebar took too much space
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -148,8 +148,7 @@
- margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
- calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
- margin-bottom: 0px;
-- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
-- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
-+ padding: 0px 4px;
- padding-bottom: 0px;
- background: -gtk-win32-theme-part(window, 1, 1);
- min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
diff --git a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
deleted file mode 100644
index 6ebc701..0000000
--- a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Unfocused treeview selections are hardly visible on MSWin
-Use background color instead of light grey (e.g. selected folder
-should stay visible, even when focus is changed to a different
-widget, e.g. a file selection widget for that folder).
-This isn't native MSWin behaviour, but rather resembles the
-behaviour of Posix based applications.
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -294,3 +294,7 @@
- treeview.view.expander {
- -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
- }
-+
-+treeview.view:selected {
-+ background-color: @selected_bg_color;
-+}
diff --git a/patches/gtk/66-win32-theme-Native-combobox-height.patch b/patches/gtk/66-win32-theme-Native-combobox-height.patch
deleted file mode 100644
index e253acb..0000000
--- a/patches/gtk/66-win32-theme-Native-combobox-height.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Combobox had too little height
-Thorsten Maerz <info at netztorte.de>
-
-diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -965,6 +965,10 @@
-
- /* Combobox */
-
-+combobox {
-+ margin-top: 1px;
-+ min-height: -gtk-win32-size(combobox, cysize);
-+}
- combobox entry {
- margin-right: calc( -2ex - -gtk-win32-part-width(combobox, 6, 1));
- background-image: -gtk-win32-theme-part(combobox, 4, 1);
diff --git a/patches/gtk/67-win32-theme-Credits.patch b/patches/gtk/67-win32-theme-Credits.patch
deleted file mode 100644
index 55f24f0..0000000
--- a/patches/gtk/67-win32-theme-Credits.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
---- a/gtk/theme/win32/gtk.css
-+++ b/gtk/theme/win32/gtk.css
-@@ -1,3 +1,21 @@
-+/* win71 theme
-+ * Based on (internal) win32 theme from gtk+-3.24.26 source
-+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
-+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
-+ */
-+
- @import url("gtk-win32-base.css");
-
- /* Menus */
-diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
---- a/gtk/theme/win32/gtk-win32-base.css
-+++ b/gtk/theme/win32/gtk-win32-base.css
-@@ -1,3 +1,21 @@
-+/* win71 theme
-+ * Based on (internal) win32 theme from gtk+-3.24.26 source
-+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
-+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
-+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
-+ */
-+
- @define-color bg_color -gtk-win32-color(button, btnface);
- @define-color text_color -gtk-win32-color(button, btntext);
- @define-color selected_bg_color -gtk-win32-color(button, highlight);
diff --git a/patches/gtk/69-win71-theme-finalize.sh b/patches/gtk/69-win71-theme-finalize.sh
index fe69c5e..ba21182 100755
--- a/patches/gtk/69-win71-theme-finalize.sh
+++ b/patches/gtk/69-win71-theme-finalize.sh
@@ -3,19 +3,15 @@
# 69-win71-theme-finalize.patch
# Restore files backed up by 50-win71-theme-prepare.patch
-WIN32_THEME_NAME=win32
-WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
-CLAWS_THEME_NAME=win71
-CLAWS_THEME_DIR=gtk/theme/claws
+cd gtk/theme || exit 1
-mkdir ${CLAWS_THEME_DIR}
-mv ${WIN32_THEME_DIR} ${CLAWS_THEME_DIR}/
-mv ${WIN32_THEME_DIR}.org ${WIN32_THEME_DIR}
-mv ${CLAWS_THEME_DIR}/${WIN32_THEME_NAME} ${CLAWS_THEME_DIR}/${CLAWS_THEME_NAME}
+mkdir claws || exit 1
+mv -n win32 claws/win71 || exit 1
+mv -n win32.bak win32 || exit 1
-cat << GTK_INI_EOF > ${CLAWS_THEME_DIR}/settings.ini
+cat << GTK_INI_EOF > claws/settings.ini
[Settings]
-gtk-theme-name=${CLAWS_THEME_NAME}
+gtk-theme-name=win71
gtk-auto-mnemonics=true
gtk-button-images=true
;gtk-application-prefer-dark-theme=1
commit d2eaa34f797d63f3104f626d6270bab27eea55da
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Jul 29 19:52:45 2021 -0700
Add patch to horizontally expand toolbars
diff --git a/patches/claws_mail/07-hexpand.patch b/patches/claws_mail/07-hexpand.patch
new file mode 100644
index 0000000..01a4371
--- /dev/null
+++ b/patches/claws_mail/07-hexpand.patch
@@ -0,0 +1,30 @@
+From 9674154cb67aa8c9fe672a285730233ab7df68d8 Mon Sep 17 00:00:00 2001
+From: Jonathan Boeing <jonathan at claws-mail.org>
+Date: Thu, 29 Jul 2021 17:26:33 -0700
+Subject: [PATCH] Set hexpand on toolbars
+
+Depending on the Windows version and theme, a non-horizontally expanded
+toolbar has a sharp visual discontinuity between the toolbar button
+backgrounds and the background next to the toolbar.
+
+Enabling horizontal expansion gives a seamless background across the width
+of the window.
+---
+ src/toolbar.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/toolbar.c b/src/toolbar.c
+index 682b7b964..c2fe7de0c 100644
+--- a/src/toolbar.c
++++ b/src/toolbar.c
+@@ -2262,6 +2262,7 @@ Toolbar *toolbar_create(ToolbarType type,
+
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
+ gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
++ gtk_widget_set_hexpand(toolbar, TRUE);
+
+ for (cur = toolbar_list; cur != NULL; cur = cur->next) {
+
+--
+2.20.1
+
commit af11845d7e5a9ca05146a3e2b33dc2720b0b4a39
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 20:02:07 2021 -0700
Add litehtml rendering patches
diff --git a/patches/claws_mail/06-litehtml.patch b/patches/claws_mail/06-litehtml.patch
new file mode 100644
index 0000000..04b2a2a
--- /dev/null
+++ b/patches/claws_mail/06-litehtml.patch
@@ -0,0 +1,672 @@
+# Commits 6fce79c9 -> 8eaf132b from claws.git
+
+diff --git a/src/plugins/litehtml_viewer/container_linux.cpp b/src/plugins/litehtml_viewer/container_linux.cpp
+index ac0f40e0e..4a455696f 100644
+--- a/src/plugins/litehtml_viewer/container_linux.cpp
++++ b/src/plugins/litehtml_viewer/container_linux.cpp
+@@ -127,21 +127,12 @@ void container_linux::draw_background( litehtml::uint_ptr hdc, const litehtml::b
+ litehtml::tstring url;
+ make_url(bg.image.c_str(), bg.baseurl.c_str(), url);
+
+- const image *img_i = NULL;
+-
+ lock_images_cache();
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
+- if (i->first == url) {
+- img_i = i;
+- break;
+- }
+- }
+-
+- if(img_i != NULL && img_i->second)
++ auto i = m_images.find(url);
++ if(i != m_images.end() && i->second.first)
+ {
+- GdkPixbuf *bgbmp = img_i->second;
++ GdkPixbuf *bgbmp = i->second.first;
+
+ GdkPixbuf *new_img;
+ if(bg.image_size.width != gdk_pixbuf_get_width(bgbmp) || bg.image_size.height != gdk_pixbuf_get_height(bgbmp))
+diff --git a/src/plugins/litehtml_viewer/container_linux.h b/src/plugins/litehtml_viewer/container_linux.h
+index f35ffeab1..05c66ce4f 100644
+--- a/src/plugins/litehtml_viewer/container_linux.h
++++ b/src/plugins/litehtml_viewer/container_linux.h
+@@ -20,6 +20,7 @@
+ #include <vector>
+ #include <list>
+ #include <string>
++#include <sys/time.h>
+
+ #include <cairo.h>
+ #include <gtk/gtk.h>
+@@ -54,8 +55,8 @@ struct cairo_clip_box
+
+ class container_linux : public litehtml::document_container
+ {
+- typedef std::pair<litehtml::tstring, GdkPixbuf*> image;
+- typedef std::list<image> images_map;
++ typedef std::pair<GdkPixbuf*, struct timeval> img_cache_entry;
++ typedef std::map<litehtml::tstring, img_cache_entry> images_map;
+
+ protected:
+ cairo_surface_t* m_temp_surface;
+@@ -92,10 +93,10 @@ public:
+
+ /* Trim down images cache to less than desired_size [bytes],
+ * starting from oldest stored. */
+- gint clear_images(gint desired_size);
++ gint clear_images(gsize desired_size);
+
+- void add_image_to_cache(const gchar *url, GdkPixbuf *image);
+- virtual void redraw(gboolean force_render) = 0;
++ void update_image_cache(const gchar *url, GdkPixbuf *image);
++ virtual void rerender() = 0;
+ virtual GdkPixbuf *get_local_image(const litehtml::tstring url) const = 0;
+
+ protected:
+diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
+index 5ef7c0ced..1e0d70f83 100644
+--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
++++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
+@@ -20,12 +20,15 @@
+ #include "claws-features.h"
+ #endif
+
++#include <set>
+ #include "common/utils.h"
+
+ #include "container_linux.h"
+ #include "http.h"
+ #include "lh_prefs.h"
+
++typedef std::pair<litehtml::tstring, struct timeval> lru_entry;
++
+ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+ {
+ GError *error = NULL;
+@@ -37,8 +40,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+
+ if (error || !image) {
+ if (error) {
+- g_warning("lh_get_image: Could not create pixbuf %s",
+- error->message);
++ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
++ url, error->message);
+ g_clear_error(&error);
+ }
+ goto theend;
+@@ -46,8 +49,8 @@ static GdkPixbuf *lh_get_image(const litehtml::tchar_t* url)
+
+ pixbuf = gdk_pixbuf_new_from_stream(image, NULL, &error);
+ if (error) {
+- g_warning("lh_get_image: Could not create pixbuf %s",
+- error->message);
++ g_warning("lh_get_image: Could not create pixbuf for '%s': %s",
++ url, error->message);
+ pixbuf = NULL;
+ g_clear_error(&error);
+ }
+@@ -80,10 +83,8 @@ static void get_image_callback(GObject *source, GAsyncResult *res, gpointer user
+
+ pixbuf = GDK_PIXBUF(g_task_propagate_pointer(G_TASK(res), NULL));
+
+- if (pixbuf != NULL) {
+- ctx->container->add_image_to_cache(ctx->url, pixbuf);
+- ctx->container->redraw(true);
+- }
++ ctx->container->update_image_cache(ctx->url, pixbuf);
++ ctx->container->rerender();
+
+ g_free(ctx->url);
+ g_free(ctx);
+@@ -93,33 +94,36 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ {
+ litehtml::tstring url;
+ make_url(src, baseurl, url);
+- bool found = false;
+-
+- lock_images_cache();
++ bool request = false;
++ struct timeval last;
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
++ gettimeofday(&last, NULL);
+
+- if (!strcmp(i->first.c_str(), url.c_str())) {
+- found = true;
+- break;
+- }
+- }
+-
+- unlock_images_cache();
+-
+- if (!found) {
+- struct FetchCtx *ctx;
++ lock_images_cache();
+
++ auto i = m_images.find(url);
++ if(i == m_images.end()) {
+ /* Attached images can be loaded into cache right here. */
+ if (!strncmp(src, "cid:", 4)) {
+ GdkPixbuf *pixbuf = get_local_image(src);
+
+ if (pixbuf != NULL)
+- add_image_to_cache(src, pixbuf);
++ m_images.insert(std::make_pair(src, std::make_pair(pixbuf, last)));
+
+ return;
++ } else {
++ request = true;
++ m_images.insert(std::make_pair(url, std::make_pair((GdkPixbuf *)NULL, last)));
+ }
++ } else {
++ debug_print("found image cache entry: %p '%s'\n", i->second.first, url.c_str());
++ i->second.second = last;
++ }
++
++ unlock_images_cache();
++
++ if (request) {
++ struct FetchCtx *ctx;
+
+ if (!lh_prefs_get()->enable_remote_content) {
+ debug_print("blocking download of image from '%s'\n", src);
+@@ -132,11 +136,9 @@ void container_linux::load_image( const litehtml::tchar_t* src, const litehtml::
+ ctx->url = g_strdup(url.c_str());
+ ctx->container = this;
+
+- GTask *task = g_task_new(this, NULL, get_image_callback, ctx);
++ GTask *task = g_task_new(NULL, NULL, get_image_callback, ctx);
+ g_task_set_task_data(task, ctx, NULL);
+ g_task_run_in_thread(task, get_image_threaded);
+- } else {
+- debug_print("found image in cache: '%s'\n", url.c_str());
+ }
+ }
+
+@@ -144,43 +146,54 @@ void container_linux::get_image_size( const litehtml::tchar_t* src, const liteht
+ {
+ litehtml::tstring url;
+ make_url(src, baseurl, url);
+- bool found = false;
+- const image *img = NULL;
++ const GdkPixbuf *img = NULL;
+
+ lock_images_cache();
+
+- for (auto ii = m_images.cbegin(); ii != m_images.cend(); ++ii) {
+- const image *i = &(*ii);
+- if (i->first == url) {
+- img = i;
+- found = true;
+- break;
+- }
+- }
+-
+- if(img != NULL)
+- {
+- sz.width = gdk_pixbuf_get_width(img->second);
+- sz.height = gdk_pixbuf_get_height(img->second);
+- } else
+- {
+- sz.width = 0;
+- sz.height = 0;
++ auto i = m_images.find(url);
++ if (i != m_images.end() && i->second.first) {
++ img = i->second.first;
++ sz.width = gdk_pixbuf_get_width(img);
++ sz.height = gdk_pixbuf_get_height(img);
++ } else {
++ sz.width = 0;
++ sz.height = 0;
+ }
+
+ unlock_images_cache();
+ }
+
+-void container_linux::add_image_to_cache(const gchar *url, GdkPixbuf *image)
++void container_linux::update_image_cache(const gchar *url, GdkPixbuf *image)
+ {
+ g_return_if_fail(url != NULL);
+- g_return_if_fail(image != NULL);
+
+- debug_print("adding image to cache: '%s'\n", url);
++ debug_print("updating image cache: %p '%s'\n", image, url);
+ lock_images_cache();
+- m_images.push_back(std::make_pair(url, image));
++ auto i = m_images.find(url);
++ if(i == m_images.end()) {
++ g_warning("image '%s' was not found in pixbuf cache\n", url);
++ unlock_images_cache();
++ return;
++ }
++
++ if(i->second.first != NULL && i->second.first != image) {
++ g_warning("pixbuf pointer for image '%s' changed\n", url);
++ g_object_unref(i->second.first);
++ }
++
++ if(image == NULL) {
++ /* A null pixbuf pointer presumably means the download failed,
++ * so remove the cache entry to allow for future retries. */
++ debug_print("warning - new pixbuf for '%s' is null\n", url);
++ m_images.erase(i);
++ unlock_images_cache();
++ return;
++ }
++
++ i->second.first = image;
+ unlock_images_cache();
+ }
++
+ void container_linux::lock_images_cache(void)
+ {
+ g_rec_mutex_lock(&m_images_lock);
+@@ -196,10 +209,8 @@ void container_linux::clear_images()
+ lock_images_cache();
+
+ for(auto i = m_images.begin(); i != m_images.end(); ++i) {
+- image *img = &(*i);
+-
+- if (img->second) {
+- g_object_unref(img->second);
++ if (i->second.first) {
++ g_object_unref(i->second.first);
+ }
+ }
+
+@@ -208,54 +219,71 @@ void container_linux::clear_images()
+ unlock_images_cache();
+ }
+
+-gint container_linux::clear_images(gint desired_size)
++gint container_linux::clear_images(gsize desired_size)
+ {
+- gint size = 0;
++ gsize size = 0;
+ gint num = 0;
+
+ lock_images_cache();
+
+- /* First, remove all local images - the ones with "cid:"
+- * URL. We will remove their list elements later. */
+- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
+- image *img = &(*i);
+-
+- if (!strncmp(img->first.c_str(), "cid:", 4)) {
+- g_object_unref(img->second);
+- img->second = NULL;
++ /* First, remove all local images - the ones with "cid:" URL. */
++ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
++ if (!strncmp(i->first.c_str(), "cid:", 4)) {
++ g_object_unref(i->second.first);
++ i = m_images.erase(i);
+ num++;
+ }
+ }
+
+- /* Now tally up size of all the stored GdkPixbufs and
+- * deallocate those which make the total size be above
+- * the desired_size limit. We will remove their list
+- * elements later. */
+- for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
+- image *img = &(*i);
+- gint cursize;
++ /* Second, build an LRU list */
++ auto lru_comp_func = [](const lru_entry& l1, const lru_entry& l2) {
++ return timercmp(&l1.second, &l2.second, <);
++ };
++ std::set<lru_entry, decltype(lru_comp_func)> lru(lru_comp_func);
+
+- if (img->second == NULL)
++ for (auto i = m_images.begin(); i != m_images.end(); ++i) {
++ lru.insert(std::make_pair(i->first, i->second.second));
++ }
++
++ /*
++ for (auto l = lru.begin(); l != lru.end(); l++) {
++ debug_print("lru dump: %d %d %s\n", l->second.tv_sec, l->second.tv_usec, l->first.c_str());
++ }
++ */
++
++ /* Last, walk the LRU list and remove the oldest entries that push it over
++ * the desired size limit */
++ for (auto l = lru.rbegin(); l != lru.rend(); ++l) {
++ gsize cursize;
++
++ auto i = m_images.find(l->first);
++
++ if(i == m_images.end()) {
++ g_warning("failed to find '%s' in m_images\n", l->first.c_str());
+ continue;
++ }
+
+- cursize = gdk_pixbuf_get_byte_length(img->second);
++ if(i->second.first == NULL) {
++ /* This should mean that the download is still in progress */
++ debug_print("warning - trying to prune a null pixbuf for %s\n", i->first.c_str());
++ continue;
++ }
+
++ cursize = gdk_pixbuf_get_byte_length(i->second.first);
++ /*
++ debug_print("clear_images: desired_size %d - size %d - cursize %d - %d %d %s\n",
++ desired_size, size, cursize, l->second.tv_sec, l->second.tv_usec, l->first.c_str());
++ */
+ if (size + cursize > desired_size) {
+- g_object_unref(img->second);
+- img->second = NULL;
++ debug_print("pruning %s from image cache\n", i->first.c_str());
++ g_object_unref(i->second.first);
++ m_images.erase(i);
+ num++;
+ } else {
+ size += cursize;
+ }
+ }
+
+- /* Remove elements whose GdkPixbuf pointers point to NULL. */
+- m_images.remove_if([&](image _img) -> bool {
+- if (_img.second == NULL)
+- return true;
+- return false;
+- });
+-
+ unlock_images_cache();
+
+ return num;
+diff --git a/src/plugins/litehtml_viewer/http.cpp b/src/plugins/litehtml_viewer/http.cpp
+index f846aef8c..453a56c7b 100644
+--- a/src/plugins/litehtml_viewer/http.cpp
++++ b/src/plugins/litehtml_viewer/http.cpp
+@@ -33,15 +33,20 @@ struct Data {
+ };
+
+ static size_t write_data(char* ptr, size_t size, size_t nmemb, void* data_ptr) {
+- struct Data* data = (struct Data *) data_ptr;
+- size_t realsize = size * nmemb;
+-
+- g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
+- g_memdup(ptr, realsize), realsize,
+- g_free);
+- data->size += realsize;
++ struct Data* data = (struct Data *) data_ptr;
++ size_t realsize = size * nmemb;
++
++ g_memory_input_stream_add_data((GMemoryInputStream *)data->memory,
++#if !GLIB_CHECK_VERSION (2, 68, 0)
++ g_memdup(ptr, realsize),
++#else
++ g_memdup2(ptr, realsize),
++#endif
++ realsize,
++ g_free);
++ data->size += realsize;
+
+- return realsize;
++ return realsize;
+ }
+
+ http::http()
+diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
+index ae33dfb9e..7c73346c5 100644
+--- a/src/plugins/litehtml_viewer/lh_widget.cpp
++++ b/src/plugins/litehtml_viewer/lh_widget.cpp
+@@ -60,6 +60,9 @@ lh_widget::lh_widget()
+ {
+ GtkWidget *item;
+
++ m_force_render = false;
++ m_blank = false;
++
+ /* scrolled window */
+ m_scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(m_scrolled_window),
+@@ -193,11 +196,17 @@ void lh_widget::open_html(const gchar *contents)
+ adj = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(m_scrolled_window));
+ gtk_adjustment_set_value(adj, 0.0);
+- redraw(false);
++ m_blank = false;
+ }
+ lh_widget_statusbar_pop();
+ }
+
++void lh_widget::rerender()
++{
++ m_force_render = true;
++ gtk_widget_queue_draw(m_drawing_area);
++}
++
+ void lh_widget::draw(cairo_t *cr)
+ {
+ double x1, x2, y1, y2;
+@@ -220,7 +229,7 @@ void lh_widget::draw(cairo_t *cr)
+ m_html->draw((litehtml::uint_ptr)cr, 0, 0, &pos);
+ }
+
+-void lh_widget::redraw(gboolean force_render)
++void lh_widget::redraw()
+ {
+ GtkAllocation rect;
+ gint width;
+@@ -229,18 +238,16 @@ void lh_widget::redraw(gboolean force_render)
+ cairo_region_t *creg;
+ GdkDrawingContext *gdkctx;
+
+- paint_white();
+-
+ if (m_html == NULL)
+ return;
+
+ /* Get width of the viewport. */
+- gdkwin = gtk_viewport_get_view_window(GTK_VIEWPORT(m_viewport));
+- width = gdk_window_get_width(gdkwin);
+- m_height = gdk_window_get_height(gdkwin);
++ gtk_widget_get_allocation(GTK_WIDGET(m_viewport), &rect);
++ width = rect.width;
++ m_height = rect.height;
+
+ /* If the available width has changed, rerender the HTML content. */
+- if (m_rendered_width != width || force_render) {
++ if (m_rendered_width != width || std::atomic_exchange(&m_force_render, false)) {
+ debug_print("lh_widget::redraw: width changed: %d != %d\n",
+ m_rendered_width, width);
+
+@@ -268,12 +275,18 @@ void lh_widget::redraw(gboolean force_render)
+ g_warning("lh_widget::redraw: No GdkWindow to draw on!");
+ return;
+ }
+- creg = gdk_window_get_clip_region(gdkwin);
++ creg = cairo_region_create_rectangle(&rect);
+ gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
+ cr = gdk_drawing_context_get_cairo_context(gdkctx);
+ }
+
+- draw(cr);
++ if(!std::atomic_exchange(&m_blank, false)) {
++ draw(cr);
++ } else {
++ cairo_rectangle(cr, rect.x, rect.y, rect.width, rect.height);
++ cairo_set_source_rgb(cr, 255, 255, 255);
++ cairo_fill(cr);
++ }
+
+ /* Only destroy the used cairo context if we created it earlier. */
+ if (m_cairo_context == NULL) {
+@@ -282,40 +295,10 @@ void lh_widget::redraw(gboolean force_render)
+ }
+ }
+
+-void lh_widget::paint_white()
+-{
+- GdkWindow *gdkwin = gtk_widget_get_window(m_drawing_area);
+- cairo_region_t *creg;
+- cairo_t *cr;
+- GdkDrawingContext *gdkctx;
+-
+- if (gdkwin == NULL) {
+- g_warning("lh_widget::clear: No GdkWindow to draw on!");
+- return;
+- }
+-
+- creg = gdk_window_get_clip_region(gdkwin);
+- gdkctx = gdk_window_begin_draw_frame(gdkwin, creg);
+- cr = gdk_drawing_context_get_cairo_context(gdkctx);
+-
+- /* Paint white background. */
+- gint width, height;
+- width = gdk_window_get_width(gdkwin);
+- height = gdk_window_get_height(gdkwin);
+- cairo_rectangle(cr, 0, 0,
+- gdk_window_get_width(gdkwin),
+- gdk_window_get_height(gdkwin));
+- cairo_set_source_rgb(cr, 255, 255, 255);
+- cairo_fill(cr);
+-
+- gdk_window_end_draw_frame(gdkwin, gdkctx);
+- cairo_region_destroy(creg);
+-}
+-
+ void lh_widget::clear()
+ {
+ m_html = nullptr;
+- paint_white();
++ m_blank = true;
+ m_rendered_width = 0;
+ m_base_url.clear();
+ m_clicked_url.clear();
+@@ -324,7 +307,6 @@ void lh_widget::clear()
+ void lh_widget::set_cursor(const litehtml::tchar_t* cursor)
+ {
+ litehtml::element::ptr over_el = m_html->over_element();
+- gint x, y;
+
+ if (m_showing_url &&
+ (over_el == NULL || over_el != m_over_element)) {
+@@ -508,7 +490,7 @@ static gboolean draw_cb(GtkWidget *widget, cairo_t *cr,
+ {
+ lh_widget *w = (lh_widget *)user_data;
+ w->set_cairo_context(cr);
+- w->redraw(false);
++ w->redraw();
+ w->set_cairo_context(NULL);
+ return FALSE;
+ }
+@@ -520,13 +502,13 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ lh_widget *w = (lh_widget *)user_data;
+
+ if (w->m_html == NULL)
+- return false;
++ return FALSE;
+
+ //debug_print("lh_widget on_button_press_event\n");
+
+ if (event->type == GDK_2BUTTON_PRESS ||
+ event->type == GDK_3BUTTON_PRESS)
+- return true;
++ return TRUE;
+
+ /* Right-click */
+ if (event->button == 3) {
+@@ -535,7 +517,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ if (url != NULL)
+ w->popup_context_menu(url, event);
+
+- return true;
++ return TRUE;
+ }
+
+ if(w->m_html->on_lbutton_down((int) event->x, (int) event->y,
+@@ -546,7 +528,7 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
+ }
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
+@@ -569,7 +551,7 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventButton *event,
+ }
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+@@ -577,20 +559,19 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+ {
+ litehtml::position::vector redraw_boxes;
+ lh_widget *w = (lh_widget *)user_data;
+- GError* error = NULL;
+
+ if (w->m_html == NULL)
+- return false;
++ return FALSE;
+
+ //debug_print("lh_widget on_button_release_event\n");
+
+ if (event->type == GDK_2BUTTON_PRESS ||
+ event->type == GDK_3BUTTON_PRESS)
+- return true;
++ return TRUE;
+
+ /* Right-click */
+ if (event->button == 3)
+- return true;
++ return TRUE;
+
+ w->m_clicked_url.clear();
+
+@@ -609,7 +590,7 @@ static gboolean button_release_event(GtkWidget *widget, GdkEventButton *event,
+ open_uri(w->m_clicked_url.c_str(), prefs_common_get_uri_cmd());
+ }
+
+- return true;
++ return TRUE;
+ }
+
+ static void open_link_cb(GtkMenuItem *item, gpointer user_data)
+diff --git a/src/plugins/litehtml_viewer/lh_widget.h b/src/plugins/litehtml_viewer/lh_widget.h
+index 378d80a71..827fad49e 100644
+--- a/src/plugins/litehtml_viewer/lh_widget.h
++++ b/src/plugins/litehtml_viewer/lh_widget.h
+@@ -18,6 +18,7 @@
+ #include <gtk/gtk.h>
+ #include <glib.h>
+ #include <gio/gio.h>
++#include <atomic>
+
+ #include "procmime.h"
+
+@@ -54,7 +55,8 @@ class lh_widget : public container_linux
+ void draw_text(litehtml::uint_ptr hdc, const litehtml::tchar_t* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos);
+
+ void draw(cairo_t *cr);
+- void redraw(gboolean force_render);
++ void rerender();
++ void redraw();
+ void open_html(const gchar *contents);
+ void clear();
+ void update_cursor(const litehtml::tchar_t* cursor);
+@@ -76,8 +78,6 @@ class lh_widget : public container_linux
+ litehtml::tstring m_base_url;
+
+ private:
+- void paint_white();
+-
+ gint m_rendered_width;
+ GtkWidget *m_drawing_area;
+ GtkWidget *m_scrolled_window;
+@@ -92,4 +92,6 @@ class lh_widget : public container_linux
+
+ litehtml::tchar_t *m_font_name;
+ int m_font_size;
++ std::atomic<bool> m_force_render;
++ std::atomic<bool> m_blank;
+ };
commit f8c40eca5b5c91dcb0fd9d01c4d2d12fa124690b
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 19:52:59 2021 -0700
Fix right scrollbar button
diff --git a/patches/gtk/04-scrollbar-button.patch b/patches/gtk/04-scrollbar-button.patch
new file mode 100644
index 0000000..1e724e6
--- /dev/null
+++ b/patches/gtk/04-scrollbar-button.patch
@@ -0,0 +1,17 @@
+# Fix off by one error on right scrollbar button
+
+--- a/gtk/theme/win32/gtk-win32-base.css 2021-07-27 20:41:30.602797036 -0700
++++ b/gtk/theme/win32/gtk-win32-base.css 2021-07-27 20:44:48.859483836 -0700
+@@ -609,10 +609,10 @@
+ background-image: -gtk-win32-theme-part(scrollbar, 1 , 14);
+ }
+ scrollbar.horizontal:hover button.down:active {
+-background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
++background-image: -gtk-win32-theme-part(scrollbar, 1 , 15);
+ }
+ scrollbar.horizontal:hover button.down:disabled {
+-background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
++background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
+ }
+
+ scrollbar trough {
commit 7470b310be8bb9b9b41b223cc03d58ae5eeecf52
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Wed Jul 28 19:51:38 2021 -0700
convert gtk3 patches
diff --git a/patches/gtk/01-theme.patch b/patches/gtk/01-theme.patch
old mode 100755
new mode 100644
index 22cf8f6..97ac52e
--- a/patches/gtk/01-theme.patch
+++ b/patches/gtk/01-theme.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
--- a/gtk/meson.build 2021-07-02 03:46:22.482498861 -0700
+++ b/gtk/meson.build 2021-07-02 03:49:19.252060379 -0700
@@ -1041,6 +1041,8 @@
diff --git a/patches/gtk/02-csd.patch b/patches/gtk/02-csd.patch
old mode 100755
new mode 100644
index 88a2700..c7c4c3a
--- a/patches/gtk/02-csd.patch
+++ b/patches/gtk/02-csd.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -f -p1 $* < $0
-exit $?
-
From 975e5ce8ac04632606917e321cddad4bcce31553 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph at gmail.com>
Date: Thu, 28 Sep 2017 12:02:03 +0200
diff --git a/patches/gtk/03-keyboard-hook.patch b/patches/gtk/03-keyboard-hook.patch
old mode 100755
new mode 100644
index fa0deb9..aebd160
--- a/patches/gtk/03-keyboard-hook.patch
+++ b/patches/gtk/03-keyboard-hook.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 0d860b1994961585b42ea2f25ab5bc8a0fb7331d Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2 at gmx.de>
Date: Sat, 29 Feb 2020 17:53:19 +0100
diff --git a/patches/gtk/50-win71-theme-prepare.patch b/patches/gtk/50-win71-theme-prepare.sh
similarity index 100%
rename from patches/gtk/50-win71-theme-prepare.patch
rename to patches/gtk/50-win71-theme-prepare.sh
diff --git a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
old mode 100755
new mode 100644
index 0b90b93..35a60c3
--- a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+++ b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 56ec8b1af54e43682fbe4c57a12b83de2f43e0af Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Thu, 20 Oct 2016 09:58:19 +0100
diff --git a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
old mode 100755
new mode 100644
index e3a2f07..cd7e38a
--- a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
+++ b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 4627b31437db1b7d1b413bb6b9bd434e30c748d7 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Thu, 20 Oct 2016 11:00:09 +0100
diff --git a/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch b/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
old mode 100755
new mode 100644
index 07a235f..13cdcf2
--- a/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
+++ b/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 39e3fcc4acfb049960eb16539535f3e8f7a44390 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Fri, 21 Oct 2016 09:23:24 +0100
diff --git a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
old mode 100755
new mode 100644
index 148fd93..0587fc8
--- a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
+++ b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 6441ce083826a8526bfd17d3807939e63f90ffba Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Fri, 21 Oct 2016 12:35:07 +0100
diff --git a/patches/gtk/55-win32-theme-make-separator-visible-again.patch b/patches/gtk/55-win32-theme-make-separator-visible-again.patch
old mode 100755
new mode 100644
index a4f8196..58f841c
--- a/patches/gtk/55-win32-theme-make-separator-visible-again.patch
+++ b/patches/gtk/55-win32-theme-make-separator-visible-again.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From 33f0e49e56783712aa267b0b86a62ad6e6cb8f62 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Tue, 25 Oct 2016 13:23:04 +0100
diff --git a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
old mode 100755
new mode 100644
index ed151ad..9abbaa4
--- a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
+++ b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
From be59f5bc95d9fd18fba250282021c96d2b9254f1 Mon Sep 17 00:00:00 2001
From: Jaime Velasco Juan <jsagarribay at gmail.com>
Date: Mon, 31 Oct 2016 14:00:16 +0000
diff --git a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
old mode 100755
new mode 100644
index 3894808..3439654
--- a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
+++ b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw missing arrows for submenu entries
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/62-win32-theme-Draw-menu-separator.patch b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
old mode 100755
new mode 100644
index c8e9966..ba6fc95
--- a/patches/gtk/62-win32-theme-Draw-menu-separator.patch
+++ b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw missing separator between menu entries
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/63-win32-theme-Native-treeview-expander.patch b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
old mode 100755
new mode 100644
index cd36b53..7caf9e9
--- a/patches/gtk/63-win32-theme-Native-treeview-expander.patch
+++ b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Draw native +/- expanders in treeview (instead of arrows)
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
old mode 100755
new mode 100644
index 114b3e0..cf0e4cf
--- a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
+++ b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Titlebar took too much space
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
old mode 100755
new mode 100644
index d358dd1..6ebc701
--- a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
+++ b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Unfocused treeview selections are hardly visible on MSWin
Use background color instead of light grey (e.g. selected folder
should stay visible, even when focus is changed to a different
diff --git a/patches/gtk/66-win32-theme-Native-combobox-height.patch b/patches/gtk/66-win32-theme-Native-combobox-height.patch
old mode 100755
new mode 100644
index 0aa2932..e253acb
--- a/patches/gtk/66-win32-theme-Native-combobox-height.patch
+++ b/patches/gtk/66-win32-theme-Native-combobox-height.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
Combobox had too little height
Thorsten Maerz <info at netztorte.de>
diff --git a/patches/gtk/67-win32-theme-Credits.patch b/patches/gtk/67-win32-theme-Credits.patch
old mode 100755
new mode 100644
index 84b9881..55f24f0
--- a/patches/gtk/67-win32-theme-Credits.patch
+++ b/patches/gtk/67-win32-theme-Credits.patch
@@ -1,7 +1,3 @@
-#!/bin/sh
-patch -p1 -f $* < $0
-exit $?
-
diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
--- a/gtk/theme/win32/gtk.css
+++ b/gtk/theme/win32/gtk.css
diff --git a/patches/gtk/69-win71-theme-finalize.patch b/patches/gtk/69-win71-theme-finalize.sh
similarity index 100%
rename from patches/gtk/69-win71-theme-finalize.patch
rename to patches/gtk/69-win71-theme-finalize.sh
commit 74f9361a4dd2895a02cfca0587228d8ca9058154
Merge: 851a27b 8773971
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Thu Jul 29 01:12:42 2021 -0700
Merge branch 'master' into gtk3
diff --cc README
index b0ac7c0,0cce80d..a8d9df6
--- a/README
+++ b/README
@@@ -125,7 -123,8 +125,8 @@@ libgettextpo-de
meson
python3-distutils
wget
+ curl
-ruby
+gtk-3-examples
Building in a Docker container
@@@ -137,7 -136,7 +138,7 @@@ is sufficient
--------8<---------8<---------8<--------
FROM debian:buster
- RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget gtk-3-examples & apt-get clean
-RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl ruby & apt-get clean
++RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget curl gtk-3-examples & apt-get clean
--------8<---------8<---------8<--------
To build the image locally (run in the directory with Dockerfile
diff --cc packages/packages.current
index 0228ffa,9e9069b..754ac1c
--- a/packages/packages.current
+++ b/packages/packages.current
@@@ -1,81 -1,51 +1,54 @@@
# package name,version,type,url,sha256 hash,branch,ref
-claws_mail,3.18.0,file,https://www.claws-mail.org/releases/claws-mail-3.18.0.tar.xz,cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb,,
+claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
++adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
+ atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
+ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
+ bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
+ cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+ certdata,20210506,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/4d343134c8a3a46520e41d31e7cb26f718d9daec/security/nss/lib/ckfw/builtins/certdata.txt,c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f,,
+ curl,7.78.0,file,https://curl.se/download/curl-7.78.0.tar.xz,be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5,,
+ cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
+ enchant,2.2.30,file,https://github.com/AbiWord/enchant/releases/download/v2.3.0/enchant-2.3.0.tar.gz,df68063b6c13b245fa7246b0e098a03e74f7a91c6d8947bc5c4f42ce55e2e41d,,
+ expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
+ fontconfig,2.13.94,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz,a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c,,
+ freetype,2.11.0,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.11.0.tar.xz,8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7,,
+ fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
+ gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
- libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
- libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
- nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
-
- zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
-
-glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
-glib_networking,2.66.0,file,https://download.gnome.org/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz,c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099,,
++glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
++glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
-
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
-
- p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
-
- expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
-
- libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
- regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
- bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
- ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
- cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
-
- jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
-
- curl,7.77.0,file,https://curl.se/download/curl-7.77.0.tar.xz,0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b,,
-
- libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
- libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
-
- enchant,2.2.15,file,https://github.com/AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz,3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03,,
+ gpgme,1.16.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2,6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0,,
-gtk,2.24.33,file,https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz,ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da,,
++gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
+ gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
+ harfbuzz,2.8.2,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.2/harfbuzz-2.8.2.tar.xz,d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
-
- sqlite,3.35.5,file,https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz,f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0,,
-
- libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-
- glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
+ icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
+ jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
+ libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
+libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
- adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
- gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
- gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
- pango,1.48.5,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.5.tar.xz,501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a,,
- atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
- glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
+ libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
+ libffi,3.4.2,file,https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz,540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620,,
+ libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
+ libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
+ libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
+ libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
+ libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
libsoup,2.72.0,file,https://download.gnome.org/sources/libsoup/2.72/libsoup-2.72.0.tar.xz,170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387,,
-
- fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
-
- harfbuzz,2.8.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.1/harfbuzz-2.8.1.tar.xz,4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300,,
-
- cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+ libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
+ libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
+ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
+ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
+ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
++p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
+ pango,1.48.7,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz,28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
-
- freetype,2.10.4,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz,86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784,,
-
- fontconfig,2.13.93,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.93.tar.xz,ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0,,
-
- libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
-
- libffi,3.3,file,https://mirrors.kernel.org/sourceware/libffi/libffi-3.3.tar.gz,72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056,,
-
+ regex,20210702,git,git://git.savannah.gnu.org/gnulib.git,7769c80aaa6b75c4fc4f2cfe62f6bf46291dabfef9e11dd42bd9656dbbd7a9af,master,901694b904cd861adc2529b2e05a3fb33f9b534f
+ sqlite,3.36.0,file,https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz,bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3,,
w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
-
- bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
-
- libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
- libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
- gpgme,1.15.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.15.1.tar.bz2,eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad,,
-
- libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
-
- icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
-
webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
-
- libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
-
- gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
+ ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
+ zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
diff --cc po/ar.po
index 32722cd,bd93ae8..dd13cf2
--- a/po/ar.po
+++ b/po/ar.po
@@@ -28,8 -28,8 +28,10 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"åÐå ÇáÈÑãÌíÉ ãÑÎÕÉ ÈÑÎÕÉ Ìäæ ÇáÚãæãíÉ ÇáÚÇãÉ (GPL) æÇáÊí ÊãäÍß ÍÑíÉ ãÔÇÑßÉ "
--"æÊÚÏíá ÇáÈÑãÌíÇÊ ÇáÍÑÉ."
++"��� �������� ����� ����� ��� "
++"�������� ������ (GPL) ����� ���ï¿"
++"½ï¿½ ���� ������ ������ ������ï¿"
++"½ï¿½ï¿½ �����."
msgctxt "T_GPLShort"
msgid ""
@@@ -37,42 -37,42 +39,48 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"ÈÇÎÊÕÇÑ: ÊÓÊØíÚ ÊÔÛíá åÐå ÇáÈÑãÌíÉ áÃí ÛÑÖ. æíãßäß ÊæÒíÚåÇ ãÇ ÏãÊ ÊÚØí "
--"ÇáãÊáÞíä äÝÓ ÇáÍÞæÞ ÇáÊí ÍÕáÊ ÚáíåÇ."
++"�������: ������ ����� ��� ��ï¿"
++"½ï¿½ï¿½ï¿½ï¿½ï¿½ ��� ���. ������ ������ï¿"
++"½ �� ��� ���� �������� ��� ��ï¿"
++"½ï¿½ï¿½ï¿½ ���� ���� �����."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "ÎíÇÑÇÊ ÇáÊËÈíÊ"
++msgstr "������ �������"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "æÕáÇÊ ÇáÈÏÁ"
++msgstr "����� �����"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "ÇÎÊÑ Ãíä íÊÚíä ËÈíÊ ÇáæÕáÇÊ:"
++msgstr ""
++"���� ��� ����� ���� �������:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(ÝÞØ ÇáÈÑãÌíÇÊ ÓíÑÈØ ÅáíåÇ Ýí ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ.)"
++msgstr ""
++"(��� ��������� ����� ����� �ï¿"
++"½ ���� ����� ������.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "ÞÇÆãÉ ÇÈÏÃ"
++msgstr "����� ����"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "ÓØÍ ÇáãßÊÈ"
++msgstr "��� ������"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "ÔÑíØ ÇáÈÏÁ ÇáÓÑíÚ"
++msgstr "���� ����� ������"
#, fuzzy
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
++msgstr ""
++"���� ��� ����� ���� �������"
msgctxt "T_FoundExisting"
msgid ""
@@@ -85,7 -85,7 +93,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "ãÑÍÈÇ Ýí ÊËÈíÊ Claws Mail"
++msgstr "����� �� ����� Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -103,17 -103,17 +111,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "åÐå ÇáÅÕÏÇÑÉ ${VERSION} ãä Claws Mail"
++msgstr "��� �������� ${VERSION} �� Claws Mail"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
++msgstr "������ ����� ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
++msgstr "����� ������� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -141,7 -141,7 +149,7 @@@ msgstr "
#, fuzzy
msgctxt "T_Menu_ClawsMail"
msgid "Run Claws Mail"
--msgstr "ÔÛá ÈÑãÌíÉ ÇáÈÑíÏ Claws"
++msgstr "��� ������ ������ Claws"
msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
@@@ -152,8 -152,8 +160,9 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
--#~ "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ ${VERSION}¿"
++#~ "�������� $R1 ����� ������.\n"
++#~ "����� ��������� ��������� "
++#~ "${VERSION}�"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -162,10 -162,10 +171,12 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
--#~ "æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
++#~ "�� ����� ������ �� Gpg4Win ��� �ï¿"
++#~ "½ï¿½ ������ �� ���. �� ����� �� ï¿"
++#~ "½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ �������� ��� �����ï¿"
++#~ "½ï¿½ï¿½.\n"
#~ "\n"
--#~ "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
++#~ "����� ������ ����� Claws Mail�"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -175,7 -175,7 +186,9 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
--#~ "æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
++#~ "�� ����� ������ �� Gpg4Win ��� �ï¿"
++#~ "½ï¿½ ������ �� ���. �� ����� �� ï¿"
++#~ "½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ �������� ��� �����ï¿"
++#~ "½ï¿½ï¿½.\n"
#~ "\n"
--#~ "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
++#~ "����� ������ ����� Claws Mail�"
diff --cc po/cz.po
index 828ffc8,f5414b8..adf455f
--- a/po/cz.po
+++ b/po/cz.po
@@@ -28,7 -28,7 +28,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"ento program je licencovaný pod licencí GNU General Public License (GPL)."
++"ento program je licencovan� pod licenc� GNU General Public License (GPL)."
msgctxt "T_GPLShort"
msgid ""
@@@ -36,15 -36,15 +36,16 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck "
--"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
--"dieselben Rechte einräumen, die auch Sie erhalten haben.Ve zkratce: mùžete "
--"spouštìt tentyo program pro jakýkoli úèrl. Mùžete distribuovat tento program "
--"se stejnými právy, které jste obdrželi."
++"In aller K�rze: Sie haben das Recht, die Software zu jedem Zweck "
++"einzusetzen. Sie k�nnen die Software weitergeben, sofern Sie dem "
++"Empf�nger dieselben Rechte einr�umen, die auch Sie erhalten haben.Ve "
++"zkratce: m��ete spou�t�t tentyo program pro jak�koli ��rl. "
++"M��ete distribuovat tento program se stejn�mi pr�vy, kter� jste "
++"obdr�eli."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Možnosti instalace"
++msgstr "Mo�nosti instalace"
msgctxt "T_InstallOptLinks"
msgid "Start links"
@@@ -53,11 -53,11 +54,12 @@@ msgstr "Start odkazy
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Prosím vyberte, kam má Claws Mail nainstalovat odkazy:"
++msgstr "Pros�m vyberte, kam m� Claws Mail nainstalovat odkazy:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Jen odkazy progarmù budou vytvoøeny v panelu rychlého spuštìní.)"
++msgstr ""
++"(Jen odkazy progarm� budou vytvo�eny v panelu rychl�ho spu�t�n�.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
@@@ -69,12 -69,12 +71,12 @@@ msgstr "Plocha
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Panel rychlého spuštìní"
++msgstr "Panel rychl�ho spu�t�n�"
#, fuzzy
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "Kliknìte pro homepage projektu"
++msgstr "Klikn�te pro homepage projektu"
msgctxt "T_FoundExisting"
msgid ""
@@@ -87,7 -87,7 +89,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Vítejte v instalaci programu Claws Mail"
++msgstr "V�tejte v instalaci programu Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -115,7 -115,7 +117,7 @@@ msgstr "verze souboru ${PROD_VERSION}
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "datum vydání ${_BUILD_ISODATE}"
++msgstr "datum vyd�n� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -124,7 -124,7 +126,9 @@@ msgstr "
#, fuzzy
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Chcete nastavit Claws Mail jako váš pøednastavený poštovní program?"
++msgstr ""
++"Chcete nastavit Claws Mail jako v�� p�ednastaven� po�tovn� "
++"program?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -156,8 -156,8 +160,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "Verze $R1 byla nainstalována.\n"
--#~ "Chcete ji pøepsat verzí ${VERSION} reiben?"
++#~ "Verze $R1 byla nainstalov�na.\n"
++#~ "Chcete ji p�epsat verz� ${VERSION} reiben?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -166,9 -166,9 +170,9 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Staší verze $R1 byla nainstalována. Dùraznì se doporuèuje odinstalovat "
--#~ "starší verzi pøed instalací nové verze.\n"
--#~ "Chcete pokraèovat v instalaci Claws Mail verze ${VERSION} ?"
++#~ "Sta�� verze $R1 byla nainstalov�na. D�razn� se doporu�uje "
++#~ "odinstalovat star�� verzi p�ed instalac� nov� verze.\n"
++#~ "Chcete pokra�ovat v instalaci Claws Mail verze ${VERSION} ?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -178,7 -178,7 +182,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Jedna verze Gpg4Win již byla nainstalována. Nebude vadit, když se "
--#~ "nainstaluje a tudíž pøepíše touhle verzí.\n"
++#~ "Jedna verze Gpg4Win ji� byla nainstalov�na. Nebude vadit, kdy� se "
++#~ "nainstaluje a tud�� p�ep��e touhle verz�.\n"
#~ "\n"
--#~ "Chcete pokraèovat s instalací Claws Mail?"
++#~ "Chcete pokra�ovat s instalac� Claws Mail?"
diff --cc po/de.po
index 89cb221,1781cb6..bf486ea
--- a/po/de.po
+++ b/po/de.po
@@@ -33,9 -33,9 +33,9 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"In aller Kürze: Sie haben das Recht, die Software zu jedem Zweck "
--"einzusetzen. Sie können die Software weitergeben, sofern Sie dem Empfänger "
--"dieselben Rechte einräumen, die auch Sie erhalten haben."
++"In aller K�rze: Sie haben das Recht, die Software zu jedem Zweck "
++"einzusetzen. Sie k�nnen die Software weitergeben, sofern Sie dem "
++"Empf�nger dieselben Rechte einr�umen, die auch Sie erhalten haben."
msgctxt "T_InstallOptions"
msgid "Install Options"
@@@ -48,20 -48,20 +48,21 @@@ msgstr "Startlinks
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
++msgstr "Bitte w�hlen Sie, welche Verkn�pfungen angelegt werden sollen:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
msgstr ""
--"(In der Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"
++"(In der Schnellstartleiste werden nur Verkn�pfungen f�r Programme "
++"angelegt.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Startmenü"
++msgstr "Startmen�"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "Arbeitsfläche"
++msgstr "Arbeitsfl�che"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
@@@ -120,7 -120,7 +121,7 @@@ msgstr "
#, fuzzy
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Möchten Sie Claws-Mail als Ihr E-Mail-Standardprogramm auswählen?"
++msgstr "M�chten Sie Claws-Mail als Ihr E-Mail-Standardprogramm ausw�hlen?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -153,10 -153,10 +154,10 @@@ msgstr "
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
#~ "Version $R1 ist hier bereits installiert.\n"
--#~ "Möchten Sie diese mit Version ${VERSION} überschreiben?\n"
++#~ "M�chten Sie diese mit Version ${VERSION} �berschreiben?\n"
#~ "\n"
--#~ "(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
--#~ "oder dieselbe Version handelt.)"
++#~ "(Sie k�nnen in jedem Fall mit JA antworten, falls es sich um eine "
++#~ "neuere oder dieselbe Version handelt.)"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -166,9 -166,9 +167,9 @@@
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
#~ "Eine alte Version $R1 ist hier bereits installiert. Es wird dringend "
--#~ "Empfohlen, bei einer großen Aktualisierung alte Versionen zu "
++#~ "Empfohlen, bei einer gro�en Aktualisierung alte Versionen zu "
#~ "deinstallieren.\n"
--#~ "Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
++#~ "M�chten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -179,6 -179,6 +180,6 @@@
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
#~ "Eine Version von Claws Mail ist hier bereits installiert. Es ist "
--#~ "problemlos möglich, die Installation fortzuführen.\n"
++#~ "problemlos m�glich, die Installation fortzuf�hren.\n"
#~ "\n"
--#~ "Möchten die die Installation von Claws Mail fortführen?"
++#~ "M�chten die die Installation von Claws Mail fortf�hren?"
diff --cc po/es.po
index e1687ca,97093dd..06f0412
--- a/po/es.po
+++ b/po/es.po
@@@ -25,7 -25,7 +25,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Este software está licenciado bajo los términos de la GNU General Public "
++"Este software est� licenciado bajo los t�rminos de la GNU General Public "
"License (GPL)."
msgctxt "T_GPLShort"
@@@ -34,30 -34,30 +34,31 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"En resúmen: Se le permite ejecutar este software para cualquier propósito. "
--"Puede distribuirlo en tanto dé al receptor los mismos derechos que usted ha "
--"recibido."
++"En res�men: Se le permite ejecutar este software para cualquier "
++"prop�sito. Puede distribuirlo en tanto d� al receptor los mismos "
++"derechos que usted ha recibido."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Opciones de instalación"
++msgstr "Opciones de instalaci�n"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Vínculos de inicio"
++msgstr "V�nculos de inicio"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Por favor seleccione dónde debe Claws Mail instalar los vínculos:"
++msgstr "Por favor seleccione d�nde debe Claws Mail instalar los v�nculos:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Sólo las aplicaciones serán vinculadas en la barra de inicio rápido.)"
++msgstr ""
++"(S�lo las aplicaciones ser�n vinculadas en la barra de inicio r�pido.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menú inicio"
++msgstr "Men� inicio"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -65,7 -65,7 +66,7 @@@ msgstr "Escritorio
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Barra de inicio rápido"
++msgstr "Barra de inicio r�pido"
#, fuzzy
msgctxt "T_MoreInfo"
@@@ -83,7 -83,7 +84,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Bienvenido a la instalación de Claws Mail"
++msgstr "Bienvenido a la instalaci�n de Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -101,17 -101,17 +102,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Este es Claws Mail versión ${VERSION}"
++msgstr "Este es Claws Mail versi�n ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "versión del archivo ${PROD_VERSION}"
++msgstr "versi�n del archivo ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "fecha de publicación ${_BUILD_ISODATE}"
++msgstr "fecha de publicaci�n ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -150,8 -150,8 +151,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La versión $R1 ya está instalada.\n"
--#~ "¿Desea sobreescribirla con la versión ${VERSION}?"
++#~ "La versi�n $R1 ya est� instalada.\n"
++#~ "�Desea sobreescribirla con la versi�n ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -160,10 -160,10 +161,10 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Una versión anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
++#~ "Una versi�n anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
#~ "Recomendamos muy especialmente desinstalar las versiones anteriores \n"
--#~ "cuando se trata de actualizaciones importantes. ¿Quiere continuar de \n"
--#~ "todas formas la instalación de Claws Mail 2.0.0?"
++#~ "cuando se trata de actualizaciones importantes. �Quiere continuar de \n"
++#~ "todas formas la instalaci�n de Claws Mail 2.0.0?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -173,7 -173,7 +174,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Una versión de Gpg4Win ya se encuentra instalada en este sistema.No habrá "
--#~ "problema si instala y por ende, sobreescribe esta versión.\n"
++#~ "Una versi�n de Gpg4Win ya se encuentra instalada en este sistema.No "
++#~ "habr� problema si instala y por ende, sobreescribe esta versi�n.\n"
#~ "\n"
--#~ "¿Desea continuar con la instalación?"
++#~ "�Desea continuar con la instalaci�n?"
diff --cc po/fr.po
index 89ce85d,de07740..702d843
--- a/po/fr.po
+++ b/po/fr.po
@@@ -25,8 -25,8 +25,8 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Ce logiciel est publié selon les termes de la Licence publique générale GNU "
--"(GPL)."
++"Ce logiciel est publi� selon les termes de la Licence publique "
++"g�n�rale GNU (GPL)."
msgctxt "T_GPLShort"
msgid ""
@@@ -34,9 -34,9 +34,9 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"En bref : vous avez le droit d'utiliser ce logiciel à n'importe quelle fin. "
--"Vous pouvez le redistribuer pour autant que vous donniez aux destinataires "
--"les mêmes droits que ceux que vous avez."
++"En bref : vous avez le droit d'utiliser ce logiciel � n'importe quelle "
++"fin. Vous pouvez le redistribuer pour autant que vous donniez aux "
++"destinataires les m�mes droits que ceux que vous avez."
msgctxt "T_InstallOptions"
msgid "Install Options"
@@@ -44,20 -44,20 +44,21 @@@ msgstr "Options de l'installation
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Liens de démarrage"
++msgstr "Liens de d�marrage"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Veuillez choisir où Claws Mail doit installer des liens :"
++msgstr "Veuillez choisir o� Claws Mail doit installer des liens :"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Seuls les programmes seront intégrés à la barre de lancement rapide.)"
++msgstr ""
++"(Seuls les programmes seront int�gr�s � la barre de lancement rapide.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menu Démarrer"
++msgstr "Menu D�marrer"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -121,8 -121,8 +122,8 @@@ msgstr "
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
msgstr ""
--"Voulez-vous faire de Claws Mail votre client de messagerie électronique par "
--"défaut ?"
++"Voulez-vous faire de Claws Mail votre client de messagerie �lectronique "
++"par d�faut ?"
msgctxt "T_FoundGnupg"
msgid ""
@@@ -138,7 -138,7 +139,7 @@@ msgstr "
#, fuzzy
msgctxt "T_Menu_Uninstall"
msgid "Uninstall"
--msgstr "Désinstaller"
++msgstr "D�sinstaller"
#, fuzzy
msgctxt "T_Menu_ClawsMail"
@@@ -154,7 -154,7 +155,7 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La version $R1 est déjà installée.\n"
++#~ "La version $R1 est d�j� install�e.\n"
#~ "Voulez-vous la remplacer par la version ${VERSION} ?"
#, fuzzy
@@@ -164,10 -164,10 +165,10 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Une version ancienne $R1 est déjà installée. Il est fortement recommandé "
--#~ "de désinstaller les versions antérieures lors des mises à jour "
--#~ "importantes.\n"
--#~ "Souhaitez-vous tout de même pousuivre l'installation de Claws Mail "
++#~ "Une version ancienne $R1 est d�j� install�e. Il est fortement "
++#~ "recommand� de d�sinstaller les versions ant�rieures lors des mises "
++#~ "� jour importantes.\n"
++#~ "Souhaitez-vous tout de m�me pousuivre l'installation de Claws Mail "
#~ "${VERSION} ?"
#, fuzzy
@@@ -178,7 -178,7 +179,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Une version de Gpg4Win est déjà installée sur le système. Le remplacement "
--#~ "de cette version s'effectuera sans problème.\n"
++#~ "Une version de Gpg4Win est d�j� install�e sur le syst�me. Le "
++#~ "remplacement de cette version s'effectuera sans probl�me.\n"
#~ "\n"
#~ "Voulez-vous poursuivre l'installation de Claws Mail?"
diff --cc po/it.po
index 205d78f,111cea2..840d9ac
--- a/po/it.po
+++ b/po/it.po
@@@ -27,7 -27,7 +27,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Questo programma è fornito in accordo coi termini della GNU General Public "
++"Questo programma � fornito in accordo coi termini della GNU General Public "
"Licence (GPL)."
msgctxt "T_GPLShort"
@@@ -51,7 -51,7 +51,7 @@@ msgstr "Collegamento di avvio
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Prego, selezionare dove Claws Mail installerà il collegamento:"
++msgstr "Prego, selezionare dove Claws Mail installer� il collegamento:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
@@@ -103,7 -103,7 +103,7 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Questa è la versione ${VERSION} di Claws Mail"
++msgstr "Questa � la versione ${VERSION} di Claws Mail"
#, fuzzy
msgctxt "T_AboutFileVersion"
@@@ -154,7 -154,7 +154,7 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "La versione $R1 è già stata installata. \n"
++#~ "La versione $R1 � gi� stata installata. \n"
#~ "Volete sovrascriverla con la versione ${VERSION}?"
#, fuzzy
@@@ -164,7 -164,7 +164,7 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Una vecchia versione $R1 è già stata installata. È raccomandato "
++#~ "Una vecchia versione $R1 � gi� stata installata. � raccomandato "
#~ "vivamente di disinstallare le versioni precedenti per gli aggiornamenti "
#~ "importanti. \n"
#~ "Volete comunque continuare ad installare Claws Mail $ {VERSIONE}?"
@@@ -177,7 -177,7 +177,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Nel sistema è già stata installata una versione di Gpg4Win. Si può "
++#~ "Nel sistema � gi� stata installata una versione di Gpg4Win. Si pu� "
#~ "installare e sovrascrive questa versione senza problemi.\n"
#~ "\n"
#~ "Volete continuare con l'installazione di Claws Mail?"
diff --cc po/pt.po
index 12eec5f,265723c..3461ed3
--- a/po/pt.po
+++ b/po/pt.po
@@@ -27,7 -27,7 +27,7 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Este software está licenciado sob os termos da GNU General Public License "
++"Este software est� licenciado sob os termos da GNU General Public License "
"(GPL)."
msgctxt "T_GPLShort"
@@@ -36,29 -36,29 +36,30 @@@ msgid "
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"Em suma: É permitido usar este software para quaisquer fins. Podes distribuí-"
--"lo desde que dês aos destinatários os mesmos direitos que recebeste."
++"Em suma: � permitido usar este software para quaisquer fins. Podes "
++"distribu�-lo desde que d�s aos destinat�rios os mesmos direitos que "
++"recebeste."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Opções de instalação"
++msgstr "Op��es de instala��o"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "Atalhos de início"
++msgstr "Atalhos de in�cio"
#, fuzzy
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Por favor selecciona onde o Claws Mail deverá instalar atalhos:"
++msgstr "Por favor selecciona onde o Claws Mail dever� instalar atalhos:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Apenas os programas terão atalhos na barra de início rápido.)"
++msgstr "(Apenas os programas ter�o atalhos na barra de in�cio r�pido.)"
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Menu de Início"
++msgstr "Menu de In�cio"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
@@@ -66,7 -66,7 +67,7 @@@ msgstr "Ambiente de trabalho
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Barra de Início Rápido"
++msgstr "Barra de In�cio R�pido"
#, fuzzy
msgctxt "T_MoreInfo"
@@@ -84,7 -84,7 +85,7 @@@ msgstr "
#, fuzzy
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Bem-vindo à instalação do Claws Mail"
++msgstr "Bem-vindo � instala��o do Claws Mail"
msgctxt "T_About"
msgid ""
@@@ -102,17 -102,17 +103,17 @@@ msgstr "
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Esta é a versão do Gpg4Win ${VERSION}"
++msgstr "Esta � a vers�o do Gpg4Win ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "versão do ficheiro ${PROD_VERSION}"
++msgstr "vers�o do ficheiro ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "data de lançamento ${_BUILD_ISODATE}"
++msgstr "data de lan�amento ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
@@@ -153,8 -153,8 +154,8 @@@ msgstr "
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "A versão $R1 já está instalada.\n"
--#~ "Queres substituí-la com a versão ${VERSION}?"
++#~ "A vers�o $R1 j� est� instalada.\n"
++#~ "Queres substitu�-la com a vers�o ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingOldVersion"
@@@ -163,8 -163,8 +164,8 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Uma versão antiga $R1 já foi instalada. Recomenda-se vivamente "
--#~ "desinstalar versões anteriores em upgrades.\n"
++#~ "Uma vers�o antiga $R1 j� foi instalada. Recomenda-se vivamente "
++#~ "desinstalar vers�es anteriores em upgrades.\n"
#~ "Queres continuar a instalar o Claws Mail ${VERSION} mesmo assim?"
#, fuzzy
@@@ -175,7 -175,7 +176,7 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Uma versão do Gpg4Win já se encontra instalada neste sistema. Não existe "
--#~ "problema em instalar e daí substituir esta Versão.\n"
++#~ "Uma vers�o do Gpg4Win j� se encontra instalada neste sistema. N�o "
++#~ "existe problema em instalar e da� substituir esta Vers�o.\n"
#~ "\n"
#~ "Queres continuar a instalar o Gpg4Win?"
diff --cc po/ru.po
index 0eeb3f1,d33a529..9419b7f
--- a/po/ru.po
+++ b/po/ru.po
@@@ -26,9 -26,9 +26,13 @@@ msgid "
"This software is licensed under the terms of the GNU General Public License "
"(GPL)."
msgstr ""
--"Èñïîëüçîâàíèå ýòîé ïðîãðàììû ðåãóëèðóåòñÿ ëèöåíçèåé GNU General Public "
--"License (GPL). Âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü ýòó ïðîãðàììó è âíîñèòü â "
--"íåå èçìåíåíèÿ."
++"������������� ���� "
++"��������� ������������ "
++"��������� GNU General Public License (GPL). �� "
++"������ �������� "
++"�������������� ��� "
++"��������� � ������� � ��� "
++"���������."
msgctxt "T_GPLShort"
msgid ""
@@@ -36,41 -36,41 +40,52 @@@
"distribute it as long as you give the recipients the same rights you have "
"received."
msgstr ""
--"Âêðàòöå: âû ìîæåòå èñïîëüçîâàòü ýòó ïðîãðàììó â ëþáûõ öåëÿõ. Âû ìîæåòå "
--"ðàñïðîñòðàíÿòü åå ïðè óñëîâèè, ÷òî íå áóäåòå îãðàíè÷èâàòü ïðàâà äðóãèõ "
--"ïîëüçîâàòåëåé ïðîãðàììû."
++"�������: �� ������ "
++"������������ ��� ��������� "
++"� ����� �����. �� ������ "
++"�������������� �� ��� "
++"�������, ��� �� ������ "
++"������������ ����� ������ "
++"������������� ���������."
msgctxt "T_InstallOptions"
msgid "Install Options"
--msgstr "Ïàðàìåòðû Óñòàíîâêè"
++msgstr "��������� ���������"
msgctxt "T_InstallOptLinks"
msgid "Start links"
--msgstr "ßðëûêè Claws Mail"
++msgstr "������ Claws Mail"
msgctxt "T_InstOptLabelA"
msgid "Please select where Claws Mail shall install links:"
--msgstr "Óêàæèòå, ãäå ñëåäóåò ñîçäàòü ÿðëûêè Claws Mail:"
++msgstr ""
++"�������, ��� ������� ������� "
++"������ Claws Mail:"
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
--msgstr "(Â ïàíåëè áûñòðîãî çàïóñêà áóäóò ññûëêè òîëüêî íà ïðîãðàììû)."
++msgstr ""
++"(� ������ �������� ������� "
++"����� ������ ������ �� "
++"���������)."
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
--msgstr "Ìåíþ Ïóñê"
++msgstr "���� ����"
msgctxt "T_InstOptFieldB"
msgid "Desktop"
--msgstr "Ðàáî÷èé Ñòîë"
++msgstr "������� ����"
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
--msgstr "Ïàíåëü Áûñòðîãî Çàïóñêà"
++msgstr "������ �������� �������"
msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
--msgstr "Îòêðûòü äîìàøíþþ ñòðàíèöó ïðîåêòà"
++msgstr ""
++"������� �������� �������� "
++"�������"
msgctxt "T_FoundExisting"
msgid ""
@@@ -82,7 -82,7 +97,9 @@@ msgstr "
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
--msgstr "Äîáðî ïîæàëîâàòü â ïðîãðàììó óñòàíîâêè ${PRETTY_PACKAGE}"
++msgstr ""
++"����� ���������� � "
++"��������� ��������� ${PRETTY_PACKAGE}"
msgctxt "T_About"
msgid ""
@@@ -96,39 -96,39 +113,50 @@@
"Robustness and stability.\r\n"
"It is Free Software, released under the GNU GPL v3 or later."
msgstr ""
--"Claws Mail - ýòî ïî÷òîâûé êëèåíò (è êëèåíò íîâîñòíûõ ëåíò), íà áàçå GTK+, ñî "
--"ñëåäóþùèìè îñîáåííîñòÿìè: \r\n"
--"Âîçìîæíîñòü áûñòðîãî îòâåòà\r\n"
--"Èçÿùíûé è èçîùðåííûé èíòåðôåéñ\r\n"
--"Èíòóèòèâíîå óïðàâëåíèå è ëåãêàÿ íàñòðîéêà\r\n"
--"Áîëüøîå êîëè÷åñòâî âîçìîæíîñòåé\r\n"
--"Ðàñøèðÿåìîñòü\r\n"
--"Íàäåæíîñòü è ñòàáèëüíîñòü ðàáîòû.\r\n"
--"Ýòî Áåñïëàòíîå Ïðîãðàììíîå îáåñïå÷åíèå, âûïóùåííîå ïîä ëèöåíçèåé GNU GPL v3 "
--"èëè áîëåå ïîçäíåé."
++"Claws Mail - ��� �������� ������ (� "
++"������ ��������� ����), �� "
++"���� GTK+, �� ���������� "
++"�������������: \r\n"
++"����������� �������� ������"
++"\r\n"
++"������� � ���������� "
++"���������\r\n"
++"����������� ���������� � "
++"������ ���������\r\n"
++"������� ���������� "
++"������������\r\n"
++"�������������\r\n"
++"���������� � ������������ "
++"������.\r\n"
++"��� ���������� ����������� "
++"�����������, ���������� ��� "
++"��������� GNU GPL v3 ��� ����� "
++"�������."
#, fuzzy
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
--msgstr "Ýòî Claws Mail âåðñèè ${VERSION}"
++msgstr "��� Claws Mail ������ ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
msgid "File version ${PROD_VERSION}"
--msgstr "âåðñèÿ ôàéëà ${PROD_VERSION}"
++msgstr "������ ����� ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
msgid "Release date ${_BUILD_ISODATE}"
--msgstr "äàòà âûïóñêà ${_BUILD_ISODATE}"
++msgstr "���� ������� ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
--msgstr "Êëèåíò ïî óìîë÷àíèþ"
++msgstr "������ �� ���������"
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
--msgstr "Õîòèòå èñïîëüçîâàòü Claws Mail ïðè îáðàùåíèè ê ññûëêàì 'mailto:'?"
++msgstr ""
++"������ ������������ Claws Mail ��� "
++"��������� � ������� 'mailto:'?"
#, fuzzy
msgctxt "T_FoundGnupg"
@@@ -141,36 -141,36 +169,47 @@@ msgid "
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
--"Áûë îáíàðóæåí óñòàíîâëåííûé ïàêåò GnuPG2 â ïàïêå óñòàíîâêè.\n"
--"Ïîæàëóéñòà, îáðàòèòå âíèìàíèå, óòèëèòû GnuPG è GPA áîëåå íå ïîñòàâëÿþòñÿ ñ "
--"Claws Mail. Âàì ñëåäóåò óäàëèòü òåêóùåþ âåðñèþ Claws Mail ñåé÷àñ, è, åñëè âû "
--"æåëàåòå èñïîëüçîâàòü óòèëèòû äàëüøå, óñòàíîâèòü èõ íîâûå âåðñèè ñ Gpg4win:\n"
++"��� ��������� "
++"������������� ����� GnuPG2 � "
++"����� ���������.\n"
++"����������, �������� "
++"��������, ������� GnuPG � GPA "
++"����� �� ������������ � Claws Mail. "
++"��� ������� ������� ������� "
++"������ Claws Mail ������, �, ���� �� "
++"������� ������������ "
++"������� ������, ���������� "
++"�� ����� ������ � Gpg4win:\n"
"http://www.gpg4win.org/\n"
"\n"
--"Åñëè âû ïðîäîëæèòå ñåé÷àñ, óòèëèòû áóäóò îñòàâëåíû íà äèñêå, è âàì ïðèäåòñÿ "
--"óäàëÿòü èõ âðó÷íóþ.\n"
++"���� �� ���������� ������, "
++"������� ����� ��������� �� "
++"�����, � ��� �������� "
++"������� �� �������.\n"
"\n"
--"Õîòèòå ïðîäîëæèòü óñòàíîâêó Claws Mail?"
++"������ ���������� "
++"��������� Claws Mail?"
msgctxt "T_Menu_Uninstall"
msgid "Uninstall"
--msgstr "Óäàëèòü"
++msgstr "�������"
msgctxt "T_Menu_ClawsMail"
msgid "Run Claws Mail"
--msgstr "Çàïóñòèòü Claws Mail"
++msgstr "��������� Claws Mail"
msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
--msgstr "Ñïðàâî÷íèê Claws Mail"
++msgstr "���������� Claws Mail"
#~ msgctxt "T_FoundExistingVersion"
#~ msgid ""
#~ "Version $R1 has already been installed.\n"
#~ "Do you want to overwrite it with version ${VERSION}?"
#~ msgstr ""
--#~ "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
--#~ "Ïåðåçàïèñàòü å¸ âåðñèåé ${VERSION}?"
++#~ "������ $R1 ��� �����������.\n"
++#~ "������������ �� ������� "
++#~ "${VERSION}?"
#~ msgctxt "T_FoundExistingOldVersion"
#~ msgid ""
@@@ -178,9 -178,9 +217,14 @@@
#~ "recommended to uninstall previous versions before installing new one.\n"
#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
#~ msgstr ""
--#~ "Ïðåäûäóùàÿ âåðñèÿ $R1 óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Íàñòîÿòåëüíî "
--#~ "ðåêîìåíäóåòñÿ óäàëèòü ïðåäûäóùóþ âåðñèþ ïåðåä óñòàíîâêîé íîâîé.\n"
--#~ "Âñå ðàâíî ïðîäîëæèòü óñòàíîâêó Claws Mail ${VERSION}?"
++#~ "���������� ������ $R1 ��� "
++#~ "����������� �� ���� "
++#~ "����������. ������������ "
++#~ "������������� ������� "
++#~ "���������� ������ ����� "
++#~ "���������� �����.\n"
++#~ "��� ����� ���������� "
++#~ "��������� Claws Mail ${VERSION}?"
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
@@@ -190,7 -190,7 +234,9 @@@
#~ "\n"
#~ "Do you want to continue installing Claws Mail?"
#~ msgstr ""
--#~ "Gpg4Win óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Äàëüíåéøàÿ óñòàíîâêà "
--#~ "ïåðåçàïèøåò ýòó âåðñèþ íîâîé.\n"
++#~ "Gpg4Win ��� ����������� �� ���� "
++#~ "����������. ���������� "
++#~ "��������� ����������� ��� "
++#~ "������ �����.\n"
#~ "\n"
--#~ "Ïðîäîëæèòü óñòàíîâêó Gpg4Win?"
++#~ "���������� ��������� Gpg4Win?"
commit 851a27bb2df22b18d21ec0526497316dadb16595
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Mon Jul 12 01:55:03 2021 -0700
update po files
diff --git a/po/ar.po b/po/ar.po
index 7563b9d..32722cd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gpg4Win\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2008-03-11 23:52+0200\n"
"Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -74,25 +74,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "ÇäÞÑ åäÇ áÊÒæÑ ÕÝÍÉ ÇáãÔÑæÚ"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
-"ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ ${VERSION}¿"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
-msgstr ""
-"Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
-"æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
"\n"
-"ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
+"No user data or settings will be touched. Do you want to continue?"
+msgstr ""
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -119,12 +107,12 @@ msgstr "
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "ÅÕÏÇÑÉ ÇáãáÝ ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "ÊÇÑíÎ ÇáÅÕÏÇÑ ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -137,15 +125,11 @@ msgstr ""
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -163,6 +147,26 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "ÇáÅÕÏÇÑÉ $R1 ãËÈÊÉ ÈÇáÝÚá.\n"
+#~ "ÃÊÑíÏ ÇÓÊÈÏÇáåÇ ÈÇáÅÕÏÇÑÉ ${VERSION}¿"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Êã ÊËÈíÊ ÅÕÏÇÑÉ ãä Gpg4Win Úáì åÐÇ ÇáäÙÇã ãä ÞÈá. áÇ ãÔÇßá Ýí ÇáÊËÈíÊ "
+#~ "æÇÓÊÈÏÇá Êáß ÇáÅÕÏÇÑÉ.\n"
+#~ "\n"
+#~ "ÃÊÑíÏ ãæÇÕáÉ ÊËÈíÊ Claws Mail¿"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/claws-mail-win32.pot b/po/claws-mail-win32.pot
index 6683502..26dc58a 100644
--- a/po/claws-mail-win32.pot
+++ b/po/claws-mail-win32.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -78,26 +78,20 @@ msgid "Click here for the project homepage"
msgstr ""
#: src/strings.nsi:38
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-
-#: src/strings.nsi:42
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-#: src/strings.nsi:56
+#: src/strings.nsi:43
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
msgstr ""
-#: src/strings.nsi:60
+#: src/strings.nsi:47
msgctxt "T_About"
msgid ""
"Claws Mail is an email client (and news reader), based on GTK+, featuring "
@@ -111,58 +105,54 @@ msgid ""
"It is Free Software, released under the GNU GPL v3 or later."
msgstr ""
-#: src/strings.nsi:70
+#: src/strings.nsi:57
msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
msgstr ""
-#: src/strings.nsi:73
+#: src/strings.nsi:60
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr ""
-#: src/strings.nsi:76
+#: src/strings.nsi:63
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr ""
-#: src/strings.nsi:79
+#: src/strings.nsi:66
msgctxt "T_SetDefaultClientHeader"
msgid "Default client"
msgstr ""
-#: src/strings.nsi:82
+#: src/strings.nsi:69
msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
msgstr ""
-#: src/strings.nsi:85
+#: src/strings.nsi:72
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
-#: src/strings.nsi:97
+#: src/strings.nsi:81
msgctxt "T_Menu_Uninstall"
msgid "Uninstall"
msgstr ""
-#: src/strings.nsi:100
+#: src/strings.nsi:84
msgctxt "T_Menu_ClawsMail"
msgid "Run Claws Mail"
msgstr ""
-#: src/strings.nsi:103
+#: src/strings.nsi:87
msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
diff --git a/po/cz.po b/po/cz.po
index 082c11d..828ffc8 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 2.0\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2011-06-05 11:48+0100\n"
"Last-Translator: E.T. <tsgender at gmail.com>\n"
"Language-Team: Czech <tsgender at gmail.com>\n"
@@ -76,24 +76,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Kliknìte pro homepage projektu"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"Verze $R1 byla nainstalována.\n"
-"Chcete ji pøepsat verzí ${VERSION} reiben?"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Staší verze $R1 byla nainstalována. Dùraznì se doporuèuje odinstalovat starší "
-"verzi pøed instalací nové verze.\n"
-"Chcete pokraèovat v instalaci Claws Mail verze ${VERSION} ?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -120,12 +109,12 @@ msgstr "Tato verze programu Claws Mail je ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "verze souboru ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "datum vydání ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -139,15 +128,11 @@ msgstr "Chcete nastavit Claws Mail jako v
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -166,6 +151,25 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "Verze $R1 byla nainstalována.\n"
+#~ "Chcete ji pøepsat verzí ${VERSION} reiben?"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Staší verze $R1 byla nainstalována. Dùraznì se doporuèuje odinstalovat "
+#~ "starší verzi pøed instalací nové verze.\n"
+#~ "Chcete pokraèovat v instalaci Claws Mail verze ${VERSION} ?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/de.po b/po/de.po
index 9b3e539..89cb221 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 2.0\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2009-09-28 15:17+0200\n"
"Last-Translator: Werner Koch <wk at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -72,28 +72,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Hier klicken um zur Homepage des Projekts zu gelangen"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"Version $R1 ist hier bereits installiert.\n"
-"Möchten Sie diese mit Version ${VERSION} überschreiben?\n"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
"\n"
-"(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
-"oder dieselbe Version handelt.)"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Eine alte Version $R1 ist hier bereits installiert. Es wird dringend "
-"Empfohlen, bei einer großen Aktualisierung alte Versionen zu "
-"deinstallieren.\n"
-"Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -120,12 +105,12 @@ msgstr "Dies ist Claws Mail Version ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "Dateiversion ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "Releasedatum ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -139,15 +124,11 @@ msgstr "M
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -166,6 +147,29 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "Version $R1 ist hier bereits installiert.\n"
+#~ "Möchten Sie diese mit Version ${VERSION} überschreiben?\n"
+#~ "\n"
+#~ "(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
+#~ "oder dieselbe Version handelt.)"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Eine alte Version $R1 ist hier bereits installiert. Es wird dringend "
+#~ "Empfohlen, bei einer großen Aktualisierung alte Versionen zu "
+#~ "deinstallieren.\n"
+#~ "Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/es.po b/po/es.po
index d708880..e1687ca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2009-09-28 09:43+0200\n"
"Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
"Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -72,25 +72,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Siga este enlace para ver el sitio web del proyecto"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"La versión $R1 ya está instalada.\n"
-"¿Desea sobreescribirla con la versión ${VERSION}?"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Una versión anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
-"Recomendamos muy especialmente desinstalar las versiones anteriores \n"
-"cuando se trata de actualizaciones importantes. ¿Quiere continuar de \n"
-"todas formas la instalación de Claws Mail 2.0.0?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -117,12 +105,12 @@ msgstr "Este es Claws Mail versi
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "versión del archivo ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "fecha de publicación ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -135,15 +123,11 @@ msgstr ""
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -161,6 +145,26 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "La versión $R1 ya está instalada.\n"
+#~ "¿Desea sobreescribirla con la versión ${VERSION}?"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Una versión anterior 1.1.4 ya se encuentra instalada en este sistema. \n"
+#~ "Recomendamos muy especialmente desinstalar las versiones anteriores \n"
+#~ "cuando se trata de actualizaciones importantes. ¿Quiere continuar de \n"
+#~ "todas formas la instalación de Claws Mail 2.0.0?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/fr.po b/po/fr.po
index 68c8363..89ce85d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ngoinabox\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2011-01-12 16:25+0100\n"
"Last-Translator: Mickey Mouse <mickey.mouse at disney.com>\n"
"Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -72,25 +72,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Cliquer ici pour ouvrir la page d'accueil du projet"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"La version $R1 est déjà installée.\n"
-"Voulez-vous la remplacer par la version ${VERSION} ?"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Une version ancienne $R1 est déjà installée. Il est fortement recommandé de "
-"désinstaller les versions antérieures lors des mises à jour importantes.\n"
-"Souhaitez-vous tout de même pousuivre l'installation de Claws Mail "
-"${VERSION} ?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -117,12 +105,12 @@ msgstr "Claws Mail version ${VERSION}"
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "version du fichier : ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "date de sortie : ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -138,15 +126,11 @@ msgstr ""
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -165,6 +149,27 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "La version $R1 est déjà installée.\n"
+#~ "Voulez-vous la remplacer par la version ${VERSION} ?"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Une version ancienne $R1 est déjà installée. Il est fortement recommandé "
+#~ "de désinstaller les versions antérieures lors des mises à jour "
+#~ "importantes.\n"
+#~ "Souhaitez-vous tout de même pousuivre l'installation de Claws Mail "
+#~ "${VERSION} ?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/it.po b/po/it.po
index 77b5792..205d78f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 2.1.1-svn\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2011-07-08 12:21+0100\n"
"Last-Translator: Mariano MARINI <mariano.marini at gmail.com>\n"
"Language-Team: Italian\n"
@@ -74,24 +74,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Clicca qui per accedere alla pagina principale del progetto."
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"La versione $R1 è già stata installata. \n"
-"Volete sovrascriverla con la versione ${VERSION}?"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Una vecchia versione $R1 è già stata installata. È raccomandato vivamente "
-"di disinstallare le versioni precedenti per gli aggiornamenti importanti. \n"
-"Volete comunque continuare ad installare Claws Mail $ {VERSIONE}?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -118,12 +107,12 @@ msgstr "Questa
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "versione file ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "data di rilascio ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -137,15 +126,11 @@ msgstr "Volete rendere Claws Mail il vostro cliente di posta predefinito?"
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -164,6 +149,26 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "La versione $R1 è già stata installata. \n"
+#~ "Volete sovrascriverla con la versione ${VERSION}?"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Una vecchia versione $R1 è già stata installata. È raccomandato "
+#~ "vivamente di disinstallare le versioni precedenti per gli aggiornamenti "
+#~ "importanti. \n"
+#~ "Volete comunque continuare ad installare Claws Mail $ {VERSIONE}?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/pt.po b/po/pt.po
index 7778776..12eec5f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2010-08-04 11:55-0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -73,24 +73,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Clica aqui para a homepage do projecto"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"A versão $R1 já está instalada.\n"
-"Queres substituí-la com a versão ${VERSION}?"
-
-#, fuzzy
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Uma versão antiga $R1 já foi instalada. Recomenda-se vivamente desinstalar "
-"versões anteriores em upgrades.\n"
-"Queres continuar a instalar o Claws Mail ${VERSION} mesmo assim?"
#, fuzzy
msgctxt "T_WelcomePageTitle"
@@ -117,12 +106,12 @@ msgstr "Esta
#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "versão do ficheiro ${PROD_VERSION}"
#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "data de lançamento ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -136,15 +125,11 @@ msgstr "Queres tornar o Claws Mail o teu cliente de e-mail por defeito?"
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -163,6 +148,25 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr ""
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "A versão $R1 já está instalada.\n"
+#~ "Queres substituí-la com a versão ${VERSION}?"
+
+#, fuzzy
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Uma versão antiga $R1 já foi instalada. Recomenda-se vivamente "
+#~ "desinstalar versões anteriores em upgrades.\n"
+#~ "Queres continuar a instalar o Claws Mail ${VERSION} mesmo assim?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
diff --git a/po/ru.po b/po/ru.po
index 535d4ca..0eeb3f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Claws Mail Win Installer\n"
"Report-Msgid-Bugs-To: jonathan at claws-mail.org\n"
-"POT-Creation-Date: 2021-03-15 23:47-0700\n"
+"POT-Creation-Date: 2021-07-12 01:54-0700\n"
"PO-Revision-Date: 2015-12-22 15:09+0300\n"
"Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
"Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
@@ -72,23 +72,13 @@ msgctxt "T_MoreInfo"
msgid "Click here for the project homepage"
msgstr "Îòêðûòü äîìàøíþþ ñòðàíèöó ïðîåêòà"
-msgctxt "T_FoundExistingVersion"
+msgctxt "T_FoundExisting"
msgid ""
-"Version $R1 has already been installed.\n"
-"Do you want to overwrite it with version ${VERSION}?"
-msgstr ""
-"Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
-"Ïåðåçàïèñàòü å¸ âåðñèåé ${VERSION}?"
-
-msgctxt "T_FoundExistingOldVersion"
-msgid ""
-"An old version $R1 has already been installed. It is strongly recommended "
-"to uninstall previous versions before installing new one.\n"
-"Do you want to continue installing Claws Mail ${VERSION} anyway?"
+"$OLD_DISPNAME $OLD_DISPVER will be uninstalled and replaced with "
+"${PRETTY_PACKAGE} ${VERSION}\n"
+"\n"
+"No user data or settings will be touched. Do you want to continue?"
msgstr ""
-"Ïðåäûäóùàÿ âåðñèÿ $R1 óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Íàñòîÿòåëüíî "
-"ðåêîìåíäóåòñÿ óäàëèòü ïðåäûäóùóþ âåðñèþ ïåðåä óñòàíîâêîé íîâîé.\n"
-"Âñå ðàâíî ïðîäîëæèòü óñòàíîâêó Claws Mail ${VERSION}?"
msgctxt "T_WelcomePageTitle"
msgid "Welcome to the installation of ${PRETTY_PACKAGE}"
@@ -122,12 +112,14 @@ msgctxt "T_AboutVersion"
msgid "This is Claws Mail version ${VERSION_NO_REL}${GIT_REVISION}-${RELEASE}"
msgstr "Ýòî Claws Mail âåðñèè ${VERSION}"
+#, fuzzy
msgctxt "T_AboutFileVersion"
-msgid "file version ${PROD_VERSION}"
+msgid "File version ${PROD_VERSION}"
msgstr "âåðñèÿ ôàéëà ${PROD_VERSION}"
+#, fuzzy
msgctxt "T_AboutReleaseDate"
-msgid "release date ${_BUILD_ISODATE}"
+msgid "Release date ${_BUILD_ISODATE}"
msgstr "äàòà âûïóñêà ${_BUILD_ISODATE}"
msgctxt "T_SetDefaultClientHeader"
@@ -138,17 +130,14 @@ msgctxt "T_SetDefaultClient"
msgid "Do you want Claws Mail to handle 'mailto:' URLs?"
msgstr "Õîòèòå èñïîëüçîâàòü Claws Mail ïðè îáðàùåíèè ê ññûëêàì 'mailto:'?"
+#, fuzzy
msgctxt "T_FoundGnupg"
msgid ""
-"GnuPG2 was found in your installation directory.\n"
+"GnuPG2 was found in your previous installation directory.\n"
"Please note that GnuPG and GPA utilities are no longer bundled with Claws "
-"Mail. You should uninstall your current version of Claws Mail now, and if "
-"you wish to continue these utilities, install an up-to-date version of "
-"Gpg4win from:\n"
-"http://www.gpg4win.org/\n"
-"\n"
-"If you continue now, these utilities will be left behind on your disk, and "
-"you will have to remove them manually.\n"
+"Mail and will be removed. If you wish to continue using these utilities, "
+"install an up-to-date version of Gpg4win from:\n"
+"https://www.gpg4win.org/\n"
"\n"
"Do you want to continue installing Claws Mail?"
msgstr ""
@@ -175,6 +164,24 @@ msgctxt "T_Menu_ClawsMailManual"
msgid "Claws Mail Manual"
msgstr "Ñïðàâî÷íèê Claws Mail"
+#~ msgctxt "T_FoundExistingVersion"
+#~ msgid ""
+#~ "Version $R1 has already been installed.\n"
+#~ "Do you want to overwrite it with version ${VERSION}?"
+#~ msgstr ""
+#~ "Âåðñèÿ $R1 óæå óñòàíîâëåíà.\n"
+#~ "Ïåðåçàïèñàòü å¸ âåðñèåé ${VERSION}?"
+
+#~ msgctxt "T_FoundExistingOldVersion"
+#~ msgid ""
+#~ "An old version $R1 has already been installed. It is strongly "
+#~ "recommended to uninstall previous versions before installing new one.\n"
+#~ "Do you want to continue installing Claws Mail ${VERSION} anyway?"
+#~ msgstr ""
+#~ "Ïðåäûäóùàÿ âåðñèÿ $R1 óæå óñòàíîâëåíà íà ýòîì êîìïüþòåðå. Íàñòîÿòåëüíî "
+#~ "ðåêîìåíäóåòñÿ óäàëèòü ïðåäûäóùóþ âåðñèþ ïåðåä óñòàíîâêîé íîâîé.\n"
+#~ "Âñå ðàâíî ïðîäîëæèòü óñòàíîâêó Claws Mail ${VERSION}?"
+
#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
commit 9d414e9db5a2f1f512db18aea01f81ec1c9d515e
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Sun Jul 11 16:50:07 2021 -0700
update to claws-mail-4.0.0
diff --git a/packages/packages.current b/packages/packages.current
index 3230002..0228ffa 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -1,6 +1,6 @@
# package name,version,type,url,sha256 hash,branch,ref
-claws_mail,3.99.0-105-g88f72a,git,git://git.claws-mail.org/claws.git,056ec9db1a5fd2b1dc99cad8ad43aaae68114665bd5c80cafa74418e509451f9,,88f72a3216b336abe186daf5a0d8821e87eb996e
+claws_mail,4.0.0,file,https://www.claws-mail.org/releases/claws-mail-4.0.0.tar.xz,4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475,,
gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
commit 582896a9800bcc77ece7458aea993c8c8792d619
Merge: 3fa95ed 7843d41
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Sun Jul 11 16:45:27 2021 -0700
Merge branch 'master' into gtk3
diff --cc Makefile.am
index db40016,9cc1b3a..cc4e612
--- a/Makefile.am
+++ b/Makefile.am
@@@ -39,9 -39,9 +39,10 @@@ EXTRA_DIST = autogen.sh
patches/atk-2.36.0/01-meson-build.patch \
patches/bzip2-1.0.8/01-g10-bzlib_h.patch \
patches/bzip2-1.0.8/02-g10-Makefile.patch \
+ patches/cairo-1.17.4/01-nofortify-hack.patch.off \
patches/claws_mail/01-etpan-sasl-plugin-path.patch \
- patches/claws_mail/05-define-WIN32-for-litehtml.patch \
+ patches/claws_mail/02-define-WIN32-for-litehtml.patch \
+ patches/claws_mail/03-fancy-prefs.patch \
patches/claws_mail/99-autogen.patch \
patches/cyrus_sasl-2.1.27/01-md5-typedef.patch \
patches/cyrus_sasl-2.1.27/02-tchar.patch \
@@@ -82,9 -65,17 +83,9 @@@
patches/libetpan-1.9.4/06-libs.patch \
patches/libetpan-1.9.4/99-autogen.patch \
patches/pixman-0.40.0/01-no-tests.patch \
- patches/regex-20090805/01-no-large-offsets.patch \
+ patches/regex/01-setup.patch \
patches/w32pth-2.0.5/01-def-fix.patch \
patches/w32pth-2.0.5/99-autogen.sh.patch \
- patches/webkitgtk-2.4.11/01-mingw-std-threads.patch \
- patches/webkitgtk-2.4.11/02-no-class-size-check.patch \
- patches/webkitgtk-2.4.11/03-missing-RenderBox-include.patch \
- patches/webkitgtk-2.4.11/04-LLIntAssembly-hack.patch \
- patches/webkitgtk-2.4.11/05-print-size.patch \
- patches/webkitgtk-2.4.11/06-flags.patch \
- patches/webkitgtk-2.4.11/07-misc.patch \
- patches/webkitgtk-2.4.11/08-missing-RenderElement-include.patch \
patches/ytnef-1.9.3/01-malloc.patch \
patches/ytnef-1.9.3/02-no-undefined.patch \
patches/ytnef-1.9.3/99-autotools.patch \
diff --cc README
index 26eaf51,41b209f..b0ac7c0
--- a/README
+++ b/README
@@@ -122,9 -122,7 +124,8 @@@ libtoo
libgettextpo-dev
meson
python3-distutils
- mingw-w64-tools
-ruby
+wget
+gtk-3-examples
Building in a Docker container
@@@ -136,7 -134,7 +137,7 @@@ is sufficient
--------8<---------8<---------8<--------
FROM debian:buster
- RUN apt-get update && apt-get -y install automake autoconf mingw-w64 nsis stow unzip texinfo imagemagick docbook-utils libglib2.0-dev libgdk-pixbuf2.0-dev ghostscript git binutils make cmake bison flex gperf intltool gcc g++ libtool libgettextpo-dev meson pkg-config-mingw-w64-x86-64 gobject-introspection wget gpg sudo && apt-get clean
-RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils ruby & apt-get clean
++RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils wget gtk-3-examples & apt-get clean
--------8<---------8<---------8<--------
To build the image locally (run in the directory with Dockerfile
commit 3fa95ed855957ebaefe0943de89460a3163bf763
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 20:50:04 2021 -0700
update README
diff --git a/README b/README
index f04e29e..26eaf51 100644
--- a/README
+++ b/README
@@ -124,6 +124,7 @@ meson
python3-distutils
mingw-w64-tools
wget
+gtk-3-examples
Building in a Docker container
@@ -216,36 +217,6 @@ additional steps to update to a recent version:
dpkg -i meson_0.57.0+really0.56.2-0.1_all.deb
-Building the gtk3 version
-=========================
-
-The gtk3 version needs icons from adwaita-icon-theme, which requires
-"icontool-render" (from package "icontool") and "gtk-encode-symbolic-svg"
-(from package "gtk-3-examples" on Debian or "libgtk-3-bin" on Ubuntu).
-The package "icontool" is not available on Debian (AFAIK) and has to be
-compiled from source (depends on libxml-simple-perl).
-
-The binary packages of adwaita-icon-theme (that I know) don't contain
-the required icons from the 16x16/ui folder, so this is no option
-(e.g. window-close-symbolic.symbolic.png is missing).
-
-Following steps are required (in addition to the apt-get packages
-listed in the docker section above):
-
- sudo apt-get install -y inkscape gtk-3-examples libxml-simple-perl
-
-On Ubuntu you can simply install icontool:
-
- sudo apt-get install -y icontool
-
-On Debian, you have to manually fetch and compile icontool:
-
- wget http://archive.ubuntu.com/ubuntu/pool/universe/i/icontool/icontool_0.1.0.orig.tar.gz
- tar -xvaf icontool_0.1.0.orig.tar.gz
- cd icontool-0.1.0
- ./configure && make && sudo make install
-
-
Copyright
=========
commit 33f57624814cfa2e91cd9d8fd221f282d9b58b9f
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 18:54:55 2021 -0700
update gtk icon cache during install
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index db95c80..9b82c64 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -214,6 +214,28 @@ File ${prefix}/bin/libgdk_pixbuf-2.0-0.dll
File ${prefix}/bin/gdk-pixbuf-query-loaders.exe
File ${prefix}/bin/gdk-pixbuf-pixdata.exe
+#######################################
+### gtk+
+!insertmacro SetPrefix gtk
+File ${prefix}/bin/libgailutil-3-0.dll
+File ${prefix}/bin/libgdk-3-0.dll
+File ${prefix}/bin/libgtk-3-0.dll
+File ${prefix}/bin/gtk-query-immodules-3.0.exe
+File ${prefix}/bin/gtk-update-icon-cache.exe
+
+SetOutPath "$INSTDIR\etc\gtk-3.0"
+File ${prefix}/etc/gtk-3.0/im-multipress.conf
+
+SetOutPath "$INSTDIR\share\themes\Default\gtk-3.0"
+File ${prefix}/share/themes/Default/gtk-3.0/gtk-keys.css
+
+SetOutPath "$INSTDIR\share\themes\Emacs\gtk-3.0"
+File ${prefix}/share/themes/Emacs/gtk-3.0/gtk-keys.css
+
+SetOutPath "$INSTDIR\share\locale\"
+File /r ${prefix}/share/locale/
+SetOutPath "$INSTDIR"
+
#######################################
### adwaita-icon-theme
!insertmacro SetPrefix adwaita_icon_theme
@@ -284,30 +306,7 @@ File ${prefix}/share/icons/Adwaita/cursors/dnd-move.cur
File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
-SetOutPath "$INSTDIR"
-
-#######################################
-### gtk+
-!insertmacro SetPrefix gtk
-File ${prefix}/bin/libgdk-3-0.dll
-File ${prefix}/bin/libgtk-3-0.dll
-
-File ${prefix}/bin/libgailutil-3-0.dll
-File ${prefix}/bin/gtk-query-immodules-3.0.exe
-
-File ${prefix}/bin/gtk-update-icon-cache.exe
-
-SetOutPath "$INSTDIR\etc\gtk-3.0"
-File ${prefix}/etc/gtk-3.0/im-multipress.conf
-
-SetOutPath "$INSTDIR\share\themes\Default\gtk-3.0"
-File ${prefix}/share/themes/Default/gtk-3.0/gtk-keys.css
-
-SetOutPath "$INSTDIR\share\themes\Emacs\gtk-3.0"
-File ${prefix}/share/themes/Emacs/gtk-3.0/gtk-keys.css
-
-SetOutPath "$INSTDIR\share\locale\"
-File /r ${prefix}/share/locale/
+ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
SetOutPath "$INSTDIR"
#######################################
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 76b7bb1..3c491ef 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -128,28 +128,6 @@ Delete "$INSTDIR\share\themes\win71\gtk-3.0\gtk.css"
RMDir "$INSTDIR\share\themes\win71\gtk-3.0"
RMDir "$INSTDIR\share\themes\win71"
-#######################################
-### gtk+
-Delete /REBOOTOK "$INSTDIR\libgdk-3-0.dll"
-Delete /REBOOTOK "$INSTDIR\libgtk-3-0.dll"
-
-Delete /REBOOTOK "$INSTDIR\libgailutil-3-0.dll"
-Delete "$INSTDIR\gtk-query-immodules-3.0.exe"
-Delete "$INSTDIR\gtk-update-icon-cache.exe"
-
-Delete "$INSTDIR\etc\gtk-3.0\im-multipress.conf"
-RMDir "$INSTDIR\etc\gtk-3.0"
-
-Delete "$INSTDIR\share\themes\Default\gtk-3.0\gtk-keys.css"
-RMDir "$INSTDIR\share\themes\Default\gtk-3.0"
-RMDir "$INSTDIR\share\themes\Default"
-
-Delete "$INSTDIR\share\themes\Emacs\gtk-3.0\gtk-keys.css"
-RMDir "$INSTDIR\share\themes\Emacs\gtk-3.0"
-RMDir "$INSTDIR\share\themes\Emacs"
-
-RMDir "$INSTDIR\share\themes"
-
#######################################
### adwaita-icon-theme
Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
@@ -221,9 +199,31 @@ Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-move.cur"
Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-none.cur"
RMDIR "$INSTDIR\share\icons\Adwaita\cursors"
Delete "$INSTDIR\share\icons\Adwaita\index.theme"
+Delete "$INSTDIR\share\icons\Adwaita\icon-theme.cache"
RMDIR "$INSTDIR\share\icons\Adwaita"
RMDIR "$INSTDIR\share\icons"
+#######################################
+### gtk+
+Delete /REBOOTOK "$INSTDIR\libgailutil-3-0.dll"
+Delete /REBOOTOK "$INSTDIR\libgdk-3-0.dll"
+Delete /REBOOTOK "$INSTDIR\libgtk-3-0.dll"
+Delete "$INSTDIR\gtk-query-immodules-3.0.exe"
+Delete "$INSTDIR\gtk-update-icon-cache.exe"
+
+Delete "$INSTDIR\etc\gtk-3.0\im-multipress.conf"
+RMDir "$INSTDIR\etc\gtk-3.0"
+
+Delete "$INSTDIR\share\themes\Default\gtk-3.0\gtk-keys.css"
+RMDir "$INSTDIR\share\themes\Default\gtk-3.0"
+RMDir "$INSTDIR\share\themes\Default"
+
+Delete "$INSTDIR\share\themes\Emacs\gtk-3.0\gtk-keys.css"
+RMDir "$INSTDIR\share\themes\Emacs\gtk-3.0"
+RMDir "$INSTDIR\share\themes\Emacs"
+
+RMDir "$INSTDIR\share\themes"
+
#######################################
### gdk-pixbuf
Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
commit 74f43d075d813db0a90787a508b66161c10bfffc
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 17:27:35 2021 -0700
disable csd by default
diff --git a/Makefile.am b/Makefile.am
index 86a0fa0..db40016 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,8 @@ EXTRA_DIST = autogen.sh \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
patches/gtk/01-theme.patch \
+ patches/gtk/02-csd.patch \
+ patches/gtk/03-keyboard-hook.patch \
patches/gtk/50-win71-theme-prepare.patch \
patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch \
diff --git a/patches/gtk/02-csd.patch b/patches/gtk/02-csd.patch
new file mode 100755
index 0000000..88a2700
--- /dev/null
+++ b/patches/gtk/02-csd.patch
@@ -0,0 +1,38 @@
+#!/bin/sh
+patch -f -p1 $* < $0
+exit $?
+
+From 975e5ce8ac04632606917e321cddad4bcce31553 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph at gmail.com>
+Date: Thu, 28 Sep 2017 12:02:03 +0200
+Subject: [PATCH] gtkwindow: Don't force enable CSD under Windows
+
+CSD look a bit out of place under Windows, especially
+when the application doesn't use the headerbar and the CSD
+doesn't add any value.
+
+Instead let the application decide, like under X11.
+It can still be force enabled through GTK_CSD=1
+---
+ gtk/gtkwindow.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 6c5f136043..d178390536 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -6119,12 +6119,6 @@ gtk_window_should_use_csd (GtkWindow *window)
+ }
+ #endif
+
+-#ifdef GDK_WINDOWING_WIN32
+- if (g_strcmp0 (csd_env, "0") != 0 &&
+- GDK_IS_WIN32_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
+- return TRUE;
+-#endif
+-
+ return (g_strcmp0 (csd_env, "1") == 0);
+ }
+
+--
+2.24.0
diff --git a/patches/gtk/03-keyboard-hook.patch b/patches/gtk/03-keyboard-hook.patch
new file mode 100755
index 0000000..fa0deb9
--- /dev/null
+++ b/patches/gtk/03-keyboard-hook.patch
@@ -0,0 +1,41 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 0d860b1994961585b42ea2f25ab5bc8a0fb7331d Mon Sep 17 00:00:00 2001
+From: Patrick Storz <eduard.braun2 at gmx.de>
+Date: Sat, 29 Feb 2020 17:53:19 +0100
+Subject: [PATCH] Only install low level keyboard hook if GTK_CSD=1
+
+Added in eece8a7dd2405f76829031f3d6dd5e39fb5dc542 in order to
+intercept keyboard combos to provide AeroSnap-like functionality for
+CSD windows.
+
+Unfortunately it causes many issues, e.g.
+- https://gitlab.gnome.org/GNOME/gtk/issues/2015
+- https://gitlab.gnome.org/GNOME/gtk/issues/1082
+- https://gitlab.gnome.org/GNOME/gtk/issues/1033
+
+As the hook is completely useless for non-CSD windows, only install
+it if CSD is explicitly requested (environment variable GTK_CSD=1).
+---
+ gdk/win32/gdkevents-win32.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
+index 7aef277c27..8b64d7dd22 100644
+--- a/gdk/win32/gdkevents-win32.c
++++ b/gdk/win32/gdkevents-win32.c
+@@ -530,7 +530,9 @@ _gdk_events_init (GdkDisplay *display)
+ g_source_set_can_recurse (source, TRUE);
+ g_source_attach (source, NULL);
+
+- set_up_low_level_keyboard_hook ();
++ if (g_strcmp0 (g_getenv ("GTK_CSD"), "1") == 0) {
++ set_up_low_level_keyboard_hook ();
++ }
+ }
+
+ gboolean
+--
+2.25.1.windows.1
diff --git a/patches/gtk/69-win71-theme-finalize.patch b/patches/gtk/69-win71-theme-finalize.patch
index ed9479d..fe69c5e 100755
--- a/patches/gtk/69-win71-theme-finalize.patch
+++ b/patches/gtk/69-win71-theme-finalize.patch
@@ -21,7 +21,6 @@ gtk-button-images=true
;gtk-application-prefer-dark-theme=1
[Doc]
-;= To enable native titlebar, set following environment variable
-;= GTK_CSD=0
-;= (Dont omit the zero. Dont use higher values.)
+;= To enable CSD, set following environment variable
+;= GTK_CSD=1
GTK_INI_EOF
commit 59d3cb0a0c1c57c61cace31d8f6d69ad886edb4a
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 05:13:30 2021 -0700
update to glib-networking-2.68.1
diff --git a/packages/packages.current b/packages/packages.current
index c362fd7..0061e22 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,7 +44,7 @@ gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.x
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
pango,1.48.5,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.5.tar.xz,501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a,,
atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
-glib_networking,2.66.0,file,https://download.gnome.org/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz,c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099,,
+glib_networking,2.68.1,file,https://download.gnome.org/sources/glib-networking/2.68/glib-networking-2.68.1.tar.xz,d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30,,
libsoup,2.72.0,file,https://download.gnome.org/sources/libsoup/2.72/libsoup-2.72.0.tar.xz,170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387,,
fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
commit 96b22cdb2dc2c6e7a24efd50d02124fd7343085c
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 05:11:43 2021 -0700
add p11-kit-0.24.0 and add pkcs support to gnutls
diff --git a/configure.ac b/configure.ac
index 7bb0f03..16b932a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,8 @@ CM_SPKG([libassuan], [libgpg_error w32pth])
CM_SPKG([gpgme], [libgpg_error libassuan glib])
CM_SPKG([libtasn1])
CM_SPKG([nettle], [gmp])
-CM_SPKG([gnutls], [gmp nettle libtasn1])
+CM_SPKG([p11_kit], [gettext libffi libtasn1])
+CM_SPKG([gnutls], [gmp nettle libtasn1 p11_kit])
CM_SPKG([libpsl], [icu4c])
CM_SPKG([icu4c])
CM_SPKG([libepoxy])
diff --git a/packages/packages.current b/packages/packages.current
index f92cfc3..c362fd7 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -13,6 +13,8 @@ gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f
gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
+p11_kit,0.24.0,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.0/p11-kit-0.24.0.tar.xz,81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685,,
+
expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
diff --git a/src/Makefile.am b/src/Makefile.am
index 405d7ca..9020e53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ cm_pkg_pango_meson = yes
cm_pkg_libsoup_meson = yes
cm_pkg_libpsl_meson = yes
cm_pkg_harfbuzz_meson = yes
+cm_pkg_p11_kit_meson = yes
cm_pkg_libiconv_configure = \
--enable-shared=yes \
@@ -189,10 +190,8 @@ cm_pkg_gpgme_configure = \
--with-libassuan-prefix=$(idir) \
LDFLAGS=-L$(idir)/lib
-# We can't use pkcs11 due to too much additional dependencies.
cm_pkg_gnutls_configure = \
--disable-cxx \
- --without-p11-kit \
--without-included-libtasn1 \
--with-included-unistring \
--disable-gtk-doc-html \
@@ -202,6 +201,9 @@ cm_pkg_gnutls_configure = \
CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib
+cm_pkg_p11_kit_meson_cppflags = -I$(idir)/include
+cm_pkg_p11_kit_meson_ldflags = -L$(idir)/lib -lintl
+
cm_pkg_gmp_configure = \
--disable-static \
--enable-shared \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 02f6d26..e59e589 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -51,6 +51,7 @@
!define cm_pkg_pixman_version @cm_pkg_pixman_version@
!define cm_pkg_cairo_version @cm_pkg_cairo_version@
!define cm_pkg_gnutls_version @cm_pkg_gnutls_version@
+!define cm_pkg_p11_kit_version @cm_pkg_p11_kit_version@
!define cm_pkg_curl_version @cm_pkg_curl_version@
!define cm_pkg_libxml2_version @cm_pkg_libxml2_version@
!define cm_pkg_libxslt_version @cm_pkg_libxslt_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 5c4281d..db95c80 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -320,6 +320,11 @@ File ${prefix}/share/themes/claws/win71/gtk-win32-base.css
File ${Prefix}/share/themes/claws/win71/gtk.css
SetOutPath "$INSTDIR"
+#######################################
+### p11-kit
+!insertmacro SetPrefix p11_kit
+File ${prefix}/bin/libp11-kit-0.dll
+
#######################################
### gnutls
!insertmacro SetPrefix gnutls
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 71e9f19..76b7bb1 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -115,6 +115,10 @@ Delete "$INSTDIR\libcurl-4.dll"
### gnutls
Delete "$INSTDIR\libgnutls-30.dll"
+#######################################
+### p11-kit
+Delete "$INSTDIR\libp11-kit-0.dll"
+
#######################################
### gtk-add
# directories "etc" and "themes" are cleaned in gtk+ section
commit 53b8b0fdb7194d32d077adeb8d06682cd57f27b5
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 05:00:19 2021 -0700
update to glib-2.68.3
diff --git a/packages/packages.current b/packages/packages.current
index a0c66a2..f92cfc3 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -35,7 +35,7 @@ sqlite,3.35.5,file,https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz,f52b72
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
-glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
+glib,2.68.3,file,https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz,e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138,,
libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
commit 6b308ae94067865c1cafe6a8ab726f0adfa783e5
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 04:54:27 2021 -0700
update to libepoxy-1.5.8
diff --git a/packages/packages.current b/packages/packages.current
index ce030cd..a0c66a2 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -36,7 +36,7 @@ sqlite,3.35.5,file,https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz,f52b72
libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
-libepoxy,1.5.5,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.5.tar.xz,261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556,,
+libepoxy,1.5.8,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.8.tar.xz,cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d,,
adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
commit 6ec598a4ed8319581c3bdc68c70fc4c0c259362f
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 04:40:54 2021 -0700
update to gtk-3.24.29
diff --git a/packages/packages.current b/packages/packages.current
index cee939e..ce030cd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -38,7 +38,7 @@ libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1
glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
libepoxy,1.5.5,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.5.tar.xz,261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556,,
adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
-gtk,3.24.27,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.27.tar.xz,f71c067570339f9f8efac7bb87717a2c52279cb50223fb8b5ba7085930757a26,,
+gtk,3.24.29,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz,f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa,,
gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
pango,1.48.5,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.5.tar.xz,501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a,,
atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
commit 558d2bf25ad1fd95247957225500f5fde574f9a7
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 04:33:44 2021 -0700
fixes for gtk3 and theme
diff --git a/Makefile.am b/Makefile.am
index 7b0c1fa..86a0fa0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST = autogen.sh \
patches/cyrus_sasl-2.1.27/99-reautomagic.patch \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
+ patches/gtk/01-theme.patch \
patches/gtk/50-win71-theme-prepare.patch \
patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch \
diff --git a/patches/gtk/01-theme.patch b/patches/gtk/01-theme.patch
new file mode 100755
index 0000000..22cf8f6
--- /dev/null
+++ b/patches/gtk/01-theme.patch
@@ -0,0 +1,15 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+--- a/gtk/meson.build 2021-07-02 03:46:22.482498861 -0700
++++ b/gtk/meson.build 2021-07-02 03:49:19.252060379 -0700
+@@ -1041,6 +1041,8 @@
+ install_dir: join_paths(get_option('datadir'), 'themes/Emacs/gtk-3.0'),
+ rename: ['gtk-keys.css'])
+
++install_subdir('theme/claws', install_dir: join_paths(get_option('datadir'), 'themes'))
++
+ # Data to install
+ install_data('gtkbuilder.rng',
+ install_dir: join_paths(gtk_datadir, 'gtk-3.0'))
diff --git a/patches/gtk/69-win71-theme-finalize.patch b/patches/gtk/69-win71-theme-finalize.patch
index e478c84..ed9479d 100755
--- a/patches/gtk/69-win71-theme-finalize.patch
+++ b/patches/gtk/69-win71-theme-finalize.patch
@@ -6,7 +6,7 @@
WIN32_THEME_NAME=win32
WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
CLAWS_THEME_NAME=win71
-CLAWS_THEME_DIR=_claws_theme
+CLAWS_THEME_DIR=gtk/theme/claws
mkdir ${CLAWS_THEME_DIR}
mv ${WIN32_THEME_DIR} ${CLAWS_THEME_DIR}/
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cab945..405d7ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,6 +85,8 @@ cm_pkg_gdk_pixbuf_meson_ldflags = -L$(idir)/lib
cm_pkg_gtk_configure = \
-Dx11_backend=false \
-Dwin32_backend=true \
+ -Ddemos=false \
+ -Dexamples=false \
-Dtests=false \
-Dintrospection=false
cm_pkg_gtk_meson_cppflags = -I$(idir)/include
diff --git a/src/functions.nsi b/src/functions.nsi
index e64366e..d8d619f 100644
--- a/src/functions.nsi
+++ b/src/functions.nsi
@@ -111,14 +111,6 @@ FunctionEnd
!define prefix ${PKG_ROOT}/${pkgname}-${cm_pkg_${pkgname}_version}
!macroend
-# Macro to set "sourceprefix" variable to correct package's source dir.
-!macro SetSourcePrefix pkgname
-!ifdef sourceprefix
-!undef sourceprefix
-!endif
-!define sourceprefix ${bpdir}/${pkgname}-${cm_pkg_${pkgname}_version}
-!macroend
-
Function .onInstSuccess
${MementoSectionSave}
FunctionEnd
diff --git a/src/meson-cross.txt.in b/src/meson-cross.txt.in
index 0b5299a..029227a 100644
--- a/src/meson-cross.txt.in
+++ b/src/meson-cross.txt.in
@@ -13,6 +13,7 @@ objcopy = '@OBJCOPY@'
strip = '@STRIP@'
pkgconfig = '@PKG_CONFIG@'
windres = '@WINDRES@'
+gdbus-codegen = '@abs_srcdir@/playground/install/bin/gdbus-codegen'
glib-genmarshal = '@abs_srcdir@/playground/install/bin/glib-genmarshal'
glib-mkenums = '@abs_srcdir@/playground/install/bin/glib-mkenums'
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 6776d6b..5c4281d 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -312,12 +312,12 @@ SetOutPath "$INSTDIR"
#######################################
### gtk+ win71 theme
-!insertmacro SetSourcePrefix gtk
+!insertmacro SetPrefix gtk
SetOutPath "$INSTDIR\etc\gtk-3.0"
-File ${sourceprefix}/_claws_theme/settings.ini
+File ${prefix}/share/themes/claws/settings.ini
SetOutPath "$INSTDIR\share\themes\win71\gtk-3.0"
-File ${sourceprefix}/_claws_theme/win71/gtk-win32-base.css
-File ${sourceprefix}/_claws_theme/win71/gtk.css
+File ${prefix}/share/themes/claws/win71/gtk-win32-base.css
+File ${Prefix}/share/themes/claws/win71/gtk.css
SetOutPath "$INSTDIR"
#######################################
commit db7e79e2ec6d130d7c6f6cb0c73a3ffc35c6d8cb
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Fri Jul 2 00:06:04 2021 -0700
disable fancy plugin by default
diff --git a/configure.ac b/configure.ac
index 904db34..7bb0f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,9 +75,9 @@ AC_SUBST(BUILD_ISODATE)
AC_SUBST(BUILD_FILEVERSION)
AC_ARG_ENABLE([fancy-plugin],
- AS_HELP_STRING([--enable-fancy-plugin],[Enable building the fancy plugin and dependencies (default=yes)]),
+ AS_HELP_STRING([--enable-fancy-plugin],[Enable building the fancy plugin and dependencies (default=no)]),
[build_fancy=$enableval],
- [build_fancy=yes])
+ [build_fancy=no])
AS_IF([test "$build_fancy" = yes],
[ENABLE_FANCY_PLUGIN=--enable-fancy-plugin],
[ENABLE_FANCY_PLUGIN=--disable-fancy-plugin])
commit 8e4f1a266321e683431ddad2b4cfd69218952577
Merge: ff4f8cf be6771c
Author: Jonathan Boeing <jonathan.n.boeing at gmail.com>
Date: Thu Jul 1 23:58:41 2021 -0700
Merge branch 'master' into gtk3
diff --cc Makefile.am
index 7ea9cd8,6b87733..7b0c1fa
--- a/Makefile.am
+++ b/Makefile.am
@@@ -40,37 -39,27 +39,38 @@@ EXTRA_DIST = autogen.sh
patches/atk-2.36.0/01-meson-build.patch \
patches/bzip2-1.0.8/01-g10-bzlib_h.patch \
patches/bzip2-1.0.8/02-g10-Makefile.patch \
- patches/claws_mail-3.17.8/01-etpan-sasl-plugin-path.patch \
- patches/claws_mail-3.17.8/02-quote-fmt-parse.patch \
- patches/claws_mail-3.17.8/03-fd_write.patch \
- patches/claws_mail-3.17.8/04-fclose.patch \
- patches/claws_mail-3.17.8/05-define-WIN32-for-litehtml.patch \
- patches/claws_mail-3.17.8/06-Double-buffer-row-drawing-in-gtkcmctree.patch \
+ patches/cairo-1.17.4/01-nofortify-hack.patch.off \
- patches/claws-mail/01-etpan-sasl-plugin-path.patch \
- patches/claws-mail/05-define-WIN32-for-litehtml.patch \
- patches/cyrus-sasl-2.1.27/01-md5-typedef.patch \
- patches/cyrus-sasl-2.1.27/02-tchar.patch \
- patches/cyrus-sasl-2.1.27/03-exports.patch \
- patches/cyrus-sasl-2.1.27/04-paths-relocation.patch \
- patches/cyrus-sasl-2.1.27/99-reautomagic.patch \
++ patches/claws_mail/01-etpan-sasl-plugin-path.patch \
++ patches/claws_mail/05-define-WIN32-for-litehtml.patch \
+ patches/claws_mail/99-autogen.patch \
+ patches/cyrus_sasl-2.1.27/01-md5-typedef.patch \
+ patches/cyrus_sasl-2.1.27/02-tchar.patch \
+ patches/cyrus_sasl-2.1.27/03-exports.patch \
+ patches/cyrus_sasl-2.1.27/04-paths-relocation.patch \
+ patches/cyrus_sasl-2.1.27/99-reautomagic.patch \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
- patches/gtk+/50-win71-theme-prepare.patch \
- patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
- patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch \
- patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch \
- patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch \
- patches/gtk+/55-win32-theme-make-separator-visible-again.patch \
- patches/gtk+/57-win32-theme-Draw-expander-arrow.patch \
- patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch \
- patches/gtk+/62-win32-theme-Draw-menu-separator.patch \
- patches/gtk+/63-win32-theme-Native-treeview-expander.patch \
- patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch \
- patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch \
- patches/gtk+/66-win32-theme-Native-combobox-height.patch \
- patches/gtk+/67-win32-theme-Credits.patch \
- patches/gtk+/69-win71-theme-finalize.patch \
- patches/gumbo-parser-0.10.1/99-autotools.patch \
- patches/gtk-2.24.33/01-no-tests-demos.patch \
++ patches/gtk/50-win71-theme-prepare.patch \
++ patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
++ patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch \
++ patches/gtk/53-win32-theme-Fix-notebook-tabs.patch \
++ patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch \
++ patches/gtk/55-win32-theme-make-separator-visible-again.patch \
++ patches/gtk/57-win32-theme-Draw-expander-arrow.patch \
++ patches/gtk/61-win32-theme-Draw-submenu-arrow.patch \
++ patches/gtk/62-win32-theme-Draw-menu-separator.patch \
++ patches/gtk/63-win32-theme-Native-treeview-expander.patch \
++ patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch \
++ patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch \
++ patches/gtk/66-win32-theme-Native-combobox-height.patch \
++ patches/gtk/67-win32-theme-Credits.patch \
++ patches/gtk/69-win71-theme-finalize.patch \
+ patches/gumbo_parser-0.10.1/99-autotools.patch \
patches/hunspell-1.7.0/99-autoreconf.patch \
- patches/icu4c-58_3-src/01-libnames.patch \
- patches/icu4c-58_3-src/02-float128-clang.patch \
- patches/icu4c-58_3-src/03-no-xlocale.patch \
- patches/icu4c-58_3-src/99-build.patch.in \
+ patches/icu4c-58.3/01-libnames.patch \
+ patches/icu4c-58.3/02-float128-clang.patch \
+ patches/icu4c-58.3/03-no-xlocale.patch \
+ patches/icu4c-58.3/99-build.patch.in \
patches/libetpan-1.9.4/01-no-tests.patch \
patches/libetpan-1.9.4/02-wsaewouldblock.patch \
patches/libetpan-1.9.4/03-sasl-set-path.patch \
diff --cc README
index 6c7f9b7,756bd94..f04e29e
--- a/README
+++ b/README
@@@ -99,10 -98,10 +99,11 @@@ To finish the build, following package
Debian Buster system.
Note - at the time of writing, the meson package in Debian Buster
-(currently 0.49.1) is too old to build pixman, but a sufficiently
-recent version can be installed from buster-backports (currently 0.52.1).
+(currently 0.49.1) is too old, see below for update instructions.
+
+Building the gtk3 version has additional requirements (see below).
+ build-essential
automake
autoconf
mingw-w64
@@@ -126,13 -119,10 +121,10 @@@ intltoo
libtool
libgettextpo-dev
meson
- pkg-config-mingw-w64-x86-64
- gobject-introspection
+ python3-distutils
+ mingw-w64-tools
-ruby
+wget
- gpg
- sudo
+
Building in a Docker container
==============================
diff --cc autogen.sh
index b24f5be,b5d70b1..afbd217
--- a/autogen.sh
+++ b/autogen.sh
@@@ -11,50 -11,18 +11,44 @@@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+check_compiler () {
- warn=""
- for prefix in x86_64-w64-mingw32 i686-w64-mingw32 i586-mingw32msvc \
- i386-mingw32msvc mingw32 ; do
- if which $prefix-gcc > /dev/null ; then
- ver=$($prefix-gcc -dumpversion|cut -d "." -f 1)
- if test "$ver" -gt 8 ; then
- warn=" $prefix-gcc $ver\n$warn"
- fi
- fi
- done
- if [ -n "$warn" ] ; then
- echo
- echo "Warning: Unrecommended gcc version found on your system!"
- echo "For building releases, MinGW gcc-8 should be used."
- echo "Using gcc-9 currently produces less hardened binaries."
- echo "Following unrecommended versions have been found:"
- echo "$warn"
- echo "To use gcc-9, please remove the \".off\" extension from"
- echo "./patches/cairo-1.17.4/01-nofortify-hack.patch.off"
- return 1
- else
- return 0
- fi
++ warn=""
++ for prefix in x86_64-w64-mingw32 i686-w64-mingw32 i586-mingw32msvc \
++ i386-mingw32msvc mingw32 ; do
++ if which $prefix-gcc > /dev/null ; then
++ ver=$($prefix-gcc -dumpversion|cut -d "." -f 1)
++ if test "$ver" -gt 8 ; then
++ warn=" $prefix-gcc $ver\n$warn"
++ fi
++ fi
++ done
++ if [ -n "$warn" ] ; then
++ echo
++ echo "Warning: Unrecommended gcc version found on your system!"
++ echo "For building releases, MinGW gcc-8 should be used."
++ echo "Using gcc-9 currently produces less hardened binaries."
++ echo "Following unrecommended versions have been found:"
++ echo "$warn"
++ echo "To use gcc-9, please remove the \".off\" extension from"
++ echo "./patches/cairo-1.17.4/01-nofortify-hack.patch.off"
++ return 1
++ else
++ return 0
++ fi
+}
+
win_rel=1
+ git_revision=""
tsdir="$(readlink -f $(dirname $0))"
- claws_pkg=$(ls -1 packages/claws-mail-*.*.*.tar.* | head -n 1)
- if [ -z "${claws_pkg}" ]; then
- echo "No Claws Mail source tarball found in packages/ dir, exiting..."
- exit 1
- fi
-
- claws_full_ver=$(basename ${claws_pkg} | sed 's/claws-mail-\(.*\)\.tar\..*/\1/')
- claws_base_ver=$(echo ${claws_full_ver} | sed 's/git.*//')
+ claws_full_ver=$(grep -E "^claws_mail," packages/packages.current | cut -f 2 -d ,)
+ claws_base_ver=$(echo ${claws_full_ver} | cut -f 1 -d -)
- if [ "$claws_full_ver" != "$claws_base_ver" ]; then
+ claws_type=$(grep -E "^claws_mail," packages/packages.current | cut -f 3 -d ,)
+ if [ "x${claws_type}" = "xgit" ]; then
echo "Building a git snapshot of Claws Mail."
- git_revision=$(echo ${claws_full_ver} | sed 's/.*\(git.*\)/\1/')
+ git_revision="git$(echo ${claws_full_ver} | cut -f 2 -d -)"
win_rel=99
- else
- git_revision=""
fi
printf "%s\n" "${claws_base_ver}" > ${tsdir}/VERSION
diff --cc configure.ac
index 001f9ae,1e95d0f..904db34
--- a/configure.ac
+++ b/configure.ac
@@@ -259,53 -250,42 +250,44 @@@ CM_SPKG([gpgme], [libgpg_error libassua
CM_SPKG([libtasn1])
CM_SPKG([nettle], [gmp])
CM_SPKG([gnutls], [gmp nettle libtasn1])
- CM_SPKG([glib-networking], [glib gnutls])
- CM_SPKG([sqlite-autoconf], [zlib])
CM_SPKG([libpsl], [icu4c])
- CM_SPKG([libsoup], [gnutls libxml2 glib-networking sqlite-autoconf libpsl])
- CM_SPKG([libwebp], [zlib libpng jpeg])
CM_SPKG([icu4c])
+CM_SPKG([libepoxy])
- CM_SPKG([harfbuzz], [glib cairo icu4c])
+ CM_SPKG([harfbuzz], [glib cairo icu4c freetype])
CM_SPKG([pango], [harfbuzz fontconfig glib cairo fribidi])
- CM_SPKG([gtk+], [libiconv gettext atk pango glib gdk-pixbuf cairo libepoxy])
- CM_SPKG([adwaita-icon-theme])
- #CM_SPKG([webkitgtk], [jpeg libpng glib gtk+ libsoup libxml2 libxslt libwebp icu4c harfbuzz])
-CM_SPKG([gtk], [libiconv gettext atk pango glib gdk_pixbuf cairo])
++CM_SPKG([gtk], [libiconv gettext atk pango glib gdk_pixbuf cairo libepoxy])
++CM_SPKG([adwaita_icon_theme])
CM_SPKG([curl], [zlib gnutls libpsl])
- CM_SPKG([cyrus-sasl])
- CM_SPKG([libetpan], [gnutls cyrus-sasl])
- CM_SPKG([bsfilter])
+ CM_SPKG([cyrus_sasl])
+ CM_SPKG([libetpan], [gnutls cyrus_sasl curl expat libiconv zlib])
CM_SPKG([libical], [icu4c])
CM_SPKG([ytnef])
- CM_SPKG([gumbo-parser])
- CM_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
- gpgme regex libetpan gnutls ytnef gumbo-parser dnl
- libxml2 expat curl libical nettle])
- # TODO: add webkitgtk2 as claws-mail dependency
+ CM_SPKG([gumbo_parser])
+
+ if test "$build_fancy" = yes; then
+ CM_SPKG([jpeg])
+ CM_SPKG([sqlite], [zlib])
+ CM_SPKG([libwebp], [zlib libpng jpeg])
+ CM_SPKG([libxslt], [libxml2])
+ CM_SPKG([glib_networking], [glib gnutls])
+ CM_SPKG([libsoup], [gnutls libxml2 glib_networking sqlite libpsl])
+ CM_SPKG([webkitgtk], [jpeg libpng glib gtk libsoup libxml2 libxslt libwebp icu4c harfbuzz])
+ cm_dep_webkitgtk="webkitgtk"
+ else
+ cm_dep_webkitgtk=""
+ AC_SUBST(NSIS_DISABLE_FANCY, [-DDISABLE_FANCY_PLUGIN])
+ fi
- CM_CHECK_DEPS
+ claws_mail_deps="libiconv gettext zlib gtk libpng enchant glib"
+ claws_mail_deps="$claws_mail_deps gpgme regex libetpan gnutls ytnef gumbo_parser"
+ claws_mail_deps="$claws_mail_deps libxml2 expat $cm_dep_webkitgtk curl libical nettle"
+ CM_SPKG([claws_mail], [$claws_mail_deps])
- # Throw an error if required tools are missing
- if test -n "$missing_tools"; then
- for i in $missing_tools; do
- AC_MSG_NOTICE([$i is missing])
- done
- AC_MSG_ERROR([[
- ***
- *** Required tools not found. Please consult the above messages
- *** and install them before running configure again.
- ***]])
- fi
+ AC_SUBST(cm_bpkgs)
+ AC_SUBST(cm_mpkgs)
+ AC_SUBST(cm_spkgs)
- # Throw an error if any duplicate source packages have been found
- if test -n "$cm_dup_sources"; then
- tmp=
- for i in $cm_dup_sources; do
- tmp="$tmp
- $i"
- done
- AC_MSG_ERROR([Packages with more that one source version:$tmp])
- fi
+ CM_CHECK_DEPS
# Finalize.
diff --cc packages/packages.current
index a67979f,60f7fe0..cee939e
--- a/packages/packages.current
+++ b/packages/packages.current
@@@ -1,279 -1,77 +1,79 @@@
- # packages.current - list of current packages for use with gpg4win -*- sh -*-
- #
- # The download script processes the statements here to
- # actually download the packages. The syntax is trivial:
- #
- # If the first non whitespace character of a line is #, the line is
- # considered a comment. If the first word of a line is "server", the
- # rest of the line will be taken as the base URL for following file
- # commands. If the first word of a line is "file" the rest of the
- # line will be appended to the current base URL (with a / as
- # delimiter). The statement "chk" is followed by the SHA256 checksum of
- # the last file.
+ # package name,version,type,url,sha256 hash,branch,ref
- #
- # claws-mail itself
- #
-claws_mail,3.17.8,file,https://www.claws-mail.org/releases/claws-mail-3.17.8.tar.xz,cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf,,
++claws_mail,3.99.0-105-g88f72a,git,git://git.claws-mail.org/claws.git,056ec9db1a5fd2b1dc99cad8ad43aaae68114665bd5c80cafa74418e509451f9,,88f72a3216b336abe186daf5a0d8821e87eb996e
- server https://www.claws-mail.org/releases
+ gettext,0.21,file,https://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.xz,d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192,,
+ libiconv,1.16,file,https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz,e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04,,
+ libtasn1,4.17.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.17.0.tar.gz,ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5,,
+ nettle,3.7.3,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.7.3.tar.gz,661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0,,
- # file and checksum will be added by getgit-claws-mail.sh / download.sh
+ zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
- #file claws-mail-3.17.8.tar.xz
- #chk cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+ gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
- #
- # GNU
- #
- server https://ftp.gnu.org/pub/gnu
+ gnutls,3.6.16,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz,1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3,,
- # gettext & support
- file gettext/gettext-0.21.tar.xz
- chk d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
+ expat,2.4.1,file,https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz,cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a,,
- file libiconv/libiconv-1.16.tar.gz
- chk e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+ libetpan,1.9.4,file,https://www.claws-mail.org/win32/libetpan-1.9.4.tar.gz,82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1,,
+ regex,20090805,file,https://www.claws-mail.org/win32/regex-20090805.tar.gz,199bbf3fca3bcee826b10d718f556485c3e1d031af21252ed58a8cb83cf3b493,,
+ bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
+ ytnef,1.9.3,file,https://www.claws-mail.org/win32/ytnef-1.9.3.tar.gz,41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f,,
+ cyrus_sasl,2.1.27,file,https://www.claws-mail.org/win32/cyrus-sasl-2.1.27.tar.gz,26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5,,
- # GNU TLS and support libraries
- file libtasn1/libtasn1-4.16.0.tar.gz
- chk 0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d
+ jpeg,9d,file,https://ijg.org/files/jpegsrc.v9d.tar.gz,6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee,,
- # nettle
- file nettle/nettle-3.7.2.tar.gz
- chk 8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162
+ curl,7.77.0,file,https://curl.se/download/curl-7.77.0.tar.xz,0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b,,
- #
- # zlib
- #
- server https://zlib.net
+ libxml2,2.9.12,file,ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz,c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92,,
+ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f,,
- file zlib-1.2.11.tar.gz
- chk c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+ enchant,2.2.15,file,https://github.com/AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz,3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03,,
+ hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
+ sqlite,3.35.5,file,https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz,f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0,,
- # gmp
- server https://gmplib.org/download/gmp
+ libpsl,0.21.1,file,https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz,ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c,,
- file gmp-6.2.1.tar.xz
- chk fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
+ glib,2.66.8,file,https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz,97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b,,
-gtk,2.24.33,file,https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz,ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da,,
++libepoxy,1.5.5,file,https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.5.tar.xz,261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556,,
++adwaita_icon_theme,3.38.0,file,https://download.gnome.org/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz,6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97,,
++gtk,3.24.27,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.27.tar.xz,f71c067570339f9f8efac7bb87717a2c52279cb50223fb8b5ba7085930757a26,,
+ gdk_pixbuf,2.42.6,file,https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz,c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f,,
+ pango,1.48.5,file,https://download.gnome.org/sources/pango/1.48/pango-1.48.5.tar.xz,501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a,,
+ atk,2.36.0,file,https://download.gnome.org/sources/atk/2.36/atk-2.36.0.tar.xz,fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788,,
+ glib_networking,2.66.0,file,https://download.gnome.org/sources/glib-networking/2.66/glib-networking-2.66.0.tar.xz,c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099,,
+ libsoup,2.72.0,file,https://download.gnome.org/sources/libsoup/2.72/libsoup-2.72.0.tar.xz,170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387,,
- # gnutls
- server https://www.gnupg.org/ftp/gcrypt
+ fribidi,1.0.10,file,https://github.com/fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz,7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01,,
- file gnutls/v3.6/gnutls-3.6.15.tar.xz
- chk 0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558
+ harfbuzz,2.8.1,file,https://github.com/harfbuzz/harfbuzz/releases/download/2.8.1/harfbuzz-2.8.1.tar.xz,4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300,,
- # expat
- server https://github.com
- file libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.xz
- chk caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9
+ cairo,1.17.4,file,https://cairographics.org/snapshots/cairo-1.17.4.tar.xz,74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705,,
+ pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
- # Various libraries, mostly those from sf.net
- # (Kept on our own mirror due to Sourceforge/github peculiarities.)
- server https://www.claws-mail.org/win32
+ freetype,2.10.4,file,https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz,86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784,,
- file libetpan-1.9.4.tar.gz
- chk 82ec8ea11d239c9967dbd1717cac09c8330a558e025b3e4dc6a7594e80d13bb1
+ fontconfig,2.13.93,file,https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.93.tar.xz,ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0,,
- file regex-20090805.tar.gz
- chk 199bbf3fca3bcee826b10d718f556485c3e1d031af21252ed58a8cb83cf3b493
+ libpng,1.6.37,file,https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz,505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca,,
- name bsfilter-1.0.16.tar.gz
- file bsfilter-1.0.16-bin.tar.gz
- chk d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85
+ libffi,3.3,file,https://mirrors.kernel.org/sourceware/libffi/libffi-3.3.tar.gz,72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056,,
- file ytnef-1.9.3.tar.gz
- chk 41a0033bde33c86a7e4aa4e14bb822dd03084098638e7d6557263e47e80b4f4f
+ w32pth,2.0.5,file,ftp://ftp.g10code.com/g10code/w32pth/w32pth-2.0.5.tar.bz2,5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06,,
- file cyrus-sasl-2.1.27.tar.gz
- chk 26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
+ bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
- # jpeg
- server https://ijg.org/files/
- name jpeg-9d.tar.gz
- file jpegsrc.v9d.tar.gz
- chk 6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee
+ libgpg_error,1.42,file,https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2,fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23,,
+ libassuan,2.5.5,file,https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2,8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4,,
+ gpgme,1.15.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.15.1.tar.bz2,eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad,,
- #
- # curl for Claws plugins
- #
+ libwebp,1.2.0,file,https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz,2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c,,
- server https://curl.se/download
+ icu4c,58.3,file,https://github.com/unicode-org/icu/releases/download/release-58-3/icu4c-58_3-src.tgz,2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c,,
- file curl-7.76.0.tar.xz
- chk 6302e2d75c59cdc6b35ce3fbe716481dd4301841bbb5fd71854653652a014fc8
+ webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
+ libical,3.0.10,file,https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz,f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4,,
- #
- # libxml2 & libxslt
-
- server ftp://xmlsoft.org/libxml2
-
- file libxml2-2.9.10.tar.gz
- chk aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
-
- file libxslt-1.1.34.tar.gz
- chk 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
-
- #
- # Enchant for Claws
- #
- server https://github.com/AbiWord/enchant/releases/download/v2.2.15
- file enchant-2.2.15.tar.gz
- chk 3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03
-
- server https://github.com/hunspell/hunspell/files/2573619
- file hunspell-1.7.0.tar.gz
- chk 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
-
- # sqlite for libsoup
- server https://sqlite.org/2021
- file sqlite-autoconf-3350400.tar.gz
- chk 7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d
-
- # libpsl
- server https://github.com/rockdaboot/libpsl/releases/download
- file 0.21.1/libpsl-0.21.1.tar.gz
- chk ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c
-
- #
- # GLIB & friends
- #
- server https://download.gnome.org/sources
-
- file glib/2.66/glib-2.66.8.tar.xz
- chk 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
-
- file libepoxy/1.5/libepoxy-1.5.5.tar.xz
- chk 261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556
-
- file gtk+/3.24/gtk+-3.24.27.tar.xz
- chk f71c067570339f9f8efac7bb87717a2c52279cb50223fb8b5ba7085930757a26
-
- file gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz
- chk fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d
-
- file pango/1.48/pango-1.48.4.tar.xz
- chk 418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a
-
- file atk/2.36/atk-2.36.0.tar.xz
- chk fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788
-
- file glib-networking/2.66/glib-networking-2.66.0.tar.xz
- chk c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
-
- file libsoup/2.72/libsoup-2.72.0.tar.xz
- chk 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387
-
- file adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz
- chk 6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
-
- # fribidi
- server https://github.com/fribidi/fribidi/releases/download
-
- file v1.0.10/fribidi-1.0.10.tar.xz
- chk 7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01
-
- # harfbuzz
- server https://github.com/harfbuzz/harfbuzz/releases/download/2.8.0
-
- file harfbuzz-2.8.0.tar.xz
- chk a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
-
- #
- # CAIRO
- #
- server https://cairographics.org/snapshots
-
- file cairo-1.17.4.tar.xz
- chk 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
-
- server https://cairographics.org/releases
-
- file pixman-0.40.0.tar.gz
- chk 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
-
- # Freetype
- server https://download.savannah.gnu.org/releases/freetype
-
- file freetype-2.10.4.tar.xz
- chk 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
-
- # Fontconfig
- server https://www.freedesktop.org/software/fontconfig/release
-
- file fontconfig-2.13.93.tar.xz
- chk ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0
-
- # libpng
-
- server https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37
- file libpng-1.6.37.tar.xz
- chk 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
-
- #
- # LibFFI
- #
- server https://mirrors.kernel.org/sourceware/libffi
- file libffi-3.3.tar.gz
- chk 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-
-
- #
- # Pth emulation
- #
-
- server ftp://ftp.g10code.com/g10code/w32pth
-
- file w32pth-2.0.5.tar.bz2
- chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06
-
- #
- # bzip2
- #
- server https://sourceware.org/pub/bzip2
- file bzip2-1.0.8.tar.gz
- chk ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
-
- #
- # gpgme and dependencies
- #
- server https://gnupg.org/ftp/gcrypt
-
- file libgpg-error/libgpg-error-1.42.tar.bz2
- chk fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
-
- file libassuan/libassuan-2.5.5.tar.bz2
- chk 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-
- file gpgme/gpgme-1.15.1.tar.bz2
- chk eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
-
- # libwebp
- server https://storage.googleapis.com/downloads.webmproject.org/releases/webp
-
- file libwebp-1.2.0.tar.gz
- chk 2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c
-
- # icu4c
- server https://github.com/unicode-org/icu/releases/download
- file release-58-3/icu4c-58_3-src.tgz
- chk 2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c
-
- # webkitgtk
- server https://webkitgtk.org/releases
-
- file webkitgtk-2.4.11.tar.xz
- chk 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
-
- # libical
- server https://github.com/libical/libical/releases/download
- file v3.0.9/libical-3.0.9.tar.gz
- chk bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728
-
- # gumbo-parser
- server https://github.com/google/gumbo-parser/archive/
- name gumbo-parser-0.10.1.tar.gz
- file v0.10.1.tar.gz
- chk 28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad
-
+ gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
diff --cc patches/gtk/50-win71-theme-prepare.patch
index 82200a2,0000000..82200a2
mode 100755,000000..100755
--- a/patches/gtk/50-win71-theme-prepare.patch
+++ b/patches/gtk/50-win71-theme-prepare.patch
diff --cc patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
index 0b90b93,0000000..0b90b93
mode 100755,000000..100755
--- a/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+++ b/patches/gtk/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
diff --cc patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
index e3a2f07,0000000..e3a2f07
mode 100755,000000..100755
--- a/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
+++ b/patches/gtk/52-win32-theme-fix-disabled-GtkEntry-style.patch
diff --cc patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
index 07a235f,0000000..07a235f
mode 100755,000000..100755
--- a/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
+++ b/patches/gtk/53-win32-theme-Fix-notebook-tabs.patch
diff --cc patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
index 148fd93,0000000..148fd93
mode 100755,000000..100755
--- a/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
+++ b/patches/gtk/54-win32-theme-Fix-unfocused-window-buttons.patch
diff --cc patches/gtk/55-win32-theme-make-separator-visible-again.patch
index a4f8196,0000000..a4f8196
mode 100755,000000..100755
--- a/patches/gtk/55-win32-theme-make-separator-visible-again.patch
+++ b/patches/gtk/55-win32-theme-make-separator-visible-again.patch
diff --cc patches/gtk/57-win32-theme-Draw-expander-arrow.patch
index ed151ad,0000000..ed151ad
mode 100755,000000..100755
--- a/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
+++ b/patches/gtk/57-win32-theme-Draw-expander-arrow.patch
diff --cc patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
index 3894808,0000000..3894808
mode 100755,000000..100755
--- a/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
+++ b/patches/gtk/61-win32-theme-Draw-submenu-arrow.patch
diff --cc patches/gtk/62-win32-theme-Draw-menu-separator.patch
index c8e9966,0000000..c8e9966
mode 100755,000000..100755
--- a/patches/gtk/62-win32-theme-Draw-menu-separator.patch
+++ b/patches/gtk/62-win32-theme-Draw-menu-separator.patch
diff --cc patches/gtk/63-win32-theme-Native-treeview-expander.patch
index cd36b53,0000000..cd36b53
mode 100755,000000..100755
--- a/patches/gtk/63-win32-theme-Native-treeview-expander.patch
+++ b/patches/gtk/63-win32-theme-Native-treeview-expander.patch
diff --cc patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
index 114b3e0,0000000..114b3e0
mode 100755,000000..100755
--- a/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
+++ b/patches/gtk/64-win32-theme-Reduce-titlebar-headroom.patch
diff --cc patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
index d358dd1,0000000..d358dd1
mode 100755,000000..100755
--- a/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
+++ b/patches/gtk/65-win32-theme-Visible-treeview-inactive-selection.patch
diff --cc patches/gtk/66-win32-theme-Native-combobox-height.patch
index 0aa2932,0000000..0aa2932
mode 100755,000000..100755
--- a/patches/gtk/66-win32-theme-Native-combobox-height.patch
+++ b/patches/gtk/66-win32-theme-Native-combobox-height.patch
diff --cc patches/gtk/67-win32-theme-Credits.patch
index 84b9881,0000000..84b9881
mode 100755,000000..100755
--- a/patches/gtk/67-win32-theme-Credits.patch
+++ b/patches/gtk/67-win32-theme-Credits.patch
diff --cc patches/gtk/69-win71-theme-finalize.patch
index e478c84,0000000..e478c84
mode 100755,000000..100755
--- a/patches/gtk/69-win71-theme-finalize.patch
+++ b/patches/gtk/69-win71-theme-finalize.patch
diff --cc src/Makefile.am
index e5d7bbe,221b446..1cab945
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -55,8 -40,6 +40,8 @@@ SUBDIRS = dictionarie
cm_pkg_libical_cmake = yes
- cm_pkg_gtk__meson = yes
++cm_pkg_gtk_meson = yes
+cm_pkg_libepoxy_meson = yes
cm_pkg_atk_meson = yes
cm_pkg_glib_meson = yes
cm_pkg_pixman_meson = yes
@@@ -94,23 -80,15 +82,21 @@@ cm_pkg_gdk_pixbuf_configure =
cm_pkg_gdk_pixbuf_meson_cppflags = -I$(idir)/include
cm_pkg_gdk_pixbuf_meson_ldflags = -L$(idir)/lib
- cm_pkg_gtk__configure = \
+ cm_pkg_gtk_configure = \
- --with-gdktarget=win32 \
- --with-included-immodules \
- --disable-cups \
- --disable-gtk-doc \
- --disable-static \
- --disable-glibtest \
- CPPFLAGS=-I$(idir)/include \
- LDFLAGS=-L$(idir)/lib
+ -Dx11_backend=false \
+ -Dwin32_backend=true \
+ -Dtests=false \
+ -Dintrospection=false
- cm_pkg_gtk__meson_cppflags = -I$(idir)/include
- cm_pkg_gtk__meson_ldflags = -L$(idir)/lib
-
- #cm_pkg_adwaita_icon_theme_configure =
++cm_pkg_gtk_meson_cppflags = -I$(idir)/include
++cm_pkg_gtk_meson_ldflags = -L$(idir)/lib
+
+cm_pkg_libepoxy_configure = \
+ -Dglx=no \
+ -Degl=no \
+ -Dx11=false \
+ -Dtests=false
+cm_pkg_libepoxy_meson_cppflags = -I$(idir)/include
+cm_pkg_libepoxy_meson_ldflags = -L$(idir)/lib
cm_pkg_harfbuzz_configure = \
-Ddocs=disabled \
diff --cc src/config.nsi.in
index 3dd09ce,e75b63a..02f6d26
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@@ -59,10 -59,9 +59,10 @@@
!define cm_pkg_regex_version @cm_pkg_regex_version@
!define cm_pkg_claws_mail_version @cm_pkg_claws_mail_version@
!define cm_pkg_libwebp_version @cm_pkg_libwebp_version@
- !define cm_pkg_sqlite_autoconf_version @cm_pkg_sqlite_autoconf_version@
+ !define cm_pkg_sqlite_version @cm_pkg_sqlite_version@
!define cm_pkg_icu4c_version @cm_pkg_icu4c_version@
+!define cm_pkg_libepoxy_version @cm_pkg_libepoxy_version@
- #!define cm_pkg_webkitgtk_version @cm_pkg_webkitgtk_version@
+ !define cm_pkg_webkitgtk_version @cm_pkg_webkitgtk_version@
!define cm_pkg_jpeg_version @cm_pkg_jpeg_version@
!define cm_pkg_glib_networking_version @cm_pkg_glib_networking_version@
!define cm_pkg_libpsl_version @cm_pkg_libpsl_version@
@@@ -83,8 -82,7 +83,8 @@@
!define cm_pkg_fontconfig_version @cm_pkg_fontconfig_version@
!define cm_pkg_fribidi_version @cm_pkg_fribidi_version@
!define cm_pkg_pango_version @cm_pkg_pango_version@
- !define cm_pkg_gtk__version @cm_pkg_gtk__version@
+ !define cm_pkg_gtk_version @cm_pkg_gtk_version@
+!define cm_pkg_adwaita_icon_theme_version @cm_pkg_adwaita_icon_theme_version@
!define cm_pkg_libiconv_version @cm_pkg_libiconv_version@
!define cm_pkg_gettext_version @cm_pkg_gettext_version@
!define cm_pkg_libical_version @cm_pkg_libical_version@
diff --cc src/functions.nsi
index 286bee7,d8d619f..e64366e
--- a/src/functions.nsi
+++ b/src/functions.nsi
@@@ -108,39 -108,9 +108,17 @@@ FunctionEn
!ifdef prefix
!undef prefix
!endif
- !define prefix ${ipdir}/${pkgname}-${cm_pkg_${pkgname}_version}
- !macroend
-
- # Macro to set "prefix" variable to correct package's install dir.
- # Use this second macro if package name contains a character not
- # allowed in a NSIS variable, e.g.:
- # !insertmacro SetPrefix2 pkg_name pkg-name
- !macro SetPrefix2 pkgname pkgdirname
- !ifdef prefix
- !undef prefix
- !endif
- !define prefix ${ipdir}/${pkgdirname}-${cm_pkg_${pkgname}_version}
+ !define prefix ${PKG_ROOT}/${pkgname}-${cm_pkg_${pkgname}_version}
!macroend
+# Macro to set "sourceprefix" variable to correct package's source dir.
+!macro SetSourcePrefix pkgname
+!ifdef sourceprefix
+!undef sourceprefix
+!endif
+!define sourceprefix ${bpdir}/${pkgname}-${cm_pkg_${pkgname}_version}
+!macroend
+
- # Macro to set "sourceprefix" variable to correct package's source dir.
- # Use this second macro if package name contains a character not
- # allowed in a NSIS variable, e.g.:
- # !insertmacro SetSourcePrefix2 pkg_name pkg-name
- !macro SetSourcePrefix2 pkgname pkgdirname
- !ifdef sourceprefix
- !undef sourceprefix
- !endif
- !define sourceprefix ${bpdir}/${pkgdirname}-${cm_pkg_${pkgname}_version}
- !macroend
-
Function .onInstSuccess
${MementoSectionSave}
FunctionEnd
diff --cc src/sections-installer.nsi
index 94e8f6d,e691741..6776d6b
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@@ -296,453 -214,43 +214,112 @@@ File ${prefix}/bin/libgdk_pixbuf-2.0-0.
File ${prefix}/bin/gdk-pixbuf-query-loaders.exe
File ${prefix}/bin/gdk-pixbuf-pixdata.exe
+#######################################
+### adwaita-icon-theme
- !insertmacro SetPrefix2 adwaita_icon_theme adwaita-icon-theme
++!insertmacro SetPrefix adwaita_icon_theme
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
+File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-clear.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-copy.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-delete.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-find.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-redo.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/edit-undo.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-bottom.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-down.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-next.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-previous.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-top.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/go-up.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/help-browser.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/image-missing.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/list-add.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/list-remove.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/system-help.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/view-refresh.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
+File ${prefix}/share/icons/Adwaita/16x16/places/folder.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\ui"
+File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-mixed-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/checkbox-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/focus-legacy-systray-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/focus-top-bar-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/focus-windows-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/list-drag-handle-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-down-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-end-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-end-symbolic-rtl.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-start-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-start-symbolic-rtl.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/pan-up-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/radio-checked-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/radio-mixed-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/radio-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/selection-end-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/selection-end-symbolic-rtl.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/selection-start-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/selection-start-symbolic-rtl.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/tab-new-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/window-close-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/window-maximize-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/window-minimize-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/window-new-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
+File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
+File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
+File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-password.png
+File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-question.png
+File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-warning.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\cursors"
+File ${prefix}/share/icons/Adwaita/cursors/dnd-copy.cur
+File ${prefix}/share/icons/Adwaita/cursors/dnd-move.cur
+File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
+SetOutPath "$INSTDIR\share\icons\Adwaita"
+File ${prefix}/share/icons/Adwaita/index.theme
+SetOutPath "$INSTDIR"
+
#######################################
### gtk+
- !insertmacro SetPrefix2 gtk_ gtk+
+ !insertmacro SetPrefix gtk
-File ${prefix}/bin/libgdk-win32-2.0-0.dll
-File ${prefix}/bin/libgtk-win32-2.0-0.dll
+File ${prefix}/bin/libgdk-3-0.dll
+File ${prefix}/bin/libgtk-3-0.dll
-File ${prefix}/bin/libgailutil-18.dll
-File ${prefix}/bin/gtk-query-immodules-2.0.exe
+File ${prefix}/bin/libgailutil-3-0.dll
+File ${prefix}/bin/gtk-query-immodules-3.0.exe
File ${prefix}/bin/gtk-update-icon-cache.exe
-SetOutPath "$INSTDIR\etc\gtk-2.0"
-File ${prefix}/etc/gtk-2.0/im-multipress.conf
-
-SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
-File ${prefix}/lib/gtk-2.0/2.10.0/engines/libpixmap.dll
-File ${prefix}/lib/gtk-2.0/2.10.0/engines/libwimp.dll
-
-SetOutPath "$INSTDIR\lib\gtk-2.0\modules"
-File ${prefix}/lib/gtk-2.0/modules/libgail.dll
-
-SetOutPath "$INSTDIR\share\themes\Default\gtk-2.0-key"
-File ${prefix}/share/themes/Default/gtk-2.0-key/gtkrc
-
-SetOutPath "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
-File ${prefix}/share/themes/Emacs/gtk-2.0-key/gtkrc
+SetOutPath "$INSTDIR\etc\gtk-3.0"
+File ${prefix}/etc/gtk-3.0/im-multipress.conf
- #SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
- #File ${prefix}/lib/gtk-2.0/2.10.0/engines/libpixmap.dll
- #File ${prefix}/lib/gtk-2.0/2.10.0/engines/libwimp.dll
-
- # SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-thai.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-multipress.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ime.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll
- # File ${prefix}/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll
-
- #SetOutPath "$INSTDIR\lib\gtk-2.0\modules"
- #File ${prefix}/lib/gtk-2.0/modules/libgail.dll
-
-SetOutPath "$INSTDIR\share\themes\Raleigh\gtk-2.0"
-File ${prefix}/share/themes/Raleigh/gtk-2.0/gtkrc
+SetOutPath "$INSTDIR\share\themes\Default\gtk-3.0"
+File ${prefix}/share/themes/Default/gtk-3.0/gtk-keys.css
-SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-File ${prefix}/share/themes/MS-Windows/gtk-2.0/gtkrc
+SetOutPath "$INSTDIR\share\themes\Emacs\gtk-3.0"
+File ${prefix}/share/themes/Emacs/gtk-3.0/gtk-keys.css
- #SetOutPath "$INSTDIR\share\themes\Raleigh\gtk-2.0"
- #File ${prefix}/share/themes/Raleigh/gtk-2.0/gtkrc
-
- #SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
- #File ${prefix}/share/themes/MS-Windows/gtk-2.0/gtkrc
-
- # Install all the localizations
- SetOutPath "$INSTDIR\share\locale\af\LC_MESSAGES"
- File ${prefix}/share/locale/af/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/af/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\am\LC_MESSAGES"
- File ${prefix}/share/locale/am/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/am/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ang\LC_MESSAGES"
- File ${prefix}/share/locale/ang/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ang/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES"
- File ${prefix}/share/locale/ar/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ar/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\as\LC_MESSAGES"
- File ${prefix}/share/locale/as/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/as/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ast\LC_MESSAGES"
- File ${prefix}/share/locale/ast/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ast/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\az_IR\LC_MESSAGES"
- File ${prefix}/share/locale/az_IR/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/az_IR/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\az\LC_MESSAGES"
- File ${prefix}/share/locale/az/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/az/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\be at latin\LC_MESSAGES"
- File ${prefix}/share/locale/be at latin/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/be at latin/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\be\LC_MESSAGES"
- File ${prefix}/share/locale/be/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/be/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\bg\LC_MESSAGES"
- File ${prefix}/share/locale/bg/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/bg/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\bn_IN\LC_MESSAGES"
- File ${prefix}/share/locale/bn_IN/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/bn_IN/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\bn\LC_MESSAGES"
- File ${prefix}/share/locale/bn/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/bn/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\br\LC_MESSAGES"
- File ${prefix}/share/locale/br/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/br/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\bs\LC_MESSAGES"
- File ${prefix}/share/locale/bs/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/bs/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File ${prefix}/share/locale/ca/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ca/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES"
- File ${prefix}/share/locale/ca at valencia/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ca at valencia/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\crh\LC_MESSAGES"
- File ${prefix}/share/locale/crh/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/crh/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File ${prefix}/share/locale/cs/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/cs/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\cy\LC_MESSAGES"
- File ${prefix}/share/locale/cy/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/cy/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\da\LC_MESSAGES"
- File ${prefix}/share/locale/da/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/da/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File ${prefix}/share/locale/de/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/de/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\dz\LC_MESSAGES"
- File ${prefix}/share/locale/dz/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/dz/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\el\LC_MESSAGES"
- File ${prefix}/share/locale/el/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/el/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\en_CA\LC_MESSAGES"
- File ${prefix}/share/locale/en_CA/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/en_CA/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
- File ${prefix}/share/locale/en_GB/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/en_GB/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
- File ${prefix}/share/locale/eo/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/eo/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File ${prefix}/share/locale/es/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/es/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\et\LC_MESSAGES"
- File ${prefix}/share/locale/et/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/et/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\eu\LC_MESSAGES"
- File ${prefix}/share/locale/eu/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/eu/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\fa\LC_MESSAGES"
- File ${prefix}/share/locale/fa/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/fa/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File ${prefix}/share/locale/fi/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/fi/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File ${prefix}/share/locale/fr/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/fr/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ga\LC_MESSAGES"
- File ${prefix}/share/locale/ga/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ga/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\gl\LC_MESSAGES"
- File ${prefix}/share/locale/gl/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/gl/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\gu\LC_MESSAGES"
- File ${prefix}/share/locale/gu/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/gu/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\he\LC_MESSAGES"
- File ${prefix}/share/locale/he/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/he/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\hi\LC_MESSAGES"
- File ${prefix}/share/locale/hi/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/hi/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\hr\LC_MESSAGES"
- File ${prefix}/share/locale/hr/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/hr/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File ${prefix}/share/locale/hu/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/hu/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\hy\LC_MESSAGES"
- File ${prefix}/share/locale/hy/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/hy/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ia\LC_MESSAGES"
- File ${prefix}/share/locale/ia/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ia/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\id\LC_MESSAGES"
- File ${prefix}/share/locale/id/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/id/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\io\LC_MESSAGES"
- File ${prefix}/share/locale/io/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/io/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\is\LC_MESSAGES"
- File ${prefix}/share/locale/is/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/is/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File ${prefix}/share/locale/it/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/it/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File ${prefix}/share/locale/ja/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ja/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ka\LC_MESSAGES"
- File ${prefix}/share/locale/ka/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ka/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\kk\LC_MESSAGES"
- File ${prefix}/share/locale/kk/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/kk/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\kn\LC_MESSAGES"
- File ${prefix}/share/locale/kn/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/kn/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ko\LC_MESSAGES"
- File ${prefix}/share/locale/ko/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ko/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ku\LC_MESSAGES"
- File ${prefix}/share/locale/ku/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ku/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\li\LC_MESSAGES"
- File ${prefix}/share/locale/li/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/li/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\lt\LC_MESSAGES"
- File ${prefix}/share/locale/lt/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/lt/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\lv\LC_MESSAGES"
- File ${prefix}/share/locale/lv/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/lv/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\mai\LC_MESSAGES"
- File ${prefix}/share/locale/mai/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/mai/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\mi\LC_MESSAGES"
- File ${prefix}/share/locale/mi/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/mi/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\mk\LC_MESSAGES"
- File ${prefix}/share/locale/mk/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/mk/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ml\LC_MESSAGES"
- File ${prefix}/share/locale/ml/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ml/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\mn\LC_MESSAGES"
- File ${prefix}/share/locale/mn/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/mn/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\mr\LC_MESSAGES"
- File ${prefix}/share/locale/mr/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/mr/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ms\LC_MESSAGES"
- File ${prefix}/share/locale/ms/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ms/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\my\LC_MESSAGES"
- File ${prefix}/share/locale/my/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/my/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\nb\LC_MESSAGES"
- File ${prefix}/share/locale/nb/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/nb/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\nds\LC_MESSAGES"
- File ${prefix}/share/locale/nds/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/nds/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ne\LC_MESSAGES"
- File ${prefix}/share/locale/ne/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ne/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
- File ${prefix}/share/locale/nl/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/nl/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\nn\LC_MESSAGES"
- File ${prefix}/share/locale/nn/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/nn/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\nso\LC_MESSAGES"
- File ${prefix}/share/locale/nso/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/nso/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\oc\LC_MESSAGES"
- File ${prefix}/share/locale/oc/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/oc/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\or\LC_MESSAGES"
- File ${prefix}/share/locale/or/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/or/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\pa\LC_MESSAGES"
- File ${prefix}/share/locale/pa/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/pa/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
- File ${prefix}/share/locale/pl/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/pl/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ps\LC_MESSAGES"
- File ${prefix}/share/locale/ps/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ps/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/pt_BR/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
- File ${prefix}/share/locale/pt/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/pt/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ro\LC_MESSAGES"
- File ${prefix}/share/locale/ro/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ro/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File ${prefix}/share/locale/ru/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ru/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\rw\LC_MESSAGES"
- File ${prefix}/share/locale/rw/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/rw/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\si\LC_MESSAGES"
- File ${prefix}/share/locale/si/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/si/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File ${prefix}/share/locale/sk/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sk/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sl\LC_MESSAGES"
- File ${prefix}/share/locale/sl/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sl/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sq\LC_MESSAGES"
- File ${prefix}/share/locale/sq/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sq/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sr at ije\LC_MESSAGES"
- File ${prefix}/share/locale/sr at ije/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sr at ije/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
- File ${prefix}/share/locale/sr at latin/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sr at latin/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sr\LC_MESSAGES"
- File ${prefix}/share/locale/sr/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sr/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
- File ${prefix}/share/locale/sv/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/sv/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ta\LC_MESSAGES"
- File ${prefix}/share/locale/ta/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ta/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\te\LC_MESSAGES"
- File ${prefix}/share/locale/te/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/te/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\th\LC_MESSAGES"
- File ${prefix}/share/locale/th/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/th/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\tk\LC_MESSAGES"
- File ${prefix}/share/locale/tk/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/tk/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\tr\LC_MESSAGES"
- File ${prefix}/share/locale/tr/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/tr/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\tt\LC_MESSAGES"
- File ${prefix}/share/locale/tt/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/tt/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ug\LC_MESSAGES"
- File ${prefix}/share/locale/ug/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ug/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
- File ${prefix}/share/locale/uk/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/uk/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\ur\LC_MESSAGES"
- File ${prefix}/share/locale/ur/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/ur/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES"
- File ${prefix}/share/locale/uz at cyrillic/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/uz at cyrillic/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\uz\LC_MESSAGES"
- File ${prefix}/share/locale/uz/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/uz/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\vi\LC_MESSAGES"
- File ${prefix}/share/locale/vi/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/vi/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\wa\LC_MESSAGES"
- File ${prefix}/share/locale/wa/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/wa/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\xh\LC_MESSAGES"
- File ${prefix}/share/locale/xh/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/xh/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\yi\LC_MESSAGES"
- File ${prefix}/share/locale/yi/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/yi/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File ${prefix}/share/locale/zh_CN/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/zh_CN/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\zh_HK\LC_MESSAGES"
- File ${prefix}/share/locale/zh_HK/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/zh_HK/LC_MESSAGES/gtk30-properties.mo
- SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
- File ${prefix}/share/locale/zh_TW/LC_MESSAGES/gtk30.mo
- File ${prefix}/share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo
-
+ SetOutPath "$INSTDIR\share\locale\"
+ File /r ${prefix}/share/locale/
SetOutPath "$INSTDIR"
+#######################################
+### gtk+ win71 theme
- !insertmacro SetSourcePrefix2 gtk_ gtk+
++!insertmacro SetSourcePrefix gtk
+SetOutPath "$INSTDIR\etc\gtk-3.0"
+File ${sourceprefix}/_claws_theme/settings.ini
+SetOutPath "$INSTDIR\share\themes\win71\gtk-3.0"
+File ${sourceprefix}/_claws_theme/win71/gtk-win32-base.css
+File ${sourceprefix}/_claws_theme/win71/gtk.css
+SetOutPath "$INSTDIR"
+
#######################################
### gnutls
!insertmacro SetPrefix gnutls
@@@ -808,17 -294,12 +363,18 @@@ File ${prefix}/lib/icui18n58.dl
File ${prefix}/lib/icuuc58.dll
File ${prefix}/lib/icudata58.dll
+#######################################
+### libepoxy
+!insertmacro SetPrefix libepoxy
+SetOutPath "$INSTDIR"
+File ${prefix}/bin/libepoxy-0.dll
+
#######################################
### sqlite-autoconf
- !insertmacro SetPrefix2 sqlite_autoconf sqlite-autoconf
- SetOutPath "$INSTDIR"
+ !ifndef DISABLE_FANCY_PLUGIN
+ !insertmacro SetPrefix sqlite
File ${prefix}/bin/libsqlite3-0.dll
+ !endif
#######################################
### webkit
diff --cc src/sections-uninstaller.nsi
index 384cc91,0ecee0a..71e9f19
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@@ -154,362 -112,46 +115,111 @@@ Delete "$INSTDIR\libcurl-4.dll
### gnutls
Delete "$INSTDIR\libgnutls-30.dll"
+#######################################
+### gtk-add
+# directories "etc" and "themes" are cleaned in gtk+ section
+Delete "$INSTDIR\etc\gtk-3.0\settings.ini"
+Delete "$INSTDIR\share\themes\win71\gtk-3.0\gtk-win32-base.css"
+Delete "$INSTDIR\share\themes\win71\gtk-3.0\gtk.css"
+RMDir "$INSTDIR\share\themes\win71\gtk-3.0"
+RMDir "$INSTDIR\share\themes\win71"
+
#######################################
### gtk+
-Delete /REBOOTOK "$INSTDIR\libgdk-win32-2.0-0.dll"
-Delete /REBOOTOK "$INSTDIR\libgtk-win32-2.0-0.dll"
+Delete /REBOOTOK "$INSTDIR\libgdk-3-0.dll"
+Delete /REBOOTOK "$INSTDIR\libgtk-3-0.dll"
-Delete /REBOOTOK "$INSTDIR\libgailutil-18.dll"
-Delete "$INSTDIR\gtk-query-immodules-2.0.exe"
+Delete /REBOOTOK "$INSTDIR\libgailutil-3-0.dll"
+Delete "$INSTDIR\gtk-query-immodules-3.0.exe"
-
- Delete "$INSTDIR\gtk-update-icon-cache.exe.manifest"
Delete "$INSTDIR\gtk-update-icon-cache.exe"
- #Delete "$INSTDIR\etc\gtk-3.0\gdk-pixbuf.loaders"
- #Delete "$INSTDIR\etc\gtk-3.0\gtk.immodules"
-Delete "$INSTDIR\etc\gtk-2.0\im-multipress.conf"
-Delete "$INSTDIR\etc\gtk-2.0\gtkrc"
-RMDir "$INSTDIR\etc\gtk-2.0"
-
-Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
-Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
-RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
-RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0"
-
-Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules\libgail.dll"
-RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules"
-RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0"
+Delete "$INSTDIR\etc\gtk-3.0\im-multipress.conf"
- #Delete "$INSTDIR\etc\gtk-3.0\gtkrc"
+RMDir "$INSTDIR\etc\gtk-3.0"
- RMDir "$INSTDIR\etc"
-
- Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
- Delete "$INSTDIR\lib\gtk-2.0\2.10.0\loaders\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
-
- # Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.dll"
- # RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
- # Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.dll"
- # RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
-
- #Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.dll"
- #RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
-
- #RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
- #RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0"
-
- #Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules\*.dll"
- #RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules"
-
- #RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0"
-
- Delete "$INSTDIR\share\locale\af\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\af\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\am\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\am\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ang\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ang\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\as\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\as\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\az_IR\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\az_IR\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\az\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\az\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\be at latin\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\be at latin\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\be\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\be\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\bn_IN\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\bn_IN\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\bn\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\bn\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\br\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\br\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\bs\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\bs\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\crh\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\crh\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\cy\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\cy\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\da\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\da\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\dz\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\dz\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\el\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\el\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\en_CA\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\en_CA\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\et\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\et\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\eu\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\eu\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\fa\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\fa\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ga\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ga\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\gl\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\gl\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\gu\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\gu\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\he\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\he\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\hi\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\hi\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\hr\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\hr\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\hy\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\hy\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ia\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ia\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\io\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\io\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\is\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\is\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ka\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ka\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\kk\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\kk\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\kn\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\kn\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ko\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ko\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ku\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ku\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\li\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\li\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\lt\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\lt\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\lv\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\lv\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\mai\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\mai\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\mi\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\mi\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\mk\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\mk\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ml\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ml\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\mn\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\mn\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\mr\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\mr\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ms\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ms\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\my\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\my\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\nb\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\nb\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\nds\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\nds\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ne\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ne\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\nn\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\nn\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\nso\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\nso\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\oc\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\oc\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\or\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\or\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\pa\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\pa\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ps\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ps\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\rw\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\rw\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\si\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\si\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sl\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sl\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sq\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sq\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sr at ije\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sr at ije\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ta\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ta\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\te\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\te\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\th\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\th\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\tk\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\tk\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\tr\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\tr\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\tt\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\tt\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ug\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ug\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\ur\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\ur\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\uz\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\uz\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\vi\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\vi\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\wa\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\wa\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\xh\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\xh\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\yi\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\yi\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\zh_HK\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\zh_HK\LC_MESSAGES\gtk30-properties.mo"
- Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\gtk30.mo"
- Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\gtk30-properties.mo"
-Delete "$INSTDIR\share\themes\Default\gtk-2.0-key\gtkrc"
-RMDir "$INSTDIR\share\themes\Default\gtk-2.0-key"
+Delete "$INSTDIR\share\themes\Default\gtk-3.0\gtk-keys.css"
- RMDir "$INSTDIR\share\themes\Default\gtk-3.0"
- #Delete "$INSTDIR\share\themes\Default\gtk-2.0-key\gtkrc"
- #RMDir "$INSTDIR\share\themes\Default\gtk-2.0-key"
++RMDir "$INSTDIR\share\themes\Default\gtk-3.0"
RMDir "$INSTDIR\share\themes\Default"
-Delete "$INSTDIR\share\themes\Emacs\gtk-2.0-key\gtkrc"
-RMDir "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
+Delete "$INSTDIR\share\themes\Emacs\gtk-3.0\gtk-keys.css"
+RMDir "$INSTDIR\share\themes\Emacs\gtk-3.0"
- #Delete "$INSTDIR\share\themes\Emacs\gtk-2.0-key\gtkrc"
- #RMDir "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
RMDir "$INSTDIR\share\themes\Emacs"
- #Delete "$INSTDIR\share\themes\Raleigh\gtk-2.0\gtkrc"
- #RMDir "$INSTDIR\share\themes\Raleigh\gtk-2.0"
- #RMDir "$INSTDIR\share\themes\Raleigh"
-Delete "$INSTDIR\share\themes\Raleigh\gtk-2.0\gtkrc"
-RMDir "$INSTDIR\share\themes\Raleigh\gtk-2.0"
-RMDir "$INSTDIR\share\themes\Raleigh"
--
- #Delete "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
- #RMDir "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
- #RMDir "$INSTDIR\share\themes\MS-Windows"
-Delete "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
-RMDir "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-RMDir "$INSTDIR\share\themes\MS-Windows"
--
RMDir "$INSTDIR\share\themes"
- RMDir "$INSTDIR\share"
+#######################################
+### adwaita-icon-theme
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16\actions"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-copy.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-delete.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-find.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-redo.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-undo.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-bottom.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-down.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-next.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-previous.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-top.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-up.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\help-browser.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\image-missing.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-add.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-remove.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\system-help.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\view-refresh.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16\legacy"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\places\folder.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16\places"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-checked-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-mixed-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\checkbox-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\focus-legacy-systray-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\focus-top-bar-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\focus-windows-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\list-drag-handle-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-down-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-end-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-end-symbolic-rtl.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-start-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-start-symbolic-rtl.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\pan-up-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\radio-checked-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\radio-mixed-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\radio-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-end-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-end-symbolic-rtl.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-start-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\selection-start-symbolic-rtl.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\tab-new-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-close-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-maximize-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-minimize-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-new-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-restore-symbolic.symbolic.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16\ui"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16"
+Delete "$INSTDIR\share\icons\Adwaita\32x32\mimetypes\text-x-generic.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+RMDIR "$INSTDIR\share\icons\Adwaita\32x32"
+Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
+Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
+Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
+Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-question.png"
+Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-warning.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\256x256\legacy"
+RMDIR "$INSTDIR\share\icons\Adwaita\256x256"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-copy.cur"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-move.cur"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-none.cur"
+RMDIR "$INSTDIR\share\icons\Adwaita\cursors"
+Delete "$INSTDIR\share\icons\Adwaita\index.theme"
+RMDIR "$INSTDIR\share\icons\Adwaita"
+RMDIR "$INSTDIR\share\icons"
+
#######################################
### gdk-pixbuf
Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
commit ff4f8cf52efaa3c527de8094987ea72d5b8e9945
Author: Thorsten Maerz <info at netztorte.de>
Date: Tue May 4 12:10:49 2021 +0200
Remove autom4te.cache before aclocal/automake
The cached version numbers may be outdated,
so remove the cache before invoking autotools.
diff --git a/autogen.sh b/autogen.sh
index a449039..b24f5be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -75,6 +75,8 @@ if [ ! -d build-aux ]; then
mkdir build-aux
fi
+# autom4te.cache may contain outdated version number
+rm -rf autom4te.cache
echo "Running aclocal -I m4 -Wall..."
if ! aclocal -I m4 -Wall; then exit $?; fi
echo "Running autoconf -Wall..."
commit 64c5398655196efa566cd5a5d378823b44bf899f
Author: Thorsten Maerz <info at netztorte.de>
Date: Tue May 4 12:08:44 2021 +0200
Speed up git/tarball generation
Directly create a tarball from git checkout
(without calling autogen.sh, configure, make dist-xz).
diff --git a/packages/getgit-claws-mail.sh b/packages/getgit-claws-mail.sh
index 42bdd5d..35be003 100755
--- a/packages/getgit-claws-mail.sh
+++ b/packages/getgit-claws-mail.sh
@@ -36,22 +36,26 @@ REVISION="gtk3"
PKG_CURRENT="packages.current"
create_package () {
- local logfile="$0.log"
+ local oldpwd=$(pwd)
+ local checkout=${TMPGIT}/claws
echo "Creating tarball for Claws-Mail REVISION=${REVISION:-(unset)} in $TMPGIT"
- echo "This may take a while, output is redirected to $logfile"
- [ -e "$logfile" ] && rm "$logfile"
- git clone https://git.claws-mail.org/readonly/claws.git "$TMPGIT" > "$logfile" 2>&1
- ( cd "$TMPGIT" ;
- [ -z "$REVISION" ] || git checkout $REVISION
- GTK_CFLAGS="dummy" GTK_LIBS="dummy" \
- NETTLE_CFLAGS="dummy" NETTLE_LIBS="dummy" \
- ./autogen.sh --disable-libetpan --disable-gnutls \
- && make dist-xz) > "$logfile" 2>&1
- local pkgtmp=$(ls "$TMPGIT"/claws-mail-*.tar.xz)
- PKGNAME=$(basename "$pkgtmp")
- cp "$pkgtmp" .
+ git clone --progress https://git.claws-mail.org/readonly/claws.git "$checkout"
+ cd $checkout
+ [ -z "$REVISION" ] || git checkout $REVISION
+ echo "Creating version file"
+ local git_version=$(git describe --abbrev=6 --dirty --always)
+ local pkg_version=${git_version%-*}
+ pkg_version=${pkg_version/-/git}
+ echo "echo $git_version" > ./version
+ cd ..
+ local pkg_basename=claws-mail-$pkg_version
+ mv claws $pkg_basename
+ PKGNAME=${pkg_basename}.tar.xz
+ echo "Creating tarball: $PKGNAME"
+ tar -caf ${oldpwd}/${PKGNAME} $pkg_basename
echo "Created $PKGNAME"
rm -rf "$TMPGIT"
+ cd $oldpwd
}
remove_old_packages () {
commit 9543ffd932c2648bcd54329fe78a0b5391836172
Author: Thorsten Maerz <info at netztorte.de>
Date: Tue May 4 06:57:08 2021 +0200
Remove stray lines from commit c4e6c459
diff --git a/packages/packages.current b/packages/packages.current
index 8a57246..a67979f 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,30 +17,6 @@
server https://www.claws-mail.org/releases
-file claws-mail-3.99.0git87.tar.xz
-chk 57ae88c0deaa1645305e2f343492fb5795c0be100fc3123d5246b0f863df77a0
-
-#file claws-mail-3.99.0git105.tar.xz
-#chk a1991e513622ed37575d7f40c2993aec180a9b1e2949a2f42dcfe3bc3196a0f1
-
-#file claws-mail-3.99.0git102.tar.xz
-#chk eb9d2cc5a3388022a9ceb41c09b58c48ffc0160f2772d61223ba5fb7c7536de4
-
-#file claws-mail-3.99.0git88.tar.xz
-#chk f07ef7daa3703fa9ad36dee75818a57f525b88a321445900e3ab7052d1f6c4cd
-
-#file claws-mail-3.99.0git82.tar.xz
-#chk dbb42b0bc99468e3eb11c9bbd2255806653e263c2bef61902b9f8595821e4e57
-
-#file claws-mail-3.99.0git74.tar.xz
-#chk d50e6336c5cab3bc3119c7c4842742f7442859c368f7acc358c018ad6aab8d45
-
-#file claws-mail-3.99.0git70.tar.xz
-#chk 4eda0fb1345ff11da3d0aec78e801ccda880b28b6f970e8ba217a9c05eb382e7
-
-#file claws-mail-3.99.0git65.tar.xz
-#chk b5470d5bb41f5851a86f6dfe8573c52ec0b0a7e68d28d62a9118024b064a033e
-
# file and checksum will be added by getgit-claws-mail.sh / download.sh
#file claws-mail-3.17.8.tar.xz
commit b30fdb410e55f677ae45e40e6c94baef7fbfb570
Merge: c95b79e e8b1116
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun May 2 11:12:36 2021 +0200
Merge branch 'master' into gtk3
Re-added "bpdir" to src/claws-mail.nsi
(required for building win71 theme)
diff --cc Makefile.am
index 24e980e,5b2ab4f..7ea9cd8
--- a/Makefile.am
+++ b/Makefile.am
@@@ -28,8 -26,16 +26,17 @@@ SUBDIRS = po sr
# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
EXTRA_DIST = autogen.sh \
- configure.ac.template \
- doc/license-page doc/GPLv3 \
+ doc/GPLv3 \
+ doc/license-page \
+ doc/logo/claws-mail-nsis-header-install-150x57.bmp \
+ doc/logo/claws-mail-nsis-header-uninstall-150x57.bmp \
+ doc/logo/claws-mail-nsis-install.ico \
+ doc/logo/claws-mail-nsis-uninstall.ico \
+ doc/logo/claws-mail-nsis-wizard-install-164x314.bmp \
+ doc/logo/claws-mail-nsis-wizard-uninstall-164x314.bmp \
+ packages/download.sh \
++ packages/getgit-claws-mail.sh \
+ packages/packages.current \
patches/atk-2.36.0/01-meson-build.patch \
patches/bzip2-1.0.8/01-g10-bzlib_h.patch \
patches/bzip2-1.0.8/02-g10-Makefile.patch \
@@@ -43,23 -52,8 +50,22 @@@
patches/cyrus-sasl-2.1.27/99-reautomagic.patch \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
- patches/gtk+-2.24.33/01-no-tests-demos.patch \
+ patches/gtk+/50-win71-theme-prepare.patch \
+ patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
+ patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch \
+ patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch \
+ patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch \
+ patches/gtk+/55-win32-theme-make-separator-visible-again.patch \
+ patches/gtk+/57-win32-theme-Draw-expander-arrow.patch \
+ patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch \
+ patches/gtk+/62-win32-theme-Draw-menu-separator.patch \
+ patches/gtk+/63-win32-theme-Native-treeview-expander.patch \
+ patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch \
+ patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch \
+ patches/gtk+/66-win32-theme-Native-combobox-height.patch \
+ patches/gtk+/67-win32-theme-Credits.patch \
+ patches/gtk+/69-win71-theme-finalize.patch \
patches/gumbo-parser-0.10.1/99-autotools.patch \
- patches/harfbuzz-2.6.7/01-no-tests-utils-docs.patch \
patches/hunspell-1.7.0/99-autoreconf.patch \
patches/icu4c-58_3-src/01-libnames.patch \
patches/icu4c-58_3-src/02-float128-clang.patch \
diff --cc autogen.sh
index 1a21ef3,f628bc8..a449039
--- a/autogen.sh
+++ b/autogen.sh
@@@ -11,278 -11,84 +11,111 @@@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- configure_ac="configure.ac"
-
- if [ $# -eq 0 ]; then
- clawspkg=$(ls -1 packages/claws-mail-*.*.*.tar.* | head -n 1)
- if [ -z "${clawspkg}" ]; then
- echo "No Claws Mail source tarball found in packages/ dir, exiting..."
- exit 1
- fi
- clawspkg=$(basename ${clawspkg})
- clawsver=$(echo ${clawspkg} | sed 's/claws-mail-\(.*\)\.tar\..*/\1/')
- clawsver_nogit=$(echo $clawsver | sed 's/git.*//')
-
- gitrev=""
- gitsed=""
- if [ "$clawsver" != "$clawsver_nogit" ]; then
- echo "Building a git snapshot of Claws Mail."
- gitrev=$(echo $clawsver | sed 's/.*\(git.*\)/\1/')
- gitsed="s/^m4_define(\[my_release\].*/m4_define([my_release], [99])/"
- fi
-
- sed \
- -e "s/^m4_define(\[my_version\].*/m4_define([my_version], [$clawsver_nogit])/" \
- -e "s/^m4_define(\[my_gitrev\].*/m4_define([my_gitrev], [$gitrev])/" \
- -e "$gitsed" \
- ${configure_ac}.template >${configure_ac}
- touch stamp-autogen-1stpass
- fi
-
- cvtver () {
- awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}'
- }
-
- check_version () {
- if [ `("$1" --version || echo "0") | cvtver` -ge "$2" ]; then
- return 0
- fi
- echo "**Error**: "\`$1\'" not installed or too old." >&2
- echo ' Version '$3' or newer is required.' >&2
- [ -n "$4" ] && echo ' Note that this is part of '\`$4\''.' >&2
- DIE="yes"
- return 1
- }
-
+check_compiler () {
+ warn=""
+ for prefix in x86_64-w64-mingw32 i686-w64-mingw32 i586-mingw32msvc \
+ i386-mingw32msvc mingw32 ; do
+ if which $prefix-gcc > /dev/null ; then
+ ver=$($prefix-gcc -dumpversion|cut -d "." -f 1)
+ if test "$ver" -gt 8 ; then
+ warn=" $prefix-gcc $ver\n$warn"
+ fi
+ fi
+ done
+ if [ -n "$warn" ] ; then
+ echo
+ echo "Warning: Unrecommended gcc version found on your system!"
+ echo "For building releases, MinGW gcc-8 should be used."
+ echo "Using gcc-9 currently produces less hardened binaries."
+ echo "Following unrecommended versions have been found:"
+ echo "$warn"
+ echo "To use gcc-9, please remove the \".off\" extension from"
+ echo "./patches/cairo-1.17.4/01-nofortify-hack.patch.off"
+ return 1
+ else
+ return 0
+ fi
+}
+
- # Allow to override the default tool names
- AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
- AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
+ win_rel=1
+ tsdir="$(readlink -f $(dirname $0))"
- AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
- ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
-
- DIE=no
- FORCE=
- if test x"$1" = x"--force"; then
- FORCE=" --force"
- shift
+ claws_pkg=$(ls -1 packages/claws-mail-*.*.*.tar.* | head -n 1)
+ if [ -z "${claws_pkg}" ]; then
+ echo "No Claws Mail source tarball found in packages/ dir, exiting..."
+ exit 1
fi
- # Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces
- # as unsafe because it is too easy to get scripts wrong in this regard.
- am_lf='
- '
- case `pwd` in
- *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe working directory name"; DIE=yes;;
- esac
- case $tsdir in
- *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe source directory: \`$tsdir'"; DIE=yes;;
- esac
- case $HOME in
- *[\;\\\"\#\$\&\'\`$am_lf\ \ ]*)
- echo "unsafe home directory: \`$HOME'"; DIE=yes;;
- esac
- if test "$DIE" = "yes"; then
- exit 1
+ claws_full_ver=$(basename ${claws_pkg} | sed 's/claws-mail-\(.*\)\.tar\..*/\1/')
+ claws_base_ver=$(echo ${claws_full_ver} | sed 's/git.*//')
+
+ if [ "$claws_full_ver" != "$claws_base_ver" ]; then
+ echo "Building a git snapshot of Claws Mail."
+ git_revision=$(echo ${claws_full_ver} | sed 's/.*\(git.*\)/\1/')
+ win_rel=99
+ else
+ git_revision=""
fi
- # Begin list of optional variables sourced from ~/.gnupg-autogen.rc
- w32_toolprefixes=
- w32_extraoptions=
- w64_toolprefixes=
+ printf "%s\n" "${claws_base_ver}" > ${tsdir}/VERSION
+ printf "%s\n" "${win_rel}" >> ${tsdir}/VERSION
+ printf "%s\n" "${git_revision}" >> ${tsdir}/VERSION
+
+ # Reject unsafe characters in $tsdir and cwd. We consider spaces as unsafe
+ # because it is too easy to get scripts wrong in this regard.
+ if [ "$tsdir" != "$(echo $tsdir | tr -d -c '[A-Za-z0-9/\-_.]')" ]; then
+ printf "unsafe source directory: \"%s\"\n" "$tsdir"
+ exit 1
+ elif [ "$(pwd)" != "$(pwd | tr -d -c '[A-Za-z0-9/\-_.]')" ]; then
+ printf "unsafe working directory: \"%s\"\n" "$(pwd)"
+ exit 1
+ fi
- if [ -f "$HOME/.gnupg-autogen.rc" ]; then
- echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
- . "$HOME/.gnupg-autogen.rc"
+ if [ ! -d build-aux ]; then
+ mkdir build-aux
fi
+ echo "Running aclocal -I m4 -Wall..."
+ if ! aclocal -I m4 -Wall; then exit $?; fi
+ echo "Running autoconf -Wall..."
+ if ! autoconf -Wall; then exit $?; fi
+ echo "Running autoheader -Wall..."
+ if ! autoheader -Wall; then exit $?; fi
+ echo "Running automake --gnu -Wall -Wno-portability --add-missing --copy ..."
+ if ! automake --gnu -Wall -Wno-portability --add-missing --copy; then exit $?; fi
# Convenience option to use certain configure options for some hosts.
- myhost=""
case "$1" in
- --build-w32)
- myhost="w32"
- shift
- ;;
- --build-w64)
- myhost="w64"
- shift
- ;;
- --build*)
- echo "**Error**: invalid build option $1" >&2
- shift
- exit 1
- ;;
- *)
- ;;
+ --build-w32)
+ host_triplet="i686-w64-mingw32"
+ shift
+ ;;
+ --build-w64)
+ host_triplet="x86_64-w64-mingw32"
+ shift
+ ;;
+ "")
+ host_triplet="x86_64-w64-mingw32"
+ ;;
+ *)
+ echo "**Error**: invalid build option $1" >&2
+ exit 1
+ ;;
esac
-
- # ***** Windows build script *******
- # Used to cross-compile for Windows.
- if [ "$myhost" = "w32" ]; then
- toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
- toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
- extraoptions="$w32_extraoptions"
- elif [ "$myhost" = "w64" ]; then
- toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
- extraoptions="$w64_extraoptions"
- fi
-
- if [ -n "$myhost" ]; then
- if [ ! -f stamp-autogen-1stpass ]; then
- echo "You need to succesfully run autogen.sh with no parameters first..."
- exit 1
- fi
- tmp=`dirname $0`
- tsdir=`cd "$tmp"; pwd`
- if [ ! -f $tsdir/config.guess ]; then
- echo "$tsdir/config.guess not found" >&2
- exit 1
- fi
- build=`$tsdir/config.guess`
-
- # Locate the cross compiler
- crossbindir=
- for host in $toolprefixes; do
- if ${host}-gcc --version >/dev/null 2>&1 ; then
- crossbindir=/usr/${host}/bin
- conf_CC="CC=${host}-gcc"
- break;
- fi
- done
-
- if [ -z "$crossbindir" ]; then
- echo "Cross compiler kit not installed" >&2
- echo "Under Debian GNU/Linux Jessie and later, you may install it using" >&2
- echo " apt-get install mingw-w64" >&2
- echo "Stop." >&2
- exit 1
- fi
-
- if [ -f "$tsdir/config.log" ]; then
- if ! head $tsdir/config.log | grep "$host" >/dev/null; then
- echo "Pease run a 'make distclean' first" >&2
- exit 1
- fi
- fi
-
- $tsdir/configure --host=${host} --build=${build} --enable-maintainer-mode \
- ${extraoptions} "$@"
- rc=$?
- exit $rc
- fi
- # ***** end Windows build script *******
-
-
- # Grep the required versions from configure.ac
- autoconf_vers=`sed -n '/^AC_PREREQ(/ {
- s/^.*(\(.*\))/\1/p
- q
- }' ${configure_ac}`
- autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
-
- automake_vers=`sed -n '/^min_automake_version=/ {
- s/^.*="\(.*\)"/\1/p
- q
- }' ${configure_ac}`
- automake_vers_num=`echo "$automake_vers" | cvtver`
-
-
- if [ -z "$autoconf_vers" -o -z "$automake_vers" ]
- then
- echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
- exit 1
- fi
-
-
- if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
- check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
- fi
- if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
- check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
- fi
-
- if test "$DIE" = "yes"; then
- cat <<EOF
-
- Note that you may use alternative versions of the tools by setting
- the corresponding environment variables; see README.SVN for details.
-
- EOF
- exit 1
- fi
-
- # Check the git setup.
- if [ -d .git ]; then
- if [ -f build-aux/git-hooks/pre-commit -a ! -x .git/hooks/pre-commit ];then
- cat <<EOF >&2
- *** Activating trailing whitespace git pre-commit hook. ***
- For more information see this thread:
- http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
- To deactivate this pre-commit hook again move .git/hooks/pre-commit
- and .git/hooks/pre-commit.sample out of the way.
- EOF
- cp -av build-aux/git-hooks/pre-commit .git/hooks/pre-commit
- chmod -c +x .git/hooks/pre-commit
- fi
- tmp=$(git config --get filter.cleanpo.clean)
- if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
- then
- echo "*** Adding GIT filter.cleanpo.clean configuration." >&2
- git config --add filter.cleanpo.clean \
- "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
- fi
- if [ -f build-aux/git-hooks/commit-msg -a ! -x .git/hooks/commit-msg ];then
- cat <<EOF >&2
- *** Activating commit log message check hook. ***
- EOF
- cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
- chmod -c +x .git/hooks/commit-msg
- fi
+ if [ -f "$tsdir/config.log" ]; then
+ if ! head $tsdir/config.log | grep "$host_triplet" >/dev/null; then
+ echo "Please run a 'make distclean' first" >&2
+ exit 1
+ fi
fi
+ build=$($tsdir/build-aux/config.guess)
- echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
- $ACLOCAL -I m4 $ACLOCAL_FLAGS
- echo "Running autoheader..."
- $AUTOHEADER
- echo "Running automake --gnu ..."
- $AUTOMAKE --gnu -Wno-portability;
- echo "Running autoconf${FORCE} ..."
- $AUTOCONF${FORCE}
+ echo "Running configure --host=${host_triplet} --build=${build} --enable-maintainer-mode $@"
+ if ! $tsdir/configure --host=${host_triplet} --build=${build} --enable-maintainer-mode "$@"; then exit $?; fi
- echo
- echo "You may now run ./autogen.sh with --build-w32 or --build-w64 switch,"
- echo "followed by \"make\"."
+ echo "You may now run make."
echo
+check_compiler
diff --cc configure.ac
index d652533,19c07fd..001f9ae
--- a/configure.ac
+++ b/configure.ac
@@@ -295,26 -265,22 +265,25 @@@ CM_SPKG([libpsl], [icu4c]
CM_SPKG([libsoup], [gnutls libxml2 glib-networking sqlite-autoconf libpsl])
CM_SPKG([libwebp], [zlib libpng jpeg])
CM_SPKG([icu4c])
+CM_SPKG([libepoxy])
CM_SPKG([harfbuzz], [glib cairo icu4c])
CM_SPKG([pango], [harfbuzz fontconfig glib cairo fribidi])
-CM_SPKG([gtk+], [libiconv gettext atk pango glib gdk-pixbuf cairo])
-CM_SPKG([webkitgtk], [jpeg libpng glib gtk+ libsoup libxml2 libxslt libwebp icu4c harfbuzz])
+CM_SPKG([gtk+], [libiconv gettext atk pango glib gdk-pixbuf cairo libepoxy])
+CM_SPKG([adwaita-icon-theme])
+#CM_SPKG([webkitgtk], [jpeg libpng glib gtk+ libsoup libxml2 libxslt libwebp icu4c harfbuzz])
- CM_SPKG([curl], [zlib gnutls])
+ CM_SPKG([curl], [zlib gnutls libpsl])
CM_SPKG([cyrus-sasl])
CM_SPKG([libetpan], [gnutls cyrus-sasl])
- CM_BPKG_GNUWIN32([bsfilter])
- CM_SPKG([libical])
+ CM_SPKG([bsfilter])
+ CM_SPKG([libical], [icu4c])
CM_SPKG([ytnef])
CM_SPKG([gumbo-parser])
CM_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng enchant glib dnl
gpgme regex libetpan gnutls ytnef gumbo-parser dnl
- libxml2 expat webkitgtk curl libical nettle])
+ libxml2 expat curl libical nettle])
+# TODO: add webkitgtk2 as claws-mail dependency
-
- CM_FINALIZE
+ CM_CHECK_DEPS
# Throw an error if required tools are missing
if test -n "$missing_tools"; then
diff --cc packages/packages.current
index 57975cc,15b6c99..8a57246
--- a/packages/packages.current
+++ b/packages/packages.current
@@@ -170,20 -140,17 +165,20 @@@ chk ac6ce1e1fbd4d0254c4ddb9d37f1fa99
#
server https://download.gnome.org/sources
- file glib/2.66/glib-2.66.7.tar.xz
- chk 09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
+ file glib/2.66/glib-2.66.8.tar.xz
+ chk 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
-file gtk+/2.24/gtk+-2.24.33.tar.xz
-chk ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da
+file libepoxy/1.5/libepoxy-1.5.5.tar.xz
+chk 261663db21bcc1cc232b07ea683252ee6992982276536924271535875f5b0556
+
+file gtk+/3.24/gtk+-3.24.27.tar.xz
+chk f71c067570339f9f8efac7bb87717a2c52279cb50223fb8b5ba7085930757a26
- file gdk-pixbuf/2.42/gdk-pixbuf-2.42.2.tar.xz
- chk 83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15
+ file gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz
+ chk fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d
- file pango/1.47/pango-1.47.0.tar.xz
- chk 730db8652fc43188e03218c3374db9d152351f51fc7011b9acae6d0a6c92c367
+ file pango/1.48/pango-1.48.4.tar.xz
+ chk 418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a
file atk/2.36/atk-2.36.0.tar.xz
chk fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788
diff --cc src/Makefile.am
index 2bb4801,1efd841..e5d7bbe
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -48,45 -52,8 +53,10 @@@ cm_spkgs = glib libffi gdk-pixbuf gtk+
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
- cm_pkg_adwait_icon_theme_make_args = -j$(NUMPROC)
- cm_pkg_harfbuzz_make_args = -j$(NUMPROC)
- cm_pkg_freetype_make_args = -j$(NUMPROC)
- cm_pkg_fontconfig_make_args = -j$(NUMPROC)
- cm_pkg_libgpg_error_make_args = -j$(NUMPROC)
- cm_pkg_gpgme_make_args = -j$(NUMPROC)
- cm_pkg_expat_make_args = -j$(NUMPROC)
- cm_pkg_libpng_make_args = -j$(NUMPROC)
- cm_pkg_enchant_make_args = -j$(NUMPROC)
- cm_pkg_hunspell_make_args = -j$(NUMPROC)
- cm_pkg_libtasn1_make_args = -j$(NUMPROC)
- cm_pkg_curl_make_args = -j$(NUMPROC)
- cm_pkg_libxslt_make_args = -j$(NUMPROC)
- cm_pkg_libxml2_make_args = -j$(NUMPROC)
- cm_pkg_libetpan_make_args = -j$(NUMPROC)
- cm_pkg_claws_mail_make_args = -j$(NUMPROC)
- cm_pkg_libassuan_make_args = -j$(NUMPROC)
- cm_pkg_w32pth_make_args = -j$(NUMPROC)
- cm_pkg_jpeg_make_args = -j$(NUMPROC)
- cm_pkg_sqlite_autoconf_make_args = -j$(NUMPROC)
- cm_pkg_libwebp_make_args = -j$(NUMPROC)
- cm_pkg_icu4c_make_args = -j$(NUMPROC)
- cm_pkg_gmp_make_args = -j$(NUMPROC)
- cm_pkg_nettle_make_args = -j$(NUMPROC)
- cm_pkg_cairo_make_args = -j$(NUMPROC)
- cm_pkg_cyrus_sasl_make_args = -j$(NUMPROC)
- cm_pkg_libical_make_args = -j$(NUMPROC)
- cm_pkg_ytnef_make_args = -j$(NUMPROC)
- cm_pkg_gumbo_parser_make_args = -j$(NUMPROC)
- cm_pkg_libffi_make_args = -j$(NUMPROC)
- cm_pkg_gnutls_make_args = -j$(NUMPROC)
- cm_pkg_libiconv_make_args = -j$(NUMPROC)
- cm_pkg_regex_make_args = -j$(NUMPROC)
- cm_pkg_gettext_make_args = -j$(NUMPROC)
-
cm_pkg_libical_cmake = yes
+cm_pkg_gtk__meson = yes
+cm_pkg_libepoxy_meson = yes
cm_pkg_atk_meson = yes
cm_pkg_glib_meson = yes
cm_pkg_pixman_meson = yes
@@@ -125,33 -92,26 +95,35 @@@ cm_pkg_gdk_pixbuf_meson_cppflags = -I$(
cm_pkg_gdk_pixbuf_meson_ldflags = -L$(idir)/lib
cm_pkg_gtk__configure = \
- --with-gdktarget=win32 \
- --with-included-immodules \
- --disable-cups \
- --disable-gtk-doc \
- --disable-static \
- --disable-glibtest \
- CPPFLAGS=-I$(idir)/include LDFLAGS=\"-L$(idir)/lib\"
+ -Dx11_backend=false \
+ -Dwin32_backend=true \
+ -Dtests=false \
+ -Dintrospection=false
+cm_pkg_gtk__meson_cppflags = -I$(idir)/include
+cm_pkg_gtk__meson_ldflags = -L$(idir)/lib
+
+#cm_pkg_adwaita_icon_theme_configure =
+
+cm_pkg_libepoxy_configure = \
+ -Dglx=no \
+ -Degl=no \
+ -Dx11=false \
+ -Dtests=false
+cm_pkg_libepoxy_meson_cppflags = -I$(idir)/include
+cm_pkg_libepoxy_meson_ldflags = -L$(idir)/lib
cm_pkg_harfbuzz_configure = \
- --disable-gtk-doc-html \
- --with-glib \
- --with-gobject \
- --with-fontconfig \
- --with-freetype \
- --with-cairo \
- --with-icu=yes \
- CPPFLAGS=\"-I$(idir)/include\" \
- LDFLAGS=\"-L$(idir)/lib\" LIBS=\"-lpthread\"
+ -Ddocs=disabled \
+ -Dglib=enabled \
+ -Dgobject=enabled \
+ -Dfontconfig=enabled \
+ -Dfreetype=enabled \
+ -Dcairo=enabled \
+ -Dicu=enabled \
+ -Dintrospection=disabled \
+ -Dtests=disabled
+ cm_pkg_harfbuzz_meson_cppflags = -I$(idir)/include
+ cm_pkg_harfbuzz_meson_ldflags = -L$(idir)/lib
cm_pkg_freetype_configure = \
--with-png --without-bzip2 --with-zlib \
diff --cc src/claws-mail.nsi
index 99b3234,d8d1f24..abbd4d7
--- a/src/claws-mail.nsi
+++ b/src/claws-mail.nsi
@@@ -19,9 -19,8 +19,9 @@@ RequestExecutionLevel admi
# Directories where the compiled components are installed
!define ipdir "playground/install/pkgs"
+!define bpdir "playground/build"
- SetCompressor /SOLID lzma
+ SetCompressor /SOLID ${NSIS_COMPRESSOR}
# We use Memento to remember past installation choices.
!include "Memento.nsh"
diff --cc src/config.nsi.in
index c27aaed,f3a0c0e..3dd09ce
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@@ -31,191 -33,58 +33,60 @@@
# DLL filenames which change between i686 and x86_64
!define gpg_dll_num @gpg_dll_num@
+ !define gcc_dir @gcc_dir@
!define libgcc_dll @libgcc_dll@
- !define w64 @w64@
-
- !define build @build_cpu at -@build_os@
- !define host @host_cpu at -@host_os@
- !define MAKE @MAKE@
- !define UNZIP @UNZIP@
- !define TAR @TAR@
- !define MKDIR @MKDIR@
- !define CP @CP@
- !define RM @RM@
- !define STOW @STOW@
- !define INSTALL "@INSTALL@"
- !define WGET @WGET@
-
- !define DOSLF "\r\n"
-
- # The package build list, in order.
- !define cm_build_list "@cm_build_list@"
-
-
- # The default packages source directory.
- !define cm_packages @cm_packages@
-
-
- # The path of each package.
+ !define libstdcpp_dll @libstdcpp_dll@
+ !define libwinpthread_dir @libwinpthread_dir@
+ !define libwinpthread_dll @libwinpthread_dll@
+ !define nsis64 @nsis64@
- !define cm_pkg_libgpg_error @cm_pkg_libgpg_error@
+ # The version of each package.
!define cm_pkg_libgpg_error_version @cm_pkg_libgpg_error_version@
-
- !define cm_pkg_w32pth @cm_pkg_w32pth@
!define cm_pkg_w32pth_version @cm_pkg_w32pth_version@
-
- !define cm_pkg_libassuan @cm_pkg_libassuan@
!define cm_pkg_libassuan_version @cm_pkg_libassuan_version@
-
- !define cm_pkg_gpgme @cm_pkg_gpgme@
!define cm_pkg_gpgme_version @cm_pkg_gpgme_version@
-
- !define cm_pkg_libtasn1 @cm_pkg_libtasn1@
!define cm_pkg_libtasn1_version @cm_pkg_libtasn1_version@
-
- !define cm_pkg_gmp @cm_pkg_gmp@
!define cm_pkg_gmp_version @cm_pkg_gmp_version@
-
- !define cm_pkg_nettle @cm_pkg_nettle@
!define cm_pkg_nettle_version @cm_pkg_nettle_version@
-
- !define cm_pkg_pixman @cm_pkg_pixman@
!define cm_pkg_pixman_version @cm_pkg_pixman_version@
-
- !define cm_pkg_cairo @cm_pkg_cairo@
!define cm_pkg_cairo_version @cm_pkg_cairo_version@
-
- !define cm_pkg_gnutls @cm_pkg_gnutls@
!define cm_pkg_gnutls_version @cm_pkg_gnutls_version@
-
- !define cm_pkg_curl @cm_pkg_curl@
!define cm_pkg_curl_version @cm_pkg_curl_version@
-
- !define cm_pkg_libxml2 @cm_pkg_libxml2@
!define cm_pkg_libxml2_version @cm_pkg_libxml2_version@
-
- !define cm_pkg_libxslt @cm_pkg_libxslt@
!define cm_pkg_libxslt_version @cm_pkg_libxslt_version@
-
- !define cm_pkg_cyrus_sasl @cm_pkg_cyrus_sasl@
!define cm_pkg_cyrus_sasl_version @cm_pkg_cyrus_sasl_version@
-
- !define cm_pkg_libetpan @cm_pkg_libetpan@
!define cm_pkg_libetpan_version @cm_pkg_libetpan_version@
-
- !define cm_pkg_regex @cm_pkg_regex@
!define cm_pkg_regex_version @cm_pkg_regex_version@
-
- !define cm_pkg_crypt @cm_pkg_crypt@
- !define cm_pkg_crypt_version @cm_pkg_crypt_version@
-
- !define cm_pkg_claws_mail @cm_pkg_claws_mail@
!define cm_pkg_claws_mail_version @cm_pkg_claws_mail_version@
-
- !define cm_pkg_libwebp @cm_pkg_libwebp@
!define cm_pkg_libwebp_version @cm_pkg_libwebp_version@
-
- !define cm_pkg_sqlite_autoconf @cm_pkg_sqlite_autoconf@
!define cm_pkg_sqlite_autoconf_version @cm_pkg_sqlite_autoconf_version@
-
- !define cm_pkg_icu4c @cm_pkg_icu4c@
!define cm_pkg_icu4c_version @cm_pkg_icu4c_version@
-
- !define cm_pkg_libepoxy @cm_pkg_libepoxy@
-!define cm_pkg_webkitgtk_version @cm_pkg_webkitgtk_version@
+!define cm_pkg_libepoxy_version @cm_pkg_libepoxy_version@
-
- #!define cm_pkg_webkitgtk @cm_pkg_webkitgtk@
+#!define cm_pkg_webkitgtk_version @cm_pkg_webkitgtk_version@
-
- !define cm_pkg_jpeg @cm_pkg_jpeg@
!define cm_pkg_jpeg_version @cm_pkg_jpeg_version@
-
- !define cm_pkg_glib_networking @cm_pkg_glib_networking@
!define cm_pkg_glib_networking_version @cm_pkg_glib_networking_version@
-
- !define cm_pkg_libpsl @cm_pkg_libpsl@
!define cm_pkg_libpsl_version @cm_pkg_libpsl_version@
-
- !define cm_pkg_libsoup @cm_pkg_libsoup@
!define cm_pkg_libsoup_version @cm_pkg_libsoup_version@
-
- !define cm_pkg_bsfilter @cm_pkg_bsfilter@
!define cm_pkg_bsfilter_version @cm_pkg_bsfilter_version@
- !define cm_pkg_bsfilter_src @cm_pkg_bsfilter_src@
-
- !define cm_pkg_zlib @cm_pkg_zlib@
!define cm_pkg_zlib_version @cm_pkg_zlib_version@
-
- !define cm_pkg_bzip2 @cm_pkg_bzip2@
!define cm_pkg_bzip2_version @cm_pkg_bzip2_version@
-
- !define cm_pkg_libpng @cm_pkg_libpng@
!define cm_pkg_libpng_version @cm_pkg_libpng_version@
-
- !define cm_pkg_hunspell @cm_pkg_hunspell2
!define cm_pkg_hunspell_version @cm_pkg_hunspell_version@
-
- !define cm_pkg_enchant @cm_pkg_enchant@
!define cm_pkg_enchant_version @cm_pkg_enchant_version@
-
- !define cm_pkg_pkgconfig @cm_pkg_pkgconfig@
- !define cm_pkg_pkgconfig_version @cm_pkg_pkgconfig_version@
- !define cm_pkg_pkgconfig_src @cm_pkg_pkgconfig_src@
-
- !define cm_pkg_glib @cm_pkg_glib@
!define cm_pkg_glib_version @cm_pkg_glib_version@
-
- !define cm_pkg_gdk_pixbuf @cm_pkg_gdk_pixbuf@
!define cm_pkg_gdk_pixbuf_version @cm_pkg_gdk_pixbuf_version@
-
- !define cm_pkg_libffi @cm_pkg_libffi@
!define cm_pkg_libffi_version @cm_pkg_libffi_version@
-
- !define cm_pkg_expat @cm_pkg_expat@
!define cm_pkg_expat_version @cm_pkg_expat_version@
-
- !define cm_pkg_harfbuzz @cm_pkg_harfbuzz@
!define cm_pkg_harfbuzz_version @cm_pkg_harfbuzz_version@
-
- !define cm_pkg_atk @cm_pkg_atk@
!define cm_pkg_atk_version @cm_pkg_atk_version@
-
- !define cm_pkg_freetype @cm_pkg_freetype@
!define cm_pkg_freetype_version @cm_pkg_freetype_version@
-
- !define cm_pkg_fontconfig @cm_pkg_fontconfig@
!define cm_pkg_fontconfig_version @cm_pkg_fontconfig_version@
-
- !define cm_pkg_fribidi @cm_pkg_fribidi@
!define cm_pkg_fribidi_version @cm_pkg_fribidi_version@
-
- !define cm_pkg_pango @cm_pkg_pango@
!define cm_pkg_pango_version @cm_pkg_pango_version@
-
- !define cm_pkg_gtk_ @cm_pkg_gtk_@
!define cm_pkg_gtk__version @cm_pkg_gtk__version@
- !define cm_pkg_gtk__dev @cm_pkg_gtk__dev@
- !define cm_pkg_gtk__src @cm_pkg_gtk__src@
-
- !define cm_pkg_adwaita_icon_theme @cm_pkg_adwaita_icon_theme@
+!define cm_pkg_adwaita_icon_theme_version @cm_pkg_adwaita_icon_theme_version@
-
- !define cm_pkg_libiconv @cm_pkg_libiconv@
!define cm_pkg_libiconv_version @cm_pkg_libiconv_version@
- !define cm_pkg_libiconv_src @cm_pkg_libiconv_src@
-
- !define cm_pkg_gettext @cm_pkg_gettext@
!define cm_pkg_gettext_version @cm_pkg_gettext_version@
- !define cm_pkg_gettext_src @cm_pkg_gettext_src@
-
- !define cm_pkg_libical @cm_pkg_libical@
!define cm_pkg_libical_version @cm_pkg_libical_version@
- !define cm_pkg_libical_src @cm_pkg_libical_src@
-
- !define cm_pkg_ytnef @cm_pkg_ytnef@
!define cm_pkg_ytnef_version @cm_pkg_ytnef_version@
- !define cm_pkg_ytnef_src @cm_pkg_ytnef_src@
-
- !define cm_pkg_gumbo_parser @cm_pkg_gumbo_parser@
!define cm_pkg_gumbo_parser_version @cm_pkg_gumbo_parser_version@
- !define cm_pkg_gumbo_parser_src @cm_pkg_gumbo_parser_src@
commit c95b79e755beeb4631d08b81f31d3d4f708ac1da
Author: Thorsten Maerz <info at netztorte.de>
Date: Thu Apr 29 11:10:15 2021 +0200
Win32 theme: Use native combobox height
diff --git a/Makefile.am b/Makefile.am
index 45aaa99..24e980e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ EXTRA_DIST = autogen.sh \
patches/cyrus-sasl-2.1.27/99-reautomagic.patch \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
- patches/gtk+/50-win71-theme-init.patch \
+ patches/gtk+/50-win71-theme-prepare.patch \
patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch \
patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch \
@@ -55,7 +55,8 @@ EXTRA_DIST = autogen.sh \
patches/gtk+/63-win32-theme-Native-treeview-expander.patch \
patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch \
patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch \
- patches/gtk+/66-win32-theme-Credits.patch \
+ patches/gtk+/66-win32-theme-Native-combobox-height.patch \
+ patches/gtk+/67-win32-theme-Credits.patch \
patches/gtk+/69-win71-theme-finalize.patch \
patches/gumbo-parser-0.10.1/99-autotools.patch \
patches/harfbuzz-2.6.7/01-no-tests-utils-docs.patch \
diff --git a/patches/gtk+/66-win32-theme-Native-combobox-height.patch b/patches/gtk+/66-win32-theme-Native-combobox-height.patch
new file mode 100755
index 0000000..0aa2932
--- /dev/null
+++ b/patches/gtk+/66-win32-theme-Native-combobox-height.patch
@@ -0,0 +1,21 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Combobox had too little height
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -965,6 +965,10 @@
+
+ /* Combobox */
+
++combobox {
++ margin-top: 1px;
++ min-height: -gtk-win32-size(combobox, cysize);
++}
+ combobox entry {
+ margin-right: calc( -2ex - -gtk-win32-part-width(combobox, 6, 1));
+ background-image: -gtk-win32-theme-part(combobox, 4, 1);
diff --git a/patches/gtk+/66-win32-theme-Credits.patch b/patches/gtk+/67-win32-theme-Credits.patch
similarity index 100%
rename from patches/gtk+/66-win32-theme-Credits.patch
rename to patches/gtk+/67-win32-theme-Credits.patch
commit c26609e0239cdd897174e5e25124a86ca3b6225f
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Apr 18 14:30:26 2021 +0000
Correct URL for theme patches
diff --git a/patches/gtk+/66-win32-theme-Credits.patch b/patches/gtk+/66-win32-theme-Credits.patch
index a00c28f..84b9881 100755
--- a/patches/gtk+/66-win32-theme-Credits.patch
+++ b/patches/gtk+/66-win32-theme-Credits.patch
@@ -16,12 +16,12 @@ diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/61-win71-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/62-win71-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/63-win71-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/64-win71-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/65-win71-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/66-win71-theme-Credits.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
+ */
+
@import url("gtk-win32-base.css");
@@ -41,12 +41,12 @@ diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.cs
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
+ * Additional changes from Thorsten Maerz <info at netztorte.de>
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/61-win71-theme-Draw-submenu-arrow.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/62-win71-theme-Draw-menu-separator.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/63-win71-theme-Native-treeview-expander.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/64-win71-theme-Reduce-titlebar-headroom.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/65-win71-theme-Visible-treeview-inactive-selection.patch
-+ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/66-win71-theme-Credits.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/61-win32-theme-Draw-submenu-arrow.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/62-win32-theme-Draw-menu-separator.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/63-win32-theme-Native-treeview-expander.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/64-win32-theme-Reduce-titlebar-headroom.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/65-win32-theme-Visible-treeview-inactive-selection.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk%2B/66-win32-theme-Credits.patch
+ */
+
@define-color bg_color -gtk-win32-color(button, btnface);
commit 9c24c3fc31fc778868aa366f0bfaee82600bb534
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Apr 18 14:07:36 2021 +0000
Remove patch for missing ctree redraw events
Obsoleted by
https://git.claws-mail.org/?p=claws.git;a=commitdiff;h=31d6518f57b8a5a42e2c0c6d2381e589658a64c2
diff --git a/Makefile.am b/Makefile.am
index b4b002a..45aaa99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,6 @@ EXTRA_DIST = autogen.sh \
patches/cairo-1.17.4/01-nofortify-hack.patch.off \
patches/claws-mail/01-etpan-sasl-plugin-path.patch \
patches/claws-mail/05-define-WIN32-for-litehtml.patch \
- patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch \
patches/cyrus-sasl-2.1.27/01-md5-typedef.patch \
patches/cyrus-sasl-2.1.27/02-tchar.patch \
patches/cyrus-sasl-2.1.27/03-exports.patch \
diff --git a/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch b/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch
deleted file mode 100755
index b64e6ab..0000000
--- a/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-Taken from
-https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4366#c10
-
-From 335ce50b853d84bcbd3ce1fed770cf0e93855e9e Mon Sep 17 00:00:00 2001
-From: Manuel Stoeckl <code at mstoeckl.com>
-Date: Fri, 11 Dec 2020 23:10:31 -0500
-Subject: [PATCH] Defer all painting outside of widget draw entrypoint
-
----
- src/gtk/gtkcmclist.c | 80 ++++++++++++++++++++++++++++----------------
- src/gtk/gtkcmclist.h | 16 +++++++++
- src/gtk/gtkcmctree.c | 6 ++++
- 3 files changed, 73 insertions(+), 29 deletions(-)
-
-diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.c claws-mail-3.99.0git63/src/gtk/gtkcmclist.c
---- claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.c 2021-03-20 15:47:59.000000000 +0000
-+++ claws-mail-3.99.0git63/src/gtk/gtkcmclist.c 2021-03-21 17:51:40.295417192 +0000
-@@ -1124,6 +1124,8 @@
- * isn't there
- */
- column_button_create (clist, 0);
-+
-+ clist->should_I_be_drawing_now = 0;
-
- return object;
- }
-@@ -4797,6 +4799,7 @@
- if (gtk_widget_is_drawable (widget))
- {
- clist = GTK_CMCLIST (widget);
-+ clist->should_I_be_drawing_now = 1;
-
- /* Draw clist_window */
- if (gtk_cairo_should_draw_window (cr, clist->clist_window))
-@@ -4855,8 +4858,8 @@
- }
- }
- }
-+ clist->should_I_be_drawing_now = 0;
- }
--
- return FALSE;
- }
-
-@@ -5668,6 +5671,11 @@
- cairo_t *cr;
- cm_return_if_fail (clist != NULL);
-
-+ if (!clist->should_I_be_drawing_now) {
-+ gtk_widget_queue_draw(clist);
-+ return;
-+ }
-+
- /* bail now if we arn't drawable yet */
- if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
- return;
-@@ -5948,22 +5956,27 @@
- }
-
- if (!area) {
-- int w, h, y;
-- cairo_t *cr;
-- w = gdk_window_get_width(clist->clist_window);
-- h = gdk_window_get_height(clist->clist_window);
-- cr = gdk_cairo_create(clist->clist_window);
-- y = ROW_TOP_YPIXEL (clist, i);
-- gdk_cairo_set_source_color(cr, >k_widget_get_style(GTK_WIDGET(clist))->base[GTK_STATE_NORMAL]);
-- cairo_rectangle(cr, 0, y, w, h - y);
-- cairo_fill(cr);
-- cairo_destroy(cr);
-+ if (clist->should_I_be_drawing_now) {
-+ int w, h, y;
-+ cairo_t *cr;
-+ w = gdk_window_get_width(clist->clist_window);
-+ h = gdk_window_get_height(clist->clist_window);
-+ cr = gdk_cairo_create(clist->clist_window);
-+ y = ROW_TOP_YPIXEL (clist, i);
-+ gdk_cairo_set_source_color(cr, >k_widget_get_style(GTK_WIDGET(clist))->base[GTK_STATE_NORMAL]);
-+ cairo_rectangle(cr, 0, y, w, h - y);
-+ cairo_fill(cr);
-+ cairo_destroy(cr);
-+ } else {
-+ gtk_widget_queue_draw(clist);
-+ }
- }
- }
-
- static void
- draw_xor_line (GtkCMCList *clist)
- {
-+ // TODO: figure out GTK3 method of drawing this!
- cairo_t *cr;
- cr = gdk_cairo_create(clist->clist_window);
- cairo_set_line_width(cr, 1.0);
-@@ -6234,6 +6247,7 @@
-
- clist->hoffset = -value;
-
-+ // TODO: figure out GTK3 method of drawing this!
- cr = gdk_cairo_create(clist->clist_window);
- cairo_dash_from_add_mode(clist, cr);
- cairo_set_line_width(cr, 1.0);
-@@ -6521,15 +6535,19 @@
-
- clist = GTK_CMCLIST (widget);
- if (clist->focus_row >= 0) {
-- cr = gdk_cairo_create(clist->clist_window);
-- cairo_dash_from_add_mode(clist, cr);
-- cairo_set_line_width(cr, 1.0);
-- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-- cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
-- clist->clist_window_width + 1,
-- clist->row_height - 0.5);
-- cairo_stroke(cr);
-- cairo_destroy(cr);
-+ if (clist->should_I_be_drawing_now) {
-+ cr = gdk_cairo_create(clist->clist_window);
-+ cairo_dash_from_add_mode(clist, cr);
-+ cairo_set_line_width(cr, 1.0);
-+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-+ cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
-+ clist->clist_window_width + 1,
-+ clist->row_height - 0.5);
-+ cairo_stroke(cr);
-+ cairo_destroy(cr);
-+ } else {
-+ gtk_widget_queue_draw(clist);
-+ }
- }
- }
-
-@@ -6550,15 +6568,19 @@
-
- clist = GTK_CMCLIST (widget);
- if (clist->focus_row >= 0) {
-- cairo_t *cr = gdk_cairo_create(clist->clist_window);
-- cairo_set_line_width(cr, 1.0);
-- gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->base[GTK_STATE_NORMAL]);
-- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-- cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
-- clist->clist_window_width + 1,
-- clist->row_height - 0.5);
-- cairo_stroke(cr);
-- cairo_destroy(cr);
-+ if (clist->should_I_be_drawing_now) {
-+ cairo_t *cr = gdk_cairo_create(clist->clist_window);
-+ cairo_set_line_width(cr, 1.0);
-+ gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->base[GTK_STATE_NORMAL]);
-+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-+ cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
-+ clist->clist_window_width + 1,
-+ clist->row_height - 0.5);
-+ cairo_stroke(cr);
-+ cairo_destroy(cr);
-+ } else {
-+ gtk_widget_queue_draw(clist);
-+ }
- }
-
- row = clist->focus_row;
-diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.h claws-mail-3.99.0git63/src/gtk/gtkcmclist.h
---- claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.h 2021-03-20 15:47:59.000000000 +0000
-+++ claws-mail-3.99.0git63/src/gtk/gtkcmclist.h 2021-03-21 17:51:40.295417192 +0000
-@@ -235,6 +235,22 @@
-
- gint drag_highlight_row;
- GtkCMCListDragPos drag_highlight_pos;
-+
-+ /*
-+ * Pre-GTK3 functions called draw_row, draw_rows, etc. whenever a region of
-+ * the widget needed to be updated, so that the region would be immediately
-+ * redrawn. Around the GTK3/Qt4 transitions, toolkits moved away from this
-+ * immediate-update mode, and started the more efficient approach of tracking
-+ * damage and then redrawing only the damaged regions. When this variable
-+ * is 0 (most old uses), the 'draw_X' are to be interpreted as requests to
-+ * mark damage; when it is 1 (precisely when the widget draw entrypoint is used)
-+ * the 'draw_X' actually do the drawing.
-+ *
-+ * See also:
-+ * https://doc.qt.io/archives/qt-4.8/porting4.html#painting-and-redrawing-widgets
-+ * https://developer.gnome.org/gtk3/stable/ch26s02.html#id-1.6.3.4.11
-+ */
-+ int should_I_be_drawing_now;
- };
-
- struct _GtkCMCListClass
-diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmctree.c claws-mail-3.99.0git63/src/gtk/gtkcmctree.c
---- claws-mail-3.99.0git63.org/src/gtk/gtkcmctree.c 2021-03-20 15:47:59.000000000 +0000
-+++ claws-mail-3.99.0git63/src/gtk/gtkcmctree.c 2021-03-21 17:51:40.295417192 +0000
-@@ -604,6 +604,12 @@
- GdkColor *fgcolor, *bgcolor;
-
- cm_return_if_fail (clist != NULL);
-+
-+ if (!clist->should_I_be_drawing_now) {
-+ gtk_widget_queue_draw(GTK_WIDGET (clist));
-+ return;
-+ }
-+
- widget = GTK_WIDGET (clist);
-
- /* if the function is passed the pointer to the row instead of null,
commit c4e6c459b6b650493904b14cc3b3e6427a0ec9d0
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Apr 18 14:00:27 2021 +0000
Generate "win71" theme from gtk+ sources
diff --git a/Makefile.am b/Makefile.am
index 54b400f..b4b002a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,20 @@ EXTRA_DIST = autogen.sh \
patches/cyrus-sasl-2.1.27/99-reautomagic.patch \
patches/enchant-2.2.15/01-fix-relocation.patch \
patches/fontconfig-2.13.93/01-no-fluff.patch \
+ patches/gtk+/50-win71-theme-init.patch \
+ patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch \
+ patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch \
+ patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch \
+ patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch \
+ patches/gtk+/55-win32-theme-make-separator-visible-again.patch \
+ patches/gtk+/57-win32-theme-Draw-expander-arrow.patch \
+ patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch \
+ patches/gtk+/62-win32-theme-Draw-menu-separator.patch \
+ patches/gtk+/63-win32-theme-Native-treeview-expander.patch \
+ patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch \
+ patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch \
+ patches/gtk+/66-win32-theme-Credits.patch \
+ patches/gtk+/69-win71-theme-finalize.patch \
patches/gumbo-parser-0.10.1/99-autotools.patch \
patches/harfbuzz-2.6.7/01-no-tests-utils-docs.patch \
patches/hunspell-1.7.0/99-autoreconf.patch \
diff --git a/packages/packages.current b/packages/packages.current
index 89d04cf..57975cc 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,6 +17,30 @@
server https://www.claws-mail.org/releases
+file claws-mail-3.99.0git87.tar.xz
+chk 57ae88c0deaa1645305e2f343492fb5795c0be100fc3123d5246b0f863df77a0
+
+#file claws-mail-3.99.0git105.tar.xz
+#chk a1991e513622ed37575d7f40c2993aec180a9b1e2949a2f42dcfe3bc3196a0f1
+
+#file claws-mail-3.99.0git102.tar.xz
+#chk eb9d2cc5a3388022a9ceb41c09b58c48ffc0160f2772d61223ba5fb7c7536de4
+
+#file claws-mail-3.99.0git88.tar.xz
+#chk f07ef7daa3703fa9ad36dee75818a57f525b88a321445900e3ab7052d1f6c4cd
+
+#file claws-mail-3.99.0git82.tar.xz
+#chk dbb42b0bc99468e3eb11c9bbd2255806653e263c2bef61902b9f8595821e4e57
+
+#file claws-mail-3.99.0git74.tar.xz
+#chk d50e6336c5cab3bc3119c7c4842742f7442859c368f7acc358c018ad6aab8d45
+
+#file claws-mail-3.99.0git70.tar.xz
+#chk 4eda0fb1345ff11da3d0aec78e801ccda880b28b6f970e8ba217a9c05eb382e7
+
+#file claws-mail-3.99.0git65.tar.xz
+#chk b5470d5bb41f5851a86f6dfe8573c52ec0b0a7e68d28d62a9118024b064a033e
+
# file and checksum will be added by getgit-claws-mail.sh / download.sh
#file claws-mail-3.17.8.tar.xz
diff --git a/patches/gtk+/50-win71-theme-prepare.patch b/patches/gtk+/50-win71-theme-prepare.patch
new file mode 100755
index 0000000..82200a2
--- /dev/null
+++ b/patches/gtk+/50-win71-theme-prepare.patch
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# 50-win71-theme-prepare.patch
+
+# Patches 51..57: Taken from Jamie Velasco / https://gitlab.gnome.org/GNOME/gtk/-/issues/687
+# Original numbering changed from 0001..0007 to 51..57
+# Patches 61..66: Added by Thorsten Maerz for Claws-Mail
+# These patches are meant to directly modify the compiled-in win32 theme
+
+# To keep gtk unchanged, the original files are backed up first.
+# 69-win71-theme-finalize.patch copies the modified files to a new location,
+# adds a settings file and finally restores the old directory before build.
+
+WIN32_THEME_NAME=win32
+WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
+
+cp -a ${WIN32_THEME_DIR} ${WIN32_THEME_DIR}.org
diff --git a/patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch b/patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
new file mode 100755
index 0000000..0b90b93
--- /dev/null
+++ b/patches/gtk+/51-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
@@ -0,0 +1,94 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 56ec8b1af54e43682fbe4c57a12b83de2f43e0af Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Thu, 20 Oct 2016 09:58:19 +0100
+Subject: [PATCH 1/7] win32 theme: Fix levelbar and tweak progressbar
+
+Both have a similar look now
+---
+ gtk/theme/win32/gtk-win32-base.css | 46 +++++++++++++++++++++++++++-----------
+ 1 file changed, 33 insertions(+), 13 deletions(-)
+
+diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+index 8ea3104..f9255cd 100644
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -998,39 +998,59 @@ scale value {
+ }
+
+
+-/* Progress bars */
++/* Progress bars and level bars */
+
+-progressbar {
+- background-color: transparent;
+- padding: 0;
++progressbar.horizontal trough,
++levelbar.horizontal trough {
++ min-height: -gtk-win32-part-height(progress, 1, 1);
++ background-image: -gtk-win32-theme-part(progress, 1, 1);
++}
++progressbar.vertical trough,
++levelbar.vertical trough {
++ min-width: -gtk-win32-part-width(progress, 1, 1);
++ background-image: -gtk-win32-theme-part(progress, 2, 1);
+ }
+
+-progressbar trough {
+- border-width: 0;
+- background-image: -gtk-win32-theme-part(progress, 1, 1);
++progressbar.horizontal progress, levelbar.horizontal block {
++ min-height: -gtk-win32-part-height(progress, 5, 1);
+ }
+
+ progressbar progress,
++levelbar block.filled,
+ entry progress,
+ entry progress:focus {
+- border-width: 0;
+ background-image: -gtk-win32-theme-part(progress, 5, 1);
+ }
+
+-progressbar progress.pulse,
++/* We use here PBFS_PAUSED (yellow by default) and PBFS_PARTIAL (blue) */
++levelbar block.low {
++ background-image: -gtk-win32-theme-part(progress, 5, 3);
++}
++levelbar block.full {
++ background-image: -gtk-win32-theme-part(progress, 5, 4);
++}
++
++progressbar.horizontal progress.pulse,
+ entry progress.pulse,
+ entry progress.pulse:focus {
+- background-color: transparent;
+ background-image: -gtk-win32-theme-part(progress, 8, 1);
+ }
+
+-progressbar.vertical trough {
+- background-image: -gtk-win32-theme-part(progress, 2, 1);
++progressbar.vertical progress,
++levelbar.vertical block {
++ min-width: -gtk-win32-part-width(progress, 6, 1);
+ }
+
+-progressbar.vertical progress {
++progressbar.vertical progress,
++levelbar.vertical block.filled {
+ background-image: -gtk-win32-theme-part(progress, 6, 1);
+ }
++levelbar.vertical block.low {
++ background-image: -gtk-win32-theme-part(progress, 6, 3);
++}
++levelbar.vertical block.full {
++ background-image: -gtk-win32-theme-part(progress, 6, 4);
++}
+
+ progressbar.vertical progress.pulse {
+ background-image: -gtk-win32-theme-part(progress, 10, 1);
+--
+2.9.1
+
diff --git a/patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch b/patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch
new file mode 100755
index 0000000..e3a2f07
--- /dev/null
+++ b/patches/gtk+/52-win32-theme-fix-disabled-GtkEntry-style.patch
@@ -0,0 +1,31 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 4627b31437db1b7d1b413bb6b9bd434e30c748d7 Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Thu, 20 Oct 2016 11:00:09 +0100
+Subject: [PATCH 2/7] win32 theme: fix disabled GtkEntry style
+
+---
+ gtk/theme/win32/gtk-win32-base.css | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+index f9255cd..3038452 100644
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -690,7 +690,9 @@ entry:focus {
+
+ textview.view:disabled,
+ entry:disabled {
+- background-image: -gtk-win32-theme-part(edit, 1, 4);
++ /* This theme part feels wrong here, but it looks as one would expect,
++ whereas (edit, 5, 3) BACKGROUNDWITHBORDER, EBS_DISABLED is just white */
++ background-image: -gtk-win32-theme-part(combobox, 5, 4);
+ color: -gtk-win32-color(edit, graytext);
+ }
+
+--
+2.9.1
+
diff --git a/patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch b/patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch
new file mode 100755
index 0000000..07a235f
--- /dev/null
+++ b/patches/gtk+/53-win32-theme-Fix-notebook-tabs.patch
@@ -0,0 +1,288 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 39e3fcc4acfb049960eb16539535f3e8f7a44390 Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Fri, 21 Oct 2016 09:23:24 +0100
+Subject: [PATCH 3/7] win32 theme: Fix notebook tabs
+
+This is a somewhat hacky fix, but it reasonably mimics the default
+windows style and hopefully is not too bad with different themes.
+---
+ gtk/theme/win32/gtk-win32-base.css | 235 +++++++++++--------------------------
+ 1 file changed, 70 insertions(+), 165 deletions(-)
+
+diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+index 3038452..03a3d47 100644
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -10,6 +10,7 @@
+ @define-color question_bg_color rgb(138, 173, 212);
+ @define-color error_fg_color rgb(166, 38, 38);
+ @define-color error_bg_color rgb(237, 54, 54);
++ at define-color notebook_border_color rgb(137, 140, 147);
+
+ @define-color app_notification_a #aeaea4;
+ @define-color app_notification_b #d1d1cb;
+@@ -340,188 +341,92 @@ notebook > stack {
+ background-image: -gtk-win32-theme-part(tab, 9, 1);
+ }
+
+-notebook > header > tabs {
+- padding: 2px;
++/* We can't use directly the standard theme parts because they are only
++ valid with tabs on top, so we draw solid borders of reasonable colors
++ and hope for the best */
++
++notebook > header > tabs > tab {
++ background-image: -gtk-win32-theme-part(tab, 1, 1, margins(-1));
++ padding: 2px 1ex;
++ border: 1px solid @notebook_border_color;
++}
++notebook > header > tabs > tab:hover {
++ background-image: -gtk-win32-theme-part(tab, 1, 2, margins(-1));
++ border-color: @selected_bg_color;
++}
++notebook > header > tabs > tab:checked {
++ background-image: -gtk-win32-theme-part(tab, 5, 3, margins(-1));
++ padding: 2px 1.5ex;
++ margin: 0px -.5ex;
++ border-color: @notebook_border_color;
++}
++notebook > header > tabs > tab:focus {
++ background-image: -gtk-win32-theme-part(tab, 1, 5, margins(-1));
+ }
+
+-notebook > header.top > tabs {
+- padding-bottom: 0px;
++notebook > header.top, notebook > header.bottom {
++ margin-right: 2px;
+ }
+
+-notebook > header.right > tabs {
+- padding-left: 0px;
++notebook > header.top > tabs {
++ margin-left: .5ex;
++ margin-right: .5ex;
++}
++notebook > header.top > tabs > tab {
++ margin-top: 4px;
++ border-bottom: unset;
++}
++notebook > header.top > tabs > tab:checked {
++ margin: 0px -.5ex;
++ margin-bottom: -1px;
+ }
+
+ notebook > header.bottom > tabs {
+- padding-top: 0px;
++ margin-left: .5ex;
++ margin-right: .5ex;
++ margin-top: -1px;
+ }
+-
+-notebook > header.left > tabs {
+- padding-right: 0px;
++notebook > header.bottom > tabs > tab {
++ margin-bottom: 4px;
++ border-top: unset;
+ }
+-
+-notebook > header > tabs > tab {
+- background-image: -gtk-win32-theme-part(tab, 1, 1);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 1, 1));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 1, 1));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 1, 1));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 1, 1));
++notebook > header.bottom > tabs > tab:checked {
++ margin: 0px -.5ex;
++ margin-top: -1px;
+ }
+
+-notebook > header > tabs > tab:hover {
+- background-image: -gtk-win32-theme-part(tab, 1, 2);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 1, 2));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 1, 2));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 1, 2));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 1, 2));
++notebook > header.left, notebook > header.right {
++ margin-bottom: 2px;
+ }
+-
+-notebook > header > tabs > tab:focus {
+- background-image: -gtk-win32-theme-part(tab, 1, 5);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 1, 5));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 1, 5));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 1, 5));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 1, 5));
++notebook > header.left > tabs {
++ margin-top: .3ex;
++ margin-bottom: .3ex;
+ }
+-
+-notebook > header > tabs > tab:disabled {
+- background-image: -gtk-win32-theme-part(tab, 1, 4);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 1, 4));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 1, 4));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 1, 4));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 1, 4));
++notebook > header.left > tabs > tab {
++ padding: .5ex 2px;
++ margin-left: 4px;
++ border-right: unset;
+ }
+-
+-notebook > header > tabs > tab:checked {
+- background-image: -gtk-win32-theme-part(tab, 5, 3);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 5, 3));
+- padding-right: calc(5px + -gtk-win32-part-border-right(tab, 5, 3));
+- padding-bottom: calc(4px + -gtk-win32-part-border-bottom(tab, 5, 3));
+- padding-left: calc(5px + -gtk-win32-part-border-left(tab, 5, 3));
+- margin: -2px;
++notebook > header.left > tabs > tab:checked {
++ margin: -.3ex 0;
++ margin-right: -1px;
++ padding: .8ex 2px;
+ }
+-
+-notebook > header > tabs > tab:first-child {
+- background-image: -gtk-win32-theme-part(tab, 2, 1);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 2, 1));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 2, 1));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 2, 1));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 2, 1));
++
++notebook > header.right > tabs {
++ margin-top: .3ex;
++ margin-bottom: .3ex;
++ margin-left: -2px;
+ }
+-
+-notebook > header > tabs > tab:first-child:hover {
+- background-image: -gtk-win32-theme-part(tab, 2, 2);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 2, 2));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 2, 2));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 2, 2));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 2, 2));
++notebook > header.right > tabs > tab {
++ padding: .5ex 2px;
++ margin-right: 4px;
++ border-left: unset;
+ }
+-
+-notebook > header > tabs > tab:first-child:focus {
+- background-image: -gtk-win32-theme-part(tab, 1, 5);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 2, 5));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 2, 5));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 2, 5));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 2, 5));
+-}
+-
+-notebook > header > tabs > tab:first-child:disabled {
+- background-image: -gtk-win32-theme-part(tab, 1, 4);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 2, 4));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 2, 4));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 2, 4));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 2, 4));
+-}
+-
+-notebook > header > tabs > tab:first-child:checked {
+- background-image: -gtk-win32-theme-part(tab, 6, 3);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 6, 3));
+- padding-right: calc(5px + -gtk-win32-part-border-right(tab, 6, 3));
+- padding-bottom: calc(4px + -gtk-win32-part-border-bottom(tab, 6, 3));
+- padding-left: calc(5px + -gtk-win32-part-border-left(tab, 6, 3));
+- margin: -2px;
+-}
+-
+-notebook > header > tabs > tab:last-child {
+- background-image: -gtk-win32-theme-part(tab, 3, 1);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 3, 1));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 3, 1));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 3, 1));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 3, 1));
+-}
+-
+-notebook > header > tabs > tab:last-child:hover {
+- background-image: -gtk-win32-theme-part(tab, 3, 2);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 3, 2));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 3, 2));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 3, 2));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 3, 2));
+-}
+-
+-notebook > header > tabs > tab:last-child:focus {
+- background-image: -gtk-win32-theme-part(tab, 3, 5);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 3, 5));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 3, 5));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 3, 5));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 3, 5));
+-}
+-
+-notebook > header > tabs > tab:last-child:disabled {
+- background-image: -gtk-win32-theme-part(tab, 3, 4);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 3, 4));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 3, 4));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 3, 4));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 3, 4));
+-}
+-
+-notebook > header > tabs > tab:last-child:checked {
+- background-image: -gtk-win32-theme-part(tab, 7, 3);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 7, 3));
+- padding-right: calc(5px + -gtk-win32-part-border-right(tab, 7, 3));
+- padding-bottom: calc(4px + -gtk-win32-part-border-bottom(tab, 7, 3));
+- padding-left: calc(5px + -gtk-win32-part-border-left(tab, 7, 3));
+- margin: -2px;
+-}
+-
+-notebook > header > tabs > tab:only-child {
+- background-image: -gtk-win32-theme-part(tab, 4, 1);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 4, 1));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 4, 1));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 4, 1));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 4, 1));
+-}
+-
+-notebook > header > tabs > tab:only-child:hover {
+- background-image: -gtk-win32-theme-part(tab, 4, 2);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 4, 2));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 4, 2));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 4, 2));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 4, 2));
+-}
+-
+-notebook > header > tabs > tab:only-child:focus {
+- background-image: -gtk-win32-theme-part(tab, 4, 5);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 4, 5));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 4, 5));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 4, 5));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 4, 5));
+-}
+-
+-notebook > header > tabs > tab:only-child:disabled {
+- background-image: -gtk-win32-theme-part(tab, 4, 4);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 4, 4));
+- padding-right: calc(3px + -gtk-win32-part-border-right(tab, 4, 4));
+- padding-bottom: calc(2px + -gtk-win32-part-border-bottom(tab, 4, 4));
+- padding-left: calc(3px + -gtk-win32-part-border-left(tab, 4, 4));
+-}
+-
+-notebook > header > tabs > tab:only-child:checked {
+- background-image: -gtk-win32-theme-part(tab, 8, 3);
+- padding-top: calc(1px + -gtk-win32-part-border-top(tab, 8, 3));
+- padding-right: calc(5px + -gtk-win32-part-border-right(tab, 8, 3));
+- padding-bottom: calc(4px + -gtk-win32-part-border-bottom(tab, 8, 3));
+- padding-left: calc(5px + -gtk-win32-part-border-left(tab, 8, 3));
+- margin: -2px;
++notebook > header.right > tabs > tab:checked {
++ margin: -.3ex 0;
++ margin-left: -1px;
++ padding: .8ex 2px;
+ }
+
+ /* Scrollbars */
+--
+2.9.1
+
diff --git a/patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch b/patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch
new file mode 100755
index 0000000..148fd93
--- /dev/null
+++ b/patches/gtk+/54-win32-theme-Fix-unfocused-window-buttons.patch
@@ -0,0 +1,75 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 6441ce083826a8526bfd17d3807939e63f90ffba Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Fri, 21 Oct 2016 12:35:07 +0100
+Subject: [PATCH 4/7] win32 theme: Fix unfocused window buttons
+
+---
+ gtk/theme/win32/gtk.css | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+index 218875e..cd9b859 100644
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -183,9 +183,18 @@ decoration:disabled {
+ margin: -3px;
+ }
+
++.titlebar .close image,
++.titlebar .maximize image,
++.titlebar .minimize image {
++ color: transparent;
++}
++
+ .titlebar button.close {
+ background-image: -gtk-win32-theme-part(window, 18, 1);
+- color: transparent;
++}
++
++.titlebar button.close:backdrop {
++ background-image: -gtk-win32-theme-part(window, 18, 5);
+ }
+
+ .titlebar button.close:hover {
+@@ -202,7 +211,10 @@ decoration:disabled {
+
+ .titlebar button.minimize {
+ background-image: -gtk-win32-theme-part(window, 15, 1);
+- color: transparent;
++}
++
++.titlebar button.minimize:backdrop {
++ background-image: -gtk-win32-theme-part(window, 15, 5);
+ }
+
+ .titlebar button.minimize:hover {
+@@ -219,7 +231,10 @@ decoration:disabled {
+
+ .titlebar button.maximize {
+ background-image: -gtk-win32-theme-part(window, 17, 1);
+- color: transparent;
++}
++
++.titlebar button.maximize:backdrop {
++ background-image: -gtk-win32-theme-part(window, 17, 5);
+ }
+
+ .titlebar button.maximize:hover {
+@@ -238,6 +253,10 @@ decoration:disabled {
+ background-image: -gtk-win32-theme-part(window, 21, 1);
+ }
+
++.maximized .titlebar button.maximize:backdrop {
++ background-image: -gtk-win32-theme-part(window, 21, 5);
++}
++
+ .maximized .titlebar button.maximize:hover {
+ background-image: -gtk-win32-theme-part(window, 21, 2);
+ }
+--
+2.9.1
+
diff --git a/patches/gtk+/55-win32-theme-make-separator-visible-again.patch b/patches/gtk+/55-win32-theme-make-separator-visible-again.patch
new file mode 100755
index 0000000..a4f8196
--- /dev/null
+++ b/patches/gtk+/55-win32-theme-make-separator-visible-again.patch
@@ -0,0 +1,45 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From 33f0e49e56783712aa267b0b86a62ad6e6cb8f62 Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Tue, 25 Oct 2016 13:23:04 +0100
+Subject: [PATCH 5/7] win32 theme: make separator visible again
+
+---
+ gtk/theme/win32/gtk-win32-base.css | 2 +-
+ gtk/theme/win32/gtk.css | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+index 03a3d47..448a082 100644
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -1166,7 +1166,7 @@ colorswatch:hover {
+
+ separator,
+ separator:hover {
+- color: shade(@bg_color, 0.6);
++ background-color: @bg_color;
+ }
+
+ statusbar > frame {
+diff --git a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+index cd9b859..c39ee07 100644
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -171,6 +171,10 @@ decoration:disabled {
+ background-position: 50% calc(100% - -gtk-win32-size(window, cycaption) + -gtk-win32-size(window, cysize) - -gtk-win32-size(window, cyedge));
+ }
+
++.titlebar separator {
++ background-color: unset;
++}
++
+ /* XXX: headerbar insists on 6px spacing between buttons. Windows doesn't
+ * think so. */
+ .titlebar .titlebutton + .titlebutton {
+--
+2.9.1
+
diff --git a/patches/gtk+/57-win32-theme-Draw-expander-arrow.patch b/patches/gtk+/57-win32-theme-Draw-expander-arrow.patch
new file mode 100755
index 0000000..ed151ad
--- /dev/null
+++ b/patches/gtk+/57-win32-theme-Draw-expander-arrow.patch
@@ -0,0 +1,43 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From be59f5bc95d9fd18fba250282021c96d2b9254f1 Mon Sep 17 00:00:00 2001
+From: Jaime Velasco Juan <jsagarribay at gmail.com>
+Date: Mon, 31 Oct 2016 14:00:16 +0000
+Subject: [PATCH 7/7] win32 theme: Draw expander arrow
+
+Better than nothing.
+---
+ gtk/theme/win32/gtk-win32-base.css | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+index 0cbaa3c..9be7dc0 100644
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -1176,6 +1176,21 @@ statusbar > frame {
+ background-image: none;
+ }
+
++/* Expander */
++
++expander title arrow {
++ background-image: -gtk-win32-theme-part(explorerbar, 7, 1);
++}
++expander title arrow:checked {
++ background-image: -gtk-win32-theme-part(explorerbar, 6, 1);
++}
++expander title:hover arrow {
++ background-image: -gtk-win32-theme-part(explorerbar, 7, 2);
++}
++expander title:hover arrow:checked {
++ background-image: -gtk-win32-theme-part(explorerbar, 6, 2);
++}
++
+ /* Spinner */
+
+ @keyframes spin {
+--
+2.9.1
+
diff --git a/patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch b/patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch
new file mode 100755
index 0000000..3894808
--- /dev/null
+++ b/patches/gtk+/61-win32-theme-Draw-submenu-arrow.patch
@@ -0,0 +1,27 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Draw missing arrows for submenu entries
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -83,6 +83,16 @@
+ border-width: 0;
+ }
+
++menu menuitem arrow, .menu menuitem arrow {
++ min-width: 16px;
++ min-height: 16px;
++}
++
++menu menuitem arrow, .menu menuitem arrow {
++ margin-left: 10px;
++ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
++}
++
+ /* Listbox */
+
+ /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk+/62-win32-theme-Draw-menu-separator.patch b/patches/gtk+/62-win32-theme-Draw-menu-separator.patch
new file mode 100755
index 0000000..c8e9966
--- /dev/null
+++ b/patches/gtk+/62-win32-theme-Draw-menu-separator.patch
@@ -0,0 +1,22 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Draw missing separator between menu entries
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -93,6 +93,11 @@
+ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
+ }
+
++menu separator {
++ padding: 0px;
++ background-color: shade(@bg_color, 0.75);
++}
++
+ /* Listbox */
+
+ /* We're cheating here, using part 6 (listview header group),
diff --git a/patches/gtk+/63-win32-theme-Native-treeview-expander.patch b/patches/gtk+/63-win32-theme-Native-treeview-expander.patch
new file mode 100755
index 0000000..cd36b53
--- /dev/null
+++ b/patches/gtk+/63-win32-theme-Native-treeview-expander.patch
@@ -0,0 +1,22 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Draw native +/- expanders in treeview (instead of arrows)
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -287,3 +287,11 @@
+ .maximized .titlebar button.maximize:disabled {
+ background-image: -gtk-win32-theme-part(window, 21, 4);
+ }
++
++treeview.view.expander:checked {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
++}
++
++treeview.view.expander {
++ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
++}
diff --git a/patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch b/patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch
new file mode 100755
index 0000000..114b3e0
--- /dev/null
+++ b/patches/gtk+/64-win32-theme-Reduce-titlebar-headroom.patch
@@ -0,0 +1,20 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Titlebar took too much space
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -148,8 +148,7 @@
+ margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
+ calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
+ margin-bottom: 0px;
+- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
+- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
++ padding: 0px 4px;
+ padding-bottom: 0px;
+ background: -gtk-win32-theme-part(window, 1, 1);
+ min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
diff --git a/patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch b/patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch
new file mode 100755
index 0000000..d358dd1
--- /dev/null
+++ b/patches/gtk+/65-win32-theme-Visible-treeview-inactive-selection.patch
@@ -0,0 +1,23 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Unfocused treeview selections are hardly visible on MSWin
+Use background color instead of light grey (e.g. selected folder
+should stay visible, even when focus is changed to a different
+widget, e.g. a file selection widget for that folder).
+This isn't native MSWin behaviour, but rather resembles the
+behaviour of Posix based applications.
+Thorsten Maerz <info at netztorte.de>
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -294,3 +294,7 @@
+ treeview.view.expander {
+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
+ }
++
++treeview.view:selected {
++ background-color: @selected_bg_color;
++}
diff --git a/patches/gtk+/66-win32-theme-Credits.patch b/patches/gtk+/66-win32-theme-Credits.patch
new file mode 100755
index 0000000..a00c28f
--- /dev/null
+++ b/patches/gtk+/66-win32-theme-Credits.patch
@@ -0,0 +1,54 @@
+#!/bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+diff -u a/gtk/theme/win32/gtk.css b/gtk/theme/win32/gtk.css
+--- a/gtk/theme/win32/gtk.css
++++ b/gtk/theme/win32/gtk.css
+@@ -1,3 +1,21 @@
++/* win71 theme
++ * Based on (internal) win32 theme from gtk+-3.24.26 source
++ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
++ * Additional changes from Thorsten Maerz <info at netztorte.de>
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/61-win71-theme-Draw-submenu-arrow.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/62-win71-theme-Draw-menu-separator.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/63-win71-theme-Native-treeview-expander.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/64-win71-theme-Reduce-titlebar-headroom.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/65-win71-theme-Visible-treeview-inactive-selection.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/66-win71-theme-Credits.patch
++ */
++
+ @import url("gtk-win32-base.css");
+
+ /* Menus */
+diff -u a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
+--- a/gtk/theme/win32/gtk-win32-base.css
++++ b/gtk/theme/win32/gtk-win32-base.css
+@@ -1,3 +1,21 @@
++/* win71 theme
++ * Based on (internal) win32 theme from gtk+-3.24.26 source
++ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
++ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
++ * Additional changes from Thorsten Maerz <info at netztorte.de>
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/61-win71-theme-Draw-submenu-arrow.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/62-win71-theme-Draw-menu-separator.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/63-win71-theme-Native-treeview-expander.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/64-win71-theme-Reduce-titlebar-headroom.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/65-win71-theme-Visible-treeview-inactive-selection.patch
++ * https://git.claws-mail.org/?p=claws-win32-installer.git;a=blob;hb=refs/heads/gtk3;f=patches/gtk+/66-win71-theme-Credits.patch
++ */
++
+ @define-color bg_color -gtk-win32-color(button, btnface);
+ @define-color text_color -gtk-win32-color(button, btntext);
+ @define-color selected_bg_color -gtk-win32-color(button, highlight);
diff --git a/patches/gtk+/69-win71-theme-finalize.patch b/patches/gtk+/69-win71-theme-finalize.patch
new file mode 100755
index 0000000..e478c84
--- /dev/null
+++ b/patches/gtk+/69-win71-theme-finalize.patch
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# 69-win71-theme-finalize.patch
+# Restore files backed up by 50-win71-theme-prepare.patch
+
+WIN32_THEME_NAME=win32
+WIN32_THEME_DIR=gtk/theme/${WIN32_THEME_NAME}
+CLAWS_THEME_NAME=win71
+CLAWS_THEME_DIR=_claws_theme
+
+mkdir ${CLAWS_THEME_DIR}
+mv ${WIN32_THEME_DIR} ${CLAWS_THEME_DIR}/
+mv ${WIN32_THEME_DIR}.org ${WIN32_THEME_DIR}
+mv ${CLAWS_THEME_DIR}/${WIN32_THEME_NAME} ${CLAWS_THEME_DIR}/${CLAWS_THEME_NAME}
+
+cat << GTK_INI_EOF > ${CLAWS_THEME_DIR}/settings.ini
+[Settings]
+gtk-theme-name=${CLAWS_THEME_NAME}
+gtk-auto-mnemonics=true
+gtk-button-images=true
+;gtk-application-prefer-dark-theme=1
+
+[Doc]
+;= To enable native titlebar, set following environment variable
+;= GTK_CSD=0
+;= (Dont omit the zero. Dont use higher values.)
+GTK_INI_EOF
diff --git a/src/functions.nsi b/src/functions.nsi
index 3d3e7ab..286bee7 100644
--- a/src/functions.nsi
+++ b/src/functions.nsi
@@ -122,6 +122,25 @@ FunctionEnd
!define prefix ${ipdir}/${pkgdirname}-${cm_pkg_${pkgname}_version}
!macroend
+# Macro to set "sourceprefix" variable to correct package's source dir.
+!macro SetSourcePrefix pkgname
+!ifdef sourceprefix
+!undef sourceprefix
+!endif
+!define sourceprefix ${bpdir}/${pkgname}-${cm_pkg_${pkgname}_version}
+!macroend
+
+# Macro to set "sourceprefix" variable to correct package's source dir.
+# Use this second macro if package name contains a character not
+# allowed in a NSIS variable, e.g.:
+# !insertmacro SetSourcePrefix2 pkg_name pkg-name
+!macro SetSourcePrefix2 pkgname pkgdirname
+!ifdef sourceprefix
+!undef sourceprefix
+!endif
+!define sourceprefix ${bpdir}/${pkgdirname}-${cm_pkg_${pkgname}_version}
+!macroend
+
Function .onInstSuccess
${MementoSectionSave}
FunctionEnd
diff --git a/src/gtk-add/Makefile.am b/src/gtk-add/Makefile.am
deleted file mode 100644
index 9dd014f..0000000
--- a/src/gtk-add/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile.am - Gtk-Preferences for Claws Mail Windows Makefile.
-# Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST = etc/gtk-3.0/settings.ini \
- share/themes/win71/gtk-3.0/gtk-win32-base.css \
- share/themes/win71/gtk-3.0/gtk.css
diff --git a/src/gtk-add/etc/gtk-3.0/settings.ini b/src/gtk-add/etc/gtk-3.0/settings.ini
deleted file mode 100644
index 44f14bb..0000000
--- a/src/gtk-add/etc/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[Settings]
-gtk-theme-name=win71
-gtk-auto-mnemonics=true
-gtk-button-images=true
-;gtk-application-prefer-dark-theme=1
-
-[Doc]
-;= To enable native titlebar, set following environment variable
-;= GTK_CSD=0
-;= (Dont omit the zero. Dont use higher values.)
diff --git a/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css b/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
deleted file mode 100644
index 2a2b94d..0000000
--- a/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
+++ /dev/null
@@ -1,1409 +0,0 @@
-/* win71 theme
- * Based on (internal) win32 theme from gtk+-3.24.26 source
- * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
- * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
- * Additional changes from Thorsten Maerz <info at netztorte.de>
-*/
-
- at define-color bg_color -gtk-win32-color(button, btnface);
- at define-color text_color -gtk-win32-color(button, btntext);
- at define-color selected_bg_color -gtk-win32-color(button, highlight);
- at define-color selected_fg_color -gtk-win32-color(button, highlighttext);
- at define-color info_fg_color rgb(181, 171, 156);
- at define-color info_bg_color rgb(252, 252, 189);
- at define-color warning_fg_color rgb(173, 120, 41);
- at define-color warning_bg_color rgb(250, 173, 61);
- at define-color question_fg_color rgb(97, 122, 214);
- at define-color question_bg_color rgb(138, 173, 212);
- at define-color error_fg_color rgb(166, 38, 38);
- at define-color error_bg_color rgb(237, 54, 54);
- at define-color notebook_border_color rgb(137, 140, 147);
-
- at define-color app_notification_a #aeaea4;
- at define-color app_notification_b #d1d1cb;
- at define-color app_notification_c #d8d8d3;
-
- at define-color app_notification_border #949486;
-
- at define-color primary_toolbarbutton_text_shadow alpha(black, 0.1);
-
-.background,
-viewport {
- /* XXX: This should be the default, but isn't?! */
- font-family: "Segoe UI", Sans;
- font-size: 9pt;
- background-color: -gtk-win32-color(window, btnface);
- color: -gtk-win32-color(window, btntext);
-}
-
-* {
- -GtkScrolledWindow-scrollbars-spacing: 0;
-}
-
-:link {
- color: -gtk-win32-color(button, hotlight);
-}
-
-:visited {
- color: -gtk-win32-color(button, hotlight);
-}
-
-*:disabled {
- color: -gtk-win32-color(button, graytext);
-}
-
-*:selected,
-*:selected:focus {
- background-color: @selected_bg_color;
- color: @selected_fg_color;
-}
-
-.info {
- background-color: @info_bg_color;
- color: @info_fg_color;
-}
-
-.warning {
- background-color: @warning_bg_color;
- color: @warning_fg_color;
-}
-
-.question {
- background-color: @question_bg_color;
- color: @question_fg_color;
-}
-
-.error {
- background-color: @error_bg_color;
- color: @error_fg_color;
-}
-
-.highlight {
- background-color: @selected_bg_color;
- color: @selected_fg_color;
-}
-
-.light-area-focus {
- color: #000;
-}
-
-.dark-area-focus {
- color: #fff;
-}
-
-scrolledwindow.frame {
-border-style: solid;
-border-width: 2px;
-border-image: -gtk-win32-theme-part(listview, 5, 1) 2 2 2 2 stretch;
-}
-
-.view {
-border-width: 0;
-border-radius: 0;
-background-color: -gtk-win32-color(edit, window);
-color: @text_color;
-}
-
-.view:selected {
-background-color: shade(-gtk-win32-color(edit, window), 0.9);
-color: @fg_color;
-}
-
-.view:selected:focus {
-background-color: @selected_bg_color;
-color: @selected_fg_color;
-}
-
-tooltip, tooltip.background {
- background-color: -gtk-win32-color(tooltip, infobk);
- background-image: -gtk-win32-theme-part(tooltip, 1, 1);
- color: -gtk-win32-color(button, infotext);
- padding: 2px;
-}
-
-assistant .sidebar .highlight {
- font-weight: bold;
- color: -gtk-win32-color(button, captiontext);
-}
-
-/* checkmarks */
-
-check {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 1);
- min-width: -gtk-win32-part-width(button, 3, 1);
- min-height: -gtk-win32-part-height(button, 3, 1);
-}
-
-check:hover {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 2);
- min-width: -gtk-win32-part-width(button, 3, 2);
- min-height: -gtk-win32-part-height(button, 3, 2);
-}
-
-check:active {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 3);
- min-width: -gtk-win32-part-width(button, 3, 3);
- min-height: -gtk-win32-part-height(button, 3, 3);
-}
-
-check:disabled {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 4);
- min-width: -gtk-win32-part-width(button, 3, 4);
- min-height: -gtk-win32-part-height(button, 3, 4);
-}
-
-check:checked {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 5);
- min-width: -gtk-win32-part-width(button, 3, 5);
- min-height: -gtk-win32-part-height(button, 3, 5);
-}
-
-check:checked:hover {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 6);
- min-width: -gtk-win32-part-width(button, 3, 6);
- min-height: -gtk-win32-part-height(button, 3, 6);
-}
-
-check:checked:active {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 7);
- min-width: -gtk-win32-part-width(button, 3, 7);
- min-height: -gtk-win32-part-height(button, 3, 7);
-}
-
-check:checked:disabled {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 8);
- min-width: -gtk-win32-part-width(button, 3, 8);
- min-height: -gtk-win32-part-height(button, 3, 8);
-}
-
-check:indeterminate {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 9);
- min-width: -gtk-win32-part-width(button, 3, 9);
- min-height: -gtk-win32-part-height(button, 3, 9);
-}
-
-check:indeterminate:hover {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 10);
- min-width: -gtk-win32-part-width(button, 3, 10);
- min-height: -gtk-win32-part-height(button, 3, 10);
-}
-
-check:indeterminate:active {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 11);
- min-width: -gtk-win32-part-width(button, 3, 11);
- min-height: -gtk-win32-part-height(button, 3, 11);
-}
-
-check:indeterminate:disabled {
- -gtk-icon-source: -gtk-win32-theme-part(button, 3, 12);
- min-width: -gtk-win32-part-width(button, 3, 12);
- min-height: -gtk-win32-part-height(button, 3, 12);
-}
-
-/* radiomarks */
-
-radio {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 1);
- min-width: -gtk-win32-part-width(button, 2, 1);
- min-height: -gtk-win32-part-height(button, 2, 1);
-}
-
-radio:hover {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 2);
- min-width: -gtk-win32-part-width(button, 2, 2);
- min-height: -gtk-win32-part-height(button, 2, 2);
-}
-
-radio:active {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 3);
- min-width: -gtk-win32-part-width(button, 2, 3);
- min-height: -gtk-win32-part-height(button, 2, 3);
-}
-
-radio:disabled {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 4);
- min-width: -gtk-win32-part-width(button, 2, 4);
- min-height: -gtk-win32-part-height(button, 2, 4);
-}
-
-radio:checked {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 5);
- min-width: -gtk-win32-part-width(button, 2, 5);
- min-height: -gtk-win32-part-height(button, 2, 5);
-}
-
-radio:checked:hover {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 6);
- min-width: -gtk-win32-part-width(button, 2, 6);
- min-height: -gtk-win32-part-height(button, 2, 6);
-}
-
-radio:checked:active {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 7);
- min-width: -gtk-win32-part-width(button, 2, 7);
- min-height: -gtk-win32-part-height(button, 2, 7);
-}
-
-radio:checked:disabled {
- -gtk-icon-source: -gtk-win32-theme-part(button, 2, 8);
- min-width: -gtk-win32-part-width(button, 2, 8);
- min-height: -gtk-win32-part-height(button, 2, 8);
-}
-
-radio:indeterminate {
- -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 5), -gtk-win32-theme-part(button, 2, 1));
- min-width: -gtk-win32-part-width(button, 2, 9);
- min-height: -gtk-win32-part-height(button, 2, 9);
-}
-
-radio:indeterminate:hover {
- -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 6), -gtk-win32-theme-part(button, 2, 2));
- min-width: -gtk-win32-part-width(button, 2, 2);
- min-height: -gtk-win32-part-height(button, 2, 2);
-}
-
-radio:indeterminate:active {
- -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 7), -gtk-win32-theme-part(button, 2, 3));
- min-width: -gtk-win32-part-width(button, 2, 3);
- min-height: -gtk-win32-part-height(button, 2, 3);
-}
-
-radio:indeterminate:disabled {
- -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 8), -gtk-win32-theme-part(button, 2, 4));
- min-width: -gtk-win32-part-width(button, 2, 4);
- min-height: -gtk-win32-part-height(button, 2, 4);
-}
-
-/* Buttons */
-
-button {
- background-image: -gtk-win32-theme-part(button, 1, 1);
- padding-top: calc(1px + -gtk-win32-part-border-top(button, 1, 1));
- padding-right: calc(1px + -gtk-win32-part-border-right(button, 1, 1));
- padding-bottom: calc(1px + -gtk-win32-part-border-bottom(button, 1, 1));
- padding-left: calc(1px + -gtk-win32-part-border-left(button, 1, 1));
-}
-
-button.default {
- background-image: -gtk-win32-theme-part(button, 1, 5);
-}
-
-button:hover {
- background-image: -gtk-win32-theme-part(button, 1, 2);
-}
-
-button:active, button:checked {
- background-image: -gtk-win32-theme-part(button, 1, 3);
-}
-
-/* XXX: Figure out how to handle disabled active togglebuttons */
-button:disabled {
- background-image: -gtk-win32-theme-part(button, 1, 4);
-}
-
-/* checkbuttons */
-
-/* This is the magic spacing that's hardcoded in Wine */
-checkbutton:dir(ltr) check,
-radiobutton:dir(ltr) radio {
-margin-right: 6px;
-}
-
-checkbutton:dir(rtl) check,
-radiobutton:dir(rtl) radio {
-margin-left: 6px;
-}
-
-/* Frame */
-
-frame {
-padding: 0px 10px;
-}
-
-frame > border {
- margin: 0px -10px;
- background-image: -gtk-win32-theme-part(button, 4, 1);
- padding-top: -gtk-win32-part-border-top(button, 4, 1);
- padding-right: -gtk-win32-part-border-right(button, 4, 1);
- padding-bottom: -gtk-win32-part-border-bottom(button, 4, 1);
- padding-left: -gtk-win32-part-border-left(button, 4, 1);
-}
-
-frame:disabled > border {
- margin: 0px -10px;
- background-image: -gtk-win32-theme-part(button, 4, 2);
- padding-top: -gtk-win32-part-border-top(button, 4, 2);
- padding-right: -gtk-win32-part-border-right(button, 4, 2);
- padding-bottom: -gtk-win32-part-border-bottom(button, 4, 2);
- padding-left: -gtk-win32-part-border-left(button, 4, 2);
-}
-
-frame > :not(border) {
- margin: 0px 2px;
-}
-
-/* Notebooks */
-
-notebook > stack {
- background-image: -gtk-win32-theme-part(tab, 9, 1);
-}
-
-/* We can't use directly the standard theme parts because they are only
- valid with tabs on top, so we draw solid borders of reasonable colors
- and hope for the best */
-
-notebook > header > tabs > tab {
- background-image: -gtk-win32-theme-part(tab, 1, 1, margins(-1));
- padding: 2px 1ex;
- border: 1px solid @notebook_border_color;
-}
-notebook > header > tabs > tab:hover {
- background-image: -gtk-win32-theme-part(tab, 1, 2, margins(-1));
- border-color: @selected_bg_color;
-}
-notebook > header > tabs > tab:checked {
- background-image: -gtk-win32-theme-part(tab, 5, 3, margins(-1));
- padding: 2px 1.5ex;
- margin: 0px -.5ex;
- border-color: @notebook_border_color;
-}
-notebook > header > tabs > tab:focus {
- background-image: -gtk-win32-theme-part(tab, 1, 5, margins(-1));
-}
-
-notebook > header.top, notebook > header.bottom {
- margin-right: 2px;
-}
-
-notebook > header.top > tabs {
- margin-left: .5ex;
- margin-right: .5ex;
-}
-notebook > header.top > tabs > tab {
- margin-top: 4px;
- border-bottom: unset;
-}
-notebook > header.top > tabs > tab:checked {
- margin: 0px -.5ex;
- margin-bottom: -1px;
-}
-
-notebook > header.bottom > tabs {
- margin-left: .5ex;
- margin-right: .5ex;
- margin-top: -1px;
-}
-notebook > header.bottom > tabs > tab {
- margin-bottom: 4px;
- border-top: unset;
-}
-notebook > header.bottom > tabs > tab:checked {
- margin: 0px -.5ex;
- margin-top: -1px;
-}
-
-notebook > header.left, notebook > header.right {
- margin-bottom: 2px;
-}
-notebook > header.left > tabs {
- margin-top: .3ex;
- margin-bottom: .3ex;
-}
-notebook > header.left > tabs > tab {
- padding: .5ex 2px;
- margin-left: 4px;
- border-right: unset;
-}
-notebook > header.left > tabs > tab:checked {
- margin: -.3ex 0;
- margin-right: -1px;
- padding: .8ex 2px;
-}
-
-notebook > header.right > tabs {
- margin-top: .3ex;
- margin-bottom: .3ex;
- margin-left: -2px;
-}
-notebook > header.right > tabs > tab {
- padding: .5ex 2px;
- margin-right: 4px;
- border-left: unset;
-}
-notebook > header.right > tabs > tab:checked {
- margin: -.3ex 0;
- margin-left: -1px;
- padding: .8ex 2px;
-}
-
-/* Scrollbars */
-
-/* TODO: Win32 has different concept for upper and lower trough, we
- don't use this atm */
-
-scrollbar {
- background-color: transparent;
-}
-
-scrollbar.horizontal button {
- min-width : -gtk-win32-size(scrollbar, cxhscroll);
- min-height : -gtk-win32-size(scrollbar, cyhscroll);
-}
-scrollbar.vertical button {
- min-width : -gtk-win32-size(scrollbar, cxvscroll);
- min-height : -gtk-win32-size(scrollbar, cyvscroll);
-}
-scrollbar button, scrollbar button:disabled {
- color: transparent;
- margin: 0;
- padding: 0;
-}
-
-/* up button */
-scrollbar.vertical button.up {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 1);
-}
-scrollbar.vertical:hover button.up {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
-}
-scrollbar.vertical:hover button.up:hover {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 2);
-}
-scrollbar.vertical:hover button.up:active {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 3);
-}
-scrollbar.vertical:hover button.up:disabled {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 4);
-}
-
-/* down button */
-scrollbar.vertical button.down {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 5);
-}
-scrollbar.vertical:hover button.down {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 18);
-}
-scrollbar.vertical:hover button.down:hover {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 6);
-}
-scrollbar.vertical:hover button.down:active {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 7);
-}
-scrollbar.vertical:hover button.down:disabled {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 8);
-}
-
-/* left button */
-scrollbar.horizontal button.up {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 9);
-}
-scrollbar.horizontal:hover button.up {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 19);
-}
-scrollbar.horizontal:hover button.up:hover {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 10);
-}
-scrollbar.horizontal:hover button.up:active {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 11);
-}
-scrollbar.horizontal:hover button.up:disabled {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 12);
-}
-
-/* right button */
-scrollbar.horizontal button.down {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 13);
-}
-scrollbar.horizontal:hover button.down {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 20);
-}
-scrollbar.horizontal:hover button.down:hover {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 14);
-}
-scrollbar.horizontal:hover button.down:active {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
-}
-scrollbar.horizontal:hover button.down:disabled {
-background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
-}
-
-scrollbar trough {
- border-width: 0;
- background-image: -gtk-win32-theme-part(scrollbar, 6, 1);
-}
-
-scrollbar trough.vertical {
- border-width: 0;
- background-image: -gtk-win32-theme-part(scrollbar, 2, 1, over(6, 1));
-}
-
-scrollbar.horizontal slider {
- min-height: -gtk-win32-size(scrollbar, cyhscroll);
- min-width: -gtk-win32-size(scrollbar, cxhthumb);
-}
-scrollbar.vertical slider {
- min-width: -gtk-win32-size(scrollbar, cxvscroll);
- min-height: -gtk-win32-size(scrollbar, cyvthumb);
-}
-
-
-scrollbar slider {
- border-width: 0;
- background-image: -gtk-win32-theme-part(scrollbar, 2, 1, over(8, 1));
-}
-
-scrollbar slider:hover {
- background-image: -gtk-win32-theme-part(scrollbar, 2, 2, over(8, 2));
-}
-
-scrollbar slider:active {
- background-image: -gtk-win32-theme-part(scrollbar, 2, 3, over(8, 3));
-}
-
-scrollbar slider:disabled {
-/* There's a theme part for "disabled slider", but the only app observed
- to have a disabled scrollbar (Notepad) does not draw its slider at all
- when scrollbar is disabled. */
-background-image: none;
-background-color: transparent;
-}
-
-scrollbar.vertical slider {
- background-image: -gtk-win32-theme-part(scrollbar, 3, 1, over(9, 1));
-}
-
-scrollbar.vertical slider:hover {
- background-image: -gtk-win32-theme-part(scrollbar, 3, 2, over(9, 2));
-}
-
-scrollbar.vertical slider:active {
- background-image: -gtk-win32-theme-part(scrollbar, 3, 3, over(9, 3));
-}
-
-scrollbar.vertical slider:disabled {
-background-image: none;
-background-color: transparent;
-}
-
-/* Entry */
-
-textview.view,
-entry {
- background-image: -gtk-win32-theme-part(edit, 1, 1);
- /* The 1em/3 is the "margin" that Windows uses. I'm pretty sure that's the "ABC width"
- of the font. But we don't get those fancy things in CSS. */
- padding: -gtk-win32-size(edit, cyedge) calc(-gtk-win32-size(edit, cxedge) + 1em/3);
-}
-
-textview.view:focus,
-entry:focus {
- background-image: -gtk-win32-theme-part(edit, 1, 3);
-}
-
-textview.view:disabled,
-entry:disabled {
- /* This theme part feels wrong here, but it looks as one would expect,
- whereas (edit, 5, 3) BACKGROUNDWITHBORDER, EBS_DISABLED is just white */
- background-image: -gtk-win32-theme-part(combobox, 5, 4);
- color: -gtk-win32-color(edit, graytext);
-}
-
-selection {
- background: -gtk-win32-color(edit, highlight);
- color: -gtk-win32-color(edit, highlighttext);
-}
-
-entry.flat {
-padding: 0px;
-background-image: -gtk-win32-theme-part(edit, 3, 1);
-}
-
-entry.flat:focus {
- background-image: -gtk-win32-theme-part(edit, 3, 3);
-}
-
-entry.flat:disabled {
- background-image: -gtk-win32-theme-part(edit, 3, 4);
- color: -gtk-win32-color(edit, graytext);
-}
-
-/* Spinbutton (horizontal) */
-
-spinbutton.horizontal {
-padding: 2px 1px;
-background-image: -gtk-win32-theme-part(edit, 1, 1);
-}
-
-spinbutton.horizontal:focus {
- background-image: -gtk-win32-theme-part(edit, 1, 3);
-}
-
-spinbutton.horizontal:disabled {
- background-image: -gtk-win32-theme-part(edit, 1, 4);
-}
-
-spinbutton.horizontal entry {
-all: unset;
-padding: 0px calc(1em/3);
-}
-
-spinbutton.horizontal button {
-all: unset;
-color: transparent;
-min-width: 15px;
-min-height: 9px;
-background-size: 15px 9px;
-background-repeat: no-repeat;
-}
-
-spinbutton.horizontal button.down {
-background-image: -gtk-win32-theme-part(spin, 2, 1);
-background-position: top center;
-padding-left: 1px;
-margin-left: -1px;
-margin-top: 8px;
-margin-bottom: -8px;
-margin-right: -1px;
-}
-
-spinbutton.horizontal button.up {
-background-image: -gtk-win32-theme-part(spin, 1, 1);
-background-position: bottom center;
-margin-top: -8px;
-margin-bottom: 8px;
-margin-left: -16px;
-margin-right: -1px;
-}
-
-spinbutton.horizontal button.down:hover {
- background-image: -gtk-win32-theme-part(spin, 2, 2);
-}
-
-spinbutton.horizontal button.up:hover {
- background-image: -gtk-win32-theme-part(spin, 1, 2);
-}
-
-spinbutton.horizontal button.down:active {
- background-image: -gtk-win32-theme-part(spin, 2, 3);
-}
-
-spinbutton.horizontal button.up:active {
- background-image: -gtk-win32-theme-part(spin, 1, 3);
-}
-
-spinbutton.horizontal button.down:disabled {
- background-image: -gtk-win32-theme-part(spin, 2, 4);
-}
-
-spinbutton.horizontal button.up:disabled {
- background-image: -gtk-win32-theme-part(spin, 1, 4);
-}
-
-/* Spinbutton (vertical) */
-
-spinbutton.vertical button,
-spinbutton.vertical button:focus {
- background-color: transparent;
- color: rgba(0, 0, 0, 0);
- background-image: -gtk-win32-theme-part(spin, 1, 1, margins(0 -1 -0 -1));
-}
-
-spinbutton.vertical button:last-child,
-spinbutton.vertical button:focus:last-child {
- background-image: -gtk-win32-theme-part(spin, 2, 1, margins(0 -1 0 -1));
-}
-
-
-spinbutton.vertical button:hover,
-spinbutton.vertical button:hover:focus {
- background-image: -gtk-win32-theme-part(spin, 1, 2, margins(0 -1 -0 -1));
-}
-
-spinbutton.vertical button:hover:last-child,
-spinbutton.vertical button:hover:focus:last-child {
- background-image: -gtk-win32-theme-part(spin, 2, 2, margins(0 -1 0 -1));
-}
-
-
-spinbutton.vertical button:active,
-spinbutton.vertical button:active:hover,
-spinbutton.vertical button:active:focus,
-spinbutton.vertical button:active:hover:focus {
- background-image: -gtk-win32-theme-part(spin, 1, 3, margins(0 -1 -0 -1));
-}
-
-spinbutton.vertical button:active:last-child,
-spinbutton.vertical button:active:hover:last-child,
-spinbutton.vertical button:active:focus:last-child,
-spinbutton.vertical button:active:hover:focus:last-child {
- background-image: -gtk-win32-theme-part(spin, 2, 3, margins(0 -1 0 -1));
-}
-
-spinbutton.vertical button:disabled {
- background-image: -gtk-win32-theme-part(spin, 1, 4, margins(0 -1 -0 -1));
-}
-
-spinbutton.vertical button:disabled:last-child {
- background-image: -gtk-win32-theme-part(spin, 2, 4, margins(0 -1 0 -1));
-}
-
-
-
-spinbutton button:dir(rtl),
-spinbutton button:focus:dir(rtl) {
- background-color: transparent;
- background-image: -gtk-win32-theme-part(spin, 2, 1, margins(0 -1 -1 -1));
- color: rgba(0, 0, 0, 0);
-}
-
-spinbutton button:first-child:dir(rtl),
-spinbutton button:focus:first-child:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 1, 1, margins(-1 -1 0 -1));
-}
-
-spinbutton button:hover:dir(rtl),
-spinbutton button:hover:focus:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 2, 2, margins(0 -1 -1 -1));
-}
-
-spinbutton button:hover:first-child:dir(rtl),
-spinbutton button:hover:focus:first-child:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 1, 2, margins(-1 -1 0 -1));
-}
-
-
-spinbutton button:active:dir(rtl),
-spinbutton button:active:hover:dir(rtl),
-spinbutton button:active:focus:dir(rtl),
-spinbutton button:active:hover:focus:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 2, 3, margins(0 -1 -1 -1));
-}
-
-spinbutton button:active:first-child:dir(rtl),
-spinbutton button:active:hover:first-child:dir(rtl),
-spinbutton button:active:focus:first-child:dir(rtl),
-spinbutton button:active:hover:focus:first-child:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 1, 3, margins(-1 -1 0 -1));
-}
-
-spinbutton button:disabled:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 2, 4, margins(0 -1 -1 -1));
-}
-
-spinbutton button:disabled:first-child:dir(rtl) {
- background-image: -gtk-win32-theme-part(spin, 1, 4, margins(-1 -1 0 -1));
-}
-
-/* Ranges */
-
-scale.horizontal trough {
- margin: calc( -gtk-win32-part-height(trackbar, 4, 1) / 2 + 1px ) 0;
- padding: 0 calc( -gtk-win32-part-width(trackbar, 4, 1) / 2);
- background-image: -gtk-win32-theme-part(trackbar, 1, 1);
- min-height: -gtk-win32-part-height(trackbar, 1, 1);
-}
-scale.vertical trough {
- margin: 0 calc( -gtk-win32-part-width(trackbar, 8, 1) / 2 + 1px );
- padding: calc( -gtk-win32-part-height(trackbar, 8, 1) / 2 ) 0;
- background-image: -gtk-win32-theme-part(trackbar, 2, 1);
- min-width: -gtk-win32-part-width(trackbar, 2, 1);
-}
-
-scale.horizontal indicator {
- min-height: -gtk-win32-part-height(trackbar, 9, 1);
- min-width: -gtk-win32-part-width(trackbar, 9, 1);
- color: shade(@bg_color, 0.6);
- margin-top: -2px;
- margin-bottom: 2px;
-}
-scale.vertical indicator {
- min-height: -gtk-win32-part-height(trackbar, 10, 1) ;
- min-width: -gtk-win32-part-width(trackbar, 10, 1);
- color: shade(@bg_color, 0.6);
- margin-left: -2px;
- margin-right: 2px;
-}
-
-scale.horizontal slider {
- min-height: -gtk-win32-part-height(trackbar, 4, 1);
- min-width: -gtk-win32-part-width(trackbar, 4, 1);
- margin: calc( (-gtk-win32-part-height(trackbar, 4, 1) - -gtk-win32-part-height(trackbar, 1, 1)) / -2) 0;
-}
-
-scale.vertical slider {
- min-height: -gtk-win32-part-height(trackbar, 8, 1);
- min-width: -gtk-win32-part-width(trackbar, 8, 1);
- margin: 0 calc( (-gtk-win32-part-width(trackbar, 8, 1) - -gtk-win32-part-width(trackbar, 2, 1)) / -2);
-}
-
-scale.horizontal slider {
- background-image: -gtk-win32-theme-part(trackbar, 3,1)
-}
-scale.horizontal.marks-after slider {
- background-image: -gtk-win32-theme-part(trackbar, 4,1)
-}
-scale.horizontal slider:hover {
- background-image: -gtk-win32-theme-part(trackbar, 3,2)
-}
-scale.horizontal.marks-after slider:hover {
- background-image: -gtk-win32-theme-part(trackbar, 4,2)
-}
-scale.horizontal slider:focus {
- background-image: -gtk-win32-theme-part(trackbar, 3,4)
-}
-scale.horizontal.marks-after slider:focus {
- background-image: -gtk-win32-theme-part(trackbar, 4,4)
-}
-scale.horizontal slider:active {
- background-image: -gtk-win32-theme-part(trackbar, 3,3)
-}
-scale.horizontal.marks-after slider:active {
- background-image: -gtk-win32-theme-part(trackbar, 4,3)
-}
-scale.horizontal slider:disabled {
- background-image: -gtk-win32-theme-part(trackbar, 3,5)
-}
-scale.horizontal.marks-after slider:disabled {
- background-image: -gtk-win32-theme-part(trackbar, 4,5)
-}
-
-scale.vertical slider {
- background-image: -gtk-win32-theme-part(trackbar, 6, 1)
-}
-scale.vertical.marks-after slider {
- background-image: -gtk-win32-theme-part(trackbar, 8, 1)
-}
-scale.vertical slider:hover {
- background-image: -gtk-win32-theme-part(trackbar, 6, 2)
-}
-scale.vertical.marks-after slider:hover {
- background-image: -gtk-win32-theme-part(trackbar, 8, 2)
-}
-scale.vertical slider:focus {
- background-image: -gtk-win32-theme-part(trackbar, 6, 4)
-}
-scale.vertical.marks-after slider:focus {
- background-image: -gtk-win32-theme-part(trackbar, 8, 4)
-}
-scale.vertical slider:active {
- background-image: -gtk-win32-theme-part(trackbar, 6, 3)
-}
-scale.vertical.marks-after slider:active {
- background-image: -gtk-win32-theme-part(trackbar, 8, 3)
-}
-scale.vertical slider:disabled {
- background-image: -gtk-win32-theme-part(trackbar, 6, 5)
-}
-scale.vertical.marks-after slider:disabled {
- background-image: -gtk-win32-theme-part(trackbar, 8, 5)
-}
-
-scale.horizontal highlight {
- background-image: -gtk-win32-theme-part(progress, 5,1);
- margin: 0 calc( -gtk-win32-part-width(trackbar, 4, 1) / -2);
-}
-scale.vertical highlight {
- background-image: -gtk-win32-theme-part(progress, 6,1);
- margin: calc( -gtk-win32-part-height(trackbar, 6, 1) / -2) 0;
-}
-
-scale value {
- margin-bottom: 5px;
-}
-
-
-/* Progress bars and level bars */
-
-progressbar.horizontal trough,
-levelbar.horizontal trough {
- min-height: -gtk-win32-part-height(progress, 1, 1);
- background-image: -gtk-win32-theme-part(progress, 1, 1);
-}
-progressbar.vertical trough,
-levelbar.vertical trough {
- min-width: -gtk-win32-part-width(progress, 1, 1);
- background-image: -gtk-win32-theme-part(progress, 2, 1);
-}
-
-progressbar.horizontal progress, levelbar.horizontal block {
- min-height: -gtk-win32-part-height(progress, 5, 1);
-}
-
-progressbar progress,
-levelbar block.filled,
-entry progress,
-entry progress:focus {
- background-image: -gtk-win32-theme-part(progress, 5, 1);
-}
-
-/* We use here PBFS_PAUSED (yellow by default) and PBFS_PARTIAL (blue) */
-levelbar block.low {
- background-image: -gtk-win32-theme-part(progress, 5, 3);
-}
-levelbar block.full {
- background-image: -gtk-win32-theme-part(progress, 5, 4);
-}
-
-progressbar.horizontal progress.pulse,
-entry progress.pulse,
-entry progress.pulse:focus {
- background-image: -gtk-win32-theme-part(progress, 8, 1);
-}
-
-progressbar.vertical progress,
-levelbar.vertical block {
- min-width: -gtk-win32-part-width(progress, 6, 1);
-}
-
-progressbar.vertical progress,
-levelbar.vertical block.filled {
- background-image: -gtk-win32-theme-part(progress, 6, 1);
-}
-levelbar.vertical block.low {
- background-image: -gtk-win32-theme-part(progress, 6, 3);
-}
-levelbar.vertical block.full {
- background-image: -gtk-win32-theme-part(progress, 6, 4);
-}
-
-progressbar.vertical progress.pulse {
- background-image: -gtk-win32-theme-part(progress, 10, 1);
-}
-
-/* Combobox */
-
-combobox entry {
- margin-right: calc( -2ex - -gtk-win32-part-width(combobox, 6, 1));
- background-image: -gtk-win32-theme-part(combobox, 4, 1);
-}
-combobox entry:hover {
- background-image: -gtk-win32-theme-part(combobox, 4, 2);
-}
-combobox entry:focus {
- background-image: -gtk-win32-theme-part(combobox, 4, 3);
-}
-combobox:disabled entry {
- background-image: -gtk-win32-theme-part(combobox, 5, 4);
-}
-
-combobox entry, combobox entry:disabled, combobox entry:focus {
- padding-left: 1ex;
-}
-
-combobox button {
- padding: 2px;
-}
-
-combobox entry + button {
- padding: 0;
- background-image: none;
-}
-
-combobox button arrow {
- background-image: -gtk-win32-theme-part(combobox, 6, 1);
- min-height: -gtk-win32-part-height(combobox, 6, 1);
- /* this width is too small, so better put some padding */
- min-width: -gtk-win32-part-width(combobox, 6, 1);
- padding: 0 1ex;
-}
-combobox entry + button:hover arrow {
- background-image: -gtk-win32-theme-part(combobox, 6, 2);
-}
-
-combobox entry + button:disabled {
- background-image: none;
-}
-
-combobox entry + button:disabled arrow {
- background-image: -gtk-win32-theme-part(combobox, 6, 4);
-}
-combobox entry + button:checked arrow {
- background-image: -gtk-win32-theme-part(combobox, 6, 3);
-}
-
-combobox menu {
- /* Dropdown list should have "window" color, as listbox
- contents do (usually it's "white") */
- background-color: -gtk-win32-color(listview, window);
- padding: 2px;
-}
-
-combobox menuitem {
- padding: 0 2px;
-}
-
-combobox menuitem > cellview {
- padding: 0px;
-}
-
-/* Toolbar */
-
-toolbar {
- background-color: transparent;
- border-width: 0;
- background-image: -gtk-win32-theme-part(rebar, 6, 1);
-}
-
-toolbar button,
-toolbar button:focus {
- background-color: transparent;
- background-image: -gtk-win32-theme-part(toolbar, 1, 1);
-}
-
-toolbar button:hover,
-toolbar button:hover:focus {
- background-image: -gtk-win32-theme-part(toolbar, 1, 2);
-}
-
-toolbar button:active {
- background-image: -gtk-win32-theme-part(toolbar, 1, 3);
-}
-
-toolbar button:active:hover {
- background-image: -gtk-win32-theme-part(toolbar, 1, 6);
-}
-
-toolbar button:disabled {
- background-image: -gtk-win32-theme-part(toolbar, 1, 4);
-}
-
-/* Column headers */
-
-header button,
-header button:focus {
- background-color: transparent;
- border-width: 0;
- background-image: -gtk-win32-theme-part(header, 1, 1);
-}
-
-header button:hover,
-header button:hover:focus {
- background-image: -gtk-win32-theme-part(header, 1, 2);
-}
-
-header button:active,
-header button:active:hover,
-header button:active:focus,
-header button:active:hover:focus {
- background-image: -gtk-win32-theme-part(header, 1, 3);
-}
-
-/* Switch */
-
-switch {
- background-image: -gtk-win32-theme-part(button, 1, 1);
-}
-
-switch:checked {
- background-image: -gtk-win32-theme-part(button, 1, 3);
-}
-
-switch:disabled {
- background-image: -gtk-win32-theme-part(button, 1, 4);
-}
-
-switch slider {
- background-image: -gtk-win32-theme-part(button, 1, 1);
-}
-
-switch:hover slider {
- background-image: -gtk-win32-theme-part(button, 1, 2);
-}
-
-switch:checked slider {
- background-image: -gtk-win32-theme-part(button, 1, 3);
-}
-
-switch:disabled slider {
- background-image: -gtk-win32-theme-part(button, 1, 4);
-}
-
-/* Menus */
-
-menu {
- background-color: -gtk-win32-color(button, menu);
- border-color: shade(-gtk-win32-color(button, menu), 0.6);
- border-style: solid;
- border-width: 1px;
- padding: 2px;
-}
-
-menuitem {
- color: -gtk-win32-color(button, menutext);
-}
-
-menubar menuitem *:backdrop {
- color: mix(-gtk-win32-color(button, menutext), white, 0.5);
-}
-
-menubar > menuitem {
- padding: 3px 5px;
-}
-
-/* Add more padding to menus, increasing visible height of each menuitem */
-menu * {
-padding: 2px; /* TM:org 2px; */
-}
-
-/* Assistant */
-
-GtkAssistant .sidebar .highlight {
- background-color: gray;
- font-weight: bold;
-}
-
-GtkAssistant .sidebar {
- padding: 12px;
-
- background-color: white;
-
- border-image: none;
- border-width: 0 1px 0 0;
- border-style: solid;
-}
-
-colorswatch {
- border-style: solid;
- border-width: 1px;
-}
-
-colorswatch:hover {
- border-color: shade(@bg_color, 0.2);
-}
-
-separator,
-separator:hover {
- background-color: @bg_color;
-}
-
-statusbar > frame {
- border-width: 1px 1px 1px 1px;
- border-style: solid;
- border-image: -gtk-win32-theme-part(status, 0, 0, margins(-1 0 0 0)) 2 1 1 1 stretch;
- background-image: none;
-}
-
-/* Expander */
-
-expander title arrow {
- background-image: -gtk-win32-theme-part(explorerbar, 7, 1);
-}
-expander title arrow:checked {
- background-image: -gtk-win32-theme-part(explorerbar, 6, 1);
-}
-expander title:hover arrow {
- background-image: -gtk-win32-theme-part(explorerbar, 7, 2);
-}
-expander title:hover arrow:checked {
- background-image: -gtk-win32-theme-part(explorerbar, 6, 2);
-}
-
-/* Spinner */
-
- at keyframes spin {
-to { -gtk-icon-transform: rotate(1turn); }
-}
-
-spinner {
-background: none;
-opacity: 0;
--gtk-icon-source: -gtk-icontheme('process-working-symbolic');
-}
-
-spinner:checked {
-opacity: 1;
-animation: spin 1s linear infinite;
-}
-
-spinner:checked:disabled
-{
-opacity: 0.5;
-}
-
-spinner:active {
- background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
- -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-animation: spinner 1s infinite linear;
-}
-
-/* Popovers */
-popover {
- border-radius: 3px;
- background-clip: border-box;
- background-color: @bg_color;
-
- border-color: rgba(0, 0, 0, 1);
- border-width: 1px;
- border-style: solid;
-
- box-shadow: 0 2px 3px alpha(black, 0.5);
- margin: 10px;
- padding: 2px;
-}
-popover > list,
-popover > .view,
-popover > toolbar {
- background-color: transparent;
-}
-
-/* Listbox */
-list {
-background-color: -gtk-win32-color(listbox, window);
-}
-
-/* Dim label */
-.dim-label {
- color: alpha(currentColor, 0.55);
- text-shadow: none;
-}
-
-/* Modelbuttons */
-
-modelbutton:focus,
-modelbutton {
- background-color: transparent;
- background-image: -gtk-win32-theme-part(menu, 14, 1);
-}
-
-modelbutton:active,
-modelbutton:active:focus {
- background-color: transparent;
- background-image: -gtk-win32-theme-part(menu, 14, 1);
-}
-
-modelbutton:active:hover:focus,
-modelbutton:hover:focus,
-modelbutton:hover {
- background-image: -gtk-win32-theme-part(menu, 14, 2);
-}
-
-modelbutton:active:hover:disabled:focus,
-modelbutton:hover:disabled:focus,
-modelbutton:hover:disabled {
- background-image: -gtk-win32-theme-part(menu, 14, 4);
-}
-
-
-modelbutton radio:focus,
-modelbutton radio,
-modelbutton radio:hover,
-modelbutton radio:disabled {
- background-color: transparent;
- background-image: none;
- border-width: 0;
-}
-
-modelbutton radio:active:focus,
-modelbutton radio:active,
-modelbutton radio:active:hover {
- background-image: -gtk-win32-theme-part(menu, 12, 2, over(11, 3));
- border-width: 0;
-}
-
-modelbutton radio:indeterminate:focus,
-modelbutton radio:indeterminate,
-modelbutton radio:indeterminate:disabled,
-modelbutton radio:indeterminate:hover,
-modelbutton radio:indeterminate:active,
-modelbutton radio:indeterminate:active:hover {
- background-image: none; /* Fall back to default, this state is not in win32 */
- border-width: 0;
-}
-
-modelbutton radio:disabled:active:focus,
-modelbutton radio:disabled:active,
-modelbutton radio:disabled:active:hover {
- background-image: -gtk-win32-theme-part(menu, 12, 1, over(11, 4));
- border-width: 0;
-}
-
-modelbutton check:focus,
-modelbutton check,
-modelbutton check:disabled,
-modelbutton check:hover,
-modelbutton check:hover:focus {
- background-color: transparent;
- background-image: none;
- border-width: 0;
-}
-
-
-modelbutton check:active:focus,
-modelbutton check:active,
-modelbutton check:active:hover:focus,
-modelbutton check:active:hover {
- background-image: -gtk-win32-theme-part(menu, 12, 2, over(11, 1));
- border-width: 0;
-}
-
-modelbutton check:indeterminate:focus,
-modelbutton check:indeterminate,
-modelbutton check:indeterminate:disabled,
-modelbutton check:indeterminate:disabled:focus,
-modelbutton check:indeterminate:hover,
-modelbutton check:indeterminate:hover:focus,
-modelbutton check:indeterminate:active,
-modelbutton check:indeterminate:active:focus,
-modelbutton check:indeterminate:active:hover:focus,
-modelbutton check:indeterminate:active:hover {
- background-image: none; /* Fall back to default, this state is not in win32 */
- border-width: 0;
-}
-
-modelbutton check:disabled:active:focus,
-modelbutton check:disabled:active,
-modelbutton check:disabled:active:hover:focus,
-modelbutton check:disabled:active:hover {
- background-image: -gtk-win32-theme-part(menu, 12, 1, over(11, 2));
- border-width: 0;
-}
-
-/* Application notification */
-.app-notification {
- border-style: solid;
- border-color: @app_notification_border;
- border-width: 0 1px 1px 1px;
- border-radius: 0 0 5px 5px;
- padding: 8px;
-
- background-image: linear-gradient(to bottom,
- @app_notification_a,
- @app_notification_b 18%,
- @app_notification_c);
-
- color: @theme_text_color;
- text-shadow: 0 1px @primary_toolbarbutton_text_shadow;
- border-image: none;
-}
-
-
-/* TM: START: treeview - show native +/- instead of arrows */
-treeview.view.expander:checked {
- -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
-}
-treeview.view.expander {
- -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
-}
-/* TM: END: treeview - show native +/- instead of arrows */
-
-/* TM: START: Only for Claws-Mail */
-treeview.view:selected {
- background-color: @selected_bg_color;
-}
-/* TM: END: Only for Claws-Mail */
-
diff --git a/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css b/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css
deleted file mode 100644
index 29d81cb..0000000
--- a/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,309 +0,0 @@
-/* win71 theme
- * Based on (internal) win32 theme from gtk+-3.24.26 source
- * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
- * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
- * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
- * Additional changes from Thorsten Maerz <info at netztorte.de>
-*/
-
- at import url("gtk-win32-base.css");
-
-/* Menus */
-
-menubar {
- background-color: transparent;
- border-width: 0;
- background-image: -gtk-win32-theme-part(menu, 7, 1);
-}
-
-menubar > menuitem {
- background-color: transparent;
- border-width: 0px;
- background-image: -gtk-win32-theme-part(menu, 8, 1);
-}
-
-menubar > menuitem:hover {
- background-image: -gtk-win32-theme-part(menu, 8, 3);
-}
-
-menuitem:hover {
- background-image: -gtk-win32-theme-part(menu, 14, 2);
-}
-
-menuitem:hover:disabled {
- background-image: -gtk-win32-theme-part(menu, 14, 4);
-}
-
-menuitem radio,
-menuitem radio:hover,
-menuitem radio:disabled {
- background-color: transparent;
- background-image: none;
- border-width: 0;
-}
-
-menuitem radio:active,
-menuitem radio:active:hover {
- background-image: -gtk-win32-theme-part(menu, 11, 3);
- border-width: 0;
-}
-
-menuitem radio:indeterminate,
-menuitem radio:indeterminate:disabled,
-menuitem radio:indeterminate:hover,
-menuitem radio:indeterminate:active,
-menuitem radio:indeterminate:active:hover {
- background-image: none; /* Fall back to default, this state is not in win32 */
- border-width: 0;
-}
-
-menuitem radio:disabled:active,
-menuitem radio:disabled:active:hover {
- background-image: -gtk-win32-theme-part(menu, 11, 4);
- border-width: 0;
-}
-
-menuitem check,
-menuitem check:hover,
-menuitem check:disabled {
- background-image: none;
- border-width: 0;
-}
-
-menuitem check:active,
-menuitem check:active:hover {
- background-image: -gtk-win32-theme-part(menu, 11, 1);
- border-width: 0;
-}
-
-menuitem check:indeterminate,
-menuitem check:indeterminate:disabled,
-menuitem check:indeterminate:hover,
-menuitem check:indeterminate:active,
-menuitem check:indeterminate:active:hover {
- background-image: none; /* Fall back to default, this state is not in win32 */
- border-width: 0;
-}
-
-menuitem check:disabled:active,
-menuitem check:disabled:active:hover{
- background-image: -gtk-win32-theme-part(menu, 11, 2);
- border-width: 0;
-}
-
-/* TM: START: show arrow for submenu - CHECK:is there ltr/rtl? */
-menu menuitem arrow, .menu menuitem arrow {
- min-width: 16px;
- min-height: 16px;
-}
-
-menu menuitem arrow, .menu menuitem arrow {
- margin-left: 10px;
- -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
-}
-/* TM: END: show arrow for submenu */
-
-/* TM: START: show menu separator lines (1px wide) */
-menu separator {
- padding: 0px; /* TM: new */
- background-color: #cccccc;
-}
-/* TM: END */
-
-/* Listbox */
-
-/* We're cheating here, using part 6 (listview header group),
- because part 1 (listview item) is empty for some reason */
-row:hover {
- background-image: -gtk-win32-theme-part(listview, 6, 10);
-}
-
-row:selected {
- background-color: transparent;
- /* Override *:selected {} blanket style, keeping the background - bright
- and the text - dark */
- color: @text_color;
- background-image: -gtk-win32-theme-part(listview, 6, 13);
-}
-
-row:selected:focus {
- background-image: -gtk-win32-theme-part(listview, 6, 11);
-}
-
-row:selected:hover {
- background-image: -gtk-win32-theme-part(listview, 6, 12);
-}
-
-/* Titlebar */
-
-decoration {
- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
- background-image: -gtk-win32-theme-part(window, 1, 1),
- -gtk-win32-theme-part(window, 9, 1),
- -gtk-win32-theme-part(window, 7, 1),
- -gtk-win32-theme-part(window, 8, 1);
- background-size: 100% -gtk-win32-size(window, cycaption),
- 100% calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder)),
- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder)) calc(100% - 2 * (-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))),
- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder)) calc(100% - 2 * (-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder)));
- background-position: top, bottom, left, right;
- background-repeat: no-repeat;
-}
-
-/* Unset above settings when the window is a popup menu or tooltip */
-* window decoration, tooltip decoration {
- all: unset;
-}
-
-.titlebar {
- margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
- calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
- margin-bottom: 0px;
- /* TM: START: titlebar had too much headroom
- padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
- calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
- */
- padding: 0px 4px; /* TM: replace previous */
- /* TM: END: titlebar had too much headroom */
- padding-bottom: 0px;
- background: -gtk-win32-theme-part(window, 1, 1);
- min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
-}
-
-decoration:backdrop {
- background-image: -gtk-win32-theme-part(window, 1, 2),
- -gtk-win32-theme-part(window, 9, 2),
- -gtk-win32-theme-part(window, 7, 2),
- -gtk-win32-theme-part(window, 8, 2);
-}
-.titlebar:backdrop {
- background: -gtk-win32-theme-part(window, 1, 2);
-}
-
-decoration:disabled {
- background-image: -gtk-win32-theme-part(window, 1, 3),
- -gtk-win32-theme-part(window, 9, 3),
- -gtk-win32-theme-part(window, 7, 3),
- -gtk-win32-theme-part(window, 8, 3);
-}
-.titlebar:disabled {
- background: -gtk-win32-theme-part(window, 1, 3);
-}
-
-.titlebar button.titlebutton {
- margin-top: -gtk-win32-size(button, cyedge);
- margin-bottom: -gtk-win32-size(button, cyedge);
- margin-right: -gtk-win32-size(button, cxedge);
- min-width: calc(-gtk-win32-size(button, cxsize) - 2 * -gtk-win32-size(button, cxedge));
- min-height: calc(-gtk-win32-size(button, cysize) - 2 * -gtk-win32-size(button, cyedge));
- background-repeat: no-repeat;
- background-size: 100% calc(-gtk-win32-size(button, cysize) - 2 * -gtk-win32-size(button, cyedge));
- background-position: 50% calc(100% - -gtk-win32-size(window, cycaption) + -gtk-win32-size(window, cysize) - -gtk-win32-size(window, cyedge));
-}
-
-.titlebar separator {
- background-color: unset;
-}
-
-/* XXX: headerbar insists on 6px spacing between buttons. Windows doesn't
- * think so. */
-.titlebar .titlebutton + .titlebutton {
- margin-left: -6px;
-}
-
-/* XXX: We don't draw icons here, but the GtkImage still sizes itself to 16x16,
- * so shrink it enough: */
-.titlebar button.titlebutton image {
- margin: -3px;
-}
-
-.titlebar .close image,
-.titlebar .maximize image,
-.titlebar .minimize image {
- color: transparent;
-}
-
-.titlebar button.close {
- background-image: -gtk-win32-theme-part(window, 18, 1);
-}
-
-.titlebar button.close:backdrop {
- background-image: -gtk-win32-theme-part(window, 18, 5);
-}
-
-.titlebar button.close:hover {
- background-image: -gtk-win32-theme-part(window, 18, 2);
-}
-
-.titlebar button.close:active {
- background-image: -gtk-win32-theme-part(window, 18, 3);
-}
-
-.titlebar button.close:disabled {
- background-image: -gtk-win32-theme-part(window, 18, 4);
-}
-
-.titlebar button.minimize {
- background-image: -gtk-win32-theme-part(window, 15, 1);
-}
-
-.titlebar button.minimize:backdrop {
- background-image: -gtk-win32-theme-part(window, 15, 5);
-}
-
-.titlebar button.minimize:hover {
- background-image: -gtk-win32-theme-part(window, 15, 2);
-}
-
-.titlebar button.minimize:active {
- background-image: -gtk-win32-theme-part(window, 15, 3);
-}
-
-.titlebar button.minimize:disabled {
- background-image: -gtk-win32-theme-part(window, 15, 4);
-}
-
-.titlebar button.maximize {
- background-image: -gtk-win32-theme-part(window, 17, 1);
-}
-
-.titlebar button.maximize:backdrop {
- background-image: -gtk-win32-theme-part(window, 17, 5);
-}
-
-.titlebar button.maximize:hover {
- background-image: -gtk-win32-theme-part(window, 17, 2);
-}
-
-.titlebar button.maximize:active {
- background-image: -gtk-win32-theme-part(window, 17, 3);
-}
-
-.titlebar button.maximize:disabled {
- background-image: -gtk-win32-theme-part(window, 17, 4);
-}
-
-.maximized .titlebar button.maximize {
- background-image: -gtk-win32-theme-part(window, 21, 1);
-}
-
-.maximized .titlebar button.maximize:backdrop {
- background-image: -gtk-win32-theme-part(window, 21, 5);
-}
-
-.maximized .titlebar button.maximize:hover {
- background-image: -gtk-win32-theme-part(window, 21, 2);
-}
-
-.maximized .titlebar button.maximize:active {
- background-image: -gtk-win32-theme-part(window, 21, 3);
-}
-
-.maximized .titlebar button.maximize:disabled {
- background-image: -gtk-win32-theme-part(window, 21, 4);
-}
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 3ed4282..c8b04c3 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -736,12 +736,13 @@ File ${prefix}/share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo
SetOutPath "$INSTDIR"
#######################################
-### gtk-add
+### gtk+ win71 theme
+!insertmacro SetSourcePrefix2 gtk_ gtk+
SetOutPath "$INSTDIR\etc\gtk-3.0"
-File gtk-add/etc/gtk-3.0/settings.ini
+File ${sourceprefix}/_claws_theme/settings.ini
SetOutPath "$INSTDIR\share\themes\win71\gtk-3.0"
-File gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
-File gtk-add/share/themes/win71/gtk-3.0/gtk.css
+File ${sourceprefix}/_claws_theme/win71/gtk-win32-base.css
+File ${sourceprefix}/_claws_theme/win71/gtk.css
SetOutPath "$INSTDIR"
#######################################
commit b2fb821263c61c529a5fb2b7dc28feec1aa90196
Author: Thorsten Maerz <info at netztorte.de>
Date: Sat Apr 3 18:08:55 2021 +0200
Adjust treeview unfocused selection color
diff --git a/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css b/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
index 1b31403..2a2b94d 100644
--- a/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
+++ b/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
@@ -1401,3 +1401,9 @@ treeview.view.expander {
}
/* TM: END: treeview - show native +/- instead of arrows */
+/* TM: START: Only for Claws-Mail */
+treeview.view:selected {
+ background-color: @selected_bg_color;
+}
+/* TM: END: Only for Claws-Mail */
+
commit 67fd815b4595a6f00c38bb01fe5d73d5d502f674
Author: Thorsten Maerz <info at netztorte.de>
Date: Mon Mar 22 10:27:48 2021 +0000
Add native looking win71 theme
Based on (internal) win32 theme from gtk+-3.24.26 source.
Additional patches from Jaime Velasco:
https://gitlab.gnome.org/GNOME/gtk/-/issues/687
Additional changes from Thorsten Maerz <info at netztorte.de>
diff --git a/src/gtk-add/Makefile.am b/src/gtk-add/Makefile.am
index 26c1d5e..9dd014f 100644
--- a/src/gtk-add/Makefile.am
+++ b/src/gtk-add/Makefile.am
@@ -14,4 +14,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-EXTRA_DIST = etc/gtk-3.0/settings.ini
+EXTRA_DIST = etc/gtk-3.0/settings.ini \
+ share/themes/win71/gtk-3.0/gtk-win32-base.css \
+ share/themes/win71/gtk-3.0/gtk.css
diff --git a/src/gtk-add/etc/gtk-3.0/settings.ini b/src/gtk-add/etc/gtk-3.0/settings.ini
index 99d4fed..44f14bb 100644
--- a/src/gtk-add/etc/gtk-3.0/settings.ini
+++ b/src/gtk-add/etc/gtk-3.0/settings.ini
@@ -1,7 +1,8 @@
[Settings]
-;gtk-theme-name=win32
+gtk-theme-name=win71
gtk-auto-mnemonics=true
gtk-button-images=true
+;gtk-application-prefer-dark-theme=1
[Doc]
;= To enable native titlebar, set following environment variable
diff --git a/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css b/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
new file mode 100644
index 0000000..1b31403
--- /dev/null
+++ b/src/gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
@@ -0,0 +1,1403 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+-3.24.26 source
+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
+ * Additional changes from Thorsten Maerz <info at netztorte.de>
+*/
+
+ at define-color bg_color -gtk-win32-color(button, btnface);
+ at define-color text_color -gtk-win32-color(button, btntext);
+ at define-color selected_bg_color -gtk-win32-color(button, highlight);
+ at define-color selected_fg_color -gtk-win32-color(button, highlighttext);
+ at define-color info_fg_color rgb(181, 171, 156);
+ at define-color info_bg_color rgb(252, 252, 189);
+ at define-color warning_fg_color rgb(173, 120, 41);
+ at define-color warning_bg_color rgb(250, 173, 61);
+ at define-color question_fg_color rgb(97, 122, 214);
+ at define-color question_bg_color rgb(138, 173, 212);
+ at define-color error_fg_color rgb(166, 38, 38);
+ at define-color error_bg_color rgb(237, 54, 54);
+ at define-color notebook_border_color rgb(137, 140, 147);
+
+ at define-color app_notification_a #aeaea4;
+ at define-color app_notification_b #d1d1cb;
+ at define-color app_notification_c #d8d8d3;
+
+ at define-color app_notification_border #949486;
+
+ at define-color primary_toolbarbutton_text_shadow alpha(black, 0.1);
+
+.background,
+viewport {
+ /* XXX: This should be the default, but isn't?! */
+ font-family: "Segoe UI", Sans;
+ font-size: 9pt;
+ background-color: -gtk-win32-color(window, btnface);
+ color: -gtk-win32-color(window, btntext);
+}
+
+* {
+ -GtkScrolledWindow-scrollbars-spacing: 0;
+}
+
+:link {
+ color: -gtk-win32-color(button, hotlight);
+}
+
+:visited {
+ color: -gtk-win32-color(button, hotlight);
+}
+
+*:disabled {
+ color: -gtk-win32-color(button, graytext);
+}
+
+*:selected,
+*:selected:focus {
+ background-color: @selected_bg_color;
+ color: @selected_fg_color;
+}
+
+.info {
+ background-color: @info_bg_color;
+ color: @info_fg_color;
+}
+
+.warning {
+ background-color: @warning_bg_color;
+ color: @warning_fg_color;
+}
+
+.question {
+ background-color: @question_bg_color;
+ color: @question_fg_color;
+}
+
+.error {
+ background-color: @error_bg_color;
+ color: @error_fg_color;
+}
+
+.highlight {
+ background-color: @selected_bg_color;
+ color: @selected_fg_color;
+}
+
+.light-area-focus {
+ color: #000;
+}
+
+.dark-area-focus {
+ color: #fff;
+}
+
+scrolledwindow.frame {
+border-style: solid;
+border-width: 2px;
+border-image: -gtk-win32-theme-part(listview, 5, 1) 2 2 2 2 stretch;
+}
+
+.view {
+border-width: 0;
+border-radius: 0;
+background-color: -gtk-win32-color(edit, window);
+color: @text_color;
+}
+
+.view:selected {
+background-color: shade(-gtk-win32-color(edit, window), 0.9);
+color: @fg_color;
+}
+
+.view:selected:focus {
+background-color: @selected_bg_color;
+color: @selected_fg_color;
+}
+
+tooltip, tooltip.background {
+ background-color: -gtk-win32-color(tooltip, infobk);
+ background-image: -gtk-win32-theme-part(tooltip, 1, 1);
+ color: -gtk-win32-color(button, infotext);
+ padding: 2px;
+}
+
+assistant .sidebar .highlight {
+ font-weight: bold;
+ color: -gtk-win32-color(button, captiontext);
+}
+
+/* checkmarks */
+
+check {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 1);
+ min-width: -gtk-win32-part-width(button, 3, 1);
+ min-height: -gtk-win32-part-height(button, 3, 1);
+}
+
+check:hover {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 2);
+ min-width: -gtk-win32-part-width(button, 3, 2);
+ min-height: -gtk-win32-part-height(button, 3, 2);
+}
+
+check:active {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 3);
+ min-width: -gtk-win32-part-width(button, 3, 3);
+ min-height: -gtk-win32-part-height(button, 3, 3);
+}
+
+check:disabled {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 4);
+ min-width: -gtk-win32-part-width(button, 3, 4);
+ min-height: -gtk-win32-part-height(button, 3, 4);
+}
+
+check:checked {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 5);
+ min-width: -gtk-win32-part-width(button, 3, 5);
+ min-height: -gtk-win32-part-height(button, 3, 5);
+}
+
+check:checked:hover {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 6);
+ min-width: -gtk-win32-part-width(button, 3, 6);
+ min-height: -gtk-win32-part-height(button, 3, 6);
+}
+
+check:checked:active {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 7);
+ min-width: -gtk-win32-part-width(button, 3, 7);
+ min-height: -gtk-win32-part-height(button, 3, 7);
+}
+
+check:checked:disabled {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 8);
+ min-width: -gtk-win32-part-width(button, 3, 8);
+ min-height: -gtk-win32-part-height(button, 3, 8);
+}
+
+check:indeterminate {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 9);
+ min-width: -gtk-win32-part-width(button, 3, 9);
+ min-height: -gtk-win32-part-height(button, 3, 9);
+}
+
+check:indeterminate:hover {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 10);
+ min-width: -gtk-win32-part-width(button, 3, 10);
+ min-height: -gtk-win32-part-height(button, 3, 10);
+}
+
+check:indeterminate:active {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 11);
+ min-width: -gtk-win32-part-width(button, 3, 11);
+ min-height: -gtk-win32-part-height(button, 3, 11);
+}
+
+check:indeterminate:disabled {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 3, 12);
+ min-width: -gtk-win32-part-width(button, 3, 12);
+ min-height: -gtk-win32-part-height(button, 3, 12);
+}
+
+/* radiomarks */
+
+radio {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 1);
+ min-width: -gtk-win32-part-width(button, 2, 1);
+ min-height: -gtk-win32-part-height(button, 2, 1);
+}
+
+radio:hover {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 2);
+ min-width: -gtk-win32-part-width(button, 2, 2);
+ min-height: -gtk-win32-part-height(button, 2, 2);
+}
+
+radio:active {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 3);
+ min-width: -gtk-win32-part-width(button, 2, 3);
+ min-height: -gtk-win32-part-height(button, 2, 3);
+}
+
+radio:disabled {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 4);
+ min-width: -gtk-win32-part-width(button, 2, 4);
+ min-height: -gtk-win32-part-height(button, 2, 4);
+}
+
+radio:checked {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 5);
+ min-width: -gtk-win32-part-width(button, 2, 5);
+ min-height: -gtk-win32-part-height(button, 2, 5);
+}
+
+radio:checked:hover {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 6);
+ min-width: -gtk-win32-part-width(button, 2, 6);
+ min-height: -gtk-win32-part-height(button, 2, 6);
+}
+
+radio:checked:active {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 7);
+ min-width: -gtk-win32-part-width(button, 2, 7);
+ min-height: -gtk-win32-part-height(button, 2, 7);
+}
+
+radio:checked:disabled {
+ -gtk-icon-source: -gtk-win32-theme-part(button, 2, 8);
+ min-width: -gtk-win32-part-width(button, 2, 8);
+ min-height: -gtk-win32-part-height(button, 2, 8);
+}
+
+radio:indeterminate {
+ -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 5), -gtk-win32-theme-part(button, 2, 1));
+ min-width: -gtk-win32-part-width(button, 2, 9);
+ min-height: -gtk-win32-part-height(button, 2, 9);
+}
+
+radio:indeterminate:hover {
+ -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 6), -gtk-win32-theme-part(button, 2, 2));
+ min-width: -gtk-win32-part-width(button, 2, 2);
+ min-height: -gtk-win32-part-height(button, 2, 2);
+}
+
+radio:indeterminate:active {
+ -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 7), -gtk-win32-theme-part(button, 2, 3));
+ min-width: -gtk-win32-part-width(button, 2, 3);
+ min-height: -gtk-win32-part-height(button, 2, 3);
+}
+
+radio:indeterminate:disabled {
+ -gtk-icon-source: cross-fade(30% -gtk-win32-theme-part(button, 2, 8), -gtk-win32-theme-part(button, 2, 4));
+ min-width: -gtk-win32-part-width(button, 2, 4);
+ min-height: -gtk-win32-part-height(button, 2, 4);
+}
+
+/* Buttons */
+
+button {
+ background-image: -gtk-win32-theme-part(button, 1, 1);
+ padding-top: calc(1px + -gtk-win32-part-border-top(button, 1, 1));
+ padding-right: calc(1px + -gtk-win32-part-border-right(button, 1, 1));
+ padding-bottom: calc(1px + -gtk-win32-part-border-bottom(button, 1, 1));
+ padding-left: calc(1px + -gtk-win32-part-border-left(button, 1, 1));
+}
+
+button.default {
+ background-image: -gtk-win32-theme-part(button, 1, 5);
+}
+
+button:hover {
+ background-image: -gtk-win32-theme-part(button, 1, 2);
+}
+
+button:active, button:checked {
+ background-image: -gtk-win32-theme-part(button, 1, 3);
+}
+
+/* XXX: Figure out how to handle disabled active togglebuttons */
+button:disabled {
+ background-image: -gtk-win32-theme-part(button, 1, 4);
+}
+
+/* checkbuttons */
+
+/* This is the magic spacing that's hardcoded in Wine */
+checkbutton:dir(ltr) check,
+radiobutton:dir(ltr) radio {
+margin-right: 6px;
+}
+
+checkbutton:dir(rtl) check,
+radiobutton:dir(rtl) radio {
+margin-left: 6px;
+}
+
+/* Frame */
+
+frame {
+padding: 0px 10px;
+}
+
+frame > border {
+ margin: 0px -10px;
+ background-image: -gtk-win32-theme-part(button, 4, 1);
+ padding-top: -gtk-win32-part-border-top(button, 4, 1);
+ padding-right: -gtk-win32-part-border-right(button, 4, 1);
+ padding-bottom: -gtk-win32-part-border-bottom(button, 4, 1);
+ padding-left: -gtk-win32-part-border-left(button, 4, 1);
+}
+
+frame:disabled > border {
+ margin: 0px -10px;
+ background-image: -gtk-win32-theme-part(button, 4, 2);
+ padding-top: -gtk-win32-part-border-top(button, 4, 2);
+ padding-right: -gtk-win32-part-border-right(button, 4, 2);
+ padding-bottom: -gtk-win32-part-border-bottom(button, 4, 2);
+ padding-left: -gtk-win32-part-border-left(button, 4, 2);
+}
+
+frame > :not(border) {
+ margin: 0px 2px;
+}
+
+/* Notebooks */
+
+notebook > stack {
+ background-image: -gtk-win32-theme-part(tab, 9, 1);
+}
+
+/* We can't use directly the standard theme parts because they are only
+ valid with tabs on top, so we draw solid borders of reasonable colors
+ and hope for the best */
+
+notebook > header > tabs > tab {
+ background-image: -gtk-win32-theme-part(tab, 1, 1, margins(-1));
+ padding: 2px 1ex;
+ border: 1px solid @notebook_border_color;
+}
+notebook > header > tabs > tab:hover {
+ background-image: -gtk-win32-theme-part(tab, 1, 2, margins(-1));
+ border-color: @selected_bg_color;
+}
+notebook > header > tabs > tab:checked {
+ background-image: -gtk-win32-theme-part(tab, 5, 3, margins(-1));
+ padding: 2px 1.5ex;
+ margin: 0px -.5ex;
+ border-color: @notebook_border_color;
+}
+notebook > header > tabs > tab:focus {
+ background-image: -gtk-win32-theme-part(tab, 1, 5, margins(-1));
+}
+
+notebook > header.top, notebook > header.bottom {
+ margin-right: 2px;
+}
+
+notebook > header.top > tabs {
+ margin-left: .5ex;
+ margin-right: .5ex;
+}
+notebook > header.top > tabs > tab {
+ margin-top: 4px;
+ border-bottom: unset;
+}
+notebook > header.top > tabs > tab:checked {
+ margin: 0px -.5ex;
+ margin-bottom: -1px;
+}
+
+notebook > header.bottom > tabs {
+ margin-left: .5ex;
+ margin-right: .5ex;
+ margin-top: -1px;
+}
+notebook > header.bottom > tabs > tab {
+ margin-bottom: 4px;
+ border-top: unset;
+}
+notebook > header.bottom > tabs > tab:checked {
+ margin: 0px -.5ex;
+ margin-top: -1px;
+}
+
+notebook > header.left, notebook > header.right {
+ margin-bottom: 2px;
+}
+notebook > header.left > tabs {
+ margin-top: .3ex;
+ margin-bottom: .3ex;
+}
+notebook > header.left > tabs > tab {
+ padding: .5ex 2px;
+ margin-left: 4px;
+ border-right: unset;
+}
+notebook > header.left > tabs > tab:checked {
+ margin: -.3ex 0;
+ margin-right: -1px;
+ padding: .8ex 2px;
+}
+
+notebook > header.right > tabs {
+ margin-top: .3ex;
+ margin-bottom: .3ex;
+ margin-left: -2px;
+}
+notebook > header.right > tabs > tab {
+ padding: .5ex 2px;
+ margin-right: 4px;
+ border-left: unset;
+}
+notebook > header.right > tabs > tab:checked {
+ margin: -.3ex 0;
+ margin-left: -1px;
+ padding: .8ex 2px;
+}
+
+/* Scrollbars */
+
+/* TODO: Win32 has different concept for upper and lower trough, we
+ don't use this atm */
+
+scrollbar {
+ background-color: transparent;
+}
+
+scrollbar.horizontal button {
+ min-width : -gtk-win32-size(scrollbar, cxhscroll);
+ min-height : -gtk-win32-size(scrollbar, cyhscroll);
+}
+scrollbar.vertical button {
+ min-width : -gtk-win32-size(scrollbar, cxvscroll);
+ min-height : -gtk-win32-size(scrollbar, cyvscroll);
+}
+scrollbar button, scrollbar button:disabled {
+ color: transparent;
+ margin: 0;
+ padding: 0;
+}
+
+/* up button */
+scrollbar.vertical button.up {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 1);
+}
+scrollbar.vertical:hover button.up {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
+}
+scrollbar.vertical:hover button.up:hover {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 2);
+}
+scrollbar.vertical:hover button.up:active {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 3);
+}
+scrollbar.vertical:hover button.up:disabled {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 4);
+}
+
+/* down button */
+scrollbar.vertical button.down {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 5);
+}
+scrollbar.vertical:hover button.down {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 18);
+}
+scrollbar.vertical:hover button.down:hover {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 6);
+}
+scrollbar.vertical:hover button.down:active {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 7);
+}
+scrollbar.vertical:hover button.down:disabled {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 8);
+}
+
+/* left button */
+scrollbar.horizontal button.up {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 9);
+}
+scrollbar.horizontal:hover button.up {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 19);
+}
+scrollbar.horizontal:hover button.up:hover {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 10);
+}
+scrollbar.horizontal:hover button.up:active {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 11);
+}
+scrollbar.horizontal:hover button.up:disabled {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 12);
+}
+
+/* right button */
+scrollbar.horizontal button.down {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 13);
+}
+scrollbar.horizontal:hover button.down {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 20);
+}
+scrollbar.horizontal:hover button.down:hover {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 14);
+}
+scrollbar.horizontal:hover button.down:active {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 16);
+}
+scrollbar.horizontal:hover button.down:disabled {
+background-image: -gtk-win32-theme-part(scrollbar, 1 , 17);
+}
+
+scrollbar trough {
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(scrollbar, 6, 1);
+}
+
+scrollbar trough.vertical {
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(scrollbar, 2, 1, over(6, 1));
+}
+
+scrollbar.horizontal slider {
+ min-height: -gtk-win32-size(scrollbar, cyhscroll);
+ min-width: -gtk-win32-size(scrollbar, cxhthumb);
+}
+scrollbar.vertical slider {
+ min-width: -gtk-win32-size(scrollbar, cxvscroll);
+ min-height: -gtk-win32-size(scrollbar, cyvthumb);
+}
+
+
+scrollbar slider {
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(scrollbar, 2, 1, over(8, 1));
+}
+
+scrollbar slider:hover {
+ background-image: -gtk-win32-theme-part(scrollbar, 2, 2, over(8, 2));
+}
+
+scrollbar slider:active {
+ background-image: -gtk-win32-theme-part(scrollbar, 2, 3, over(8, 3));
+}
+
+scrollbar slider:disabled {
+/* There's a theme part for "disabled slider", but the only app observed
+ to have a disabled scrollbar (Notepad) does not draw its slider at all
+ when scrollbar is disabled. */
+background-image: none;
+background-color: transparent;
+}
+
+scrollbar.vertical slider {
+ background-image: -gtk-win32-theme-part(scrollbar, 3, 1, over(9, 1));
+}
+
+scrollbar.vertical slider:hover {
+ background-image: -gtk-win32-theme-part(scrollbar, 3, 2, over(9, 2));
+}
+
+scrollbar.vertical slider:active {
+ background-image: -gtk-win32-theme-part(scrollbar, 3, 3, over(9, 3));
+}
+
+scrollbar.vertical slider:disabled {
+background-image: none;
+background-color: transparent;
+}
+
+/* Entry */
+
+textview.view,
+entry {
+ background-image: -gtk-win32-theme-part(edit, 1, 1);
+ /* The 1em/3 is the "margin" that Windows uses. I'm pretty sure that's the "ABC width"
+ of the font. But we don't get those fancy things in CSS. */
+ padding: -gtk-win32-size(edit, cyedge) calc(-gtk-win32-size(edit, cxedge) + 1em/3);
+}
+
+textview.view:focus,
+entry:focus {
+ background-image: -gtk-win32-theme-part(edit, 1, 3);
+}
+
+textview.view:disabled,
+entry:disabled {
+ /* This theme part feels wrong here, but it looks as one would expect,
+ whereas (edit, 5, 3) BACKGROUNDWITHBORDER, EBS_DISABLED is just white */
+ background-image: -gtk-win32-theme-part(combobox, 5, 4);
+ color: -gtk-win32-color(edit, graytext);
+}
+
+selection {
+ background: -gtk-win32-color(edit, highlight);
+ color: -gtk-win32-color(edit, highlighttext);
+}
+
+entry.flat {
+padding: 0px;
+background-image: -gtk-win32-theme-part(edit, 3, 1);
+}
+
+entry.flat:focus {
+ background-image: -gtk-win32-theme-part(edit, 3, 3);
+}
+
+entry.flat:disabled {
+ background-image: -gtk-win32-theme-part(edit, 3, 4);
+ color: -gtk-win32-color(edit, graytext);
+}
+
+/* Spinbutton (horizontal) */
+
+spinbutton.horizontal {
+padding: 2px 1px;
+background-image: -gtk-win32-theme-part(edit, 1, 1);
+}
+
+spinbutton.horizontal:focus {
+ background-image: -gtk-win32-theme-part(edit, 1, 3);
+}
+
+spinbutton.horizontal:disabled {
+ background-image: -gtk-win32-theme-part(edit, 1, 4);
+}
+
+spinbutton.horizontal entry {
+all: unset;
+padding: 0px calc(1em/3);
+}
+
+spinbutton.horizontal button {
+all: unset;
+color: transparent;
+min-width: 15px;
+min-height: 9px;
+background-size: 15px 9px;
+background-repeat: no-repeat;
+}
+
+spinbutton.horizontal button.down {
+background-image: -gtk-win32-theme-part(spin, 2, 1);
+background-position: top center;
+padding-left: 1px;
+margin-left: -1px;
+margin-top: 8px;
+margin-bottom: -8px;
+margin-right: -1px;
+}
+
+spinbutton.horizontal button.up {
+background-image: -gtk-win32-theme-part(spin, 1, 1);
+background-position: bottom center;
+margin-top: -8px;
+margin-bottom: 8px;
+margin-left: -16px;
+margin-right: -1px;
+}
+
+spinbutton.horizontal button.down:hover {
+ background-image: -gtk-win32-theme-part(spin, 2, 2);
+}
+
+spinbutton.horizontal button.up:hover {
+ background-image: -gtk-win32-theme-part(spin, 1, 2);
+}
+
+spinbutton.horizontal button.down:active {
+ background-image: -gtk-win32-theme-part(spin, 2, 3);
+}
+
+spinbutton.horizontal button.up:active {
+ background-image: -gtk-win32-theme-part(spin, 1, 3);
+}
+
+spinbutton.horizontal button.down:disabled {
+ background-image: -gtk-win32-theme-part(spin, 2, 4);
+}
+
+spinbutton.horizontal button.up:disabled {
+ background-image: -gtk-win32-theme-part(spin, 1, 4);
+}
+
+/* Spinbutton (vertical) */
+
+spinbutton.vertical button,
+spinbutton.vertical button:focus {
+ background-color: transparent;
+ color: rgba(0, 0, 0, 0);
+ background-image: -gtk-win32-theme-part(spin, 1, 1, margins(0 -1 -0 -1));
+}
+
+spinbutton.vertical button:last-child,
+spinbutton.vertical button:focus:last-child {
+ background-image: -gtk-win32-theme-part(spin, 2, 1, margins(0 -1 0 -1));
+}
+
+
+spinbutton.vertical button:hover,
+spinbutton.vertical button:hover:focus {
+ background-image: -gtk-win32-theme-part(spin, 1, 2, margins(0 -1 -0 -1));
+}
+
+spinbutton.vertical button:hover:last-child,
+spinbutton.vertical button:hover:focus:last-child {
+ background-image: -gtk-win32-theme-part(spin, 2, 2, margins(0 -1 0 -1));
+}
+
+
+spinbutton.vertical button:active,
+spinbutton.vertical button:active:hover,
+spinbutton.vertical button:active:focus,
+spinbutton.vertical button:active:hover:focus {
+ background-image: -gtk-win32-theme-part(spin, 1, 3, margins(0 -1 -0 -1));
+}
+
+spinbutton.vertical button:active:last-child,
+spinbutton.vertical button:active:hover:last-child,
+spinbutton.vertical button:active:focus:last-child,
+spinbutton.vertical button:active:hover:focus:last-child {
+ background-image: -gtk-win32-theme-part(spin, 2, 3, margins(0 -1 0 -1));
+}
+
+spinbutton.vertical button:disabled {
+ background-image: -gtk-win32-theme-part(spin, 1, 4, margins(0 -1 -0 -1));
+}
+
+spinbutton.vertical button:disabled:last-child {
+ background-image: -gtk-win32-theme-part(spin, 2, 4, margins(0 -1 0 -1));
+}
+
+
+
+spinbutton button:dir(rtl),
+spinbutton button:focus:dir(rtl) {
+ background-color: transparent;
+ background-image: -gtk-win32-theme-part(spin, 2, 1, margins(0 -1 -1 -1));
+ color: rgba(0, 0, 0, 0);
+}
+
+spinbutton button:first-child:dir(rtl),
+spinbutton button:focus:first-child:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 1, 1, margins(-1 -1 0 -1));
+}
+
+spinbutton button:hover:dir(rtl),
+spinbutton button:hover:focus:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 2, 2, margins(0 -1 -1 -1));
+}
+
+spinbutton button:hover:first-child:dir(rtl),
+spinbutton button:hover:focus:first-child:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 1, 2, margins(-1 -1 0 -1));
+}
+
+
+spinbutton button:active:dir(rtl),
+spinbutton button:active:hover:dir(rtl),
+spinbutton button:active:focus:dir(rtl),
+spinbutton button:active:hover:focus:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 2, 3, margins(0 -1 -1 -1));
+}
+
+spinbutton button:active:first-child:dir(rtl),
+spinbutton button:active:hover:first-child:dir(rtl),
+spinbutton button:active:focus:first-child:dir(rtl),
+spinbutton button:active:hover:focus:first-child:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 1, 3, margins(-1 -1 0 -1));
+}
+
+spinbutton button:disabled:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 2, 4, margins(0 -1 -1 -1));
+}
+
+spinbutton button:disabled:first-child:dir(rtl) {
+ background-image: -gtk-win32-theme-part(spin, 1, 4, margins(-1 -1 0 -1));
+}
+
+/* Ranges */
+
+scale.horizontal trough {
+ margin: calc( -gtk-win32-part-height(trackbar, 4, 1) / 2 + 1px ) 0;
+ padding: 0 calc( -gtk-win32-part-width(trackbar, 4, 1) / 2);
+ background-image: -gtk-win32-theme-part(trackbar, 1, 1);
+ min-height: -gtk-win32-part-height(trackbar, 1, 1);
+}
+scale.vertical trough {
+ margin: 0 calc( -gtk-win32-part-width(trackbar, 8, 1) / 2 + 1px );
+ padding: calc( -gtk-win32-part-height(trackbar, 8, 1) / 2 ) 0;
+ background-image: -gtk-win32-theme-part(trackbar, 2, 1);
+ min-width: -gtk-win32-part-width(trackbar, 2, 1);
+}
+
+scale.horizontal indicator {
+ min-height: -gtk-win32-part-height(trackbar, 9, 1);
+ min-width: -gtk-win32-part-width(trackbar, 9, 1);
+ color: shade(@bg_color, 0.6);
+ margin-top: -2px;
+ margin-bottom: 2px;
+}
+scale.vertical indicator {
+ min-height: -gtk-win32-part-height(trackbar, 10, 1) ;
+ min-width: -gtk-win32-part-width(trackbar, 10, 1);
+ color: shade(@bg_color, 0.6);
+ margin-left: -2px;
+ margin-right: 2px;
+}
+
+scale.horizontal slider {
+ min-height: -gtk-win32-part-height(trackbar, 4, 1);
+ min-width: -gtk-win32-part-width(trackbar, 4, 1);
+ margin: calc( (-gtk-win32-part-height(trackbar, 4, 1) - -gtk-win32-part-height(trackbar, 1, 1)) / -2) 0;
+}
+
+scale.vertical slider {
+ min-height: -gtk-win32-part-height(trackbar, 8, 1);
+ min-width: -gtk-win32-part-width(trackbar, 8, 1);
+ margin: 0 calc( (-gtk-win32-part-width(trackbar, 8, 1) - -gtk-win32-part-width(trackbar, 2, 1)) / -2);
+}
+
+scale.horizontal slider {
+ background-image: -gtk-win32-theme-part(trackbar, 3,1)
+}
+scale.horizontal.marks-after slider {
+ background-image: -gtk-win32-theme-part(trackbar, 4,1)
+}
+scale.horizontal slider:hover {
+ background-image: -gtk-win32-theme-part(trackbar, 3,2)
+}
+scale.horizontal.marks-after slider:hover {
+ background-image: -gtk-win32-theme-part(trackbar, 4,2)
+}
+scale.horizontal slider:focus {
+ background-image: -gtk-win32-theme-part(trackbar, 3,4)
+}
+scale.horizontal.marks-after slider:focus {
+ background-image: -gtk-win32-theme-part(trackbar, 4,4)
+}
+scale.horizontal slider:active {
+ background-image: -gtk-win32-theme-part(trackbar, 3,3)
+}
+scale.horizontal.marks-after slider:active {
+ background-image: -gtk-win32-theme-part(trackbar, 4,3)
+}
+scale.horizontal slider:disabled {
+ background-image: -gtk-win32-theme-part(trackbar, 3,5)
+}
+scale.horizontal.marks-after slider:disabled {
+ background-image: -gtk-win32-theme-part(trackbar, 4,5)
+}
+
+scale.vertical slider {
+ background-image: -gtk-win32-theme-part(trackbar, 6, 1)
+}
+scale.vertical.marks-after slider {
+ background-image: -gtk-win32-theme-part(trackbar, 8, 1)
+}
+scale.vertical slider:hover {
+ background-image: -gtk-win32-theme-part(trackbar, 6, 2)
+}
+scale.vertical.marks-after slider:hover {
+ background-image: -gtk-win32-theme-part(trackbar, 8, 2)
+}
+scale.vertical slider:focus {
+ background-image: -gtk-win32-theme-part(trackbar, 6, 4)
+}
+scale.vertical.marks-after slider:focus {
+ background-image: -gtk-win32-theme-part(trackbar, 8, 4)
+}
+scale.vertical slider:active {
+ background-image: -gtk-win32-theme-part(trackbar, 6, 3)
+}
+scale.vertical.marks-after slider:active {
+ background-image: -gtk-win32-theme-part(trackbar, 8, 3)
+}
+scale.vertical slider:disabled {
+ background-image: -gtk-win32-theme-part(trackbar, 6, 5)
+}
+scale.vertical.marks-after slider:disabled {
+ background-image: -gtk-win32-theme-part(trackbar, 8, 5)
+}
+
+scale.horizontal highlight {
+ background-image: -gtk-win32-theme-part(progress, 5,1);
+ margin: 0 calc( -gtk-win32-part-width(trackbar, 4, 1) / -2);
+}
+scale.vertical highlight {
+ background-image: -gtk-win32-theme-part(progress, 6,1);
+ margin: calc( -gtk-win32-part-height(trackbar, 6, 1) / -2) 0;
+}
+
+scale value {
+ margin-bottom: 5px;
+}
+
+
+/* Progress bars and level bars */
+
+progressbar.horizontal trough,
+levelbar.horizontal trough {
+ min-height: -gtk-win32-part-height(progress, 1, 1);
+ background-image: -gtk-win32-theme-part(progress, 1, 1);
+}
+progressbar.vertical trough,
+levelbar.vertical trough {
+ min-width: -gtk-win32-part-width(progress, 1, 1);
+ background-image: -gtk-win32-theme-part(progress, 2, 1);
+}
+
+progressbar.horizontal progress, levelbar.horizontal block {
+ min-height: -gtk-win32-part-height(progress, 5, 1);
+}
+
+progressbar progress,
+levelbar block.filled,
+entry progress,
+entry progress:focus {
+ background-image: -gtk-win32-theme-part(progress, 5, 1);
+}
+
+/* We use here PBFS_PAUSED (yellow by default) and PBFS_PARTIAL (blue) */
+levelbar block.low {
+ background-image: -gtk-win32-theme-part(progress, 5, 3);
+}
+levelbar block.full {
+ background-image: -gtk-win32-theme-part(progress, 5, 4);
+}
+
+progressbar.horizontal progress.pulse,
+entry progress.pulse,
+entry progress.pulse:focus {
+ background-image: -gtk-win32-theme-part(progress, 8, 1);
+}
+
+progressbar.vertical progress,
+levelbar.vertical block {
+ min-width: -gtk-win32-part-width(progress, 6, 1);
+}
+
+progressbar.vertical progress,
+levelbar.vertical block.filled {
+ background-image: -gtk-win32-theme-part(progress, 6, 1);
+}
+levelbar.vertical block.low {
+ background-image: -gtk-win32-theme-part(progress, 6, 3);
+}
+levelbar.vertical block.full {
+ background-image: -gtk-win32-theme-part(progress, 6, 4);
+}
+
+progressbar.vertical progress.pulse {
+ background-image: -gtk-win32-theme-part(progress, 10, 1);
+}
+
+/* Combobox */
+
+combobox entry {
+ margin-right: calc( -2ex - -gtk-win32-part-width(combobox, 6, 1));
+ background-image: -gtk-win32-theme-part(combobox, 4, 1);
+}
+combobox entry:hover {
+ background-image: -gtk-win32-theme-part(combobox, 4, 2);
+}
+combobox entry:focus {
+ background-image: -gtk-win32-theme-part(combobox, 4, 3);
+}
+combobox:disabled entry {
+ background-image: -gtk-win32-theme-part(combobox, 5, 4);
+}
+
+combobox entry, combobox entry:disabled, combobox entry:focus {
+ padding-left: 1ex;
+}
+
+combobox button {
+ padding: 2px;
+}
+
+combobox entry + button {
+ padding: 0;
+ background-image: none;
+}
+
+combobox button arrow {
+ background-image: -gtk-win32-theme-part(combobox, 6, 1);
+ min-height: -gtk-win32-part-height(combobox, 6, 1);
+ /* this width is too small, so better put some padding */
+ min-width: -gtk-win32-part-width(combobox, 6, 1);
+ padding: 0 1ex;
+}
+combobox entry + button:hover arrow {
+ background-image: -gtk-win32-theme-part(combobox, 6, 2);
+}
+
+combobox entry + button:disabled {
+ background-image: none;
+}
+
+combobox entry + button:disabled arrow {
+ background-image: -gtk-win32-theme-part(combobox, 6, 4);
+}
+combobox entry + button:checked arrow {
+ background-image: -gtk-win32-theme-part(combobox, 6, 3);
+}
+
+combobox menu {
+ /* Dropdown list should have "window" color, as listbox
+ contents do (usually it's "white") */
+ background-color: -gtk-win32-color(listview, window);
+ padding: 2px;
+}
+
+combobox menuitem {
+ padding: 0 2px;
+}
+
+combobox menuitem > cellview {
+ padding: 0px;
+}
+
+/* Toolbar */
+
+toolbar {
+ background-color: transparent;
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(rebar, 6, 1);
+}
+
+toolbar button,
+toolbar button:focus {
+ background-color: transparent;
+ background-image: -gtk-win32-theme-part(toolbar, 1, 1);
+}
+
+toolbar button:hover,
+toolbar button:hover:focus {
+ background-image: -gtk-win32-theme-part(toolbar, 1, 2);
+}
+
+toolbar button:active {
+ background-image: -gtk-win32-theme-part(toolbar, 1, 3);
+}
+
+toolbar button:active:hover {
+ background-image: -gtk-win32-theme-part(toolbar, 1, 6);
+}
+
+toolbar button:disabled {
+ background-image: -gtk-win32-theme-part(toolbar, 1, 4);
+}
+
+/* Column headers */
+
+header button,
+header button:focus {
+ background-color: transparent;
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(header, 1, 1);
+}
+
+header button:hover,
+header button:hover:focus {
+ background-image: -gtk-win32-theme-part(header, 1, 2);
+}
+
+header button:active,
+header button:active:hover,
+header button:active:focus,
+header button:active:hover:focus {
+ background-image: -gtk-win32-theme-part(header, 1, 3);
+}
+
+/* Switch */
+
+switch {
+ background-image: -gtk-win32-theme-part(button, 1, 1);
+}
+
+switch:checked {
+ background-image: -gtk-win32-theme-part(button, 1, 3);
+}
+
+switch:disabled {
+ background-image: -gtk-win32-theme-part(button, 1, 4);
+}
+
+switch slider {
+ background-image: -gtk-win32-theme-part(button, 1, 1);
+}
+
+switch:hover slider {
+ background-image: -gtk-win32-theme-part(button, 1, 2);
+}
+
+switch:checked slider {
+ background-image: -gtk-win32-theme-part(button, 1, 3);
+}
+
+switch:disabled slider {
+ background-image: -gtk-win32-theme-part(button, 1, 4);
+}
+
+/* Menus */
+
+menu {
+ background-color: -gtk-win32-color(button, menu);
+ border-color: shade(-gtk-win32-color(button, menu), 0.6);
+ border-style: solid;
+ border-width: 1px;
+ padding: 2px;
+}
+
+menuitem {
+ color: -gtk-win32-color(button, menutext);
+}
+
+menubar menuitem *:backdrop {
+ color: mix(-gtk-win32-color(button, menutext), white, 0.5);
+}
+
+menubar > menuitem {
+ padding: 3px 5px;
+}
+
+/* Add more padding to menus, increasing visible height of each menuitem */
+menu * {
+padding: 2px; /* TM:org 2px; */
+}
+
+/* Assistant */
+
+GtkAssistant .sidebar .highlight {
+ background-color: gray;
+ font-weight: bold;
+}
+
+GtkAssistant .sidebar {
+ padding: 12px;
+
+ background-color: white;
+
+ border-image: none;
+ border-width: 0 1px 0 0;
+ border-style: solid;
+}
+
+colorswatch {
+ border-style: solid;
+ border-width: 1px;
+}
+
+colorswatch:hover {
+ border-color: shade(@bg_color, 0.2);
+}
+
+separator,
+separator:hover {
+ background-color: @bg_color;
+}
+
+statusbar > frame {
+ border-width: 1px 1px 1px 1px;
+ border-style: solid;
+ border-image: -gtk-win32-theme-part(status, 0, 0, margins(-1 0 0 0)) 2 1 1 1 stretch;
+ background-image: none;
+}
+
+/* Expander */
+
+expander title arrow {
+ background-image: -gtk-win32-theme-part(explorerbar, 7, 1);
+}
+expander title arrow:checked {
+ background-image: -gtk-win32-theme-part(explorerbar, 6, 1);
+}
+expander title:hover arrow {
+ background-image: -gtk-win32-theme-part(explorerbar, 7, 2);
+}
+expander title:hover arrow:checked {
+ background-image: -gtk-win32-theme-part(explorerbar, 6, 2);
+}
+
+/* Spinner */
+
+ at keyframes spin {
+to { -gtk-icon-transform: rotate(1turn); }
+}
+
+spinner {
+background: none;
+opacity: 0;
+-gtk-icon-source: -gtk-icontheme('process-working-symbolic');
+}
+
+spinner:checked {
+opacity: 1;
+animation: spin 1s linear infinite;
+}
+
+spinner:checked:disabled
+{
+opacity: 0.5;
+}
+
+spinner:active {
+ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
+ -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+animation: spinner 1s infinite linear;
+}
+
+/* Popovers */
+popover {
+ border-radius: 3px;
+ background-clip: border-box;
+ background-color: @bg_color;
+
+ border-color: rgba(0, 0, 0, 1);
+ border-width: 1px;
+ border-style: solid;
+
+ box-shadow: 0 2px 3px alpha(black, 0.5);
+ margin: 10px;
+ padding: 2px;
+}
+popover > list,
+popover > .view,
+popover > toolbar {
+ background-color: transparent;
+}
+
+/* Listbox */
+list {
+background-color: -gtk-win32-color(listbox, window);
+}
+
+/* Dim label */
+.dim-label {
+ color: alpha(currentColor, 0.55);
+ text-shadow: none;
+}
+
+/* Modelbuttons */
+
+modelbutton:focus,
+modelbutton {
+ background-color: transparent;
+ background-image: -gtk-win32-theme-part(menu, 14, 1);
+}
+
+modelbutton:active,
+modelbutton:active:focus {
+ background-color: transparent;
+ background-image: -gtk-win32-theme-part(menu, 14, 1);
+}
+
+modelbutton:active:hover:focus,
+modelbutton:hover:focus,
+modelbutton:hover {
+ background-image: -gtk-win32-theme-part(menu, 14, 2);
+}
+
+modelbutton:active:hover:disabled:focus,
+modelbutton:hover:disabled:focus,
+modelbutton:hover:disabled {
+ background-image: -gtk-win32-theme-part(menu, 14, 4);
+}
+
+
+modelbutton radio:focus,
+modelbutton radio,
+modelbutton radio:hover,
+modelbutton radio:disabled {
+ background-color: transparent;
+ background-image: none;
+ border-width: 0;
+}
+
+modelbutton radio:active:focus,
+modelbutton radio:active,
+modelbutton radio:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 12, 2, over(11, 3));
+ border-width: 0;
+}
+
+modelbutton radio:indeterminate:focus,
+modelbutton radio:indeterminate,
+modelbutton radio:indeterminate:disabled,
+modelbutton radio:indeterminate:hover,
+modelbutton radio:indeterminate:active,
+modelbutton radio:indeterminate:active:hover {
+ background-image: none; /* Fall back to default, this state is not in win32 */
+ border-width: 0;
+}
+
+modelbutton radio:disabled:active:focus,
+modelbutton radio:disabled:active,
+modelbutton radio:disabled:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 12, 1, over(11, 4));
+ border-width: 0;
+}
+
+modelbutton check:focus,
+modelbutton check,
+modelbutton check:disabled,
+modelbutton check:hover,
+modelbutton check:hover:focus {
+ background-color: transparent;
+ background-image: none;
+ border-width: 0;
+}
+
+
+modelbutton check:active:focus,
+modelbutton check:active,
+modelbutton check:active:hover:focus,
+modelbutton check:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 12, 2, over(11, 1));
+ border-width: 0;
+}
+
+modelbutton check:indeterminate:focus,
+modelbutton check:indeterminate,
+modelbutton check:indeterminate:disabled,
+modelbutton check:indeterminate:disabled:focus,
+modelbutton check:indeterminate:hover,
+modelbutton check:indeterminate:hover:focus,
+modelbutton check:indeterminate:active,
+modelbutton check:indeterminate:active:focus,
+modelbutton check:indeterminate:active:hover:focus,
+modelbutton check:indeterminate:active:hover {
+ background-image: none; /* Fall back to default, this state is not in win32 */
+ border-width: 0;
+}
+
+modelbutton check:disabled:active:focus,
+modelbutton check:disabled:active,
+modelbutton check:disabled:active:hover:focus,
+modelbutton check:disabled:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 12, 1, over(11, 2));
+ border-width: 0;
+}
+
+/* Application notification */
+.app-notification {
+ border-style: solid;
+ border-color: @app_notification_border;
+ border-width: 0 1px 1px 1px;
+ border-radius: 0 0 5px 5px;
+ padding: 8px;
+
+ background-image: linear-gradient(to bottom,
+ @app_notification_a,
+ @app_notification_b 18%,
+ @app_notification_c);
+
+ color: @theme_text_color;
+ text-shadow: 0 1px @primary_toolbarbutton_text_shadow;
+ border-image: none;
+}
+
+
+/* TM: START: treeview - show native +/- instead of arrows */
+treeview.view.expander:checked {
+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 2);
+}
+treeview.view.expander {
+ -gtk-icon-source: -gtk-win32-theme-part(treeview, 2, 1);
+}
+/* TM: END: treeview - show native +/- instead of arrows */
+
diff --git a/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css b/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css
new file mode 100644
index 0000000..29d81cb
--- /dev/null
+++ b/src/gtk-add/share/themes/win71/gtk-3.0/gtk.css
@@ -0,0 +1,309 @@
+/* win71 theme
+ * Based on (internal) win32 theme from gtk+-3.24.26 source
+ * Additional patches from Jaime Velasco: https://gitlab.gnome.org/GNOME/gtk/-/issues/687
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/e9594ce0a70c304b612bb853cebe12f5/0001-win32-theme-Fix-levelbar-and-tweak-progressbar.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/69023bc21c850dd0656f0059e484c119/0002-win32-theme-fix-disabled-GtkEntry-style.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/af528822c1e983ef39351bd1a86945bf/0003-win32-theme-Fix-notebook-tabs.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/dbd103ca72ceaee06fa11c22d05bb664/0004-win32-theme-Fix-unfocused-window-buttons.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/4fc5ac08547a39b2b08dd0c15ea903f2/0005-win32-theme-make-separator-visible-again.patch
+ * https://gitlab.gnome.org/GNOME/gtk/uploads/f2b6b77c53d7ecae94b972e6ece88b5f/0007-win32-theme-Draw-expander-arrow.patch
+ * Additional changes from Thorsten Maerz <info at netztorte.de>
+*/
+
+ at import url("gtk-win32-base.css");
+
+/* Menus */
+
+menubar {
+ background-color: transparent;
+ border-width: 0;
+ background-image: -gtk-win32-theme-part(menu, 7, 1);
+}
+
+menubar > menuitem {
+ background-color: transparent;
+ border-width: 0px;
+ background-image: -gtk-win32-theme-part(menu, 8, 1);
+}
+
+menubar > menuitem:hover {
+ background-image: -gtk-win32-theme-part(menu, 8, 3);
+}
+
+menuitem:hover {
+ background-image: -gtk-win32-theme-part(menu, 14, 2);
+}
+
+menuitem:hover:disabled {
+ background-image: -gtk-win32-theme-part(menu, 14, 4);
+}
+
+menuitem radio,
+menuitem radio:hover,
+menuitem radio:disabled {
+ background-color: transparent;
+ background-image: none;
+ border-width: 0;
+}
+
+menuitem radio:active,
+menuitem radio:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 11, 3);
+ border-width: 0;
+}
+
+menuitem radio:indeterminate,
+menuitem radio:indeterminate:disabled,
+menuitem radio:indeterminate:hover,
+menuitem radio:indeterminate:active,
+menuitem radio:indeterminate:active:hover {
+ background-image: none; /* Fall back to default, this state is not in win32 */
+ border-width: 0;
+}
+
+menuitem radio:disabled:active,
+menuitem radio:disabled:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 11, 4);
+ border-width: 0;
+}
+
+menuitem check,
+menuitem check:hover,
+menuitem check:disabled {
+ background-image: none;
+ border-width: 0;
+}
+
+menuitem check:active,
+menuitem check:active:hover {
+ background-image: -gtk-win32-theme-part(menu, 11, 1);
+ border-width: 0;
+}
+
+menuitem check:indeterminate,
+menuitem check:indeterminate:disabled,
+menuitem check:indeterminate:hover,
+menuitem check:indeterminate:active,
+menuitem check:indeterminate:active:hover {
+ background-image: none; /* Fall back to default, this state is not in win32 */
+ border-width: 0;
+}
+
+menuitem check:disabled:active,
+menuitem check:disabled:active:hover{
+ background-image: -gtk-win32-theme-part(menu, 11, 2);
+ border-width: 0;
+}
+
+/* TM: START: show arrow for submenu - CHECK:is there ltr/rtl? */
+menu menuitem arrow, .menu menuitem arrow {
+ min-width: 16px;
+ min-height: 16px;
+}
+
+menu menuitem arrow, .menu menuitem arrow {
+ margin-left: 10px;
+ -gtk-icon-source: -gtk-win32-theme-part(menu, 16, 1);
+}
+/* TM: END: show arrow for submenu */
+
+/* TM: START: show menu separator lines (1px wide) */
+menu separator {
+ padding: 0px; /* TM: new */
+ background-color: #cccccc;
+}
+/* TM: END */
+
+/* Listbox */
+
+/* We're cheating here, using part 6 (listview header group),
+ because part 1 (listview item) is empty for some reason */
+row:hover {
+ background-image: -gtk-win32-theme-part(listview, 6, 10);
+}
+
+row:selected {
+ background-color: transparent;
+ /* Override *:selected {} blanket style, keeping the background - bright
+ and the text - dark */
+ color: @text_color;
+ background-image: -gtk-win32-theme-part(listview, 6, 13);
+}
+
+row:selected:focus {
+ background-image: -gtk-win32-theme-part(listview, 6, 11);
+}
+
+row:selected:hover {
+ background-image: -gtk-win32-theme-part(listview, 6, 12);
+}
+
+/* Titlebar */
+
+decoration {
+ padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
+ calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
+ background-image: -gtk-win32-theme-part(window, 1, 1),
+ -gtk-win32-theme-part(window, 9, 1),
+ -gtk-win32-theme-part(window, 7, 1),
+ -gtk-win32-theme-part(window, 8, 1);
+ background-size: 100% -gtk-win32-size(window, cycaption),
+ 100% calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder)),
+ calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder)) calc(100% - 2 * (-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))),
+ calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder)) calc(100% - 2 * (-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder)));
+ background-position: top, bottom, left, right;
+ background-repeat: no-repeat;
+}
+
+/* Unset above settings when the window is a popup menu or tooltip */
+* window decoration, tooltip decoration {
+ all: unset;
+}
+
+.titlebar {
+ margin: calc(0px - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder))
+ calc(0px - -gtk-win32-size(window, cxframe) - -gtk-win32-size(window, cxpaddedborder));
+ margin-bottom: 0px;
+ /* TM: START: titlebar had too much headroom
+ padding: calc(-gtk-win32-size(window, cyframe) + -gtk-win32-size(window, cxpaddedborder))
+ calc(-gtk-win32-size(window, cxframe) + -gtk-win32-size(window, cxpaddedborder));
+ */
+ padding: 0px 4px; /* TM: replace previous */
+ /* TM: END: titlebar had too much headroom */
+ padding-bottom: 0px;
+ background: -gtk-win32-theme-part(window, 1, 1);
+ min-height: calc(-gtk-win32-size(window, cycaption) - -gtk-win32-size(window, cyframe) - -gtk-win32-size(window, cxpaddedborder));
+}
+
+decoration:backdrop {
+ background-image: -gtk-win32-theme-part(window, 1, 2),
+ -gtk-win32-theme-part(window, 9, 2),
+ -gtk-win32-theme-part(window, 7, 2),
+ -gtk-win32-theme-part(window, 8, 2);
+}
+.titlebar:backdrop {
+ background: -gtk-win32-theme-part(window, 1, 2);
+}
+
+decoration:disabled {
+ background-image: -gtk-win32-theme-part(window, 1, 3),
+ -gtk-win32-theme-part(window, 9, 3),
+ -gtk-win32-theme-part(window, 7, 3),
+ -gtk-win32-theme-part(window, 8, 3);
+}
+.titlebar:disabled {
+ background: -gtk-win32-theme-part(window, 1, 3);
+}
+
+.titlebar button.titlebutton {
+ margin-top: -gtk-win32-size(button, cyedge);
+ margin-bottom: -gtk-win32-size(button, cyedge);
+ margin-right: -gtk-win32-size(button, cxedge);
+ min-width: calc(-gtk-win32-size(button, cxsize) - 2 * -gtk-win32-size(button, cxedge));
+ min-height: calc(-gtk-win32-size(button, cysize) - 2 * -gtk-win32-size(button, cyedge));
+ background-repeat: no-repeat;
+ background-size: 100% calc(-gtk-win32-size(button, cysize) - 2 * -gtk-win32-size(button, cyedge));
+ background-position: 50% calc(100% - -gtk-win32-size(window, cycaption) + -gtk-win32-size(window, cysize) - -gtk-win32-size(window, cyedge));
+}
+
+.titlebar separator {
+ background-color: unset;
+}
+
+/* XXX: headerbar insists on 6px spacing between buttons. Windows doesn't
+ * think so. */
+.titlebar .titlebutton + .titlebutton {
+ margin-left: -6px;
+}
+
+/* XXX: We don't draw icons here, but the GtkImage still sizes itself to 16x16,
+ * so shrink it enough: */
+.titlebar button.titlebutton image {
+ margin: -3px;
+}
+
+.titlebar .close image,
+.titlebar .maximize image,
+.titlebar .minimize image {
+ color: transparent;
+}
+
+.titlebar button.close {
+ background-image: -gtk-win32-theme-part(window, 18, 1);
+}
+
+.titlebar button.close:backdrop {
+ background-image: -gtk-win32-theme-part(window, 18, 5);
+}
+
+.titlebar button.close:hover {
+ background-image: -gtk-win32-theme-part(window, 18, 2);
+}
+
+.titlebar button.close:active {
+ background-image: -gtk-win32-theme-part(window, 18, 3);
+}
+
+.titlebar button.close:disabled {
+ background-image: -gtk-win32-theme-part(window, 18, 4);
+}
+
+.titlebar button.minimize {
+ background-image: -gtk-win32-theme-part(window, 15, 1);
+}
+
+.titlebar button.minimize:backdrop {
+ background-image: -gtk-win32-theme-part(window, 15, 5);
+}
+
+.titlebar button.minimize:hover {
+ background-image: -gtk-win32-theme-part(window, 15, 2);
+}
+
+.titlebar button.minimize:active {
+ background-image: -gtk-win32-theme-part(window, 15, 3);
+}
+
+.titlebar button.minimize:disabled {
+ background-image: -gtk-win32-theme-part(window, 15, 4);
+}
+
+.titlebar button.maximize {
+ background-image: -gtk-win32-theme-part(window, 17, 1);
+}
+
+.titlebar button.maximize:backdrop {
+ background-image: -gtk-win32-theme-part(window, 17, 5);
+}
+
+.titlebar button.maximize:hover {
+ background-image: -gtk-win32-theme-part(window, 17, 2);
+}
+
+.titlebar button.maximize:active {
+ background-image: -gtk-win32-theme-part(window, 17, 3);
+}
+
+.titlebar button.maximize:disabled {
+ background-image: -gtk-win32-theme-part(window, 17, 4);
+}
+
+.maximized .titlebar button.maximize {
+ background-image: -gtk-win32-theme-part(window, 21, 1);
+}
+
+.maximized .titlebar button.maximize:backdrop {
+ background-image: -gtk-win32-theme-part(window, 21, 5);
+}
+
+.maximized .titlebar button.maximize:hover {
+ background-image: -gtk-win32-theme-part(window, 21, 2);
+}
+
+.maximized .titlebar button.maximize:active {
+ background-image: -gtk-win32-theme-part(window, 21, 3);
+}
+
+.maximized .titlebar button.maximize:disabled {
+ background-image: -gtk-win32-theme-part(window, 21, 4);
+}
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 28cf0e2..3ed4282 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -739,6 +739,9 @@ SetOutPath "$INSTDIR"
### gtk-add
SetOutPath "$INSTDIR\etc\gtk-3.0"
File gtk-add/etc/gtk-3.0/settings.ini
+SetOutPath "$INSTDIR\share\themes\win71\gtk-3.0"
+File gtk-add/share/themes/win71/gtk-3.0/gtk-win32-base.css
+File gtk-add/share/themes/win71/gtk-3.0/gtk.css
SetOutPath "$INSTDIR"
#######################################
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 4c7e18b..9587402 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -156,7 +156,12 @@ Delete "$INSTDIR\libgnutls-30.dll"
#######################################
### gtk-add
+# directories "etc" and "themes" are cleaned in gtk+ section
Delete "$INSTDIR\etc\gtk-3.0\settings.ini"
+Delete "$INSTDIR\share\themes\win71\gtk-3.0\gtk-win32-base.css"
+Delete "$INSTDIR\share\themes\win71\gtk-3.0\gtk.css"
+RMDir "$INSTDIR\share\themes\win71\gtk-3.0"
+RMDir "$INSTDIR\share\themes\win71"
#######################################
### gtk+
commit 85b879722016cf958a5670b59e3fda319069ee8f
Author: Thorsten Maerz <info at netztorte.de>
Date: Mon Mar 22 09:41:33 2021 +0000
Add missing icons+cursors (drag&drop)
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 13c203e..28cf0e2 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -301,6 +301,9 @@ File ${prefix}/bin/gdk-pixbuf-pixdata.exe
#######################################
### adwaita-icon-theme
!insertmacro SetPrefix2 adwaita_icon_theme adwaita-icon-theme
+SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
+File ${prefix}/share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png
+File ${prefix}/share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\legacy"
File ${prefix}/share/icons/Adwaita/16x16/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/document-properties.png
@@ -317,6 +320,7 @@ File ${prefix}/share/icons/Adwaita/16x16/legacy/go-previous.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/go-top.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/go-up.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/help-browser.png
+File ${prefix}/share/icons/Adwaita/16x16/legacy/image-missing.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/list-add.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/list-remove.png
File ${prefix}/share/icons/Adwaita/16x16/legacy/system-help.png
@@ -350,12 +354,18 @@ File ${prefix}/share/icons/Adwaita/16x16/ui/window-maximize-symbolic.symbolic.pn
File ${prefix}/share/icons/Adwaita/16x16/ui/window-minimize-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-new-symbolic.symbolic.png
File ${prefix}/share/icons/Adwaita/16x16/ui/window-restore-symbolic.symbolic.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+File ${prefix}/share/icons/Adwaita/32x32/mimetypes/text-x-generic.png
SetOutPath "$INSTDIR\share\icons\Adwaita\256x256\legacy"
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-error.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-information.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-password.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-question.png
File ${prefix}/share/icons/Adwaita/256x256/legacy/dialog-warning.png
+SetOutPath "$INSTDIR\share\icons\Adwaita\cursors"
+File ${prefix}/share/icons/Adwaita/cursors/dnd-copy.cur
+File ${prefix}/share/icons/Adwaita/cursors/dnd-move.cur
+File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
SetOutPath "$INSTDIR"
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index e477438..4c7e18b 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -433,6 +433,9 @@ RMDir "$INSTDIR\share"
#######################################
### adwaita-icon-theme
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-add-symbolic.symbolic.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\actions\list-remove-symbolic.symbolic.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\16x16\actions"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\document-properties.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\edit-clear.png"
@@ -448,6 +451,7 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-previous.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-top.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\go-up.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\help-browser.png"
+Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\image-missing.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-add.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\list-remove.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\legacy\system-help.png"
@@ -483,6 +487,9 @@ Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-new-symbolic.symbolic.png"
Delete "$INSTDIR\share\icons\Adwaita\16x16\ui\window-restore-symbolic.symbolic.png"
RMDIR "$INSTDIR\share\icons\Adwaita\16x16\ui"
RMDIR "$INSTDIR\share\icons\Adwaita\16x16"
+Delete "$INSTDIR\share\icons\Adwaita\32x32\mimetypes\text-x-generic.png"
+RMDIR "$INSTDIR\share\icons\Adwaita\32x32\mimetypes"
+RMDIR "$INSTDIR\share\icons\Adwaita\32x32"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-error.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-information.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-password.png"
@@ -490,6 +497,10 @@ Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-question.png"
Delete "$INSTDIR\share\icons\Adwaita\256x256\legacy\dialog-warning.png"
RMDIR "$INSTDIR\share\icons\Adwaita\256x256\legacy"
RMDIR "$INSTDIR\share\icons\Adwaita\256x256"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-copy.cur"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-move.cur"
+Delete "$INSTDIR\share\icons\Adwaita\cursors\dnd-none.cur"
+RMDIR "$INSTDIR\share\icons\Adwaita\cursors"
Delete "$INSTDIR\share\icons\Adwaita\index.theme"
RMDIR "$INSTDIR\share\icons\Adwaita"
RMDIR "$INSTDIR\share\icons"
commit d7743e7e8c67826668850017d05537566ee4cd05
Author: Thorsten Maerz <info at netztorte.de>
Date: Mon Mar 22 09:20:04 2021 +0100
Remove stray backslash
diff --git a/Makefile.am b/Makefile.am
index 74dbf60..54b400f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,4 +65,4 @@ EXTRA_DIST = autogen.sh \
patches/ytnef-1.9.3/01-malloc.patch \
patches/ytnef-1.9.3/02-no-undefined.patch \
patches/ytnef-1.9.3/99-autotools.patch \
- patches/zlib-1.2.11/01-no-strip.patch \
+ patches/zlib-1.2.11/01-no-strip.patch
commit 52904a015fe74903e4f8d1647b7e24e8453db605
Author: Manuel Stoeckl <code at mstoeckl.com>
Date: Sun Mar 21 18:32:14 2021 +0000
Workaround missing ctree redraw events
The selections in folder- and summaryview are not updated when needed.
Patch provided by Manuel Stoeckl <code at mstoeckl.com>
from https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4366#c10
diff --git a/Makefile.am b/Makefile.am
index 4c2ff8b..74dbf60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST = autogen.sh \
patches/cairo-1.17.4/01-nofortify-hack.patch.off \
patches/claws-mail/01-etpan-sasl-plugin-path.patch \
patches/claws-mail/05-define-WIN32-for-litehtml.patch \
+ patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch \
patches/cyrus-sasl-2.1.27/01-md5-typedef.patch \
patches/cyrus-sasl-2.1.27/02-tchar.patch \
patches/cyrus-sasl-2.1.27/03-exports.patch \
diff --git a/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch b/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch
new file mode 100755
index 0000000..b64e6ab
--- /dev/null
+++ b/patches/claws-mail/10-Defer-all-painting-outside-of-widget-draw-entrypoint.patch
@@ -0,0 +1,206 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Taken from
+https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4366#c10
+
+From 335ce50b853d84bcbd3ce1fed770cf0e93855e9e Mon Sep 17 00:00:00 2001
+From: Manuel Stoeckl <code at mstoeckl.com>
+Date: Fri, 11 Dec 2020 23:10:31 -0500
+Subject: [PATCH] Defer all painting outside of widget draw entrypoint
+
+---
+ src/gtk/gtkcmclist.c | 80 ++++++++++++++++++++++++++++----------------
+ src/gtk/gtkcmclist.h | 16 +++++++++
+ src/gtk/gtkcmctree.c | 6 ++++
+ 3 files changed, 73 insertions(+), 29 deletions(-)
+
+diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.c claws-mail-3.99.0git63/src/gtk/gtkcmclist.c
+--- claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.c 2021-03-20 15:47:59.000000000 +0000
++++ claws-mail-3.99.0git63/src/gtk/gtkcmclist.c 2021-03-21 17:51:40.295417192 +0000
+@@ -1124,6 +1124,8 @@
+ * isn't there
+ */
+ column_button_create (clist, 0);
++
++ clist->should_I_be_drawing_now = 0;
+
+ return object;
+ }
+@@ -4797,6 +4799,7 @@
+ if (gtk_widget_is_drawable (widget))
+ {
+ clist = GTK_CMCLIST (widget);
++ clist->should_I_be_drawing_now = 1;
+
+ /* Draw clist_window */
+ if (gtk_cairo_should_draw_window (cr, clist->clist_window))
+@@ -4855,8 +4858,8 @@
+ }
+ }
+ }
++ clist->should_I_be_drawing_now = 0;
+ }
+-
+ return FALSE;
+ }
+
+@@ -5668,6 +5671,11 @@
+ cairo_t *cr;
+ cm_return_if_fail (clist != NULL);
+
++ if (!clist->should_I_be_drawing_now) {
++ gtk_widget_queue_draw(clist);
++ return;
++ }
++
+ /* bail now if we arn't drawable yet */
+ if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+ return;
+@@ -5948,22 +5956,27 @@
+ }
+
+ if (!area) {
+- int w, h, y;
+- cairo_t *cr;
+- w = gdk_window_get_width(clist->clist_window);
+- h = gdk_window_get_height(clist->clist_window);
+- cr = gdk_cairo_create(clist->clist_window);
+- y = ROW_TOP_YPIXEL (clist, i);
+- gdk_cairo_set_source_color(cr, >k_widget_get_style(GTK_WIDGET(clist))->base[GTK_STATE_NORMAL]);
+- cairo_rectangle(cr, 0, y, w, h - y);
+- cairo_fill(cr);
+- cairo_destroy(cr);
++ if (clist->should_I_be_drawing_now) {
++ int w, h, y;
++ cairo_t *cr;
++ w = gdk_window_get_width(clist->clist_window);
++ h = gdk_window_get_height(clist->clist_window);
++ cr = gdk_cairo_create(clist->clist_window);
++ y = ROW_TOP_YPIXEL (clist, i);
++ gdk_cairo_set_source_color(cr, >k_widget_get_style(GTK_WIDGET(clist))->base[GTK_STATE_NORMAL]);
++ cairo_rectangle(cr, 0, y, w, h - y);
++ cairo_fill(cr);
++ cairo_destroy(cr);
++ } else {
++ gtk_widget_queue_draw(clist);
++ }
+ }
+ }
+
+ static void
+ draw_xor_line (GtkCMCList *clist)
+ {
++ // TODO: figure out GTK3 method of drawing this!
+ cairo_t *cr;
+ cr = gdk_cairo_create(clist->clist_window);
+ cairo_set_line_width(cr, 1.0);
+@@ -6234,6 +6247,7 @@
+
+ clist->hoffset = -value;
+
++ // TODO: figure out GTK3 method of drawing this!
+ cr = gdk_cairo_create(clist->clist_window);
+ cairo_dash_from_add_mode(clist, cr);
+ cairo_set_line_width(cr, 1.0);
+@@ -6521,15 +6535,19 @@
+
+ clist = GTK_CMCLIST (widget);
+ if (clist->focus_row >= 0) {
+- cr = gdk_cairo_create(clist->clist_window);
+- cairo_dash_from_add_mode(clist, cr);
+- cairo_set_line_width(cr, 1.0);
+- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+- cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
+- clist->clist_window_width + 1,
+- clist->row_height - 0.5);
+- cairo_stroke(cr);
+- cairo_destroy(cr);
++ if (clist->should_I_be_drawing_now) {
++ cr = gdk_cairo_create(clist->clist_window);
++ cairo_dash_from_add_mode(clist, cr);
++ cairo_set_line_width(cr, 1.0);
++ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
++ cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
++ clist->clist_window_width + 1,
++ clist->row_height - 0.5);
++ cairo_stroke(cr);
++ cairo_destroy(cr);
++ } else {
++ gtk_widget_queue_draw(clist);
++ }
+ }
+ }
+
+@@ -6550,15 +6568,19 @@
+
+ clist = GTK_CMCLIST (widget);
+ if (clist->focus_row >= 0) {
+- cairo_t *cr = gdk_cairo_create(clist->clist_window);
+- cairo_set_line_width(cr, 1.0);
+- gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->base[GTK_STATE_NORMAL]);
+- cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+- cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
+- clist->clist_window_width + 1,
+- clist->row_height - 0.5);
+- cairo_stroke(cr);
+- cairo_destroy(cr);
++ if (clist->should_I_be_drawing_now) {
++ cairo_t *cr = gdk_cairo_create(clist->clist_window);
++ cairo_set_line_width(cr, 1.0);
++ gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->base[GTK_STATE_NORMAL]);
++ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
++ cairo_rectangle(cr, 0, ROW_TOP_YPIXEL(clist, clist->focus_row) + 0.5,
++ clist->clist_window_width + 1,
++ clist->row_height - 0.5);
++ cairo_stroke(cr);
++ cairo_destroy(cr);
++ } else {
++ gtk_widget_queue_draw(clist);
++ }
+ }
+
+ row = clist->focus_row;
+diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.h claws-mail-3.99.0git63/src/gtk/gtkcmclist.h
+--- claws-mail-3.99.0git63.org/src/gtk/gtkcmclist.h 2021-03-20 15:47:59.000000000 +0000
++++ claws-mail-3.99.0git63/src/gtk/gtkcmclist.h 2021-03-21 17:51:40.295417192 +0000
+@@ -235,6 +235,22 @@
+
+ gint drag_highlight_row;
+ GtkCMCListDragPos drag_highlight_pos;
++
++ /*
++ * Pre-GTK3 functions called draw_row, draw_rows, etc. whenever a region of
++ * the widget needed to be updated, so that the region would be immediately
++ * redrawn. Around the GTK3/Qt4 transitions, toolkits moved away from this
++ * immediate-update mode, and started the more efficient approach of tracking
++ * damage and then redrawing only the damaged regions. When this variable
++ * is 0 (most old uses), the 'draw_X' are to be interpreted as requests to
++ * mark damage; when it is 1 (precisely when the widget draw entrypoint is used)
++ * the 'draw_X' actually do the drawing.
++ *
++ * See also:
++ * https://doc.qt.io/archives/qt-4.8/porting4.html#painting-and-redrawing-widgets
++ * https://developer.gnome.org/gtk3/stable/ch26s02.html#id-1.6.3.4.11
++ */
++ int should_I_be_drawing_now;
+ };
+
+ struct _GtkCMCListClass
+diff -urN claws-mail-3.99.0git63.org/src/gtk/gtkcmctree.c claws-mail-3.99.0git63/src/gtk/gtkcmctree.c
+--- claws-mail-3.99.0git63.org/src/gtk/gtkcmctree.c 2021-03-20 15:47:59.000000000 +0000
++++ claws-mail-3.99.0git63/src/gtk/gtkcmctree.c 2021-03-21 17:51:40.295417192 +0000
+@@ -604,6 +604,12 @@
+ GdkColor *fgcolor, *bgcolor;
+
+ cm_return_if_fail (clist != NULL);
++
++ if (!clist->should_I_be_drawing_now) {
++ gtk_widget_queue_draw(GTK_WIDGET (clist));
++ return;
++ }
++
+ widget = GTK_WIDGET (clist);
+
+ /* if the function is passed the pointer to the row instead of null,
commit 0ec15a3e3d58538b07b4ecba3359195b713f0f9c
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Mar 21 16:47:44 2021 +0100
Print warning, if gcc-9 is found
Compiling cairo with gcc-9 currently requires disabling fortification.
To avoid building less hardened release versions, a warning is printed
and the necessary patch has to be enabled manually.
diff --git a/Makefile.am b/Makefile.am
index 9acb871..4c2ff8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ EXTRA_DIST = autogen.sh \
patches/atk-2.36.0/01-meson-build.patch \
patches/bzip2-1.0.8/01-g10-bzlib_h.patch \
patches/bzip2-1.0.8/02-g10-Makefile.patch \
+ patches/cairo-1.17.4/01-nofortify-hack.patch.off \
patches/claws-mail/01-etpan-sasl-plugin-path.patch \
patches/claws-mail/05-define-WIN32-for-litehtml.patch \
patches/cyrus-sasl-2.1.27/01-md5-typedef.patch \
@@ -63,4 +64,4 @@ EXTRA_DIST = autogen.sh \
patches/ytnef-1.9.3/01-malloc.patch \
patches/ytnef-1.9.3/02-no-undefined.patch \
patches/ytnef-1.9.3/99-autotools.patch \
- patches/zlib-1.2.11/01-no-strip.patch
+ patches/zlib-1.2.11/01-no-strip.patch \
diff --git a/autogen.sh b/autogen.sh
index 0ad959a..1a21ef3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -54,6 +54,32 @@ check_version () {
return 1
}
+check_compiler () {
+ warn=""
+ for prefix in x86_64-w64-mingw32 i686-w64-mingw32 i586-mingw32msvc \
+ i386-mingw32msvc mingw32 ; do
+ if which $prefix-gcc > /dev/null ; then
+ ver=$($prefix-gcc -dumpversion|cut -d "." -f 1)
+ if test "$ver" -gt 8 ; then
+ warn=" $prefix-gcc $ver\n$warn"
+ fi
+ fi
+ done
+ if [ -n "$warn" ] ; then
+ echo
+ echo "Warning: Unrecommended gcc version found on your system!"
+ echo "For building releases, MinGW gcc-8 should be used."
+ echo "Using gcc-9 currently produces less hardened binaries."
+ echo "Following unrecommended versions have been found:"
+ echo "$warn"
+ echo "To use gcc-9, please remove the \".off\" extension from"
+ echo "./patches/cairo-1.17.4/01-nofortify-hack.patch.off"
+ return 1
+ else
+ return 0
+ fi
+}
+
# Allow to override the default tool names
AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
@@ -258,3 +284,5 @@ echo
echo "You may now run ./autogen.sh with --build-w32 or --build-w64 switch,"
echo "followed by \"make\"."
echo
+
+check_compiler
diff --git a/patches/cairo-1.17.4/01-nofortify-hack.patch.off b/patches/cairo-1.17.4/01-nofortify-hack.patch.off
new file mode 100755
index 0000000..a0c4828
--- /dev/null
+++ b/patches/cairo-1.17.4/01-nofortify-hack.patch.off
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+# Mingw gcc-9 doesn't provide fortified functions (memmove_chk, memcopy_chk)
+# When defining _FORTIFY_SOURCE to a value greater than 0,
+# these functions have to be provided by libssp (-fstack-protector or -lssp).
+# Adding -lssp currentyly only creates a static cairo library, so until this
+# is cleared, disable fortification and use gcc-8 for release versions.
+
+diff -ur cairo-1.17.4-org/build/configure.ac.warnings cairo-1.17.4/build/configure.ac.warnings
+--- cairo-1.17.4-org/build/configure.ac.warnings 2010-12-25 15:21:33.000000000 +0100
++++ cairo-1.17.4/build/configure.ac.warnings 2021-03-02 13:45:49.950952181 +0100
+@@ -39,7 +39,7 @@
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+
+ dnl Also to turn various gcc/glibc-specific preprocessor checks
+-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
++MAYBE_WARN="$MAYBE_WARN -Wp"
+
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
commit 8dee6a5e417a38cb418d9222ca0ca801d7c42ac7
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Mar 21 15:02:44 2021 +0100
Update build requirements in README
diff --git a/README b/README
index bf366ae..2704cd8 100644
--- a/README
+++ b/README
@@ -40,14 +40,16 @@ Basic requirements
A decent POSIX system is required for building this software as well
as GNU make. We are using Debian GNU/Linux 10 (Buster), any other
POSIX system should work as well but you may run into problems due to
-different toolchain versions.
+different toolchain versions (MinGW gcc-8 is required, gcc-9 works more
+or less and gcc-10 doesn't work yet).
To finish the build, following packages need to be installed on a
Debian Buster system.
Note - at the time of writing, the meson package in Debian Buster
-(currently 0.49.1) is too old to build pixman, but a sufficiently
-recent version can be installed from buster-backports (currently 0.52.1).
+(currently 0.49.1) is too old, see below for update instructions.
+
+Building the gtk3 version has additional requirements (see below).
automake
autoconf
@@ -76,6 +78,9 @@ libgettextpo-dev
meson
pkg-config-mingw-w64-x86-64
gobject-introspection
+wget
+gpg
+sudo
Building in a Docker container
==============================
@@ -86,7 +91,7 @@ is sufficient:
--------8<---------8<---------8<--------
FROM debian:buster
-RUN apt-get update && apt-get -y install automake autoconf mingw-w64 nsis stow unzip texinfo imagemagick docbook-utils libglib2.0-dev libgdk-pixbuf2.0-dev ghostscript git binutils make cmake bison flex gperf intltool gcc g++ libtool libgettextpo-dev meson pkg-config-mingw-w64-x86-64 gobject-introspection && apt-get clean
+RUN apt-get update && apt-get -y install automake autoconf mingw-w64 nsis stow unzip texinfo imagemagick docbook-utils libglib2.0-dev libgdk-pixbuf2.0-dev ghostscript git binutils make cmake bison flex gperf intltool gcc g++ libtool libgettextpo-dev meson pkg-config-mingw-w64-x86-64 gobject-introspection wget gpg sudo && apt-get clean
--------8<---------8<---------8<--------
To build the image locally (run in the directory with Dockerfile
@@ -147,6 +152,56 @@ libetpan provides some way to set the SASL plugin path. I'll consider
submitting the libetpan patch upstream later.
+Updating meson
+==============
+
+Currently, the minimum required version of meson is 0.55.
+Debian 10 (Buster) and Ubuntu 20 (Focal) ship with older versions and need
+additional steps to update to a recent version:
+
+* Debian 10 (Buster):
+ Add following line to "/etc/apt/sources.list":
+ deb http://deb.debian.org/debian buster-backports main
+ Then execute
+ sudo apt-get update
+ sudo apt-get -y install -t buster-backports meson
+
+* Ubuntu 20 (Focal)
+ Manually download and install the meson package:
+ wget http://archive.ubuntu.com/ubuntu/pool/universe/m/meson/meson_0.57.0+really0.56.2-0.1_all.deb
+ dpkg -i meson_0.57.0+really0.56.2-0.1_all.deb
+
+
+Building the gtk3 version
+=========================
+
+The gtk3 version needs icons from adwaita-icon-theme, which requires
+"icontool-render" (from package "icontool") and "gtk-encode-symbolic-svg"
+(from package "gtk-3-examples" on Debian or "libgtk-3-bin" on Ubuntu).
+The package "icontool" is not available on Debian (AFAIK) and has to be
+compiled from source (depends on libxml-simple-perl).
+
+The binary packages of adwaita-icon-theme (that I know) don't contain
+the required icons from the 16x16/ui folder, so this is no option
+(e.g. window-close-symbolic.symbolic.png is missing).
+
+Following steps are required (in addition to the apt-get packages
+listed in the docker section above):
+
+ sudo apt-get install -y inkscape gtk-3-examples libxml-simple-perl
+
+On Ubuntu you can simply install icontool:
+
+ sudo apt-get install -y icontool
+
+On Debian, you have to manually fetch and compile icontool:
+
+ wget http://archive.ubuntu.com/ubuntu/pool/universe/i/icontool/icontool_0.1.0.orig.tar.gz
+ tar -xvaf icontool_0.1.0.orig.tar.gz
+ cd icontool-0.1.0
+ ./configure && make && sudo make install
+
+
Copyright
=========
commit 6e5f7a1ed5f2300540f714d77cf062c550f5f4ef
Author: Thorsten Maerz <info at netztorte.de>
Date: Sun Mar 21 11:06:27 2021 +0100
Reduce build-deps for "make dist-xz" (getgit:claws)
Set build options, so "make dist-xz" doesn't depend on gtk (and other
libraries).
Creating a tar package from a git checkout of claws-mail is currently
required, as the plugins and docs expect the generated sources in source
dir (which are generated in build dir, thus not found). It also
generates the version numbers as required (affects file "version" and
directory- and archive-name).
diff --git a/packages/download.sh b/packages/download.sh
index 77a8d19..9f65329 100755
--- a/packages/download.sh
+++ b/packages/download.sh
@@ -124,7 +124,7 @@ WGET="wget $ipvx"
# the files, creates a tar archive with correct version number and
# modifies the packages.current file.
# The scripts should be named "getgit-{packagename}.sh" to get executed
-for fetchscript in getgit-*.sh ; do
+[ -e getgit-*.sh ] && for fetchscript in getgit-*.sh ; do
if ! [ -x $fetchscript ] ; then
echo "File not existing or not executable: $fetchscript"
exit 1
diff --git a/packages/getgit-claws-mail.sh b/packages/getgit-claws-mail.sh
index bb2f463..42bdd5d 100755
--- a/packages/getgit-claws-mail.sh
+++ b/packages/getgit-claws-mail.sh
@@ -43,7 +43,10 @@ create_package () {
git clone https://git.claws-mail.org/readonly/claws.git "$TMPGIT" > "$logfile" 2>&1
( cd "$TMPGIT" ;
[ -z "$REVISION" ] || git checkout $REVISION
- ./autogen.sh && ./configure && make dist-xz ) > "$logfile" 2>&1
+ GTK_CFLAGS="dummy" GTK_LIBS="dummy" \
+ NETTLE_CFLAGS="dummy" NETTLE_LIBS="dummy" \
+ ./autogen.sh --disable-libetpan --disable-gnutls \
+ && make dist-xz) > "$logfile" 2>&1
local pkgtmp=$(ls "$TMPGIT"/claws-mail-*.tar.xz)
PKGNAME=$(basename "$pkgtmp")
cp "$pkgtmp" .
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list