From 1e8c317c43b6e5db88050649108c712ac3561894 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Jun 2018 21:05:53 +0200 Subject: [PATCH] Update c++utilities, tagparser and tageditor --- c++utilities/apple-darwin/PKGBUILD | 5 +++-- c++utilities/default/PKGBUILD | 4 ++-- c++utilities/doc/PKGBUILD | 4 ++-- c++utilities/mingw-w64/PKGBUILD | 5 +++-- devel/own-projects/versions.sh | 8 ++++---- tageditor/default/PKGBUILD | 4 ++-- tageditor/mingw-w64-static/PKGBUILD | 19 ++++--------------- tageditor/mingw-w64-webview/PKGBUILD | 4 ++-- tageditor/mingw-w64/PKGBUILD | 4 ++-- tagparser/default/PKGBUILD | 4 ++-- tagparser/doc/PKGBUILD | 4 ++-- tagparser/mingw-w64/PKGBUILD | 4 ++-- 12 files changed, 30 insertions(+), 39 deletions(-) diff --git a/c++utilities/apple-darwin/PKGBUILD b/c++utilities/apple-darwin/PKGBUILD index 773ee1ad..b14f0ead 100644 --- a/c++utilities/apple-darwin/PKGBUILD +++ b/c++utilities/apple-darwin/PKGBUILD @@ -6,7 +6,7 @@ _reponame=cpp-utilities pkgname=apple-darwin-c++utilities _name=${pkgname#apple-darwin-} -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (apple-darwin)' @@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation") makedepends=('clang' 'cmake') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('88a41ef6e4e7347d8bf860a4ac0700018461ef5a3d41cd249aa950223e122c63') +sha256sums=('b101f3d826215dfbcdd9e679f7c23fdeeec9c6c77d56d8f8e9257b77ffd585ad') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i386-apple-darwin15 x86_64-apple-darwin15' # NOTE: can not build for x86_64h-apple-darwin15 because libstdc++ is (currently) only availabe for x86_64 @@ -32,6 +32,7 @@ build() { -DCMAKE_INSTALL_PREFIX:PATH="/opt/osxcross/${_arch}" \ -Diconv_DYNAMIC_LIB:FILEPATH='/opt/osxcross/SDK/MacOSX10.11.sdk/usr/lib/libiconv.2.tbd' \ -Diconv_DYNAMIC_INCLUDE_DIR='/opt/osxcross/SDK/MacOSX10.11.sdk/usr/include' \ + -DENABLE_THREAD_LOCAL=OFF \ ${_configurations} \ ../ make diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index 5e73c6d8..5b4fa683 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -5,7 +5,7 @@ _reponame=cpp-utilities pkgname=c++utilities -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities' @@ -16,7 +16,7 @@ makedepends=('cmake') checkdepends=('cppunit') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('88a41ef6e4e7347d8bf860a4ac0700018461ef5a3d41cd249aa950223e122c63') +sha256sums=('b101f3d826215dfbcdd9e679f7c23fdeeec9c6c77d56d8f8e9257b77ffd585ad') prepare() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/doc/PKGBUILD b/c++utilities/doc/PKGBUILD index 6f446873..c15635ad 100644 --- a/c++utilities/doc/PKGBUILD +++ b/c++utilities/doc/PKGBUILD @@ -6,7 +6,7 @@ _name=c++utilities _reponame=cpp-utilities pkgname=$_name-doc -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)' @@ -14,7 +14,7 @@ license=('GPL') makedepends=('cmake' 'doxygen' 'dia' 'graphviz') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('88a41ef6e4e7347d8bf860a4ac0700018461ef5a3d41cd249aa950223e122c63') +sha256sums=('b101f3d826215dfbcdd9e679f7c23fdeeec9c6c77d56d8f8e9257b77ffd585ad') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index afb0fe91..1adf307c 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -6,7 +6,7 @@ _reponame=cpp-utilities pkgname=mingw-w64-c++utilities _name=${pkgname#mingw-w64-} -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)' @@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation") makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('88a41ef6e4e7347d8bf860a4ac0700018461ef5a3d41cd249aa950223e122c63') +sha256sums=('b101f3d826215dfbcdd9e679f7c23fdeeec9c6c77d56d8f8e9257b77ffd585ad') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON' @@ -24,6 +24,7 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + for _arch in ${_architectures}; do mkdir -p "build-${_arch}" && pushd "build-${_arch}" ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release \ diff --git a/devel/own-projects/versions.sh b/devel/own-projects/versions.sh index 95134111..378aa8e5 100755 --- a/devel/own-projects/versions.sh +++ b/devel/own-projects/versions.sh @@ -1,9 +1,9 @@ #!/bin/bash declare -A versions=( - [c++utilities]=4.14.1 + [c++utilities]=4.14.2 [qtutilities]=5.10.0 - [tagparser]=7.0.3 - [tageditor]=3.1.0 + [tagparser]=7.1.0 + [tageditor]=3.1.1 [passwordfile]=3.1.4 [passwordmanager]=3.1.5 [syncthingtray]=0.8.1 @@ -11,7 +11,7 @@ declare -A versions=( [reflective-rapidjson]=0.0.5 [blackwidowcontrol]=1.0.1 [dbus-soundrecorder]=1.2.2 - [qt5]=5.10.1 + [qt5]=5.11.0 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD index ec301ee7..70b4f447 100644 --- a/tageditor/default/PKGBUILD +++ b/tageditor/default/PKGBUILD @@ -14,7 +14,7 @@ _json_export=ON _reponame=tageditor pkgname=tageditor -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska' @@ -30,7 +30,7 @@ makedepends=('cmake' 'qt5-tools') checkdepends=('cppunit') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('9b31ba05f44d59853da6f23d8052d07d50b8f1cc8237d3469ab3a63a6e8a32c8') +sha256sums=('aab080768b3b7074218b0f8278fde4097c6ede29ba591fcd4ca68014af7ad7a5') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/tageditor/mingw-w64-static/PKGBUILD b/tageditor/mingw-w64-static/PKGBUILD index efab3e14..8b1f30da 100644 --- a/tageditor/mingw-w64-static/PKGBUILD +++ b/tageditor/mingw-w64-static/PKGBUILD @@ -15,8 +15,8 @@ _json_export=ON _reponame=tageditor pkgname=mingw-w64-tageditor-static _name=${_reponame} -pkgver=3.1.0 -pkgrel=2 +pkgver=3.1.1 +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') @@ -29,22 +29,11 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-base-static' 'ming [[ $_json_export == ON ]] && makedepends+=('mingw-w64-reflective-rapidjson') conflicts=("${pkgname%-static}") url="https://github.com/Martchus/${_reponame}" -source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz" - "0001-Include-QHeaderView-explicitely.patch::https://github.com/Martchus/${_reponame}/commit/95ac0d6aa713325e8d1c6378c59e10d2bfe42317.patch") -sha256sums=('9b31ba05f44d59853da6f23d8052d07d50b8f1cc8237d3469ab3a63a6e8a32c8' - 'todo') +source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +sha256sums=('aab080768b3b7074218b0f8278fde4097c6ede29ba591fcd4ca68014af7ad7a5') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' -prepare() { - cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - - # apply patches; further descriptions can be found in patch files itself - for patch in "$srcdir/"*.patch; do - patch -p1 -i "$patch" - done -} - build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" for _arch in ${_architectures}; do diff --git a/tageditor/mingw-w64-webview/PKGBUILD b/tageditor/mingw-w64-webview/PKGBUILD index e3d42f54..9edce6fa 100644 --- a/tageditor/mingw-w64-webview/PKGBUILD +++ b/tageditor/mingw-w64-webview/PKGBUILD @@ -17,7 +17,7 @@ pkgname=mingw-w64-tageditor-webview provides=('mingw-w64-tageditor') conflicts=('mingw-w64-tageditor') _name=${pkgname#mingw-w64-} -pkgver=3.1.0 +pkgver=3.1.1 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,7 +32,7 @@ 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}" source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('9b31ba05f44d59853da6f23d8052d07d50b8f1cc8237d3469ab3a63a6e8a32c8') +sha256sums=('aab080768b3b7074218b0f8278fde4097c6ede29ba591fcd4ca68014af7ad7a5') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD index e3970b1b..e4ffc1d2 100644 --- a/tageditor/mingw-w64/PKGBUILD +++ b/tageditor/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ _json_export=ON _reponame=tageditor pkgname=mingw-w64-tageditor _name=${pkgname#mingw-w64-} -pkgver=3.1.0 +pkgver=3.1.1 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' @@ -30,7 +30,7 @@ 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}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('9b31ba05f44d59853da6f23d8052d07d50b8f1cc8237d3469ab3a63a6e8a32c8') +sha256sums=('aab080768b3b7074218b0f8278fde4097c6ede29ba591fcd4ca68014af7ad7a5') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD index 37cab25c..040c494f 100644 --- a/tagparser/default/PKGBUILD +++ b/tagparser/default/PKGBUILD @@ -5,7 +5,7 @@ _reponame=tagparser pkgname=tagparser -pkgver=7.0.3 +pkgver=7.1.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags' @@ -16,7 +16,7 @@ checkdepends=('cppunit' 'openssl') optdepends=("$pkgname-doc: API documentation") url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('8a3f156cab3dbfa0bbe2489c8a8f05e64739498be7910a1ec84f42eef7fc41ea') +sha256sums=('f32dec811156eaccfa51f818485ec742f5d39e5a491fd275c3664b80d6f6d3df') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/tagparser/doc/PKGBUILD b/tagparser/doc/PKGBUILD index c75e8f10..9c5c3d1e 100644 --- a/tagparser/doc/PKGBUILD +++ b/tagparser/doc/PKGBUILD @@ -6,7 +6,7 @@ _name=tagparser _reponame=tagparser pkgname=$_name-doc -pkgver=7.0.3 +pkgver=7.1.0 pkgrel=1 arch=('any') pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (API documentation)' @@ -14,7 +14,7 @@ license=('GPL') makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('8a3f156cab3dbfa0bbe2489c8a8f05e64739498be7910a1ec84f42eef7fc41ea') +sha256sums=('f32dec811156eaccfa51f818485ec742f5d39e5a491fd275c3664b80d6f6d3df') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD index ce6dae69..750fdcd3 100644 --- a/tagparser/mingw-w64/PKGBUILD +++ b/tagparser/mingw-w64/PKGBUILD @@ -6,7 +6,7 @@ _reponame=tagparser pkgname=mingw-w64-tagparser _name=${pkgname#mingw-w64-} -pkgver=7.0.3 +pkgver=7.1.0 pkgrel=1 arch=('any') pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)' @@ -17,7 +17,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') optdepends=("$pkgname-doc: API documentation") url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('8a3f156cab3dbfa0bbe2489c8a8f05e64739498be7910a1ec84f42eef7fc41ea') +sha256sums=('f32dec811156eaccfa51f818485ec742f5d39e5a491fd275c3664b80d6f6d3df') options=(!buildflags staticlibs !strip !emptydirs) _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'