Update mingw-w64-qcq to 2.3.4
This commit is contained in:
parent
4584f05fad
commit
f8c6bf206e
|
@ -0,0 +1,32 @@
|
||||||
|
From 24ed2f3a3488bb3188110d0623cfc50e632dfca1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martchus <martchus@gmx.net>
|
||||||
|
Date: Thu, 27 Jan 2022 12:24:50 +0100
|
||||||
|
Subject: [PATCH 1/2] Avoid calling setChildProcessModifier() on Windows
|
||||||
|
|
||||||
|
---
|
||||||
|
plugins/qca-gnupg/gpgproc/sprocess.cpp | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/plugins/qca-gnupg/gpgproc/sprocess.cpp b/plugins/qca-gnupg/gpgproc/sprocess.cpp
|
||||||
|
index 4eba7ac7..a1bbe737 100644
|
||||||
|
--- a/plugins/qca-gnupg/gpgproc/sprocess.cpp
|
||||||
|
+++ b/plugins/qca-gnupg/gpgproc/sprocess.cpp
|
||||||
|
@@ -32,6 +32,7 @@ namespace gpgQCAPlugin {
|
||||||
|
SProcess::SProcess(QObject *parent)
|
||||||
|
: QProcess(parent)
|
||||||
|
{
|
||||||
|
+#ifdef Q_OS_UNIX
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
setChildProcessModifier([this]() {
|
||||||
|
// set the pipes to be inheritable
|
||||||
|
@@ -39,6 +40,7 @@ SProcess::SProcess(QObject *parent)
|
||||||
|
::fcntl(pipeList[n], F_SETFD, (::fcntl(pipeList[n], F_GETFD) & ~FD_CLOEXEC));
|
||||||
|
});
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
SProcess::~SProcess()
|
||||||
|
--
|
||||||
|
2.35.0
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
From fec80e0fae55dfbe99211fbe51f3b1650d5c84b4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martchus <martchus@gmx.net>
|
||||||
|
Date: Thu, 27 Jan 2022 13:40:30 +0100
|
||||||
|
Subject: [PATCH 2/2] Fix types in socket notifier to fix x86_64 Windows build
|
||||||
|
|
||||||
|
---
|
||||||
|
src/qca_safeobj.cpp | 2 +-
|
||||||
|
src/qca_safeobj.h | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/qca_safeobj.cpp b/src/qca_safeobj.cpp
|
||||||
|
index 7133990f..b2ad3888 100644
|
||||||
|
--- a/src/qca_safeobj.cpp
|
||||||
|
+++ b/src/qca_safeobj.cpp
|
||||||
|
@@ -34,7 +34,7 @@ inline void releaseAndDeleteLater(QObject *owner, QObject *obj)
|
||||||
|
obj->deleteLater();
|
||||||
|
}
|
||||||
|
|
||||||
|
-SafeSocketNotifier::SafeSocketNotifier(int socket, QSocketNotifier::Type type, QObject *parent)
|
||||||
|
+SafeSocketNotifier::SafeSocketNotifier(qintptr socket, QSocketNotifier::Type type, QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
sn = new QSocketNotifier(socket, type, this);
|
||||||
|
diff --git a/src/qca_safeobj.h b/src/qca_safeobj.h
|
||||||
|
index ad819958..87b66594 100644
|
||||||
|
--- a/src/qca_safeobj.h
|
||||||
|
+++ b/src/qca_safeobj.h
|
||||||
|
@@ -33,7 +33,7 @@ class SafeSocketNotifier : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
- SafeSocketNotifier(int socket, QSocketNotifier::Type type, QObject *parent = nullptr);
|
||||||
|
+ SafeSocketNotifier(qintptr socket, QSocketNotifier::Type type, QObject *parent = nullptr);
|
||||||
|
|
||||||
|
~SafeSocketNotifier() override;
|
||||||
|
|
||||||
|
@@ -57,7 +57,7 @@ public Q_SLOTS:
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
- void activated(int socket);
|
||||||
|
+ void activated(QSocketDescriptor socket);
|
||||||
|
|
||||||
|
private:
|
||||||
|
QSocketNotifier *sn;
|
||||||
|
--
|
||||||
|
2.35.0
|
||||||
|
|
|
@ -4,61 +4,86 @@
|
||||||
# Contributor: Andrea Scarpino <andrea@archlinux.org>
|
# Contributor: Andrea Scarpino <andrea@archlinux.org>
|
||||||
# Contributor: Pierre Schmitz <pierre@archlinux.de>
|
# Contributor: Pierre Schmitz <pierre@archlinux.de>
|
||||||
|
|
||||||
pkgname='mingw-w64-qca-qt5'
|
pkgbase=mingw-w64-qca-qt5
|
||||||
pkgver=2.1.3
|
pkgname=(mingw-w64-qca-qt5 mingw-w64-qca-qt6)
|
||||||
pkgrel=3
|
pkgver=2.3.4
|
||||||
|
pkgrel=1
|
||||||
pkgdesc='Qt Cryptographic Architecture (mingw-w64)'
|
pkgdesc='Qt Cryptographic Architecture (mingw-w64)'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url='https://userbase.kde.org/QCA'
|
url='https://userbase.kde.org/QCA'
|
||||||
license=(LGPL)
|
license=(LGPL)
|
||||||
depends=('mingw-w64-qt5-base')
|
makedepends=('mingw-w64-cmake' 'mingw-w64-qt5-base' 'mingw-w64-qt6-5compat' 'qt6-base' 'ninja')
|
||||||
makedepends=('mingw-w64-cmake')
|
|
||||||
options=('!strip' '!buildflags' 'staticlibs')
|
options=('!strip' '!buildflags' 'staticlibs')
|
||||||
source=("http://download.kde.org/stable/qca/$pkgver/src/qca-$pkgver.tar.xz"
|
source=(https://download.kde.org/stable/qca/$pkgver/qca-$pkgver.tar.xz{,.sig}
|
||||||
qca-openssl-1.1.patch)
|
0001-Avoid-calling-setChildProcessModifier-on-Windows.patch
|
||||||
sha256sums=('003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353'
|
0002-Fix-types-in-socket-notifier-to-fix-x86_64-Windows-b.patch)
|
||||||
'b1505bc313fd2f4e350cd4c94af69256c901afa419ae6700b208cb6e40e6926d')
|
sha256sums=('6b695881a7e3fd95f73aaee6eaeab96f6ad17e515e9c2b3d4b3272d7862ff5c4'
|
||||||
|
'SKIP' 'SKIP')
|
||||||
|
validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter@kde.org>
|
||||||
|
|
||||||
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd qca-$pkgver
|
cd qca-$pkgver
|
||||||
patch -p1 -i ../qca-openssl-1.1.patch # Fix build with OpenSSL 1.1 https://bugs.kde.org/show_bug.cgi?id=379810
|
for p in "$srcdir"/*.patch ; do
|
||||||
|
patch -p1 -i "$p"
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
unset LDFLAGS
|
|
||||||
for _arch in ${_architectures}; do
|
for _arch in ${_architectures}; do
|
||||||
mkdir "build-${_arch}" && pushd "build-${_arch}"
|
${_arch}-cmake -G Ninja -B build-qt5-${_arch} -S qca-$pkgver \
|
||||||
${_arch}-cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DBUILD_TESTS=OFF \
|
|
||||||
-DQCA_INSTALL_IN_QT_PREFIX=ON \
|
-DQCA_INSTALL_IN_QT_PREFIX=ON \
|
||||||
../qca-$pkgver
|
-DBUILD_TESTS=OFF
|
||||||
make
|
VERBOSE=1 cmake --build build-qt5-$_arch
|
||||||
popd
|
|
||||||
|
${_arch}-cmake -G Ninja -B build-qt6-${_arch} -S qca-$pkgver \
|
||||||
|
-DQT6=ON \
|
||||||
|
-DQCA_INSTALL_IN_QT_PREFIX=ON \
|
||||||
|
-DQCA_PREFIX_INSTALL_DIR=/usr/${_arch} \
|
||||||
|
-DQCA_PLUGINS_INSTALL_DIR=/usr/${_arch}/lib/qt6/plugins \
|
||||||
|
-DQCA_BINARY_INSTALL_DIR=/usr/${_arch}/lib/qt6/bin \
|
||||||
|
-DQCA_LIBRARY_INSTALL_DIR=/usr/${_arch}/lib \
|
||||||
|
-DQCA_FEATURE_INSTALL_DIR=/usr/${_arch}/lib/qt6/mkspecs/features \
|
||||||
|
-DQCA_INCLUDE_INSTALL_DIR=/usr/${_arch}/include/qt6/Qca-qt6 \
|
||||||
|
-DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/${_arch}/include/qt6/Qca-qt6 \
|
||||||
|
-DQCA_DOC_INSTALL_DIR=/usr/${_arch}/share/doc \
|
||||||
|
-DQCA_MAN_INSTALL_DIR=/usr/${_arch}/share/man \
|
||||||
|
-DBUILD_TESTS=OFF
|
||||||
|
VERBOSE=1 cmake --build build-qt6-$_arch
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
_cleanup() {
|
||||||
|
# strip binaries
|
||||||
|
local _arch=$1
|
||||||
|
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
|
||||||
|
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
|
||||||
|
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
|
||||||
|
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
|
||||||
|
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
|
||||||
|
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
|
||||||
|
[[ -d "${pkgdir}/usr/${_arch}/lib/"qt*/bin/ ]] && \
|
||||||
|
find "${pkgdir}/usr/${_arch}/lib/"qt*/bin/ -exec strip --strip-all {} \;
|
||||||
|
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
|
||||||
|
# remove manual
|
||||||
|
rm -r "${pkgdir}/usr/${_arch}/share"
|
||||||
|
}
|
||||||
|
|
||||||
|
package_mingw-w64-qca-qt5() {
|
||||||
|
depends=(mingw-w64-qt5-base)
|
||||||
|
|
||||||
for _arch in ${_architectures}; do
|
for _arch in ${_architectures}; do
|
||||||
pushd "build-${_arch}"
|
DESTDIR="$pkgdir" cmake --install build-qt5-$_arch
|
||||||
make DESTDIR="$pkgdir" install
|
_cleanup $_arch
|
||||||
# strip binaries
|
|
||||||
find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
|
|
||||||
[ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
|
|
||||||
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
|
|
||||||
find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \;
|
|
||||||
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
|
|
||||||
find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \;
|
|
||||||
[[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \
|
|
||||||
find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
|
|
||||||
find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
|
|
||||||
# remove manual
|
|
||||||
rm -r "${pkgdir}/usr/${_arch}/share"
|
|
||||||
popd
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package_mingw-w64-qca-qt6() {
|
||||||
|
depends=(mingw-w64-qt6-5compat)
|
||||||
|
|
||||||
|
for _arch in ${_architectures}; do
|
||||||
|
DESTDIR="$pkgdir" cmake --install build-qt6-$_arch
|
||||||
|
_cleanup $_arch
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue