uppkg -> 46.0-1

.SRCINFO

@@ -1,11 +1,11 @@
-pkgbase = adwaita-icon-theme
-	pkgdesc = GNOME standard icons
-	pkgver = 45.0
+pkgbase = adwaita-icon-theme-fake-cursors
+	pkgdesc = GNOME standard icons - patched to make mouse cursors invincible
+	pkgver = 46.0
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/adwaita-icon-theme
 	arch = any
-	license = CCPL:by-sa
-	license = LGPL3
+	license = CC-BY-SA-3.0
+	license = LGPL-3.0-only
 	makedepends = xorg-xcursorgen
 	makedepends = git
 	makedepends = gtk3
@@ -13,7 +13,7 @@ pkgbase = adwaita-icon-theme
 	depends = hicolor-icon-theme
 	depends = gtk-update-icon-cache
 	depends = librsvg
-	source = git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=709725baa9e17e8d0ca62eab7920162bfeda37b9
+	source = git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=7d2510820199ff7f233511a00895043f3843dbcd
 	source = git+https://git.noahvogt.com/noah/transparent-xcursor.git
 	b2sums = SKIP
 	b2sums = SKIP
@@ -25,7 +25,7 @@ pkgname = adwaita-icon-theme
 	depends = adwaita-cursors
 
 pkgname = adwaita-fake-cursors
-	pkgdesc = GNOME standard cursors
+	pkgdesc = GNOME standard cursors - patched to make mouse cursors invincible
 	depends = 
 	provides = adwaita-cursors
 	conflicts = adwaita-cursors

PKGBUILD

@@ -3,19 +3,20 @@
 # Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=adwaita-icon-theme
+_upstream_pkgbase=adwaita-icon-theme
+pkgbase="$_upstream_pkgbase-fake-cursors"
 pkgname=(
   adwaita-icon-theme
   adwaita-fake-cursors
 )
-pkgver=45.0
+pkgver=46.0
 pkgrel=1
-pkgdesc="GNOME standard icons"
+pkgdesc="GNOME standard icons - patched to make mouse cursors invincible"
 url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 arch=(any)
 license=(
-  CCPL:by-sa
-  LGPL3
+  CC-BY-SA-3.0
+  LGPL-3.0-only
 )
 depends=(
   hicolor-icon-theme
@@ -28,25 +29,22 @@ makedepends=(
   gtk3
   meson
 )
-_commit=709725baa9e17e8d0ca62eab7920162bfeda37b9  # tags/45.0^0
+_commit=7d2510820199ff7f233511a00895043f3843dbcd  # tags/46.0^0
 source=("git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=$_commit"
         "git+https://git.noahvogt.com/noah/transparent-xcursor.git")
 b2sums=('SKIP' 'SKIP')
 
 pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+  cd $_upstream_pkgbase
+    git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgbase
-
-  # rm unused and problematic .icon-theme.cache.
-  git cherry-pick -n 32affe610606b3a550c2953993a72063eb2b7381
+  cd $_upstream_pkgbase
 }
 
 build() {
-  arch-meson $pkgbase build
+  arch-meson $_upstream_pkgbase build
   meson compile -C build
 }
 
@@ -64,14 +62,18 @@ package_adwaita-icon-theme() {
 }
 
 package_adwaita-fake-cursors() {
-  pkgdesc="GNOME standard cursors"
+  pkgdesc="GNOME standard cursors - patched to make mouse cursors invincible"
   depends=()
   provides=(adwaita-cursors)
   conflicts=(adwaita-cursors)
+
+  # generate transparent cursor icons
   cd "$srcdir"/transparent-xcursor
   for f in "$srcdir"/cursors/usr/share/icons/Adwaita/cursors/*; do
     xcursorgen transparent.cfg "$f"
   done
+
+  # replace standard cursors with the generated one's
   cd "$srcdir"
   mv cursors/* "$pkgdir"