ahk_x11-git 1.0.3.r25.g047a897-1

Initial AHK_X11 git PKGBUILD

2 files changed, 31 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88fa1ab26a34..313201e3e061 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ahk_x11
+pkgbase = ahk_x11-git
 	pkgdesc = AutoHotkey for Linux (X11-based systems)
-	pkgver = 1.0.3
-	pkgrel = 2
+	pkgver = 1.0.3.r25.g047a897
+	pkgrel = 1
 	url = https://github.com/phil294/AHK_X11
 	arch = x86_64
 	arch = x86_64_v3
@@ -17,21 +17,11 @@ pkgbase = ahk_x11
 	depends = libxtst
 	depends = gc
 	depends = fuse2
-	source = AHK_X11-1.0.3.tar.gz::https://github.com/phil294/AHK_X11/archive/refs/tags/1.0.3.tar.gz
-	source = AHK_X11-1.0.3-xdotool-7b63eb46631815fd4a10e1fd78a37213250d1193.tar.gz::https://github.com/jordansissel/xdotool/archive/7b63eb46631815fd4a10e1fd78a37213250d1193.tar.gz
-	source = AHK_X11-1.0.3-17_update_crystal-gi.patch::https://github.com/phil294/AHK_X11/commit/7873b93b63593cc3a178e6213181d112eb1c6acc.patch
-	source = AHK_X11-1.0.3-18_update_gtk3.patch::https://github.com/phil294/AHK_X11/commit/fba5a6cd5bef7f475280cbfc6641f7fcc4072ace.patch
-	source = AHK_X11-1.0.3-19_update_pango.patch::https://github.com/phil294/AHK_X11/commit/9cc4a0baa4685c729601d9fb8e3c154cf1c3dd46.patch
-	source = AHK_X11-1.0.3-20_frozen_shards.patch::https://github.com/phil294/AHK_X11/commit/b76359fcf79c91e41b3ce46834e0fd6cf727f64e.patch
-	source = AHK_X11-1.0.3-23_submodule.patch::https://github.com/phil294/AHK_X11/commit/5c4636f95c1d7a95d5f86d6390550dabe2e34d46.patch
-	source = AHK_X11-1.0.3-25_create-folders.patch::https://github.com/phil294/AHK_X11/commit/047a89722f9680b2b753dee59e74a2d05e746849.patch
-	sha256sums = dd46e1ac73b6a9e1f735911db3ae45de7617400dfb84198be60011733e322168
-	sha256sums = 0315b2d13a39c0c203e6685bb359006f74386f54ccda9e7b24ac2a7131d77827
-	sha256sums = 2bc1401eac1d2527a3880b619123b25c206e0d65b3dfe95f8dd8389e9a5e4e72
-	sha256sums = 683f536709dd1ba78816a4dfeb4f5755af7e5a05c431229a2a132833910c6f27
-	sha256sums = 6346d5cf734b43639a0185d3213296736310bc87765a55f77134282a254cfaa9
-	sha256sums = 2673d8b51e58642a1d734a8d91635d7e4a2ce14ef3e19a960673bb16883236e8
-	sha256sums = b75eb89f99b9131c4de996f8ca062bae455f8669518124c9c639320e3e55af03
-	sha256sums = 2aab338101e4b0b8a95367f40f880e6696575614ae02eeeb8a8854d2a4d5969a
+	provides = ahk_x11
+	conflicts = ahk_x11
+	source = git+https://github.com/phil294/AHK_X11.git
+	source = git+https://github.com/jordansissel/xdotool.git
+	b2sums = SKIP
+	b2sums = SKIP
 
-pkgname = ahk_x11
+pkgname = ahk_x11-git
diff --git a/PKGBUILD b/PKGBUILD
index 3ea1fe2bac25..70bcf86a101c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Frederik “Freso” S. Olesen <archlinux@freso.dk>
 _pkgname=AHK_X11
