Add static version of further Qt modules

2 files changed, 42 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d47a07dadf2d..8ef060d27142 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 # Generated by mksrcinfo v8
-# Wed Jun 22 18:36:03 UTC 2016
+# Fri Aug 19 20:10:34 UTC 2016
 pkgbase = mingw-w64-qt5-serialport
 	pkgdesc = Provides access to hardware and virtual serial ports (mingw-w64)
 	pkgver = 5.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.qt.io/
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
+	optdepends = mingw-w64-qt5-base-static: use of static libraries
 	options = !strip
 	options = !buildflags
 	options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index a4b7072db9a9..a39ac1e85042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,13 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
+# Includes dynamic and static versions; if only one version is requried, just
+# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
+
 _qt_module=qtserialport
 pkgname="mingw-w64-qt5-serialport"
 pkgver=5.7.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
 depends=('mingw-w64-qt5-base')
@@ -19,24 +22,31 @@ _pkgfqn="${_qt_module}-opensource-src-$pkgver"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz")
 md5sums=('f93cc8b36964c6aa965c27c3acd12f82')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+[[ $NO_STATIC_LIBS ]] || \
+  makedepends+=('mingw-w64-qt5-base-static') \
+  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
+  _configurations+=('CONFIG+=static')
+[[ $NO_SHARED_LIBS ]] || \
+  _configurations+=('CONFIG+=shared')
 
-build() {
+prepare() {
   cd "${srcdir}/${_pkgfqn}"
-
-  # don't build examples or tests.
+  # Don't build examples or tests.
   sed -i 's/ examples tests//' qtserialport.pro
+}
 
-  for _arch in ${_architectures}; do
-    mkdir -p build-${_arch}/include/QtSerialPort && pushd build-${_arch}
-    ${_arch}-qmake-qt5 ../${_qt_module}.pro
-    make
-    popd
+build() {
+  cd "${srcdir}/${_pkgfqn}"
 
-    #mkdir -p static-${_arch}/include/QtSerialPort && pushd static-${_arch}
-    #${_arch}-qmake-qt5 ../${_qt_module}.pro CONFIG+=static
-    #make
-    #popd
+  for _arch in ${_architectures}; do
+    for _config in "${_configurations[@]}"; do
+      msg2 "Building ${_config##*=} version for ${_arch}"
+      mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+      make
+      popd
+    done
   done
 }
 
@@ -44,25 +54,20 @@ package() {
   cd "${srcdir}/${_pkgfqn}"
 
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-
-    make INSTALL_ROOT="${pkgdir}" install
-
-    popd
+    for _config in "${_configurations[@]}"; do
+      pushd build-${_arch}-${_config##*=}
 
-    #pushd static-${_arch}
-    #make INSTALL_ROOT="${pkgdir}" install
-    #popd
-
-    # The .dll's are installed in both bindir and libdir
-    # One copy of the .dll's is sufficient
-    rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll
-
-    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
-    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.dll.a
-    #${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*t.a
+      make INSTALL_ROOT="$pkgdir" install
+      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 {} \;
+      popd
+    done
   done
-
-  # .prl files aren't interesting for us
-  find ${pkgdir} -name "*.prl" -delete
 }