From 7cea00e95d7ec8e86fca476f445190a5a67aa730 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 10 Jan 2019 10:13:18 +0300
Subject: [PATCH] qxmpp: Update to 1.0.0

---
 mingw-w64-qxmpp/001-fix-install.patch | 14 ++++++
 mingw-w64-qxmpp/PKGBUILD              | 68 +++++++++++++++------------
 2 files changed, 52 insertions(+), 30 deletions(-)
 create mode 100644 mingw-w64-qxmpp/001-fix-install.patch

diff --git a/mingw-w64-qxmpp/001-fix-install.patch b/mingw-w64-qxmpp/001-fix-install.patch
new file mode 100644
index 0000000000..30d471cada
--- /dev/null
+++ b/mingw-w64-qxmpp/001-fix-install.patch
@@ -0,0 +1,14 @@
+--- 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 fc03e54394..7b3747c0bc 100644
--- a/mingw-w64-qxmpp/PKGBUILD
+++ b/mingw-w64-qxmpp/PKGBUILD
@@ -4,51 +4,59 @@
 _realname=qxmpp
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.9.3
+pkgver=1.0.0
 pkgrel=1
-pkgdesc="Cross-platform C++ XMPP client and server library"
+pkgdesc="Cross-platform C++ XMPP client and server library (mingw-w64)"
 arch=('any')
 license=("LGPL")
 url="https://github.com/qxmpp-project/qxmpp"
 depends=("${MINGW_PACKAGE_PREFIX}-libtheora"
          "${MINGW_PACKAGE_PREFIX}-libvpx"
+         "${MINGW_PACKAGE_PREFIX}-opus"
          "${MINGW_PACKAGE_PREFIX}-qt5"
          "${MINGW_PACKAGE_PREFIX}-speex")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-gcc")
 options=(!strip staticlibs)
-source=("${_realname}-${pkgver}".tar.gz::"https://github.com/qxmpp-project/${_realname}/archive/v${pkgver}.tar.gz")
-sha256sums=('13f5162a1df720702c6ae15a476a4cb8ea3e57d861a992c4de9147909765e6de')
+source=("${_realname}-${pkgver}".tar.gz::"https://github.com/qxmpp-project/${_realname}/archive/v${pkgver}.tar.gz"
+        001-fix-install.patch)
+sha256sums=('bf62ac8d0b5741b3cb07ea92780b279d5c34d000dc7401d6c20a9b77865a5c1e'
+            '9b44f5c0301ede3c83f2213edb1a158abf835aebeedcbc19806acb4ffcfa9564')
+
+prepare() {
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-fix-install.patch
+}
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
 
-  local _buildpkgdir=${pkgdirbase}/${pkgname}${MINGW_PREFIX}
-  mkdir -p ${_buildpkgdir}
-  local PREFIX_WIN=$(cygpath -am ${_buildpkgdir})
+  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  mkdir ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
-  ${MINGW_PREFIX}/bin/qmake \
-    PREFIX=${PREFIX_WIN} \
-    QXMPP_USE_SPEEX=1 \
-    QXMPP_USE_THEORA=1 \
-    QXMPP_USE_VPX=1 \
-    "CONFIG+=release" \
-    qxmpp.pro
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  ${MINGW_PREFIX}/bin/cmake \
+    -G"MSYS Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    ${extra_config} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DWITH_OPUS=ON \
+    -DWITH_SPEEX=ON \
+    -DWITH_THEORA=ON \
+    -DWITH_VPX=ON \
+    ../${_realname}-${pkgver}
 
-  make # VERBOSE=1
+  make
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make install
-  mkdir -p ${pkgdir}${MINGW_PREFIX}/bin/
-  mv "${pkgdir}${MINGW_PREFIX}"/lib/*.dll "${pkgdir}${MINGW_PREFIX}"/bin/
-
-  local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX})
-  local PREFIX_DEP=$(cygpath -am ${MINGW_PREFIX})
-
-  echo "PREFIX_DEP=${PREFIX_DEP}"
-  sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/qxmpp.pc
-  sed -s "s|${PREFIX_DEP}|${MINGW_PREFIX}|g" \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/qxmpp.pc
+  cd ${srcdir}/build-${MINGW_CHOST}
+  make DESTDIR=${pkgdir} install
+  
+  install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.LGPL ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.LGPL
 }