From 91a637b759b52406e6ebcd901e9c81f642005250 Mon Sep 17 00:00:00 2001
From: John McQuah <jmcquah@disroot.org>
Date: Sat, 4 Mar 2023 21:55:06 -0500
Subject: [PATCH] tint2, xdiskusage: adopted

---
 tint2/.signature      |  6 +++---
 tint2/Pkgfile         | 10 +++++-----
 xdiskusage/.signature |  4 ++--
 xdiskusage/Pkgfile    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tint2/.signature b/tint2/.signature
index d09330d69..b1dc75bfd 100644
--- a/tint2/.signature
+++ b/tint2/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34KYmf0DAvAXxOzmjhMCsh7C3yCXIzVrAgUD7yXsX+zjQozY2gqRTQg7lhutw5NAHbZ0wlHNHvbN6kAePCeHvgE=
-SHA256 (Pkgfile) = 6daf03933b0f14962d13e8f94c6165193d452fde316743a18f9195e825d8e07a
+RWSagIOpLGJF33MwDkDVE41P44Hy+VpK2kMIl+F4xkZCCgBiTAxc1JWwKAtHISENOwOGOfXckoaKkOInPpL4i0sslVMlRcMFtQs=
+SHA256 (Pkgfile) = 24a59dc9520e91093349a25de68924de5bb2bf814677ecf19d78f57578e90075
 SHA256 (.footprint) = b746628a98545b6c2444ccae628c80abc67c9ec030f83ac4837870fc89d3aa54
-SHA256 (tint2-17.1.3.tar.gz) = 0a48a36a20498499d6369678e1fb7fb99fb4786e1604108d3abd327973276f81
+SHA256 (tint2-17.1.3.tar.bz2) = d49103d60a8753fa5e808e57f4cc028f677009a3594eb0f64dcfdc6d2b96e33c
diff --git a/tint2/Pkgfile b/tint2/Pkgfile
index 410e9da51..fb5bdd554 100644
--- a/tint2/Pkgfile
+++ b/tint2/Pkgfile
@@ -1,15 +1,15 @@
 # Description: Lightweight panel/taskbar.
 # URL: https://gitlab.com/nick87720z/tint2
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: imlib2 librsvg startup-notification xorg-libxcomposite xorg-libxdamage xorg-libxinerama xorg-libxrandr
 
 name=tint2
 version=17.1.3
 release=1
-source=(https://gitlab.com/nick87720z/tint2/-/archive/v$version/$name-$version.tar.gz)
+source=(https://gitlab.com/nick87720z/$name/-/archive/$version/$name-$version.tar.bz2)
 
 build() {
-	cmake -S $name-v$version-57e96cee7c98c0f272befd34fd959964052e51c4 -B build -G Ninja \
+	cmake -S $name-$version -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
@@ -17,8 +17,8 @@ build() {
 		-D ENABLE_TINT2CONF=OFF \
 		-Wno-dev
 
-	cmake --build build -j ${JOBS:-1}
-	DESTDIR=$PKG cmake --install build
+	ninja -C build -j ${JOBS:-1}
+	DESTDIR=$PKG ninja -C build install
 
 	rm -r $PKG/{etc,usr/share/doc}
 }
diff --git a/xdiskusage/.signature b/xdiskusage/.signature
index 9442fcdc7..5b3cef27a 100644
--- a/xdiskusage/.signature
+++ b/xdiskusage/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wBg5VTYBgCoyD6THWuB8AEw57VIIjtfAyaOWFTy44uSflnHI8HrTkJOLSxvzL0qmgh+MK207trqRJtRHcaHsAg=
-SHA256 (Pkgfile) = 09adce142cb6bcfe84872eec7fbdc68dd9f928fd9816585b4dc2f300a9332377
+RWSagIOpLGJF30oS9mREqlVQ1qoKHRNBqyLPkfBnIfNXGLb2T9KgjoQhrzHzRDGckhMQPySt68vh3iNZm/rKI/ai5vHMJtYkwgk=
+SHA256 (Pkgfile) = 07f56db21af677b4b36737520237ce76c392ce555705f23ae4be61682b35e44d
 SHA256 (.footprint) = 944cb9fd472c66a70b21545b291de64d9cb415f140f2f1d8057dac894143168c
 SHA256 (xdiskusage-1.60.tgz) = 7b536dc6f1bdc6d9bec7c29b9435c23d9d32bff8a0ebee26b9966b273dc9f67e
diff --git a/xdiskusage/Pkgfile b/xdiskusage/Pkgfile
index dc10f9af7..cb0250a32 100644
--- a/xdiskusage/Pkgfile
+++ b/xdiskusage/Pkgfile
@@ -1,6 +1,6 @@
 # Description: GUI disk space viewer.
 # URL: http://xdiskusage.sourceforge.net/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: fltk
 
 name=xdiskusage