[Commits] [SCM] claws-win32-installer branch, master, updated. 3.18.0-2-82-ged857d4

[jonathan at claws-mail.org]

The branch, master has been updated
       via  ed857d451c0d0674022f527aea34563996616e03 (commit)
      from  39a4ab14e2482df490a695d3f2bdb7904250b76e (commit)

Summary of changes:
 packages/packages.current                       |  2 +-
 patches/{zlib-1.2.11 => zlib}/01-no-strip.patch | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 rename patches/{zlib-1.2.11 => zlib}/01-no-strip.patch (52%)


- Log -----------------------------------------------------------------
commit ed857d451c0d0674022f527aea34563996616e03
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Apr 3 05:58:01 2022 -0700

    update to zlib-1.2.12

diff --git a/packages/packages.current b/packages/packages.current
index 61e47d6..c4029d4 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -49,4 +49,4 @@ regex,20220313,git,git://git.savannah.gnu.org/gnulib.git,466b513e25e938fc70c47c1
 sqlite,3.38.2,file,https://sqlite.org/2022/sqlite-autoconf-3380200.tar.gz,e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4,,
 webkitgtk,2.4.11,file,https://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz,588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7,,
 ytnef,2.0,file,https://github.com/Yeraze/ytnef/archive/refs/tags/v2.0.tar.gz,bb12f34572de89e4825fce98d2d235d93cd34b2c41fed0074ebfa89af9e724a9,,
-zlib,1.2.11,file,https://zlib.net/zlib-1.2.11.tar.gz,c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1,,
+zlib,1.2.12,file,https://zlib.net/zlib-1.2.12.tar.gz,91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9,,
diff --git a/patches/zlib-1.2.11/01-no-strip.patch b/patches/zlib/01-no-strip.patch
similarity index 52%
rename from patches/zlib-1.2.11/01-no-strip.patch
rename to patches/zlib/01-no-strip.patch
index f73b55f..38fa46c 100644
--- a/patches/zlib-1.2.11/01-no-strip.patch
+++ b/patches/zlib/01-no-strip.patch
@@ -1,18 +1,7 @@
-diff -ruN zlib-1.2.11-orig/configure.log zlib-1.2.11/configure.log
---- zlib-1.2.11-orig/configure.log	1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.11/configure.log	2018-01-08 18:25:06.722905564 +0100
-@@ -0,0 +1,7 @@
-+--------------------
-+./configure --help
-+Po jan  8 18:25:06 CET 2018
-+usage:
-+  configure [--const] [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]
-+    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]
-+    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]
-diff -ruN zlib-1.2.11-orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
---- zlib-1.2.11-orig/win32/Makefile.gcc	2015-07-29 07:44:31.000000000 +0200
-+++ zlib-1.2.11/win32/Makefile.gcc	2018-01-08 18:26:23.221515186 +0100
-@@ -57,8 +57,6 @@
+diff -Naur a/win32/Makefile.gcc b/win32/Makefile.gcc
+--- a/win32/Makefile.gcc	2022-03-27 16:39:42.000000000 -0700
++++ b/win32/Makefile.gcc	2022-04-03 06:03:59.204806923 -0700
+@@ -52,8 +52,6 @@
  RC = $(PREFIX)windres
  RCFLAGS = --define GCC_WINDRES
  
@@ -21,7 +10,7 @@ diff -ruN zlib-1.2.11-orig/win32/Makefile.gcc zlib-1.2.11/win32/Makefile.gcc
  CP = cp -fp
  # If GNU install is available, replace $(CP) with install.
  INSTALL = $(CP)
-@@ -95,23 +93,18 @@
+@@ -90,23 +88,18 @@
  $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
  	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
  	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o

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


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