desktop/oomox: Updated for version 1.5.0.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 85 insertions, 71 deletions

diff --git a/desktop/oomox/README b/desktop/oomox/README
index 017fc5753c5ad..d116f470405c3 100644
--- a/desktop/oomox/README
+++ b/desktop/oomox/README
@@ -3,11 +3,18 @@ variations of a Numix-based and Materia themes (GTK2, GTK3),
 Gnome-Colors and Archdroid icon themes.
 
 Note:
-You may specify alternate versions of the oomox-gtk-theme and/or
-Materia theme by passing OOMOXVER and/or MATERIAVER variables to the
-script, for example
+You may specify alternate versions of any of the plugins by passing the
+corresponding variables to the script
 
-  OOMOXVER=1.2.9  MATERIAVER=20171112  ./oomox.SlackBuild
+ARCHDROIDVER    (for icons_archdroid)
+GNOMECOLORSVER  (for icons_gnomecolors)
+OOMOXIFY_COMMIT (for oomoxify)
+MATERIAVER      (for theme_materia)
+OOMOXVER        (for theme_oomox)
+
+for example
+
+  OOMOXVER=1.6.1  MATERIAVER=20180110  ./oomox.SlackBuild
 
 but you will need to manually place the corresponding tarball(s) in the
 slackbuild directory.
