complete merge

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a77244fd1b9..7720ac8585df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = libadwaita-git
 	pkgdesc = Library full of GTK widgets for mobile phones
-	pkgver = 1.1.0.r.g73c17e0
+	pkgver = r1560.4f6e828
 	pkgrel = 3
-	url = https://gitlab.gnome.org/exalm/libadwaita
+	epoch = 1
+	url = https://gitlab.gnome.org/GNOME/libadwaita
 	arch = i686
 	arch = x86_64
 	arch = armv7h
@@ -17,7 +18,7 @@ pkgbase = libadwaita-git
 	depends = gtk4
 	provides = libadwaita
 	conflicts = libadwaita
-	source = git+https://gitlab.gnome.org/exalm/libadwaita
+	source = git+https://gitlab.gnome.org/GNOME/libadwaita
 	md5sums = SKIP
 
 pkgname = libadwaita-git
diff --git a/PKGBUILD b/PKGBUILD
index a550cba294b0..d58a02020279 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
 # Contributor: Philip Goto <philip.goto@gmail.com>
 # Contributor: Davide Depau <davide@depau.eu>
 # Contributor: Rafael Fontenelle <rafaelff@gnome.org>
+# Contributor: Marco Melorio <marco.melorio@protonmail.com>
 
 _pkgname=libadwaita
 pkgname=$_pkgname-git
-pkgver=1.1.0.r.g73c17e0
-pkgrel=3
+pkgver=r1560.4f6e828
+pkgrel=1
+epoch=1
 pkgdesc="Library full of GTK widgets for mobile phones"
-url="https://gitlab.gnome.org/exalm/$_pkgname"
+url="https://gitlab.gnome.org/GNOME/$_pkgname"
 license=(LGPL)
 arch=(i686 x86_64 armv7h aarch64)
 depends=(gtk4)
@@ -19,13 +21,10 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 md5sums=(SKIP)
 
-pkgver() {
-  cd $_pkgname
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+  pkgver() {
+    cd $_pkgname
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
+  }
 
 build() {
     arch-meson $_pkgname build -Dgtk_doc=false -Dexamples=true