From cb7045df3a3b2cb66c212a3d34ab3bd0b132e134 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 13 Sep 2020 13:03:06 +0200 Subject: [PATCH] Adapt mingw-w64 packages for own projects to splitting static Qt libs --- passwordmanager/mingw-w64/PKGBUILD | 2 +- syncthingtray/mingw-w64/PKGBUILD | 18 +++++++++++++----- tageditor/mingw-w64/PKGBUILD | 30 +++++++++++++++++++----------- videodownloader/mingw-w64/PKGBUILD | 4 ++-- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD index 3ac59b25..b3d23157 100644 --- a/passwordmanager/mingw-w64/PKGBUILD +++ b/passwordmanager/mingw-w64/PKGBUILD @@ -21,7 +21,7 @@ options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') _configurations=() [[ $NO_SHARED_LIBS ]] || _configurations+=('shared') -[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg' 'breeze-icons' 'numix-icon-theme-git') +[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg-static' 'breeze-icons' 'numix-icon-theme-git') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD index 0c9b3a64..4e0043b5 100644 --- a/syncthingtray/mingw-w64/PKGBUILD +++ b/syncthingtray/mingw-w64/PKGBUILD @@ -37,8 +37,15 @@ options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') _configurations=() -[[ $NO_SHARED_LIBS ]] || _configurations+=('shared') -[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'breeze-icons' 'numix-icon-theme-git') +if ! [[ $NO_SHARED_LIBS ]]; then + _configurations+=('shared') +fi +if ! [[ $NO_STATIC_LIBS ]]; then + _configurations+=('static') + makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-svg-static' 'mingw-w64-qt5-translations' 'breeze-icons' 'numix-icon-theme-git') + [[ $_js_provider == script ]] && makedepends+=('mingw-w64-qt5-script-static') + [[ $_js_provider == qml ]] && makedepends+=('mingw-w64-qt5-declarative-static') +fi [[ $_enable_libsyncthing == ON ]] && _disable_libsyncthing=OFF || _disable_libsyncthing=ON prepare() { @@ -61,9 +68,10 @@ build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" declare -A _config_flags=( - [shared]=' + [shared]=" -DBUILD_SHARED_LIBS:BOOL=ON - ' + -DWEBVIEW_PROVIDER:STRING=${_webview_provider} + " [static]=' -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=.a;.lib @@ -79,6 +87,7 @@ build() { -DIMAGE_FORMAT_SUPPORT:STRING=Gif;ICO;Jpeg -DSVG_SUPPORT:BOOL=ON -DSVG_ICON_SUPPORT:BOOL=0N + -DWEBVIEW_PROVIDER:STRING=none ' ) @@ -91,7 +100,6 @@ build() { -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DWEBVIEW_PROVIDER:STRING="${_webview_provider}" \ -DJS_PROVIDER:STRING="${_js_provider}" \ -DSYSTEMD_SUPPORT=OFF \ -DNO_FILE_ITEM_ACTION_PLUGIN=ON \ diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD index bab67eef..24fe16dc 100644 --- a/tageditor/mingw-w64/PKGBUILD +++ b/tageditor/mingw-w64/PKGBUILD @@ -20,12 +20,12 @@ pkgrel=1 arch=('any') pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska' license=('GPL') -depends=('mingw-w64-crt' 'mingw-w64-qtutilities>=5.6.0' 'mingw-w64-tagparser>=6.2.0') -[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('mingw-w64-qt5-base>=5.6') +depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-tagparser') +[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('mingw-w64-qt5-base') [[ $_webview_provider == webkit ]] && depends+=('mingw-w64-qt5-webkit') -[[ $_webview_provider == webengine ]] && depends+=('mingw-w64-qt5-webengine>=5.6') -[[ $_js_provider == script ]] && depends+=('mingw-w64-qt5-script>=5.6') -[[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative>=5.6') +[[ $_webview_provider == webengine ]] && depends+=('mingw-w64-qt5-webengine') +[[ $_js_provider == script ]] && depends+=('mingw-w64-qt5-script') +[[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg') [[ $_json_export == ON ]] && makedepends+=('mingw-w64-reflective-rapidjson') url="https://github.com/Martchus/${_reponame}" @@ -35,16 +35,24 @@ options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') _configurations=() -[[ $NO_SHARED_LIBS ]] || _configurations+=('shared') -[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg' 'breeze-icons' 'numix-icon-theme-git') +if ! [[ $NO_SHARED_LIBS ]]; then + _configurations+=('shared') +fi +if ! [[ $NO_STATIC_LIBS ]]; then + _configurations+=('static') + makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-svg-static' 'mingw-w64-qt5-translations' 'breeze-icons' 'numix-icon-theme-git') + [[ $_js_provider == script ]] && makedepends+=('mingw-w64-qt5-script-static') + [[ $_js_provider == qml ]] && makedepends+=('mingw-w64-qt5-declarative-static') +fi build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" declare -A _config_flags=( - [shared]=' + [shared]=" -DBUILD_SHARED_LIBS:BOOL=ON - ' + -DWEBVIEW_PROVIDER:STRING=${_webview_provider} + " [static]=' -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=.a;.lib @@ -59,6 +67,7 @@ build() { -DIMAGE_FORMAT_SUPPORT:STRING=Gif;ICO;Jpeg -DSVG_SUPPORT:BOOL=ON -DSVG_ICON_SUPPORT:BOOL=0N + -DWEBVIEW_PROVIDER:STRING=none ' ) @@ -73,13 +82,12 @@ build() { -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DWEBVIEW_PROVIDER:STRING="${_webview_provider}" \ -DJS_PROVIDER:STRING="${_js_provider}" \ -DENABLE_JSON_EXPORT:BOOL="${_json_export}" \ -DREFLECTION_GENERATOR_EXECUTABLE:FILEPATH='/usr/bin/reflective_rapidjson_generator' \ -DREFLECTION_GENERATOR_TRIPLE:STRING="${_arch}" \ -DREFLECTION_GENERATOR_INCLUDE_DIRECTORIES="/usr/lib/gcc/${_arch}/${gcc_version}/include;/usr/${_arch}/include/c++/${gcc_version};/usr/${_arch}/include/c++/${gcc_version}/${_arch};/usr/${_arch}/include" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ make diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD index 4a69a409..bb572178 100644 --- a/videodownloader/mingw-w64/PKGBUILD +++ b/videodownloader/mingw-w64/PKGBUILD @@ -21,7 +21,7 @@ options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') _configurations=() [[ $NO_SHARED_LIBS ]] || _configurations+=('shared') -[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg' 'breeze-icons' 'numix-icon-theme-git') +[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg-static' 'breeze-icons' 'numix-icon-theme-git') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" @@ -56,7 +56,7 @@ build() { -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \ -DCONFIGURATION_NAME:STRING="${_cfg}" \ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \ - -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ + -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \ ${_config_flags[$_cfg]} \ ../ make