Switch to applying the PR directly

2 files changed, 13 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e8b4adf378f..21e2a365da1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = alacritty-sixel-git
 	pkgdesc = A cross-platform, GPU-accelerated terminal emulator
-	pkgver = 0.12.0.2066.g53110c6e
+	pkgver = 0.12.0.2074.ga9335fcb
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/microo8/alacritty-sixel
+	url = https://github.com/alacritty/alacritty
 	arch = x86_64
 	arch = i686
 	license = Apache
@@ -25,7 +25,7 @@ pkgbase = alacritty-sixel-git
 	depends = libxrandr
 	provides = alacritty
 	conflicts = alacritty
-	source = alacritty::git+https://github.com/microo8/alacritty.git
+	source = alacritty::git+https://github.com/alacritty/alacritty.git
 	sha256sums = SKIP
 
 pkgname = alacritty-sixel-git
diff --git a/PKGBUILD b/PKGBUILD
index 93f70dea3412..d8d6ea982917 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: chrhasse <hasse dot christopher at gmail dot com>
 pkgname='alacritty-sixel-git'
 _pkgname="alacritty"
-pkgver=0.12.0.2066.g53110c6e
+pkgver=0.12.0.2074.ga9335fcb
 pkgrel=1
 epoch=1
 arch=('x86_64' 'i686')
-url="https://github.com/microo8/alacritty-sixel"
+url="https://github.com/alacritty/alacritty"
 pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
 license=('Apache')
 depends=('freetype2' 'fontconfig' 'libxi' 'libxcursor' 'libxrandr')
@@ -13,9 +13,16 @@ makedepends=('rust' 'cargo' 'cmake' 'fontconfig' 'ncurses' 'desktop-file-utils'
 checkdepends=('ttf-dejavu') # for monospace fontconfig test
 provides=('alacritty')
 conflicts=('alacritty')
-source=("$_pkgname::git+https://github.com/microo8/alacritty.git")
+source=("$_pkgname::git+https://github.com/alacritty/alacritty.git")
 sha256sums=('SKIP')
 
+prepare() {
+  cd "$_pkgname/alacritty"
+  git config user.name "user"
+  git config user.email "user@domain.fake"
+  git pull -X theirs origin pull/4763/head --no-edit
+}
+
 pkgver() {
 	cd $_pkgname/alacritty
 	echo "$(grep '^version =' Cargo.toml|head -n1|cut -d\" -f2|cut -d\- -f1).$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"