Add mxml-static and zlib-static packages

Signed-off-by: falkTX <falktx@falktx.com>

sources/libs/mxml-static/debian/changelog

@@ -0,0 +1,5 @@
+mxml-static (6:3.3-1kxstudio1) focal; urgency=medium
+
+  * Initial package
+
+ -- falkTX <falktx@falktx.com>  Sun, 17 Apr 2022 15:05:47 +0100

sources/libs/mxml-static/debian/control

@@ -0,0 +1,44 @@
+Source: mxml-static
+Section: devel
+Priority: optional
+Maintainer: falkTX <falktx@falktx.com>
+Build-Depends: debhelper-compat (= 13),
+  kxstudio-build-scripts,
+  autoconf,
+  automake,
+  libtool
+Standards-Version: 4.5.0
+Homepage: https://github.com/michaelrsweet/mxml
+Rules-Requires-Root: no
+
+Package: libmxml-static
+Architecture: any
+Depends: ${misc:Depends}
+Conflicts: mxml-static
+Breaks: mxml-static
+Description: small XML parsing library (static)
+ Mini-XML is a small XML parsing library that you can use to read XML and
+ XML-like data files in your application without requiring large non-standard
+ libraries.
+ .
+ Mini-XML provides the following functionality:
+  * Reading of UTF-8 and UTF-16 and writing of UTF-8 encoded XML files and
+    strings.
+  * Data is stored in a linked-list tree structure, preserving the XML data
+    hierarchy.
+  * Supports arbitrary element names, attributes, and attribute values with
+    no preset limits, just available memory.
+  * Supports integer, real, opaque ("cdata"), and text data types in "leaf"
+    nodes.
+  * Functions for creating, indexing, and managing trees of data.
+  * "Find" and "walk" functions for easily locating and navigating trees of
+    data.
+ .
+ Mini-XML doesn't do validation or other types of processing on the data based
+ upon schema files or other sources of definition information, nor does it
+ support character entities other than those required by the XML specification.
+ .
+ This package contains the files necessary for running applications that
+ use the Mini-XML library.
+ .
+ This package provides the static library used in KXStudio builds.

sources/libs/mxml-static/debian/install

@@ -0,0 +1,3 @@
+*.a    /opt/kxstudio/lib/
+*.pc   /opt/kxstudio/lib/pkgconfig/
+mxml.h /opt/kxstudio/include/

sources/libs/mxml-static/debian/patches/01_6785ee4357b24b247e61cbdf1e9332080e3959eb.patch

