[Commits] [SCM] claws-win32-installer branch, gtk2, updated. 3.19.0-1-18-gf52b4a4

[jonathan at claws-mail.org]

The branch, gtk2 has been updated
       via  f52b4a4367f37d4b5f4a201296604a8f778c8c75 (commit)
       via  384466554fd9cf76be382f33b306a8f68408a544 (commit)
      from  dd50aea2d613bd794c3dca2f04fd5bb9f7f977e6 (commit)

Summary of changes:
 .gitignore         |  6 +++++-
 README             |  4 ++--
 autogen.sh         |  4 ----
 build-aux/clean.sh | 23 +++++++++++++++++++++++
 build-aux/pkg.sh   | 31 +++++++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100755 build-aux/clean.sh
 create mode 100755 build-aux/pkg.sh


- Log -----------------------------------------------------------------
commit f52b4a4367f37d4b5f4a201296604a8f778c8c75
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 12 15:58:30 2022 -0700

    Add build helper scripts

diff --git a/.gitignore b/.gitignore
index 90f4f37..954b25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,11 @@ Makefile.in
 
 /aclocal.m4
 /autom4te.cache/
-/build-aux/
+/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/install-sh
+/build-aux/missing
 /config.h
 /config.h.in
 /config.log
diff --git a/autogen.sh b/autogen.sh
index acbf178..90e2514 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,10 +39,6 @@ elif [ "$(pwd)" != "$(pwd | tr -d -c '[A-Za-z0-9/\-_.]')" ]; then
 	exit 1
 fi
 
-if [ ! -d build-aux ]; then
-	mkdir build-aux
-fi
-
 # autom4te.cache may contain outdated version number
 rm -rf autom4te.cache
 echo "Running aclocal -I m4 -Wall..."
diff --git a/build-aux/clean.sh b/build-aux/clean.sh
new file mode 100755
index 0000000..3fe2333
--- /dev/null
+++ b/build-aux/clean.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This is a helper script to completely rebuild the Claws installer.
+#
+# The script does a 'git clean', excluding the packages folder. After
+# cleaning, you can re-run autogen.sh to continue building.
+#
+# Use at your own risk
+
+root=$(git rev-parse --show-toplevel)
+
+if [ $? -ne 0 ];
+then
+	echo "Git root dir not found; run this script from inside the claws-win32-installer repo"
+	exit 1
+fi
+
+cd $root
+
+echo Cleaning
+
+git clean -dfx --exclude=packages
+
diff --git a/build-aux/pkg.sh b/build-aux/pkg.sh
new file mode 100755
index 0000000..cc9f19f
--- /dev/null
+++ b/build-aux/pkg.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# This is a helper script for cleanly rebuilding packages.  It deletes build artifacts
+# matching package names passed to the script as parameters.
+#
+# The script does a simple wildcard match for packages beginning with each parameter.
+# No consideration is given for dependencies.
+#
+# Examples:
+#   pkg.sh glib - deletes glib and glib_networking
+#   pkg.sh gtk poppler - deletes gtk, poppler, poppler_data
+#
+# Use at your own risk
+
+root=$(git rev-parse --show-toplevel)
+
+if [ $? -ne 0 ];
+then
+	echo "Git root dir not found; run this script from inside the claws-win32-installer repo"
+	exit 1
+fi
+
+cd $root
+
+while (( "$#" )); do
+	rm -rf ./src/playground/build/${1}*
+	rm -r ./src/playground/install/pkgs/${1}*
+	rm ./src/stamps/stamp-${1}*
+	shift
+done
+

commit 384466554fd9cf76be382f33b306a8f68408a544
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Jun 12 15:45:16 2022 -0700

    Add missing package to README

diff --git a/README b/README
index c3931f7..ddda34c 100644
--- a/README
+++ b/README
@@ -7,7 +7,6 @@ Instructions:
 
    $ cd packages
    $ ./download.sh
-   [...]
    $ cd ..
 
 2. Configure the source tree for cross compilation, for either
@@ -109,6 +108,7 @@ nsis
 stow
 unzip
 docbook-utils
+libglib2.0-bin
 libglib2.0-dev-bin
 git
 cmake
@@ -140,7 +140,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-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 wget curl ruby gtk-3-examples & apt-get clean
 --------8<---------8<---------8<--------
 
 To build the image locally (run in the directory with Dockerfile

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


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