diff --git a/desktop/oomox/doinst.sh b/desktop/oomox/doinst.sh
index 4e8ba7071dea7..4a25de5e6fbd1 100644
--- a/desktop/oomox/doinst.sh
+++ b/desktop/oomox/doinst.sh
@@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/desktop/oomox/oomox.SlackBuild b/desktop/oomox/oomox.SlackBuild
index 1c299bde20f55..53bc493fc7a59 100644
--- a/desktop/oomox/oomox.SlackBuild
+++ b/desktop/oomox/oomox.SlackBuild
@@ -23,14 +23,17 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oomox
-VERSION=${VERSION:-1.4.3}
+VERSION=${VERSION:-1.5.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
-OOMOXVER=${OOMOXVER:-1.2.9}
-MATERIAVER=${MATERIAVER:-20171112}
+ARCHDROIDVER=${ARCHDROIDVER:-1.0.2}
+GNOMECOLORSVER=${GNOMECOLORSVER:-5.5.3}
+OOMOXIFY_COMMIT=${OOMOXIFY_COMMIT:-675fedce9a47745212b062e13a7e51b01f2bb581}
+MATERIAVER=${MATERIAVER:-20180110}
+OOMOXVER=${OOMOXVER:-1.6.1}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -55,15 +58,13 @@ find -L . \
 make -f po.mk install
 
 mkdir -p $PKG/opt/oomox
-cp -a archdroid-icon-theme archdroid.sh colors gnome-colors gnome_colors.sh \
-  gui.sh locale oomox_gui oomoxify.sh po scripts \
+cp -a colors locale oomox_gui plugins po terminal_templates \
+  gui.sh \
   $PKG/opt/oomox
 
-mkdir $PKG/opt/oomox/gtk-theme
-tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/gtk-theme
-( cd $PKG/opt/oomox/gtk-theme
-  rm -fr .editorconfig .github .gitignore .hound.yml .scss-lint.yml .travis.yml \
-    Dockerfile screenshot.png screenshots test
+tar xvf $CWD/oomox-archdroid-icon-theme-$ARCHDROIDVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_archdroid/archdroid-icon-theme
+( cd $PKG/opt/oomox/plugins/icons_archdroid/archdroid-icon-theme
+  rm -fr .git*
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,10 +72,9 @@ tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 -C $PKG/opt
    \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-mkdir $PKG/opt/oomox/materia-theme
-tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/materia-theme
-( cd $PKG/opt/oomox/materia-theme
-  rm -fr .github .gitignore test.sh
+tar xvf $CWD/oomox-gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_gnomecolors/gnome-colors-icon-theme
+( cd $PKG/opt/oomox/plugins/icons_gnomecolors/gnome-colors-icon-theme
+  rm -fr .git*
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,45 +82,53 @@ tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 -C $PKG/opt/o
    \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-mkdir -p $PKG/usr/bin
-
-cat > $PKG/usr/bin/oomox-gui <<EOF
-#!/bin/sh
-cd /opt/oomox
-exec ./gui.sh "\$@"
-EOF
-chmod +x $PKG/usr/bin/oomox-gui
+tar xvf $CWD/oomoxify-$OOMOXIFY_COMMIT.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/oomoxify
+( cd $PKG/opt/oomox/plugins/oomoxify
+  rm -fr .git*
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-cat > $PKG/usr/bin/oomox-cli <<EOF
-#!/bin/sh
-cd /opt/oomox/gtk-theme
-exec ./change_color.sh "\$@"
-EOF
-chmod +x $PKG/usr/bin/oomox-cli
+tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_materia/materia-theme
+( cd $PKG/opt/oomox/plugins/theme_materia/materia-theme
+  rm -fr .git*
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-cat > $PKG/usr/bin/oomox-gnome-colors-icons-cli <<EOF
-#!/bin/sh
-cd /opt/oomox
-exec ./gnome-colors.sh "\$@"
-EOF
-chmod +x $PKG/usr/bin/oomox-gnome-colors-icons-cli
+tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_oomox/gtk-theme
+( cd $PKG/opt/oomox/plugins/theme_oomox/gtk-theme
+  rm -fr .git* .editorconfig .*.yml {D,d}ocker* maintenance* screenshot* test*
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-cat > $PKG/usr/bin/oomox-archdroid-icons-cli <<EOF
-#!/bin/sh
-cd /opt/oomox
-exec ./archdroid.sh "\$@"
-EOF
-chmod +x $PKG/usr/bin/oomox-archdroid-icons-cli
+mkdir -p $PKG/usr/bin
+cp -a packaging/bin/* $PKG/usr/bin
 
-cat > $PKG/usr/bin/oomoxify-cli <<EOF
-#!/bin/sh
-cd /opt/oomox
-exec ./oomoxify.sh "\$@"
-EOF
-chmod +x $PKG/usr/bin/oomoxify-cli
+mkdir -p $PKG/usr/share/appdata
+cp -a packaging/com.github.actionless.oomox.appdata.xml $PKG/usr/share/appdata
 
 mkdir -p $PKG/usr/share/applications
-cat $CWD/oomox.desktop > $PKG/usr/share/applications/oomox.desktop
+cp -a packaging/com.github.actionless.oomox.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/share/icons/hicolor/64x64/apps
+cp -a packaging/com.github.actionless.oomox-64.png $PKG/usr/share/icons/hicolor/64x64/apps/com.github.actionless.oomox.png
+
+mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
+cp -a packaging/com.github.actionless.oomox-128.png $PKG/usr/share/icons/hicolor/128x128/apps/com.github.actionless.oomox.png
+
+mkdir -p $PKG/usr/share/icons/hicolor/666x666/apps
+cp -a packaging/com.github.actionless.oomox-666.png $PKG/usr/share/icons/hicolor/666x666/apps/com.github.actionless.oomox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CREDITS LICENSE README.md \
diff --git a/desktop/oomox/oomox.desktop b/desktop/oomox/oomox.desktop
deleted file mode 100644
index 9688e626c1550..0000000000000
--- a/desktop/oomox/oomox.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Oomox: customize icons and GTK themes
-GenericName=Oomox
-Comment=Graphical application for generating different color variations of Numix theme (GTK2, GTK3), gnome-colors and ArchDroid icon themes
-Exec=oomox-gui
-Terminal=false
-Type=Application
-Icon=preferences-desktop-theme
-Categories=GNOME;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
-Keywords=color;gtk;highlight;theme;widget;numix;
-StartupWMClass=oomox
-X-GNOME-Gettext-Domain=oomox
-X-Desktop-File-Install-Version=0.22
diff --git a/desktop/oomox/oomox.info b/desktop/oomox/oomox.info
index 2d7c6be43bfd8..6f69a4d851c87 100644
--- a/desktop/oomox/oomox.info
+++ b/desktop/oomox/oomox.info
@@ -1,12 +1,18 @@
 PRGNAM="oomox"
-VERSION="1.4.3"
+VERSION="1.5.0.5"
 HOMEPAGE="https://github.com/actionless/oomox"
-DOWNLOAD="https://github.com/actionless/oomox/archive/1.4.3/oomox-1.4.3.tar.gz \
-          https://github.com/actionless/oomox-gtk-theme/archive/1.2.9/oomox-gtk-theme-1.2.9.tar.gz \
-          https://github.com/nana-4/materia-theme/archive/v20171112/materia-theme-20171112.tar.gz"
-MD5SUM="d949862f150b04ac01a7e1a8738e9501 \
-        7ae336350a6f908907d80a528bde7ba4 \
-        43d2f08df2930b9971e2b4bb42911861"
+DOWNLOAD="https://github.com/actionless/oomox/archive/1.5.0.5/oomox-1.5.0.5.tar.gz \
+          https://github.com/actionless/oomox-archdroid-icon-theme/archive/1.0.2/oomox-archdroid-icon-theme-1.0.2.tar.gz \
+          https://github.com/actionless/oomox-gnome-colors-icon-theme/archive/5.5.3/oomox-gnome-colors-icon-theme-5.5.3.tar.gz \
+          https://github.com/actionless/oomoxify/archive/675fedce9a47745212b062e13a7e51b01f2bb581/oomoxify-675fedce9a47745212b062e13a7e51b01f2bb581.tar.gz \
+          https://github.com/nana-4/materia-theme/archive/v20180110/materia-theme-20180110.tar.gz \
+          https://github.com/actionless/oomox-gtk-theme/archive/1.6.1/oomox-gtk-theme-1.6.1.tar.gz"
+MD5SUM="dc098ad18b68d276a91b0c68f6ffc6a6 \
+        48ca9edc0cf2b06bdc353bd5f2c833ba \
+        f3a30f186dc92a972b88975fcbd321ed \
+        f8a91a6406ef6faacfc7f88b89a5ffdf \
+        982ef08f7d5d6229e3b0fcbd1896ebfc \
+        7b86af8b2a5eb1f9b0152ea609060b31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygobject3-python3 sassc"