Sync git package with default ones

This commit is contained in:
Martchus 2017-03-21 01:02:22 +01:00
parent 4e96122f98
commit 483d636392
8 changed files with 29 additions and 16 deletions

View File

@ -21,7 +21,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }
@ -32,7 +32,7 @@ build() {
} }
check() { check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
make check make check
} }

View File

@ -21,7 +21,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }
@ -31,6 +31,11 @@ build() {
make make
} }
check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
make check
}
package() { package() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL' pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
license=('GPL') license=('GPL')
depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils') depends=('qt5-base' 'qtutilities-git' 'passwordfile-git' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'qt5-tools' 'git') makedepends=('cmake' 'qt5-tools' 'git')
provides=("${_name}") provides=("${_name}")
conflicts=("${_name}") conflicts=("${_name}")
@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models' pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
license=('GPL') license=('GPL')
depends=('c++utilities' 'qt5-base') depends=('c++utilities-git' 'qt5-base')
makedepends=('cmake' 'git' 'qt5-tools') makedepends=('cmake' 'git' 'qt5-tools')
provides=("${_name}") provides=("${_name}")
conflicts=("${_name}") conflicts=("${_name}")
@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }

View File

@ -6,18 +6,23 @@
# set the web view provider: either webkit, webengine, auto or none # set the web view provider: either webkit, webengine, auto or none
_webview_provider=webkit _webview_provider=webkit
# set to non-empty string to enable KIO plugin to show Syncthing actions in
# Dolphin file browser
_enable_kio_plugin=1
_reponame=syncthingtray _reponame=syncthingtray
pkgname=syncthingtray-git pkgname=syncthingtray-git
_name=${pkgname%-git} _name=${pkgname%-git}
pkgver=0.4.1 pkgver=0.5.1
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='Tray application for Syncthing' pkgdesc='Tray application for Syncthing'
license=('GPL') license=('GPL')
depends=('qtutilities' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils') depends=('qtutilities-git' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
[[ $_webview_provider == none ]] && depends+=('qt5-base') [[ $_webview_provider == none ]] && depends+=('qt5-base')
[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit') [[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine') [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
makedepends=('cmake' 'qt5-tools' 'git') makedepends=('cmake' 'qt5-tools' 'git')
provides=("${_name}") provides=("${_name}")
conflicts=("${_name}") conflicts=("${_name}")
@ -26,17 +31,20 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }
build() { build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
local additional_args=
[[ $_enable_kio_plugin ]] || additional_args+=-DNO_FILE_ITEM_ACTION_PLUGIN=ON
cmake \ cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_PREFIX="/usr" \
-DWEBVIEW_PROVIDER="${_webview_provider}" \ -DWEBVIEW_PROVIDER="${_webview_provider}" \
-DSYSTEMD_SUPPORT=ON -DSYSTEMD_SUPPORT=ON \
$additional_args
make make
} }

View File

@ -17,7 +17,7 @@ pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska' pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
license=('GPL') license=('GPL')
depends=('qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils') depends=('qtutilities-git' 'tagparser-git' 'desktop-file-utils' 'xdg-utils')
[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base') [[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit') [[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine') [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
@ -31,7 +31,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags' pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags'
license=('GPL') license=('GPL')
depends=('c++utilities' 'zlib') depends=('c++utilities-git' 'zlib')
makedepends=('cmake' 'git') makedepends=('cmake' 'git')
provides=("${_name}") provides=("${_name}")
conflicts=("${_name}") conflicts=("${_name}")
@ -20,7 +20,7 @@ source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
} }

View File

@ -11,7 +11,7 @@ pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)' pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
license=('GPL') license=('GPL')
depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils') depends=('qtutilities-git' 'openssl' 'desktop-file-utils' 'xdg-utils')
makedepends=('cmake' 'qt5-tools' 'git') makedepends=('cmake' 'qt5-tools' 'git')
provides=("${_name}") provides=("${_name}")
conflicts=("${_name}") conflicts=("${_name}")