PKGBUILD

@@ -0,0 +1,40 @@
+# Maintainer: Omnikron13 <joey.sabey@gmx.com>
+# Contributor: zach <zach {at} zach-adams {dot} com>
+# Contributor: Gordian Edenhofer <gordian.edenhofer[at]yahoo[dot]de
+
+pkgname=gtk-theme-solarc-git
+_pkgname=solarc-theme
+_pkgauthor=schemar
+_cinnamonversion=4.6.6
+_gnomeversion=3.36
+pkgver=848.ee3ca40
+pkgrel=1
+pkgdesc="A flat theme with transparent elements. Based on the Arc theme: https://github.com/jnsh/arc-theme"
+arch=('any')
+url="https://github.com/${_pkgauthor}/${_pkgname}"
+license=('GPL3')
+depends=('gtk3' 'gtk-engine-murrine')
+makedepends=('git' 'wget' 'inkscape' 'sassc' 'optipng')
+source=("${_pkgname}::git+https://github.com/${_pkgauthor}/${_pkgname}.git")
+sha256sums=('SKIP')
+conflicts=('gtk-theme-solarc')
+provides=('gtk-theme-solarc')
+
+pkgver() {
+    cd "${srcdir}/${_pkgname}"
+    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "${srcdir}/${_pkgname}"
+    ./solarize.sh
+    export _arcdir=$(ls | grep "arc-theme-" | tail -1)
+    cd "${_arcdir}"
+    ./autogen.sh --prefix=/usr --with-gnome-shell=${_gnomeversion} --with-cinnamon=${_cinnamonversion}
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}/${_arcdir}"
+    make DESTDIR="${pkgdir}" install
+}

README.md

@@ -1,24 +1,24 @@
 # SolArc Theme
 SolArc is a flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Pantheon, Xfce, MATE, Cinnamon (>=3.4), Budgie Desktop (10.4 for GTK+3.22) etc.
 
