[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-17-g50aa47b
jonathan at claws-mail.org
jonathan at claws-mail.org
Wed Sep 1 17:35:40 UTC 2021
The branch, gtk3 has been updated
via 50aa47bae04b367a8ad879ae26130ac9e4a123b0 (commit)
via 482f34f07cd12412c03bee19575262effad8696f (commit)
via 6c5bcf25c00ad8e4d0d94b256de0c40053948f7c (commit)
from 27966d0244ab89e4e2a4551c7f7e3fe6de18857c (commit)
Summary of changes:
.gitignore | 2 +-
Makefile.am | 4 +-
configure.ac | 4 +-
packages/packages.current | 2 +-
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 +++++++---
src/Makefile.am | 2 +-
src/sections-installer.nsi | 6 +--
src/sections-uninstaller.nsi | 6 +--
12 files changed, 52 insertions(+), 100 deletions(-)
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%)
- Log -----------------------------------------------------------------
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
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list