From c8d03971bc86ffd3a304a589ffd891b991538d08 Mon Sep 17 00:00:00 2001 From: TBK Date: Fri, 17 Apr 2020 23:47:48 +0200 Subject: [PATCH] Update to 3.0.1 - Fix pkgver - Fix arch - Fix checksum - Remove header conflict workaround --- .SRCINFO | 6 +++--- PKGBUILD | 19 +++++-------------- README.md | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a3b49e9..516b0aa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,16 @@ pkgbase = libqtolm-git pkgdesc = A Qt wrapper for libolm - pkgver = f2d8e23 + pkgver = 3.0.1.r0.g750ae3a pkgrel = 1 url = https://gitlab.com/b0/libQtOlm - arch = any + arch = x86_64 license = GPL-3.0-or-later makedepends = cmake makedepends = git depends = qt5-base depends = libolm source = libqtolm-git::git+https://gitlab.com/b0/libQtOlm.git - b2sums = SKIP + sha512sums = SKIP pkgname = libqtolm-git diff --git a/PKGBUILD b/PKGBUILD index 230f2ec..daa985d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,29 +2,20 @@ # Contributor: TBK pkgname=libqtolm-git -pkgver=f2d8e23 +pkgver=3.0.1.r0.g750ae3a pkgrel=1 pkgdesc='A Qt wrapper for libolm' url='https://gitlab.com/b0/libQtOlm' -arch=('any') +arch=('x86_64') license=('GPL-3.0-or-later') depends=('qt5-base' 'libolm') makedepends=('cmake' 'git') source=("$pkgname::git+https://gitlab.com/b0/libQtOlm.git") -b2sums=('SKIP') +sha512sums=('SKIP') pkgver() { cd "$pkgname" - git rev-parse --short HEAD | 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 + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { @@ -33,7 +24,7 @@ build() { -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=true . + -DBUILD_SHARED_LIBS=True make -C build } diff --git a/README.md b/README.md index f7f5314..d9bb79f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Termius +# libqtolm-git Arch User Repository libqtolm-git ## Update package