[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-26-ge89c360

[jonathan at claws-mail.org]

The branch, master has been updated
       via  e89c360ecbbbf191aa0181238b070ccd478f7c62 (commit)
       via  dd1bbe08e010e5faf773eaa8e208dc992bbfb0a3 (commit)
      from  9a78a8cbaeab905c62f92c2f876c229a068095a0 (commit)

Summary of changes:
 README             | 42 +++++++++++++++++++++++++++++++++++++-----
 build-aux/clean.sh |  2 +-
 2 files changed, 38 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit e89c360ecbbbf191aa0181238b070ccd478f7c62
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 12 19:07:46 2022 -0700

    Updates for building webkitgtk

diff --git a/README b/README
index ddda34c..ef14ff2 100644
--- a/README
+++ b/README
@@ -63,13 +63,15 @@ of smaller lzma
 --enable-debug will build packages with debug CFLAGS and configure options
 
 
-The configure script looks for four environment variables:
+The configure script looks for five environment variables:
 
 CFLAGS and CXXFLAGS are respected and passed down when building the packages.
 If CFLAGS is specified but CXXFLAGS isn't, CXXFLAGS will use the CFLAGS value.
 
 EXTRA_MAKENSIS_FLAGS will be added to the makensis command line.
 
+WEBKITGTK_BISON sets a custom path to bison for building webkitgtk-2.4.11.  See below.
+
 MAKE_JOBS sets the make -j parameter for building in parallel.  It defaults to
 the number of CPUs on the system.  It doesn't build multiple packages in
 parallel; it sets the parallelism in each package.
@@ -123,12 +125,42 @@ python3-distutils
 wget
 curl
 ruby *
+python-is-python3 *
 gtk-3-examples **
 
-* only needed for webkitgtk
+* only needed for webkitgtk on gtk2 builds
 ** 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
+*** webkitgtk-2.4.11 fails to build with bison-3.7 but
+    works with bison-3.6.4.  See below.
+
+
+Fancy / WebkitGTK / GTK2
+========================
+
+Due to a lack of upstream support, webkitgtk and therefore the Claws Fancy plugin
+are only available with the GTK2 build.  The latest version of webkitgtk that can
+be built for Windows is 2.4.11, which is quite old.  Several packages needed by
+Claws have since broken compatibility with the old version of webkitgtk.  Currently,
+they are:
+	glib
+	glib-networking
+	icu
+
+In order to keep some Fancy support, the GTK2 build of Claws also builds with
+old versions of those packages.
+
+Additionally, webkitgtk-2.4.11 needs bison-3.6.4 to build.  If bison-3.6.4 isn't
+available from your distro:
+
+1. Build and install bison-3.6.4
+	wget http://mirrors.kernel.org/gnu/bison/bison-3.6.4.tar.xz
+	tar xf bison-3.6.4.tar.xz
+	cd bison-3.6.4
+	./configure --prefix=/opt/bison-3.6.4
+	make && sudo make install
+
+2. Call autogen.sh with the path to bison
+	./autogen.sh --build-w64 WEBKITGTK_BISON=/opt/bison-3.6.4/bin/bison
 
 
 Building in a Docker container
@@ -140,7 +172,7 @@ is sufficient:
 
 --------8<---------8<---------8<--------
 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-bin 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
+RUN apt-get update && apt-get -y install build-essential automake autoconf mingw-w64 mingw-w64-tools nsis stow unzip docbook-utils libglib2.0-bin libglib2.0-dev-bin git cmake bison flex gperf intltool libtool libgettextpo-dev meson python3-distutils python-is-python3 wget curl ruby gtk-3-examples & apt-get clean
 --------8<---------8<---------8<--------
 
 To build the image locally (run in the directory with Dockerfile

commit dd1bbe08e010e5faf773eaa8e208dc992bbfb0a3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 12 17:36:47 2022 -0700

    Fix clean script

diff --git a/build-aux/clean.sh b/build-aux/clean.sh
index 3fe2333..165b6ce 100755
--- a/build-aux/clean.sh
+++ b/build-aux/clean.sh
@@ -19,5 +19,5 @@ cd $root
 
 echo Cleaning
 
-git clean -dfx --exclude=packages
+git clean -dfx --exclude=/packages/
 

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


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