Align with non-lib32 package

2 files changed, 33 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdaea986b15e..63446f1ad16b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-libxft-bgra
 	pkgdesc = libXft with BGRA glyph (color emoji) rendering & scaling patches by Maxime Coste
-	pkgver = 2.3.3
+	pkgver = 2.3.3.r7.7808631e
 	pkgrel = 1
 	url = https://xorg.freedesktop.org/
 	arch = x86_64
@@ -13,11 +13,9 @@ pkgbase = lib32-libxft-bgra
 	conflicts = lib32-libxft
 	source = https://xorg.freedesktop.org//releases/individual/lib/libXft-2.3.3.tar.bz2
 	source = https://xorg.freedesktop.org//releases/individual/lib/libXft-2.3.3.tar.bz2.sig
-	source = https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1.patch
 	validpgpkeys = 4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E
 	sha512sums = 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
 	sha512sums = SKIP
-	sha512sums = SKIP
 
 pkgname = lib32-libxft-bgra
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fcbdea2a3fb..f52aa6103670 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 _pkgbasename=libxft-bgra
+_pkgbasever=2.3.3
 pkgname=lib32-$_pkgbasename
-pkgver=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')
@@ -11,17 +12,39 @@ conflicts=('lib32-libxft')
 url="https://xorg.freedesktop.org/"
 depends=('lib32-fontconfig' 'lib32-libxrender')
 makedepends=('gcc-multilib')
-source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2{,.sig}
-	'https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1.patch')
+source=(${url}/releases/individual/lib/libXft-${_pkgbasever}.tar.bz2{,.sig})
 sha512sums=('28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8'
-            'SKIP'
             'SKIP')
-validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith@oracle.com>
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
+
+LIBXFT_UPSTREAM_URL="https://gitlab.freedesktop.org/xorg/lib/libxft.git"
+GITLAB_REVISION=7
+COMMIT_ID=7808631e7a9a605d5fe7a1077129c658d9ec47fc
+
+pkgver() {
+  echo "${_pkgbasever}.r${GITLAB_REVISION}.`echo $COMMIT_ID | cut -c1-8`"
+}
 
 prepare() {
-  pushd libXft-${pkgver}
-  patch -p1 < ../1.patch
+  set -eo pipefail
+
+  # Create git repository to hold gitlab upstream code and create diff
+  if [ -d "libxft_upstream" ]; then
+    rm -rf "libxft_upstream";
+  fi;
+
+  mkdir libxft_upstream
+  pushd libxft_upstream
+  git init
+  git remote add upstream ${LIBXFT_UPSTREAM_URL}
+  git fetch --depth=2 upstream ${COMMIT_ID}
+  popd
+
+  pushd libXft-${_pkgbasever}
+  git --git-dir ../libxft_upstream/.git diff -u ${COMMIT_ID}~ ${COMMIT_ID} | patch -p1
   popd
+
+  set +eo pipefail
 }
 
 build() {
@@ -29,14 +52,14 @@ build() {
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd ${srcdir}/libXft-${pkgver}
+  cd ${srcdir}/libXft-${_pkgbasever}
   ./configure --prefix=/usr \
     --libdir=/usr/lib32 --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/libXft-${pkgver}"
+  cd "${srcdir}/libXft-${_pkgbasever}"
   make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}"/usr/{bin,include,share}