Add static version of further Qt modules

3 files changed, 109 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ee11d58cc1e..1362968a2545 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,27 @@
 # Generated by mksrcinfo v8
-# Wed Jun 22 18:36:03 UTC 2016
+# Fri Aug 19 20:10:25 UTC 2016
 pkgbase = mingw-w64-qt5-tools
 	pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)
 	pkgver = 5.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.qt.io/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	license = LGPL
+	license = LGPL3
+	license = FDL
+	license = custom
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-declarative
+	optdepends = mingw-w64-qt5-base-static: use of static libraries
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	source = https://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/qttools-opensource-src-5.7.0.tar.xz
+	source = qt5-fix-linguist-cmake-macro.patch
 	md5sums = 29eb3fd31582b5801e264c62d1158553
+	md5sums = ffc29956ebb79ba4fe8cac0b447c4214
 
 pkgname = mingw-w64-qt5-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index c53e16cdd96f..73dac2e9afad 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,40 +5,65 @@
 # 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.
+
+# For QQuickWidgetPlugin, add mingw-w64-qt5-declarative to dependencies (already present by default)
+# For QWebViewPlugin, add mingw-w64-qt5-webkit to dependencies
+# For QAxWidgetPlugin, add mingw-w64-qt5-activeqt to dependencies
+
 _qt_module=qttools
 pkgname="mingw-w64-qt5-tools"
 pkgver=5.7.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc')
 options=('!strip' '!buildflags' 'staticlibs')
-license=('GPL3' 'LGPL')
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url="https://www.qt.io/"
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('29eb3fd31582b5801e264c62d1158553')
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+        "qt5-fix-linguist-cmake-macro.patch")
+md5sums=('29eb3fd31582b5801e264c62d1158553'
+         'ffc29956ebb79ba4fe8cac0b447c4214')
+
+_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')
+
+prepare() {
+  cd "${srcdir}/${_pkgfqn}"
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+  # Somehow the linguist macro stopped working for me. CMake always appended
+  # and extra Qt5::lupdate/Qt5::lrelease to the command when invoking lupdate/lrelease.
+  # This patch resolves the IMPORTED_LOCATION manually which seems to work.
+  patch -p0 -i ../qt5-fix-linguist-cmake-macro.patch
+}
 
-build()
-{
+build() {
   cd "${srcdir}/${_pkgfqn}"
 
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-
-    ${_arch}-qmake-qt5 ../${_qt_module}.pro
-
-    # search paths for host standard library (/usr/lib) and for Qt5Bootstrap (/usr/$_arch/lib) are not set correctly by qmake
-    # hence we need insert those paths manually
-    make qmake_all
-    find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5QmlDevTools -lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5QmlDevTools -lQt5Bootstrap|g" {} \;
-    find . -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \;
-
-    make
-    popd
+    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}
+
+      # Search paths for host standard library (/usr/lib) and for Qt5Bootstrap (/usr/$_arch/lib) are not set correctly by qmake
+      # hence we need insert those paths manually
+      make qmake_all
+      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5QmlDevTools|-L/usr/lib -L/usr/$_arch/lib -lQt5QmlDevTools|g" {} \;
+      find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \;
+
+      make
+      popd
+    done
   done
 }
 
@@ -46,34 +71,39 @@ package() {
   cd "${srcdir}/${_pkgfqn}"
 
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # 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
-
-    # Make sure the executables don't conflict with their mingw-qt4 counterpart
-    for fn in "${pkgdir}/usr/${_arch}/bin/"*.exe ; do
-      fn_new=$(echo $fn | sed s/'.exe$'/'-qt5.exe'/)
-      mv $fn $fn_new
+    for _config in "${_configurations[@]}"; do
+      pushd build-${_arch}-${_config##*=}
+
+      make INSTALL_ROOT="$pkgdir" install
+      find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
+      # Applications might be useful as well; keeping them will not hurt anybody I suppose
+      [ "$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 {} \;
+
+      # Create symlinks for tools
+      mkdir -p "${pkgdir}/usr/bin"
+      for tool in lconvert lupdate lrelease; do
+        ln -sf "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-$tool-qt5"
+      done
+
+      # Remove phrasebooks
+      # Would save around 300 KiB on your floppy disk, I keep them by default because
+      # phrasebooks might be useful when using Linguist
+      #rm -r "${pkgdir}/usr/${_arch}/share"
+      popd
     done
+  done
 
-    # Symlink lrelease to /usr/bin
-    mkdir -p "${pkgdir}/usr/bin"
-    for tool in lconvert lupdate lrelease; do
-      ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-$tool-qt5"
+  # Make sure the executables don't conflict with their mingw-qt4 counterpart
+  for _arch in ${_architectures}; do
+    for exe_file in "${pkgdir}/usr/${_arch}/bin/"*.exe; do
+      [[ -f $exe_file ]] && mv "${exe_file}" "${exe_file%.exe}-qt5.exe"
     done
-
-    ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe
-    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
-    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a
-    strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*
-
-    popd
   done
-
-  # .prl files aren't interesting for us
-  find ${pkgdir} -name "*.prl" -delete
 }
diff --git a/qt5-fix-linguist-cmake-macro.patch b/qt5-fix-linguist-cmake-macro.patch
new file mode 100644
index 000000000000..b49d14018797
--- /dev/null
+++ b/qt5-fix-linguist-cmake-macro.patch
@@ -0,0 +1,25 @@
+--- src/linguist/Qt5LinguistToolsMacros.cmake.orig	2016-06-19 17:29:46.000000000 +0200
++++ src/linguist/Qt5LinguistToolsMacros.cmake	2016-07-23 00:39:31.718139700 +0200
+@@ -71,8 +71,10 @@
+ 
+           file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
+         endif()
++
++        get_target_property(LUPDATE_LOC ${Qt5_LUPDATE_EXECUTABLE} IMPORTED_LOCATION)
+         add_custom_command(OUTPUT ${_ts_file}
+-            COMMAND ${Qt5_LUPDATE_EXECUTABLE}
++            COMMAND ${LUPDATE_LOC}
+             ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
+             DEPENDS ${_my_sources} ${_ts_lst_file} VERBATIM)
+     endforeach()
+@@ -93,8 +95,9 @@
+             set(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+         endif()
+ 
++        get_target_property(LRELEASE_LOC ${Qt5_LRELEASE_EXECUTABLE} IMPORTED_LOCATION)
+         add_custom_command(OUTPUT ${qm}
+-            COMMAND ${Qt5_LRELEASE_EXECUTABLE}
++            COMMAND ${LRELEASE_LOC}
+             ARGS ${_abs_FILE} -qm ${qm}
+             DEPENDS ${_abs_FILE} VERBATIM
+         )