Remove dependency on libssp - Part2

mingw-w64-open62541/PKGBUILD

@@ -1,20 +1,20 @@
 _realname=open62541
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.2.5.r0.gb79db1ac7
-pkgrel=2
+pkgver=1.3.3.r0.gff7326882
+pkgrel=1
+_commit="ff73268829359639531ff02905c889f73a77b408"
 pkgdesc="An open source and free implementation of OPC Unified Architecture written in the common subset of the C99 and C++98 languages."
 arch=('any')
 url="http://open62541.org/"
 license=('spdx:MPL-2.0')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
-depends=("${MINGW_PACKAGE_PREFIX}-libssp")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=('git'
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-cc")
-_commit="b79db1ac78146fc06b0b8435773d3967de2d659c"
 source=("git+https://github.com/open62541/open62541.git#commit=${_commit}")
 sha256sums=('SKIP')
 
@@ -41,11 +41,6 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
-    # https://github.com/open62541/open62541/issues/5035
-    CFLAGS+=" -Wno-error=unused-command-line-argument"
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
       -GNinja \
@@ -55,6 +50,7 @@ build() {
       -DUA_NAMESPACE_ZERO=FULL \
       -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
       -DUA_ENABLE_AMALGAMATION=OFF \
+      -DUA_FORCE_WERROR=OFF \
       ../"${_realname}"
 
   ${MINGW_PREFIX}/bin/cmake.exe --build .

mingw-w64-osslsigncode/PKGBUILD

@@ -4,15 +4,14 @@ _realname=osslsigncode
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool for Authenticode signing of PE, CAB and MSI files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/mtrojnar/osslsigncode"
 license=("GPL3")
 depends=("${MINGW_PACKAGE_PREFIX}-curl"
-         "${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-libssp")
+         "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake")
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/mtrojnar/${_realname}/archive/${pkgver}.tar.gz"

mingw-w64-pulseaudio/PKGBUILD

@@ -4,7 +4,7 @@ _realname=pulseaudio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=16.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A featureful, general-purpose sound server (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,7 +17,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
          "${MINGW_PACKAGE_PREFIX}-libsndfile"
          "${MINGW_PACKAGE_PREFIX}-libsoxr"
-         "${MINGW_PACKAGE_PREFIX}-libssp"
          "${MINGW_PACKAGE_PREFIX}-libltdl"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
          "${MINGW_PACKAGE_PREFIX}-orc"

mingw-w64-stlink/PKGBUILD

@@ -4,14 +4,13 @@ _realname=stlink
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Firmware programmer for STM32 STLINK v1/v2 protocol'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://github.com/stlink-org/stlink'
 license=(BSD)
-depends=("${MINGW_PACKAGE_PREFIX}-libssp"
-         "${MINGW_PACKAGE_PREFIX}-libusb")
+depends=("${MINGW_PACKAGE_PREFIX}-libusb")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-cc")
@@ -26,21 +25,28 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
+
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${_extra_config[@]} \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 }