[Commits] [SCM] claws-win32-installer branch, master, updated. 4.3.0-1-4-g652e690

[jonathan at claws-mail.org]

The branch, master has been updated
       via  652e690a9af3f6e3c854d2c9f99869c7e6967043 (commit)
      from  47c00e609e429680e8a29101ec84171f48ecb188 (commit)

Summary of changes:
 Dockerfile                | 29 +++++++++++++++++++++++++++++
 README                    | 14 +++-----------
 configure.ac              |  3 +--
 patches/regex/01-setup.sh |  8 ++++----
 4 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 Dockerfile


- Log -----------------------------------------------------------------
commit 652e690a9af3f6e3c854d2c9f99869c7e6967043
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Wed Jun 19 20:31:19 2024 -0700

    Update Docker support

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c286bbf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,29 @@
+FROM debian:bookworm
+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 \
+    curl \
+    libgtk-3-bin \
+    && rm -rf /var/lib/apt/lists/* \
+    && update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix \
+    && update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix \
+    && update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix \
+    && update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
diff --git a/README b/README
index 625052a..1be7d3d 100644
--- a/README
+++ b/README
@@ -139,9 +139,8 @@ intltool
 libtool
 libgettextpo-dev
 meson
-python3-distutils
 curl
-gtk-3-examples
+libgtk-3-bin
 
 On Debian Bookworm, mingw-w64 needs to be configured to use the posix threads
 version, not the win32 threads version.
@@ -163,16 +162,9 @@ Building in a Docker container
 ==============================
 
 A good way to create an isolated environment for the build is to
-use a Docker container. An image built from following Dockerfile
-is sufficient:
+use a Docker container.
 
---------8<---------8<---------8<--------
-FROM debian:bookworm
-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 curl ruby gtk-3-examples && apt-get clean && update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix && update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix && update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix && update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
---------8<---------8<---------8<--------
-
-To build the image locally (run in the directory with Dockerfile
-with above content:
+To build the image locally (run in the directory with Dockerfile):
 # docker image build -t claws-win32-builder:0.1 .
 
 To launch a container based on the image, with the claws-win32-installer
diff --git a/configure.ac b/configure.ac
index 77a1dc7..8c32e89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,14 +156,13 @@ CM_CHECK_REQ_PROGS(BUILD_CC, gcc cc)
 CM_CHECK_REQ_PROGS(CMAKE, cmake)
 CM_CHECK_REQ_PROGS(MESON, meson)
 CM_CHECK_REQ_PROGS(NINJA, ninja)
-CM_CHECK_REQ_PROGS(RUBY, ruby)
 CM_CHECK_REQ_PROGS(DOCBOOK2HTML, docbook2html)
 CM_CHECK_REQ_PROGS(DOCBOOK2TXT, docbook2txt)
 CM_CHECK_REQ_PROGS(DOCBOOK2PS, docbook2ps)
 CM_CHECK_REQ_PROGS(DOCBOOK2PDF, docbook2pdf)
 
 # Optional tools.
-AC_CHECK_PROGS(WGET, wget)
+AC_CHECK_PROGS(CURL, curl)
 
 AC_MSG_CHECKING([for BASH])
 AS_IF([test -n "$BASH_VERSION"],
diff --git a/patches/regex/01-setup.sh b/patches/regex/01-setup.sh
index 98882d5..d093bb1 100755
--- a/patches/regex/01-setup.sh
+++ b/patches/regex/01-setup.sh
@@ -7,10 +7,10 @@ srcdir="$(readlink -f $(dirname $0)/../../src)"
 # gnulib sources to the 'gnulib' subdirectory and copy our regex dll-building
 # files to the ${pkg_sdir}
 
-cd ..
-mv -n ${pkg_sdir} gnulib || exit 1
-cp -a ${srcdir}/regex ${pkg_sdir} || exit 1
-mv gnulib ${pkg_sdir}/ || exit 1
+gnulib="$(mktemp -d ../gnulib-XXXX)"
+mv -n ${pkg_sdir}/* ${gnulib}/ || exit 1
+cp -a ${srcdir}/regex/* ${pkg_sdir} || exit 1
+mv ${gnulib} ${pkg_sdir}/gnulib || exit 1
 cd ${pkg_sdir} || exit 1
 
 ./gnulib/gnulib-tool --lgpl=2 --libtool --local-dir=local --import regex || exit 1

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


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