[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-17-g0d35551

[jonathan at claws-mail.org]

The branch, master has been updated
       via  0d35551631ddbf967af178255c15ecd8521ffee6 (commit)
      from  005c02d3ccd9a62e0df7b070c17b32943b518fff (commit)

Summary of changes:
 README                                          | 25 ++++++++++++-------------
 autogen.sh                                      |  4 +---
 patches/cairo-1.17.4/01-no-fortify-source.patch | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100755 patches/cairo-1.17.4/01-no-fortify-source.patch


- Log -----------------------------------------------------------------
commit 0d35551631ddbf967af178255c15ecd8521ffee6
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 6ed63a9..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,16 +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.
+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 to build pixman, but a sufficiently
-recent version can be installed from buster-backports.
+Debian Bullseye system.
 
 build-essential
 automake
@@ -126,7 +122,11 @@ meson
 python3-distutils
 wget
 curl
-ruby
+ruby *
+gtk-3-examples **
+
+* only needed for webkitgtk
+** only needed for gtk3 builds
 
 
 Building in a Docker container
@@ -137,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 ruby & 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
@@ -207,8 +207,7 @@ 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 3aacbb0..9690342 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -85,6 +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
-
+printf "You may now run make.\n"
diff --git a/patches/cairo-1.17.4/01-no-fortify-source.patch b/patches/cairo-1.17.4/01-no-fortify-source.patch
new file mode 100755
index 0000000..d20b575
--- /dev/null
+++ b/patches/cairo-1.17.4/01-no-fortify-source.patch
@@ -0,0 +1,17 @@
+# 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
+# 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,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"
+ 
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port