From da0cf7690381cec707f4b038f513661eeeb03bb0 Mon Sep 17 00:00:00 2001 From: Will Temple Date: Mon, 20 Apr 2020 13:15:17 -0700 Subject: [PATCH] Fixed a bug in the PKGBUILD --- .SRCINFO | 1 + PKGBUILD | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b0dfdfb..e79e4bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,6 +4,7 @@ pkgbase = libxft-bgra pkgrel = 1 url = https://xorg.freedesktop.org/ arch = x86_64 + groups = modified license = custom makedepends = git makedepends = pkgconfig diff --git a/PKGBUILD b/PKGBUILD index 06725ae..9c9eef6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,17 +1,17 @@ +_pkgbasever=2.3.3 pkgname=libxft-bgra -base_ver=2.3.3 pkgver=2.3.3.r7.7808631e pkgrel=1 pkgdesc="libXft with BGRA glyph (color emoji) rendering & scaling patches by Maxime Coste" arch=('x86_64') license=('custom') -group=('modified') +groups=('modified') provides=('libxft') conflicts=('libxft') url="https://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('git' 'pkgconfig') -source=(${url}/releases/individual/lib/libXft-${base_ver}.tar.bz2{,.sig}) +source=(${url}/releases/individual/lib/libXft-${_pkgbasever}.tar.bz2{,.sig}) sha512sums=('28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8' 'SKIP') validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith " @@ -21,7 +21,7 @@ GITLAB_REVISION=7 COMMIT_ID=7808631e7a9a605d5fe7a1077129c658d9ec47fc pkgver() { - echo "${base_ver}.r${GITLAB_REVISION}.`echo $COMMIT_ID | cut -c1-8`" + echo "${_pkgbasever}.r${GITLAB_REVISION}.`echo $COMMIT_ID | cut -c1-8`" } prepare() { @@ -39,7 +39,7 @@ prepare() { git fetch --depth=2 upstream ${COMMIT_ID} popd - pushd libXft-${base_ver} + pushd libXft-${_pkgbasever} git --git-dir ../libxft_upstream/.git diff -u ${COMMIT_ID}~ ${COMMIT_ID} | patch -p1 popd @@ -47,13 +47,13 @@ prepare() { } build() { - cd libXft-${base_ver} + cd libXft-${_pkgbasever} ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } package() { - cd libXft-${base_ver} + cd libXft-${_pkgbasever} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"