diff --git a/.SRCINFO b/.SRCINFO index 2ba9bf6c276f6c66a8b23c177d60a10469dfb5ce..f98ed66614124ab19558cd103cfeced12830100a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libadwaita pkgdesc = Building blocks for modern adaptive GNOME applications - pkgver = 1.4.3 + pkgver = 1.5beta pkgrel = 1 epoch = 1 url = https://gnome.pages.gitlab.gnome.org/libadwaita/ @@ -15,17 +15,24 @@ pkgbase = libadwaita makedepends = vala depends = appstream depends = gtk4 - source = git+https://gitlab.gnome.org/GNOME/libadwaita.git#commit=a0a84cb1b35d1f235f58579a415f9bf9cad20327 + source = git+https://gitlab.gnome.org/GNOME/libadwaita.git#commit=fb97bcc3aaf999c274d0f03bf9d7076ec4c97878 b2sums = SKIP pkgname = libadwaita depends = appstream depends = gtk4 + depends = fribidi + depends = glib2 + depends = graphene depends = libgtk-4.so + depends = pango provides = libadwaita-1.so pkgname = libadwaita-demos pkgdesc = Building blocks for modern adaptive GNOME applications (demo applications) + depends = glib2 + depends = gtk4 + depends = hicolor-icon-theme depends = libadwaita pkgname = libadwaita-docs diff --git a/PKGBUILD b/PKGBUILD index 3b7dafa30bc5d7d3ff9760a9cab09129bcb6c67f..e6bd62972659f91ef7560415985e0e39abd179c7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org> pkgbase=libadwaita pkgname=( @@ -6,7 +7,7 @@ pkgname=( libadwaita-demos libadwaita-docs ) -pkgver=1.4.3 +pkgver=1.5beta pkgrel=1 epoch=1 pkgdesc="Building blocks for modern adaptive GNOME applications" @@ -26,13 +27,13 @@ makedepends=( vala ) checkdepends=(weston) -_commit=a0a84cb1b35d1f235f58579a415f9bf9cad20327 # tags/1.4.3^0 +_commit=fb97bcc3aaf999c274d0f03bf9d7076ec4c97878 # tags/1.5.beta^0 source=("git+https://gitlab.gnome.org/GNOME/libadwaita.git#commit=$_commit") b2sums=('SKIP') pkgver() { cd $pkgname - git describe --tags | sed -r 's/\.([a-z])/\1/;s/[^-]*-g/r&/;s/-/+/g' + git describe --tags | sed -r 's/_/./;s/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -71,7 +72,13 @@ _pick() { } package_libadwaita() { - depends+=(libgtk-4.so) + depends+=( + fribidi + glib2 + graphene + libgtk-4.so + pango + ) provides+=(libadwaita-1.so) meson install -C build --destdir "$pkgdir" @@ -88,7 +95,12 @@ package_libadwaita() { package_libadwaita-demos() { pkgdesc+=" (demo applications)" - depends=(libadwaita) + depends=( + glib2 + gtk4 + hicolor-icon-theme + libadwaita + ) mv demo/* "$pkgdir" }