[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-30-gbf9a625
jonathan at claws-mail.org
jonathan at claws-mail.org
Thu Nov 11 22:38:52 CET 2021
The branch, gtk3 has been updated
via bf9a6253db953bc944f73904590f4d26af0a7e69 (commit)
from 9d13eb6a798a9345d8edfbe14ccf171118832850 (commit)
Summary of changes:
README | 47 ++++++----------------
autogen.sh | 31 +-------------
...y-hack.patch.off => 01-no-fortify-source.patch} | 9 +----
3 files changed, 15 insertions(+), 72 deletions(-)
rename patches/cairo-1.17.4/{01-nofortify-hack.patch.off => 01-no-fortify-source.patch} (83%)
- Log -----------------------------------------------------------------
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
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list