Update version

3 files changed, 93 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cce1a57338a9..d98905b721cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-tageditor
 	pkgdesc = A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska
-	pkgver = 3.2.1
+	pkgver = 3.3.0
 	pkgrel = 1
 	url = https://github.com/Martchus/tageditor
 	arch = any
@@ -10,6 +10,11 @@ pkgbase = mingw-w64-tageditor
 	makedepends = mingw-w64-qt5-tools
 	makedepends = ffmpeg
 	makedepends = mingw-w64-reflective-rapidjson
+	makedepends = mingw-w64-qt5-base-static
+	makedepends = mingw-w64-qt5-translations
+	makedepends = mingw-w64-qt5-svg
+	makedepends = breeze-icons
+	makedepends = numix-icon-theme-git
 	depends = mingw-w64-crt
 	depends = mingw-w64-qtutilities>=5.6.0
 	depends = mingw-w64-tagparser>=6.2.0
@@ -18,7 +23,7 @@ pkgbase = mingw-w64-tageditor
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = tageditor-3.2.1.tar.gz::https://github.com/Martchus/tageditor/archive/v3.2.1.tar.gz
+	source = tageditor-3.3.0.tar.gz::https://github.com/Martchus/tageditor/archive/v3.3.0.tar.gz
 	sha256sums = c3b15d83adf92a4c36c2f1e092a12b79f4177664cbef2ca53e82d8dfe0dc36d6
 
 pkgname = mingw-w64-tageditor
diff --git a/.sync-conflict-20190519-131722-PKPUQWZ.SRCINFO b/.sync-conflict-20190519-131722-PKPUQWZ.SRCINFO
new file mode 100644
index 000000000000..8aac75697e3e
--- /dev/null
+++ b/.sync-conflict-20190519-131722-PKPUQWZ.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = mingw-w64-tageditor
+	pkgdesc = A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska
+	pkgver = 3.2.0
+	pkgrel = 1
+	url = https://github.com/Martchus/tageditor
+	arch = any
+	license = GPL
+	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-cmake
+	makedepends = mingw-w64-qt5-tools
+	makedepends = ffmpeg
+	makedepends = mingw-w64-reflective-rapidjson
+	depends = mingw-w64-crt
+	depends = mingw-w64-qtutilities>=5.6.0
+	depends = mingw-w64-tagparser>=6.2.0
+	depends = mingw-w64-qt5-declarative>=5.6
+	options = !buildflags
+	options = staticlibs
+	options = !strip
+	options = !emptydirs
+	source = tageditor-3.2.0.tar.gz::https://github.com/Martchus/tageditor/archive/v3.2.0.tar.gz
+	sha256sums = 195781362419591f8e88f636a0fc3676389718ebc6ae96014d27a3123b2b8f0f
+
+pkgname = mingw-w64-tageditor
+
diff --git a/PKGBUILD b/PKGBUILD
index 13775d327dad..1981ea15e8d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,18 @@
 # you also find the URL of a binary repository.
 
 # set the web view provider: either webkit, webengine, auto or none
-_webview_provider=${TAGEDITOR_WEBVIEW_PROVIDER:-none}
+_webview_provider=${MINGW_64_TAGEDITOR_WEBVIEW_PROVIDER:-none}
 
 # set the JavaScript provider: either script, qml, auto or none
-_js_provider=${TAGEDITOR_JS_PROVIDER:-qml}
+_js_provider=${MINGW_64_TAGEDITOR_JS_PROVIDER:-qml}
 
 # whether the experimental JSON export is enabled: ON or OFF
-_json_export=${TAGEDITOR_JSON_EXPORT:-ON}
+_json_export=${MINGW_64_TAGEDITOR_JSON_EXPORT:-ON}
 
 _reponame=tageditor
 pkgname=mingw-w64-tageditor
 _name=${pkgname#mingw-w64-}
-pkgver=3.2.1
+pkgver=3.3.0
 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'
@@ -32,33 +32,71 @@ url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('c3b15d83adf92a4c36c2f1e092a12b79f4177664cbef2ca53e82d8dfe0dc36d6')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+_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')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  for _arch in ${_architectures}; do
+
+  declare -A _config_flags=(
+    [shared]='
+        -DBUILD_SHARED_LIBS:BOOL=ON
+    '
+    [static]='
+        -DBUILD_SHARED_LIBS:BOOL=OFF
+        -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=.a;.lib
+        -DSTATIC_LINKAGE:BOOL=ON
+        -DSTATIC_LIBRARY_LINKAGE:BOOL=ON
+        -DQT_PACKAGE_PREFIX=StaticQt5
+        -DKF_PACKAGE_PREFIX=StaticKF5
+        -DTAGEDITOR_CONFIGURATION_TARGET_SUFFIX:STRING=static
+        -DENABLE_QT_TRANSLATIONS:BOOL=ON
+        -DBUILTIN_TRANSLATIONS:BOOL=ON
+        -DBUILTIN_ICON_THEMES:STRING=breeze;breeze-dark;Numix
+        -DIMAGE_FORMAT_SUPPORT:STRING=Gif;ICO;Jpeg
+        -DSVG_SUPPORT:BOOL=ON
+        -DSVG_ICON_SUPPORT:BOOL=0N
+    '
+  )
+
+  for _arch in "${_architectures[@]}"; do
     local gcc_version=$($_arch-gcc --version | grep "^$_arch-gcc" | sed 's/^.* //g')
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
-      -DWEBVIEW_PROVIDER="${_webview_provider}" \
-      -DJS_PROVIDER="${_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" \
-      ../
-    make
-    popd
+
+    for _cfg in "${_configurations[@]}"; do
+      msg2 "${_arch}-${_cfg}"
+      mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}"
+      ${_arch}-cmake \
+        -DCMAKE_BUILD_TYPE:STRING='Release' \
+        -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 \
+        ${_config_flags[$_cfg]} \
+        ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+
+  for _arch in "${_architectures[@]}"; do
+    for _cfg in "${_configurations[@]}"; do
+      msg2 "${_arch}-${_cfg}"
+      pushd "build-${_arch}-${_cfg}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }