diff --git a/testing/arc-theme/APKBUILD b/testing/arc-theme/APKBUILD
index 55c3136068759d0893ecad701d512be05444e443..8eebad972ebc368339ef8108fdd084a0c17026a9 100644
--- a/testing/arc-theme/APKBUILD
+++ b/testing/arc-theme/APKBUILD
@@ -1,72 +1,58 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Dominika Liberda <ja@sdomi.pl>
# Maintainer: Sascha Paunovic <azarus@posteo.net>
pkgname=arc-theme
-pkgver=20201013
-_commit=934e3bfc93506581f5be1194bd6084c5b6b64bf5
-pkgrel=1
+pkgver=20220405
+pkgrel=0
pkgdesc="Flat theme with transparent elements"
options="!check" # no test suite
url="https://github.com/jnsh/arc-theme"
arch="noarch"
license="GPL-3.0-or-later"
-depends="gtk-murrine-engine"
-makedepends="automake autoconf glib-dev libtool metacity inkscape optipng sassc"
+makedepends="glib-dev sassc meson"
subpackages="
arc:arc:noarch
- arc-gnome:arc_gnome:noarch
- arc-gtk2:arc_gtk2:noarch
- arc-gtk3:arc_gtk3:noarch
- arc-metacity:arc_metacity:noarch
- arc-openbox:arc_openbox:noarch
- arc-xfwm:arc_xfwm:noarch
- arc-lighter-gnome:lighter_gnome:noarch
- arc-lighter-gtk2:lighter_gtk2:noarch
- arc-lighter-gtk3:lighter_gtk3:noarch
- arc-lighter-metacity:lighter_metacity:noarch
- arc-lighter-xfwm:lighter_xfwm:noarch
- arc-lighter:lighter:noarch
- arc-dark-gnome:dark_gnome:noarch
- arc-dark-gtk2:dark_gtk2:noarch
- arc-dark-gtk3:dark_gtk3:noarch
- arc-dark-metacity:dark_metacity:noarch
- arc-dark-openbox:dark_openbox:noarch
- arc-dark-xfwm:dark_xfwm:noarch
- arc-dark:dark:noarch
- arc-darker-gtk2:darker_gtk2:noarch
- arc-darker-gtk3:darker_gtk3:noarch
- arc-darker-metacity:darker_metacity:noarch
- arc-darker-openbox:darker_openbox:noarch
- arc-darker-xfwm:darker_xfwm:noarch
- arc-darker:darker:noarch
+ arc-cinnamon:arc_cinnamon
+ arc-gnome:arc_gnome
+ arc-gtk2:arc_gtk2
+ arc-gtk3:arc_gtk3
+ arc-gtk4:arc_gtk4
+ arc-metacity:arc_metacity
+ arc-xfwm:arc_xfwm
+ arc-lighter-gtk2:lighter_gtk2
+ arc-lighter-gtk3:lighter_gtk3
+ arc-lighter-gtk4:lighter_gtk4
+ arc-lighter-metacity:lighter_metacity
+ arc-lighter-xfwm:lighter_xfwm
+ arc-lighter:lighter
+ arc-dark-cinnamon:dark_cinnamon
+ arc-dark-gnome:dark_gnome
+ arc-dark-gtk2:dark_gtk2
+ arc-dark-gtk3:dark_gtk3
+ arc-dark-gtk4:dark_gtk4
+ arc-dark-metacity:dark_metacity
+ arc-dark-xfwm:dark_xfwm
+ arc-dark:dark
+ arc-darker-gtk2:darker_gtk2
+ arc-darker-gtk3:darker_gtk3
+ arc-darker-gtk4:darker_gtk4
+ arc-darker-metacity:darker_metacity
+ arc-darker-xfwm:darker_xfwm
+ arc-darker:darker
"
-source="$pkgname-$_commit.tar.gz::https://github.com/jnsh/arc-theme/archive/$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
-
-prepare() {
- default_prepare
- autoreconf -vif
-}
+source="https://github.com/jnsh/arc-theme/releases/download/20220405/arc-theme-$pkgver.tar.xz"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --disable-unity \
- --disable-cinnamon \
- --disable-plank \
- --with-gnome-shell=3.36 \
- --with-gtk3=3.24
- make
+ abuild-meson -Dcinnamon_version=5.2.1 \
+ -Dgnome_shell_version=41.1 \
+ -Dthemes=cinnamon,gnome-shell,gtk2,gtk3,gtk4,metacity,xfwm \
+ . build
+ meson compile -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
arc() {
@@ -75,6 +61,21 @@ arc() {
amove usr/share/themes/Arc/index.theme
}
+arc_cinnamon() {
+ pkgdesc="Cinnamon assets for Arc"
+ depends=""
+ install_if="arc=$pkgver-r$pkgrel cinnamon-desktop"
+ amove usr/share/themes/Arc/cinnamon
+}
+
+arc_gtk4() {
+ pkgdesc="GTK+4.0 assets for Arc"
+ depends=""
+ install_if="arc=$pkgver-r$pkgrel gtk4.0"
+
+ amove usr/share/themes/Arc/gtk-4.0
+}
+
arc_gtk3() {
pkgdesc="GTK+3.0 assets for Arc"
depends=""
@@ -115,13 +116,6 @@ arc_metacity() {
amove usr/share/themes/Arc/metacity-1
}
-arc_openbox() {
- pkgdesc="openbox assets for Arc"
- depends=""
- install_if="arc=$pkgver-r$pkgrel openbox"
-
- amove usr/share/themes/Arc/openbox-3
-}
lighter() {
pkgdesc="Lighter version of Arc"
@@ -129,6 +123,14 @@ lighter() {
amove usr/share/themes/Arc-Lighter/index.theme
}
+lighter_gtk4() {
+ pkgdesc="GTK+4.0 assets for Lighter version of Arc"
+ depends=""
+ install_if="arc-lighter=$pkgver-r$pkgrel gtk4.0"
+
+ amove usr/share/themes/Arc-Lighter/gtk-4.0
+}
+
lighter_gtk3() {
pkgdesc="GTK+3.0 assets for Lighter version of Arc"
depends=""
@@ -175,6 +177,21 @@ dark() {
amove usr/share/themes/Arc-Dark/index.theme
}
+dark_cinnamon() {
+ pkgdesc="Cinnamon assets for Dark version of Arc"
+ depends=""
+ install_if="arc-dark=$pkgver-r$pkgrel cinnamon-desktop"
+ amove usr/share/themes/Arc-Dark/cinnamon
+}
+
+dark_gtk4() {
+ pkgdesc="GTK+4.0 assets for Dark version of Arc"
+ depends=""
+ install_if="arc-dark=$pkgver-r$pkgrel gtk4.0"
+
+ amove usr/share/themes/Arc-Dark/gtk-4.0
+}
+
dark_gtk3() {
pkgdesc="GTK+3.0 assets for Dark version of Arc"
depends=""
@@ -215,20 +232,20 @@ dark_metacity() {
amove usr/share/themes/Arc-Dark/metacity-1
}
-dark_openbox() {
- pkgdesc="openbox assets for Dark version of Arc"
- depends=""
- install_if="arc-dark=$pkgver-r$pkgrel openbox"
-
- amove usr/share/themes/Arc-Dark/openbox-3
-}
-
darker() {
pkgdesc="Darker version of Arc"
depends=""
amove usr/share/themes/Arc-Darker/index.theme
}
+darker_gtk4() {
+ pkgdesc="GTK+4.0 assets for Darker version of Arc"
+ depends=""
+ install_if="arc-darker=$pkgver-r$pkgrel gtk4.0"
+
+ amove usr/share/themes/Arc-Darker/gtk-4.0
+}
+
darker_gtk3() {
pkgdesc="GTK+3.0 assets for Darker version of Arc"
depends=""
@@ -261,12 +278,6 @@ darker_metacity() {
amove usr/share/themes/Arc-Darker/metacity-1
}
-darker_openbox() {
- pkgdesc="openbox assets for Darker version of Arc"
- depends=""
- install_if="arc-darker=$pkgver-r$pkgrel openbox"
-
- amove usr/share/themes/Arc-Darker/openbox-3
-}
-
-sha512sums="4ec39053ccdd1f62cb80da660bf04b60e9aa6ca0ef9937fd0e033dc42196aeb85bb68928da3d92bb71eee302274033bf76fc10e73fc104171b05432758e56bdd arc-theme-934e3bfc93506581f5be1194bd6084c5b6b64bf5.tar.gz"
+sha512sums="
+16655b822548820945c5fd3c0bb809d1e55db887c3b5c5309f4acd82c4dd7dd8255d246d86025231c73a303e647bb61c7f9cdc63a04f813cfb79fadf27dec204 arc-theme-20220405.tar.xz
+"