[Commits] [SCM] claws-win32-installer branch, master, updated. 4.1.0-1-24-g9a78a8c
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Jun 13 00:06:39 UTC 2022
The branch, master has been updated
via 9a78a8cbaeab905c62f92c2f876c229a068095a0 (commit)
via 6ba20351ad0e42e99479050b1c100d5a320ac0a6 (commit)
via 412c340b93d769be58abedbbe734d6ed03cdec04 (commit)
from 13ff35806a839f3e743ed5a050e840b6185b7eb5 (commit)
Summary of changes:
.gitignore | 6 +++++-
README | 4 ++--
autogen.sh | 4 ----
build-aux/clean.sh | 23 +++++++++++++++++++++++
build-aux/pkg.sh | 31 +++++++++++++++++++++++++++++++
packages/packages.current | 2 +-
6 files changed, 62 insertions(+), 8 deletions(-)
create mode 100755 build-aux/clean.sh
create mode 100755 build-aux/pkg.sh
- Log -----------------------------------------------------------------
commit 9a78a8cbaeab905c62f92c2f876c229a068095a0
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Sun Jun 12 16:47:15 2022 -0700
Update pcre mirror
diff --git a/packages/packages.current b/packages/packages.current
index e06a264..06e057e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -45,7 +45,7 @@ libxslt,1.1.34,file,ftp://xmlsoft.org/libxml2/libxslt-1.1.34.tar.gz,98b1bd46d679
nettle,3.8,file,https://ftp.gnu.org/pub/gnu/nettle/nettle-3.8.tar.gz,7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6,,
p11_kit,0.24.1,file,https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz,d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8,,
pango,1.50.7,file,https://download.gnome.org/sources/pango/1.50/pango-1.50.7.tar.xz,0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33,,
-pcre,8.45,file,https://phoenixnap.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
+pcre,8.45,file,https://versaweb.dl.sourceforge.net/project/pcre/pcre/8.45/pcre-8.45.tar.bz2,4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8,,
pixman,0.40.0,file,https://cairographics.org/releases/pixman-0.40.0.tar.gz,6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc,,
poppler,22.06.0,file,https://poppler.freedesktop.org/poppler-22.06.0.tar.xz,a0f9aaa3918bad781039fc307a635652a14d1b391cd559b66edec4bedba3c5d7,,
poppler_data,0.4.11,file,https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz,2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c,,
commit 6ba20351ad0e42e99479050b1c100d5a320ac0a6
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 5d107ae..ce81e08 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 412c340b93d769be58abedbbe734d6ed03cdec04
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
More information about the Commits
mailing list