[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-21-g13ff358
jonathan at claws-mail.org
jonathan at claws-mail.org
Sun Jun 12 21:02:49 UTC 2022
The branch, master has been updated
via 13ff35806a839f3e743ed5a050e840b6185b7eb5 (commit)
via 0371a22ed97af9327fd0b492b54a659b3ab8649f (commit)
via 5abcad243cb107d538897eee065597c40797d8eb (commit)
via 795bf7a1c49752d84c02200640ce112daf25a822 (commit)
from 38be94a26a5913f20e1cd02e5c8f599c492fd17e (commit)
Summary of changes:
packages/packages.current | 8 ++--
patches/poppler/01-mingw-std-threads.patch | 68 ++++++++++++++++++------------
src/sections-installer.nsi | 2 +-
src/sections-uninstaller.nsi | 2 +-
4 files changed, 46 insertions(+), 34 deletions(-)
- Log -----------------------------------------------------------------
commit 13ff35806a839f3e743ed5a050e840b6185b7eb5
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jun 11 12:22:08 2022 -0700
update to poppler-22.06.0
diff --git a/packages/packages.current b/packages/packages.current
index 2ca082a..e06a264 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.7,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.7.tar.xz,0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33,,
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.05.0,file,https://poppler.freedesktop.org/poppler-22.05.0.tar.xz,a969ced458e050d6202367bd7427054e2bd19bae39e8f969910d3b9151abf958,,
+poppler,22.06.0,file,https://poppler.freedesktop.org/poppler-22.06.0.tar.xz,a0f9aaa3918bad781039fc307a635652a14d1b391cd559b66edec4bedba3c5d7,,
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.5,file,https://sqlite.org/2022/sqlite-autoconf-3380500.tar.gz,5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c,,
diff --git a/patches/poppler/01-mingw-std-threads.patch b/patches/poppler/01-mingw-std-threads.patch
index c06e824..32f09de 100755
--- a/patches/poppler/01-mingw-std-threads.patch
+++ b/patches/poppler/01-mingw-std-threads.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur a/poppler/Annot.h b/poppler/Annot.h
+--- a/poppler/Annot.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/Annot.h 2022-06-11 13:17:39.667130296 -0700
+@@ -53,7 +53,7 @@
#include <memory>
#include <atomic>
@@ -9,10 +9,10 @@ diff -aur apoppler-21.08.0/poppler/Annot.h poppler-21.08.0/poppler/Annot.h
+#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
+ #include "AnnotStampImageHelper.h"
+diff -Naur a/poppler/Array.h b/poppler/Array.h
+--- a/poppler/Array.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/Array.h 2022-06-11 13:17:34.271049840 -0700
@@ -29,7 +29,7 @@
#define ARRAY_H
@@ -22,21 +22,21 @@ diff -aur apoppler-21.08.0/poppler/Array.h poppler-21.08.0/poppler/Array.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
+diff -Naur a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
+--- a/poppler/CairoFontEngine.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/CairoFontEngine.h 2022-06-11 13:17:44.119196470 -0700
+@@ -32,7 +32,7 @@
#define CAIROFONTENGINE_H
+ #include <memory>
-#include <mutex>
+#include "mingw.mutex.h"
+ #include <unordered_map>
+ #include <vector>
- #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
+diff -Naur a/poppler/Dict.h b/poppler/Dict.h
+--- a/poppler/Dict.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/Dict.h 2022-06-11 13:17:49.935282639 -0700
@@ -31,7 +31,7 @@
#define DICT_H
@@ -46,9 +46,9 @@ diff -aur apoppler-21.08.0/poppler/Dict.h poppler-21.08.0/poppler/Dict.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
+diff -Naur a/poppler/GlobalParams.h b/poppler/GlobalParams.h
+--- a/poppler/GlobalParams.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/GlobalParams.h 2022-06-11 13:17:23.490888284 -0700
@@ -47,7 +47,7 @@
#include <unordered_map>
#include <string>
@@ -58,9 +58,9 @@ diff -aur apoppler-21.08.0/poppler/GlobalParams.h poppler-21.08.0/poppler/Global
#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
+diff -Naur a/poppler/Page.h b/poppler/Page.h
+--- a/poppler/Page.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/Page.h 2022-06-11 13:17:55.955371504 -0700
@@ -36,7 +36,7 @@
#define PAGE_H
@@ -70,10 +70,10 @@ diff -aur apoppler-21.08.0/poppler/Page.h poppler-21.08.0/poppler/Page.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 @@
+diff -Naur a/poppler/PDFDoc.h b/poppler/PDFDoc.h
+--- a/poppler/PDFDoc.h 2022-06-01 08:00:51.000000000 -0700
++++ b/poppler/PDFDoc.h 2022-06-11 13:17:28.654965814 -0700
+@@ -49,7 +49,7 @@
#include <algorithm>
#include <cstdio>
@@ -82,3 +82,15 @@ diff -aur apoppler-21.08.0/poppler/PDFDoc.h poppler-21.08.0/poppler/PDFDoc.h
#include "poppler-config.h"
+diff -Naur a/test/cairo-thread-test.cc b/test/cairo-thread-test.cc
+--- a/test/cairo-thread-test.cc 2022-06-01 08:00:51.000000000 -0700
++++ b/test/cairo-thread-test.cc 2022-06-11 13:17:14.638754783 -0700
+@@ -13,7 +13,7 @@
+ #include <condition_variable>
+ #include <cmath>
+ #include <cstdio>
+-#include <mutex>
++#include "mingw.mutex.h"
+ #include <queue>
+ #include <thread>
+ #include <vector>
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index f535ff9..05d620b 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-121.dll
+File ${prefix}/bin/libpoppler-122.dll
#######################################
### claws-mail
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index 97c136e..b7b1f3c 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-121.dll"
+Delete "$INSTDIR\libpoppler-122.dll"
#######################################
### gumbo-parser
commit 0371a22ed97af9327fd0b492b54a659b3ab8649f
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jun 11 12:21:03 2022 -0700
update to nettle-3.8
diff --git a/packages/packages.current b/packages/packages.current
index 8810c69..2ca082a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -42,7 +42,7 @@ libtasn1,4.18.0,file,https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-4.18.0.tar.gz
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,,
+nettle,3.8,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.8.tar.gz,7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6,,
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.7,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.7.tar.xz,0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33,,
pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
commit 5abcad243cb107d538897eee065597c40797d8eb
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jun 11 12:11:57 2022 -0700
update to gnutls-3.7.6
diff --git a/packages/packages.current b/packages/packages.current
index 4ad34b0..8810c69 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.72.2,file,https://download.gnome.org/sources/glib/2.72/glib-2.72.2.tar.xz,78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de,,
glib_networking,2.72.0,file,https://download.gnome.org/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz,100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
-gnutls,3.7.5,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.5.tar.xz,1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad,,
+gnutls,3.7.6,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.6.tar.xz,77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff,,
gpgme,1.17.1,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2,711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f,,
gtk,3.24.34,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.34.tar.xz,dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
commit 795bf7a1c49752d84c02200640ce112daf25a822
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sat Jun 11 12:10:33 2022 -0700
update to glib-2.72.2
diff --git a/packages/packages.current b/packages/packages.current
index ff602d8..4ad34b0 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,7 @@ freetype,2.12.1,file,https://download.savannah.gnu.org/releases/freetype/freetyp
fribidi,1.0.12,file,https://github.com/fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar.xz,0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495,,
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.72.1,file,https://download.gnome.org/sources/glib/2.72/glib-2.72.1.tar.xz,c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2,,
+glib,2.72.2,file,https://download.gnome.org/sources/glib/2.72/glib-2.72.2.tar.xz,78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de,,
glib_networking,2.72.0,file,https://download.gnome.org/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz,100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b,,
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.5,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.5.tar.xz,1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad,,
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list