@@ -0,0 +1,172 @@
+From 6785ee4357b24b247e61cbdf1e9332080e3959eb Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 14 Dec 2021 21:23:35 -0500
+Subject: [PATCH] Fix POSIX thread cleanup code - _mxml_fini shouldn't be
+ calling the global destructor, just deleting the per-thread key.
+
+Bump version to 3.3.1.
+---
+ CHANGES.md     |  6 ++++++
+ configure      | 20 ++++++++++----------
+ configure.ac   |  2 +-
+ mxml-private.c |  6 ------
+ vcnet/config.h |  2 +-
+ xcode/config.h |  2 +-
+ 6 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/CHANGES.md b/CHANGES.md
+index 964a51c..2c5d532 100644
+--- a/CHANGES.md
++++ b/CHANGES.md
+@@ -1,3 +1,9 @@
++# Changes in Mini-XML 3.3.1
++
++- Fixed a POSIX thread cleanup bug on macOS - per-thread data destructor called
++  twice.
++
++
+ # Changes in Mini-XML 3.3
+ 
+ - Cleaned up usage of `free` throughout the library (Issue #276)
+diff --git a/configure b/configure
+index 88f2afc..9ef9427 100755
+--- a/configure
++++ b/configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.71 for Mini-XML 3.3.
++# Generated by GNU Autoconf 2.71 for Mini-XML 3.3.1.
+ #
+ # Report bugs to <https://github.com/michaelrsweet/mxml/issues>.
+ #
+@@ -610,8 +610,8 @@ MAKEFLAGS=
+ # Identity of this package.
+ PACKAGE_NAME='Mini-XML'
+ PACKAGE_TARNAME='mxml'
+-PACKAGE_VERSION='3.3'
+-PACKAGE_STRING='Mini-XML 3.3'
++PACKAGE_VERSION='3.3.1'
++PACKAGE_STRING='Mini-XML 3.3.1'
+ PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues'
+ PACKAGE_URL='https://www.msweet.org/mxml'
+ 
+@@ -1301,7 +1301,7 @@ if test "$ac_init_help" = "long"; then
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures Mini-XML 3.3 to adapt to many kinds of systems.
++\`configure' configures Mini-XML 3.3.1 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -1367,7 +1367,7 @@ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+-     short | recursive ) echo "Configuration of Mini-XML 3.3:";;
++     short | recursive ) echo "Configuration of Mini-XML 3.3.1:";;
+    esac
+   cat <<\_ACEOF
+ 
+@@ -1470,7 +1470,7 @@ fi
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-Mini-XML configure 3.3
++Mini-XML configure 3.3.1
+ generated by GNU Autoconf 2.71
+ 
+ Copyright (C) 2021 Free Software Foundation, Inc.
+@@ -1770,7 +1770,7 @@ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by Mini-XML $as_me 3.3, which was
++It was created by Mini-XML $as_me 3.3.1, which was
+ generated by GNU Autoconf 2.71.  Invocation command line was
+ 
+   $ $0$ac_configure_args_raw
+@@ -2831,7 +2831,7 @@ ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+ 
+-VERSION="3.3"
++VERSION="3.3.1"
+ 
+ printf "%s\n" "#define MXML_VERSION \"Mini-XML v$VERSION\"" >>confdefs.h
+ 
+@@ -6012,7 +6012,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by Mini-XML $as_me 3.3, which was
++This file was extended by Mini-XML $as_me 3.3.1, which was
+ generated by GNU Autoconf 2.71.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+@@ -6077,7 +6077,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config='$ac_cs_config_escaped'
+ ac_cs_version="\\
+-Mini-XML config.status 3.3
++Mini-XML config.status 3.3.1
+ configured by $0, generated by GNU Autoconf 2.71,
+   with options \\"\$ac_cs_config\\"
+ 
+diff --git a/configure.ac b/configure.ac
+index 633a2e3..1b4b3ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@ AC_PREREQ([2.70])
+ 
+ 
+ dnl Package name and version...
+-AC_INIT([Mini-XML], [3.3], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
++AC_INIT([Mini-XML], [3.3.1], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
+ 
+ 
+ dnl This line is provided to ensure that you don't run the autoheader program
+diff --git a/mxml-private.c b/mxml-private.c
+index 8c1c58d..3f3ab6c 100644
+--- a/mxml-private.c
++++ b/mxml-private.c
+@@ -165,12 +165,6 @@ _mxml_destructor(void *g)		/* I - Global data */
+ static void
+ _MXML_FINI(void)
+ {
+-  _mxml_global_t	*global;	/* Global data */
+-
+-
+-  if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) != NULL)
+-    _mxml_destructor(global);
+-
+   pthread_key_delete(_mxml_key);
+ }
+ 
+diff --git a/vcnet/config.h b/vcnet/config.h
+index 9fd99ed..bf9207c 100644
+--- a/vcnet/config.h
++++ b/vcnet/config.h
+@@ -63,7 +63,7 @@
+  * Version number...
+  */
+ 
+-#define MXML_VERSION "Mini-XML v3.3"
++#define MXML_VERSION "Mini-XML v3.3.1"
+ 
+ 
+ /*
+diff --git a/xcode/config.h b/xcode/config.h
+index d627820..4cb3556 100644
+--- a/xcode/config.h
++++ b/xcode/config.h
+@@ -24,7 +24,7 @@
+  * Version number...
+  */
+ 
+-#define MXML_VERSION "Mini-XML v3.3"
++#define MXML_VERSION "Mini-XML v3.3.1"
+ 
+ 
+ /*

sources/libs/mxml-static/debian/patches/series

@@ -0,0 +1 @@
+01_6785ee4357b24b247e61cbdf1e9332080e3959eb.patch

sources/libs/mxml-static/debian/rules

@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+KXSTUDIO_NO_FASTMATH = y
+include /usr/share/dpkg/kxstudio.mk
+
+override_dh_auto_configure:
+	./configure --disable-maintainer-mode \
+		    --prefix=/opt/kxstudio \
+		    --enable-static \
+		    --disable-shared
+
+override_dh_autoreconf:
+	# skip
+
+override_dh_auto_install:
+	# skip
+
+%:
+	dh $@

sources/libs/zlib-static/debian/changelog

@@ -0,0 +1,5 @@
+zlib-static (6:1.2.12-1kxstudio1) focal; urgency=medium
+
+  * Initial package
+
+ -- falkTX <falktx@falktx.com>  Sun, 17 Apr 2022 15:05:47 +0100

sources/libs/zlib-static/debian/control

@@ -0,0 +1,22 @@
+Source: zlib-static
+Section: devel
+Priority: optional
+Maintainer: falkTX <falktx@falktx.com>
+Build-Depends: debhelper-compat (= 13),
+  kxstudio-build-scripts,
+  autoconf,
+  automake,
+  libtool
+Standards-Version: 4.5.0
+Homepage: https://github.com/madler/zlib
+Rules-Requires-Root: no
+
+Package: zlib-static
+Architecture: any
+Depends: ${misc:Depends}
+Description: compression library (static)
+ zlib is a library implementing the deflate compression method found
+ in gzip and PKZIP.  This package includes the development support
+ files.
+ .
+ This package provides the static library used in KXStudio builds.

sources/libs/zlib-static/debian/patches/01_05796d3d8d5546cf1b4dfe2cd72ab746afae505d.patch

@@ -0,0 +1,24 @@
+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 28 Mar 2022 18:34:10 -0700
+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04e..3fa3e8618 100755
+--- a/configure
++++ b/configure
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
+   else
+     cc=${CROSS_PREFIX}cc
+   fi
++else
++  cc=${CC}
+ fi
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in

sources/libs/zlib-static/debian/patches/02_ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch

@@ -0,0 +1,51 @@
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+---
+ crc32.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index a1bdce5c2..451887bc7 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+     /* Compute the CRC up to a word boundary. */
+     while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+ #ifdef W
+ 
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+     once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+ }
+ 
+ /* ========================================================================= */
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+     uLong crc2;
+     uLong op;
+ {
+-    return multmodp(op, crc1) ^ crc2;
++    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+ }

sources/libs/zlib-static/debian/patches/series

@@ -0,0 +1,2 @@
+01_05796d3d8d5546cf1b4dfe2cd72ab746afae505d.patch
+02_ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch

sources/libs/zlib-static/debian/rules

@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+KXSTUDIO_NO_FASTMATH = y
+include /usr/share/dpkg/kxstudio.mk
+
+override_dh_auto_configure:
+	./configure --static --prefix=/opt/kxstudio/
+
+%:
+	dh $@