Jan Alexander Steffens (heftig) 1 jaar geleden
bovenliggende
commit
1c5ca4a877
2 gewijzigde bestanden met toevoegingen van 47 en 13 verwijderingen
  1. 26 0
      .SRCINFO
  2. 21 13
      PKGBUILD

+ 26 - 0
.SRCINFO

@@ -0,0 +1,26 @@
+pkgbase = adwaita-icon-theme
+	pkgdesc = GNOME standard icons
+	pkgver = 45.0
+	pkgrel = 1
+	url = https://gitlab.gnome.org/GNOME/adwaita-icon-theme
+	arch = any
+	license = CCPL:by-sa
+	license = LGPL3
+	makedepends = git
+	makedepends = gtk3
+	makedepends = meson
+	depends = hicolor-icon-theme
+	depends = gtk-update-icon-cache
+	depends = librsvg
+	source = git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=709725baa9e17e8d0ca62eab7920162bfeda37b9
+	b2sums = SKIP
+
+pkgname = adwaita-icon-theme
+	depends = hicolor-icon-theme
+	depends = gtk-update-icon-cache
+	depends = librsvg
+	depends = adwaita-cursors
+
+pkgname = adwaita-cursors
+	pkgdesc = GNOME standard cursors
+	depends = 

+ 21 - 13
PKGBUILD

@@ -1,10 +1,14 @@
+# Maintainer: Fabian Bornschein <fabiscafe-at-mailbox-dot-org>
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=adwaita-icon-theme
-pkgname=(adwaita-icon-theme adwaita-cursors)
-pkgver=44.0
+pkgname=(
+  adwaita-icon-theme
+  adwaita-cursors
+)
+pkgver=45.0
 pkgrel=1
 pkgdesc="GNOME standard icons"
 url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
@@ -21,36 +25,37 @@ depends=(
 makedepends=(
   git
   gtk3
+  meson
 )
-_commit=a5a52e09d26ccbb28e60a253e5b6e7eb18247e16  # tags/44.0^0
+_commit=709725baa9e17e8d0ca62eab7920162bfeda37b9  # tags/45.0^0
 source=("git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=$_commit")
 b2sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd $pkgbase
   git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
-  autoreconf -fvi
+  cd $pkgbase
+
+  # rm unused and problematic .icon-theme.cache.
+  git cherry-pick -n 32affe610606b3a550c2953993a72063eb2b7381
 }
-  
+
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr
-  make
+  arch-meson $pkgbase build
+  meson compile -C build
 }
 
 check() {
-  cd $pkgname
-  make check
+  meson test -C build --print-errorlogs
 }
 
 package_adwaita-icon-theme() {
   depends+=(adwaita-cursors)
 
-  make -C $pkgname DESTDIR="$pkgdir" install
+  meson install -C build --destdir "$pkgdir"
 
   mkdir -p cursors/usr/share/icons/Adwaita
   mv {"$pkgdir",cursors}/usr/share/icons/Adwaita/cursors
@@ -61,6 +66,9 @@ package_adwaita-cursors() {
   depends=()
 
   mv cursors/* "$pkgdir"
+
+  # deduplicate cursors
+  hardlink -c "$pkgdir/usr"
 }
 
 # vim:set sw=2 sts=-1 et: