Update to 3.0.1

- Fix pkgver
- Fix arch
- Fix checksum
- Remove header conflict workaround
This commit is contained in:
TBK 2020-04-17 23:47:48 +02:00
parent 978713a2a7
commit c8d03971bc
No known key found for this signature in database
GPG Key ID: 6D4FD19CB66C95EA
3 changed files with 9 additions and 18 deletions

View File

@ -1,16 +1,16 @@
pkgbase = libqtolm-git pkgbase = libqtolm-git
pkgdesc = A Qt wrapper for libolm pkgdesc = A Qt wrapper for libolm
pkgver = f2d8e23 pkgver = 3.0.1.r0.g750ae3a
pkgrel = 1 pkgrel = 1
url = https://gitlab.com/b0/libQtOlm url = https://gitlab.com/b0/libQtOlm
arch = any arch = x86_64
license = GPL-3.0-or-later license = GPL-3.0-or-later
makedepends = cmake makedepends = cmake
makedepends = git makedepends = git
depends = qt5-base depends = qt5-base
depends = libolm depends = libolm
source = libqtolm-git::git+https://gitlab.com/b0/libQtOlm.git source = libqtolm-git::git+https://gitlab.com/b0/libQtOlm.git
b2sums = SKIP sha512sums = SKIP
pkgname = libqtolm-git pkgname = libqtolm-git

View File

@ -2,29 +2,20 @@
# Contributor: TBK <aur at jjtc dot eu> # Contributor: TBK <aur at jjtc dot eu>
pkgname=libqtolm-git pkgname=libqtolm-git
pkgver=f2d8e23 pkgver=3.0.1.r0.g750ae3a
pkgrel=1 pkgrel=1
pkgdesc='A Qt wrapper for libolm' pkgdesc='A Qt wrapper for libolm'
url='https://gitlab.com/b0/libQtOlm' url='https://gitlab.com/b0/libQtOlm'
arch=('any') arch=('x86_64')
license=('GPL-3.0-or-later') license=('GPL-3.0-or-later')
depends=('qt5-base' 'libolm') depends=('qt5-base' 'libolm')
makedepends=('cmake' 'git') makedepends=('cmake' 'git')
source=("$pkgname::git+https://gitlab.com/b0/libQtOlm.git") source=("$pkgname::git+https://gitlab.com/b0/libQtOlm.git")
b2sums=('SKIP') sha512sums=('SKIP')
pkgver() { pkgver() {
cd "$pkgname" cd "$pkgname"
git rev-parse --short HEAD | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
cd "$srcdir/$pkgname"
sed -i 's/utils.h/utilities.h/g' CMakeLists.txt libQtOlm.pri main.cpp
cd lib
mv utils.h utilities.h
sed -i 's/utils.h/utilities.h/g' account.cpp groupsession.cpp pk.cpp session.cpp
} }
build() { build() {
@ -33,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=None \ -DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=true . -DBUILD_SHARED_LIBS=True
make -C build make -C build
} }

View File

@ -1,4 +1,4 @@
# Termius # libqtolm-git
Arch User Repository libqtolm-git Arch User Repository libqtolm-git
## Update package ## Update package