-SolArc is a fork of the Arc theme: https://github.com/NicoHood/arc-theme
+SolArc is a fork of the Arc theme: https://github.com/jnsh/arc-theme
 
 Colours are based on the Solarized colour scheme by [Ethan Schoonover](https://github.com/altercation): https://github.com/altercation/solarized
 
-Most of the work is done inside [solarize.sh](https://github.com/apheleia/solarc-theme/blob/master/solarize.sh), which replaces various Arc colours with matching Solarized colours.
+Most of the work is done inside [solarize.sh](https://github.com/schemar/solarc-theme/blob/master/solarize.sh), which replaces various Arc colours with matching Solarized colours.
 
 ## ⚠️ Help Wanted
 If you like SolArc and want to help improve it, please get in touch! I don't have the time anymore to maintain this properly.
 
 ## SolArc is available in three variants
 ### SolArc
-![A screenshot of the Arc theme](https://github.com/apheleia/solarc-theme/blob/master/images/preview-light.png?raw=true)
+![A screenshot of the Arc theme](https://github.com/schemar/solarc-theme/blob/master/screenshots/preview-light.png?raw=true)
 
 ### SolArc-Darker
-![A screenshot of the Arc-Darker theme](https://github.com/apheleia/solarc-theme/blob/master/images/preview-darker.png?raw=true)
+![A screenshot of the Arc-Darker theme](https://github.com/schemar/solarc-theme/blob/master/screenshots/preview-darker.png?raw=true)
 
 ### SolArc-Dark
-![A screenshot of the Arc-Dark theme](https://github.com/apheleia/solarc-theme/blob/master/images/preview-dark.png?raw=true)
+![A screenshot of the Arc-Dark theme](https://github.com/schemar/solarc-theme/blob/master/screenshots/preview-dark.png?raw=true)
 
 ## Installation
 ### Arch Linux
@@ -63,7 +63,7 @@ Install the theme with the following commands
 
 If you want to install the latest version from git, clone the repository with
 
-    git clone https://github.com/apheleia/solarc-theme --depth 1 && cd solarc-theme
+    git clone https://github.com/schemar/solarc-theme --depth 1 && cd solarc-theme
 
 **2. Download & patch the Arc theme source**
 
@@ -124,11 +124,11 @@ If you get artifacts like black or invisible backgrounds under Unity, disable ov
     gsettings set com.canonical.desktop.interface scrollbar-mode normal
 
 ## Bug reporting
-If you find a bug, please report it at https://github.com/apheleia/solarc-theme/issues
+If you find a bug, please report it at https://github.com/schemar/solarc-theme/issues
 
 ## License
 SolArc is available under the terms of the GPL-3.0. See `COPYING` for details.
 
 ## Full Preview
-![A full screenshot of the SolArc theme](https://github.com/apheleia/solarc-theme/blob/master/images/preview-complete.png?raw=true)
+![A full screenshot of the SolArc theme](https://github.com/schemar/solarc-theme/blob/master/screenshots/preview-complete.png?raw=true)
 <sub>Screenshot Details: Icons: [Arc Icon Theme](https://github.com/horst3180/arc-icon-theme) | Wallpaper: [Jason Levesque](http://stuntkid.com/) | Font: [DejaVu Sans](http://dejavu-fonts.org/wiki/Main_Page)</sub>

solarize.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 # Github release to base from
-ARCVERSION="20190330"
+if [ -z $ARCVERSION ]; then
+    ARCVERSION="20210127"
+fi
 
 # Arc colors
 ## SCSS
@@ -85,6 +87,11 @@ A_GTK2_LIGHT_FRAME_BORDER="dfdfdf"
 A_OPENBOX_MENU_ITEM_BG="454a54"
 A_OPENBOX_MENU_ITEM_FG="a8adb5"
 A_OPENBOX_MENU_TITLE_BG="2d3036"
+## Plank
+A_PLANK_FILL_START="53;;57;;69;;242"
+A_PLANK_FILL_END="53;;57;;69;;242"
+A_PLANK_OUTER_STROKE="22;;26;;38;;255"
+A_PLANK_INNER_STROKE="53;;57;;69;;0"
 
 # Solarized colors
 ## Common
@@ -183,24 +190,27 @@ REPLACE[$A_GTK2_LIGHT_SLIDER_STROKE]="908f89"
 REPLACE[$A_GTK2_LIGHT_TAB_BORDER]="e1d6b4"
 REPLACE[$A_GTK2_LIGHT_MENUBAR_STROKE]="e1d6b4"
 REPLACE[$A_GTK2_LIGHT_FRAME_BORDER]="e1d6b4"
+# Plank tweaks
+REPLACE[$A_PLANK_FILL_START]="7;;54;;66;;255"
+REPLACE[$A_PLANK_FILL_END]="7;;54;;66;;255"
+REPLACE[$A_PLANK_OUTER_STROKE]="5;;18;;29;;255"
+REPLACE[$A_PLANK_INNER_STROKE]="0;;43;;54;;0"
 
 # Pull the Arc source
 echo "### Downloading Arc source"
-wget --quiet "https://github.com/NicoHood/arc-theme/releases/download/${ARCVERSION}/arc-theme-${ARCVERSION}.tar.xz"
+wget --quiet "https://github.com/jnsh/arc-theme/releases/download/${ARCVERSION}/arc-theme-${ARCVERSION}.tar.xz"
 tar -xJf "arc-theme-${ARCVERSION}.tar.xz"
 rm "arc-theme-${ARCVERSION}.tar.xz"
 
 CWD="`pwd`/arc-theme-${ARCVERSION}"
 cd "${CWD}"
 
 echo "### Applying patch(es)"
-patch -p1 < ../gtk2_png_assets.patch
-patch -p1 < ../gtk2_dark_colour.patch
 
 echo "### Optimising SVGs"
 find . -name "*.svg" -exec inkscape {} --vacuum-defs --export-plain-svg={} \;
 
-FILETYPES=('.scss' '.svg' '.xpm' '.xml' 'rc')
+FILETYPES=('.scss' '.svg' '.xpm' '.xml' 'rc' '.theme')
 
 echo "### Replacing arc colors with solarized colors"
 for filetype in "${FILETYPES[@]}"
@@ -217,6 +227,10 @@ for PATTERN in "index.theme*" "metacity-theme-*.xml"; do
     find "${CWD}/common" -name "${PATTERN}" -exec sed -i "s/Arc/SolArc/g" {} \;
 done
 sed -i "s/Arc/SolArc/g" configure.ac;
+for FILE in meson.build meson_options.txt; do
+    sed -i "s/Arc/SolArc/g" $FILE;
+    sed -i "s/arc-theme/solarc-theme/g" $FILE;
+done
 
 echo "### Patching complete! You may now run autogen.sh & make in arc-theme-${ARCVERSION} as you wish"