-pkgname="${_pkgname,,}"
-pkgver=1.0.3
-pkgrel=2
+pkgname="${_pkgname,,}-git"
+pkgver=1.0.3.r25.g047a897
+pkgrel=1
 pkgdesc='AutoHotkey for Linux (X11-based systems)'
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/phil294/$_pkgname"
@@ -24,45 +24,38 @@ makedepends=(
   shards
   gcc
 )
-_xdotool_commit='7b63eb46631815fd4a10e1fd78a37213250d1193'
-source=("$_pkgname-$pkgver.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz"
-        "$_pkgname-$pkgver-xdotool-${_xdotool_commit}.tar.gz::https://github.com/jordansissel/xdotool/archive/${_xdotool_commit}.tar.gz"
-        "$_pkgname-$pkgver-17_update_crystal-gi.patch::${url}/commit/7873b93b63593cc3a178e6213181d112eb1c6acc.patch"
-        "$_pkgname-$pkgver-18_update_gtk3.patch::${url}/commit/fba5a6cd5bef7f475280cbfc6641f7fcc4072ace.patch"
-        "$_pkgname-$pkgver-19_update_pango.patch::${url}/commit/9cc4a0baa4685c729601d9fb8e3c154cf1c3dd46.patch"
-        "$_pkgname-$pkgver-20_frozen_shards.patch::${url}/commit/b76359fcf79c91e41b3ce46834e0fd6cf727f64e.patch"
-        "$_pkgname-$pkgver-23_submodule.patch::${url}/commit/5c4636f95c1d7a95d5f86d6390550dabe2e34d46.patch"
-        "$_pkgname-$pkgver-25_create-folders.patch::${url}/commit/047a89722f9680b2b753dee59e74a2d05e746849.patch")
-sha256sums=('dd46e1ac73b6a9e1f735911db3ae45de7617400dfb84198be60011733e322168'
-            '0315b2d13a39c0c203e6685bb359006f74386f54ccda9e7b24ac2a7131d77827'
-            '2bc1401eac1d2527a3880b619123b25c206e0d65b3dfe95f8dd8389e9a5e4e72'
-            '683f536709dd1ba78816a4dfeb4f5755af7e5a05c431229a2a132833910c6f27'
-            '6346d5cf734b43639a0185d3213296736310bc87765a55f77134282a254cfaa9'
-            '2673d8b51e58642a1d734a8d91635d7e4a2ce14ef3e19a960673bb16883236e8'
-            'b75eb89f99b9131c4de996f8ca062bae455f8669518124c9c639320e3e55af03'
-            '2aab338101e4b0b8a95367f40f880e6696575614ae02eeeb8a8854d2a4d5969a')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("git+${url}.git"
+        "git+https://github.com/jordansissel/xdotool.git")
+b2sums=('SKIP'
+        'SKIP')
+
+pkgver() {
+  cd "${_pkgname}"
+  git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare() {
-  cd "${_pkgname}-${pkgver}"
-  mv --no-target-directory "${srcdir}/xdotool-${_xdotool_commit}" ./xdotool
-  for p in "${srcdir}"/*.patch; do
-    patch -p1 < $p
-  done
+  cd "${_pkgname}"
+  git submodule init
+  git config submodule.xdotool.url "$srcdir/xdotool"
+  git -c protocol.file.allow=always submodule update
 }
 
 build() {
-  cd "${_pkgname}-${pkgver}"
+  cd "${_pkgname}"
   # Don’t pollute $HOME
   export SHARDS_CACHE_PATH="$srcdir/.cache/shards"
   make bin/ahk_x11
 }
 
 #check() {
-#  cd "${_pkgname}-${pkgver}"
+#  cd "${_pkgname}"
 #  make test-dev
 #}
 
 package() {
-  cd "${_pkgname}-${pkgver}"
+  cd "${_pkgname}"
   DESTDIR="$pkgdir" make install
 }