diff --git a/mingw-w64-qxmpp/001-fix-install.patch b/mingw-w64-qxmpp/001-fix-install.patch deleted file mode 100644 index 30d471cada..0000000000 --- a/mingw-w64-qxmpp/001-fix-install.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qxmpp-1.0.0/src/CMakeLists.txt.orig 2019-01-10 09:58:04.471596900 +0300 -+++ qxmpp-1.0.0/src/CMakeLists.txt 2019-01-10 10:00:35.732863700 +0300 -@@ -220,8 +220,10 @@ - - install( - TARGETS qxmpp -- DESTINATION "${CMAKE_INSTALL_LIBDIR}" - EXPORT QXmppTarget -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - - install( \ No newline at end of file diff --git a/mingw-w64-qxmpp/PKGBUILD b/mingw-w64-qxmpp/PKGBUILD index 2a0d643945..dfc26c8ea7 100644 --- a/mingw-w64-qxmpp/PKGBUILD +++ b/mingw-w64-qxmpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=qxmpp pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc="Cross-platform C++ XMPP client and server library (mingw-w64)" arch=('any') @@ -14,20 +14,14 @@ url="https://github.com/qxmpp-project/qxmpp" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" $([[ ${CARCH} != i686 ]] && echo \ "${MINGW_PACKAGE_PREFIX}-qt6-base" \ - "${MINGW_PACKAGE_PREFIX}-qt6-5compat" || echo \ + "${MINGW_PACKAGE_PREFIX}-qt6-5compat" \ + "${MINGW_PACKAGE_PREFIX}-qca-qt6" || echo \ "${MINGW_PACKAGE_PREFIX}-qt5-base")) makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") -source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/qxmpp-project/${_realname}/archive/v${pkgver}.tar.gz" - 001-fix-install.patch) -sha256sums=('cc26345428d816bb33e63f92290c52b9a417d9a836bf9fabf295e3477f71e66c' - '9b44f5c0301ede3c83f2213edb1a158abf835aebeedcbc19806acb4ffcfa9564') - -prepare() { - cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-fix-install.patch -} +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/qxmpp-project/${_realname}/archive/v${pkgver}.tar.gz") +sha256sums=('43ef503adcea8ef1a7eb0ce3af408eb693f66875550aaca9fd8309119e1afec8') build() { declare -a extra_config