2023-04-03

3 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7467893d58f..adf145d24fae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = matcha-gtk-theme
 	pkgdesc = A flat design theme for GTK 3, GTK 2 and GNOME Shell
-	pkgver = 2022.11.15
-	pkgrel = 2
+	pkgver = 2023.04.03
+	pkgrel = 1
 	url = https://vinceliuice.github.io/theme-matcha.html
 	install = matcha-gtk-theme.install
 	arch = any
@@ -10,7 +10,7 @@ pkgbase = matcha-gtk-theme
 	optdepends = gtk-engines: GTK2 theme support
 	optdepends = qogir-icon-theme: Recommended icon theme
 	options = !strip
-	source = matcha-gtk-theme-2022-11-15.tar.gz::https://github.com/vinceliuice/Matcha-gtk-theme/archive/2022-11-15.tar.gz
-	sha256sums = bd6f46607fc5c7ff97a7b5ee8cb061bc4dfc45978c86181247da163c0a3d3968
+	source = matcha-gtk-theme-2023-04-03.tar.gz::https://github.com/vinceliuice/Matcha-gtk-theme/archive/2023-04-03.tar.gz
+	sha256sums = 0d56e41402d4b8b84568a77f31851dd26536467f7ac899aa8fad23862e5a1fd6
 
 pkgname = matcha-gtk-theme
diff --git a/PKGBUILD b/PKGBUILD
index 834a9b0ebb12..05a4ad314b65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Michael J. Pento <mjpento@verizon.net>
 # Contributor: grimi <grimi at poczta dot fm>
 pkgname=matcha-gtk-theme
-_pkgver=2022-11-15
+_pkgver=2023-04-03
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="A flat design theme for GTK 3, GTK 2 and GNOME Shell"
 arch=('any')
 url="https://vinceliuice.github.io/theme-matcha.html"
@@ -16,17 +16,14 @@ optdepends=('gtk-engine-murrine: GTK2 theme support'
 options=('!strip')
 install="$pkgname.install"
 source=("$pkgname-$_pkgver.tar.gz::https://github.com/vinceliuice/Matcha-gtk-theme/archive/$_pkgver.tar.gz")
-sha256sums=('bd6f46607fc5c7ff97a7b5ee8cb061bc4dfc45978c86181247da163c0a3d3968')
+sha256sums=('0d56e41402d4b8b84568a77f31851dd26536467f7ac899aa8fad23862e5a1fd6')
 
 package() {
   cd "Matcha-gtk-theme-$_pkgver"
   install -d "$pkgdir/usr/share/themes"
   ./install.sh -d "$pkgdir/usr/share/themes/"
 
-  # Plank theme
-  install -Dm644 src/plank/dock.theme -t "$pkgdir/usr/share/plank/themes/Matcha/"
-
-  # Firefox & Gedit theme
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r src/extra/* "$pkgdir/usr/share/doc/$pkgname/"
+  # Install script fails to honor dest DIR for GTKSV_DIR, install files manually
+  install -Dm644 src/extra/gtksourceview/*.xml -t \
+    "$pkgdir/usr/share/gtksourceview-3.0/styles/"
 }
diff --git a/matcha-gtk-theme.install b/matcha-gtk-theme.install
index d9ff759eb4c5..cbdb0f82de05 100644
--- a/matcha-gtk-theme.install
+++ b/matcha-gtk-theme.install
@@ -1,13 +1,14 @@
 post_install() {
   echo ""
-  echo "Firefox theme"
-  echo "See /usr/share/doc/matcha-gtk-theme/firefox/README.md"
+  echo "To force Libadwaita appliations to use the gtk-4.0 theme,"
+  echo "symlink the gtk-4.0 theme to config folder"
+  echo "(replace Matcha-dark-sea with chosen theme variant):"
   echo ""
-  echo "Gedit theme"
-  echo "See /usr/share/doc/matcha-gtk-theme/gedit/README.md"
+  echo "mkdir -p ~/.config/gtk-4.0/"
+  echo "ln -sf /usr/share/themes/Matcha-dark-sea/gtk-4.0/{assets,gtk.css,gtk-dark.css} ~/.config/gtk-4.0/"
   echo ""
 }
 
 post_upgrade() {
-  post_install
+   post_install
 }