Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 0 insertions, 127 deletions

diff --git a/macosx-support-lib-patches/glib-pkgconfig.patch b/macosx-support-lib-patches/glib-pkgconfig.patch
deleted file mode 100644
index 07761460..00000000
--- a/macosx-support-lib-patches/glib-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gobject-2.0.pc.in.orig	2011-12-30 22:08:27.000000000 +0100
-+++ gobject-2.0.pc.in	2011-12-30 22:09:06.000000000 +0100
-@@ -7,6 +7,6 @@
- Description: GLib Type, Object, Parameter and Signal Library
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lgobject-2.0
-+Libs: -L${libdir} -lgobject-2.0 -lffi
- Libs.private: @LIBFFI_LIBS@
- Cflags:
diff --git a/macosx-support-lib-patches/gnutls-pkgconfig.patch b/macosx-support-lib-patches/gnutls-pkgconfig.patch
deleted file mode 100644
index f0ad93ec..00000000
--- a/macosx-support-lib-patches/gnutls-pkgconfig.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- gnutls.pc.in.orig	2012-05-27 02:08:48.000000000 +0200
-+++ gnutls.pc.in	2012-05-27 02:11:39.000000000 +0200
-@@ -21,5 +21,4 @@
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls
- Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
--@GNUTLS_REQUIRES_PRIVATE@
- Cflags: -I${includedir}
diff --git a/macosx-support-lib-patches/qt-fix-pc-file b/macosx-support-lib-patches/qt-fix-pc-file
deleted file mode 100755
index fa9ba54b..00000000
--- a/macosx-support-lib-patches/qt-fix-pc-file
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-#
-# Fix a Qt .pc file's flags.
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 2014 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# Fix a single Qt .pc file to provide the right flags; a -F flag is
-# needed to point to the directory under which the frameworks are
-# placed, and a -I flag needs to point to the directory where
-# the include files for the component in question are place in
-# the framework's directory hierarchy, rather thany to where the
-# include files *would* be if the component *weren't* distributed
-# as a framework.
-#
-ed - "$1" <<EOF
-H
-/^Cflags: /s;-I\${includedir}/\([A-Za-z0-9]*\);-I\${libdir}/\1.framework/Versions/5/Headers;
-/^Cflags: /s;;Cflags: -F\${libdir} ;
-w
-q
diff --git a/macosx-support-lib-patches/qt-fix-pc-files b/macosx-support-lib-patches/qt-fix-pc-files
deleted file mode 100755
index 87dc3966..00000000
--- a/macosx-support-lib-patches/qt-fix-pc-files
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-#
-# Fix the .pc files for versions of Qt installed from binary packages.
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 2014 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# See bug QTBUG-35256 for the full painful story.  Shorter version:
-# the macOS Qt packages provide the Qt components as frameworks, but
-# the .pc files don't generate the right CFLAGS/CXXFLAGS to make
-# that work, so autoconf doesn't work correctly.
-#
-if [ "$#" != 1 ]
-then
-	echo "Usage: qt-fix-pc-files <top-level Qt directory>" 1>&1
-	exit 1
-fi
-find "$1" -name "*.pc" -exec macosx-support-lib-patches/qt-fix-pc-file {} ";"
diff --git a/macosx-support-lib-patches/snappy-signed.patch b/macosx-support-lib-patches/snappy-signed.patch
deleted file mode 100644
index 0018fcc4..00000000
--- a/macosx-support-lib-patches/snappy-signed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- snappy.cc.orig	2023-09-14 01:04:05
-+++ snappy.cc	2023-09-14 01:04:28
-@@ -1290,7 +1290,7 @@
-         DeferMemCopy(&deferred_src, &deferred_length, from, len);
-       }
-     } while (ip < ip_limit_min_slop &&
--             (op + deferred_length) < op_limit_min_slop);
-+             static_cast<ptrdiff_t>(op + deferred_length) < op_limit_min_slop);
-   exit:
-     ip--;
-     assert(ip <= ip_limit);
diff --git a/macosx-support-lib-patches/spandsp-configure-patch b/macosx-support-lib-patches/spandsp-configure-patch
deleted file mode 100644
index 5a898f99..00000000
--- a/macosx-support-lib-patches/spandsp-configure-patch
+++ /dev/null
@@ -1,53 +0,0 @@
-*** configure.dist	2014-06-04 07:28:14.000000000 -0700
---- configure	2017-08-07 00:16:39.000000000 -0700
-***************
-*** 19658,19664 ****
-  
-  case "${ax_cv_c_compiler_vendor}" in
-  gnu)
-!     COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      if test "$enable_avx" = "yes" ; then
-          COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
-      fi
---- 19658,19664 ----
-  
-  case "${ax_cv_c_compiler_vendor}" in
-  gnu)
-!     COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      if test "$enable_avx" = "yes" ; then
-          COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
-      fi
-***************
-*** 19733,19739 ****
-  
-      ;;
-  intel)
-!     COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      if test "$enable_avx" = "yes" ; then
-          COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
-      fi
---- 19733,19739 ----
-  
-      ;;
-  intel)
-!     COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      if test "$enable_avx" = "yes" ; then
-          COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS"
-      fi
-***************
-*** 19767,19773 ****
-      COMP_VENDOR_LDFLAGS=
-      ;;
-  *)
-!     COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      COMP_VENDOR_LDFLAGS=
-      ;;
-  esac
---- 19767,19773 ----
-      COMP_VENDOR_LDFLAGS=
-      ;;
-  *)
-!     COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
-      COMP_VENDOR_LDFLAGS=
-      ;;
-  esac