desktop/oomox: Updated for version 1.7.0.1.

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

4 files changed, 55 insertions, 38 deletions

diff --git a/desktop/oomox/README b/desktop/oomox/README
index d116f47040..fb6d25c237 100644
--- a/desktop/oomox/README
+++ b/desktop/oomox/README
@@ -1,6 +1,7 @@
 Oomox is a graphical application for generating different color
-variations of a Numix-based and Materia themes (GTK2, GTK3),
-Gnome-Colors and Archdroid icon themes.
+variations of a Oomox (Numix-based), Materia and Arc themes (GTK2,
+GTK3, Cinnamon, GNOME, Openbox, Xfwm), Gnome-Colors and Archdroid
+icon themes.
 
 Note:
 You may specify alternate versions of any of the plugins by passing the
@@ -8,13 +9,14 @@ corresponding variables to the script
 
 ARCHDROIDVER    (for icons_archdroid)
 GNOMECOLORSVER  (for icons_gnomecolors)
-OOMOXIFY_COMMIT (for oomoxify)
+OOMOXIFYVER     (for oomoxify)
+ARCVER          (for theme_arc)
 MATERIAVER      (for theme_materia)
 OOMOXVER        (for theme_oomox)
 
 for example
 
-  OOMOXVER=1.6.1  MATERIAVER=20180110  ./oomox.SlackBuild
+  OOMOXVER=1.9.0  MATERIAVER=20180519  ./oomox.SlackBuild
 
 but you will need to manually place the corresponding tarball(s) in the
 slackbuild directory.
diff --git a/desktop/oomox/oomox.SlackBuild b/desktop/oomox/oomox.SlackBuild
index e206205243..e6f47a6c34 100644
--- a/desktop/oomox/oomox.SlackBuild
+++ b/desktop/oomox/oomox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oomox
 
-# Copyright 2017 Leonardo Citrolo, Italy
+# Copyright 2017-2018 Leonardo Citrolo, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,17 +23,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oomox
-VERSION=${VERSION:-1.5.0.5}
+VERSION=${VERSION:-1.7.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
+ARCVER=${ARCVER:-20170302}
 ARCHDROIDVER=${ARCHDROIDVER:-1.0.2}
 GNOMECOLORSVER=${GNOMECOLORSVER:-5.5.3}
-OOMOXIFY_COMMIT=${OOMOXIFY_COMMIT:-675fedce9a47745212b062e13a7e51b01f2bb581}
-MATERIAVER=${MATERIAVER:-20180110}
-OOMOXVER=${OOMOXVER:-1.6.1}
+MATERIAVER=${MATERIAVER:-20180519}
+OOMOXVER=${OOMOXVER:-1.9.0}
+OOMOXIFYVER=${OOMOXIFYVER:-1.0}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -56,14 +57,15 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make -f po.mk install
+rm -f po/*.po~
 
 mkdir -p $PKG/opt/oomox
 cp -a colors locale oomox_gui plugins po terminal_templates \
   gui.sh \
   $PKG/opt/oomox
 
-tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz
-( cd $PKG/opt/oomox/plugins/icons_archdroid/archdroid-icon-theme
+tar xvf $CWD/arc-theme-$ARCVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_arc/arc-theme
+( cd $PKG/opt/oomox/plugins/theme_arc/arc-theme
   rm -fr .git*
   chown -R root:root .
   find -L . \
@@ -72,8 +74,8 @@ tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz
    \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz
-( cd $PKG/opt/oomox/plugins/icons_gnomecolors/gnome-colors-icon-theme
+tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_archdroid
+( cd $PKG/opt/oomox/plugins/icons_archdroid
   rm -fr .git*
   chown -R root:root .
   find -L . \
@@ -82,7 +84,19 @@ tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz
    \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
 
-tar xvf $CWD/oomoxify-$OOMOXIFY_COMMIT.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/oomoxify
+tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_gnomecolors
+( cd $PKG/opt/oomox/plugins/icons_gnomecolors
+  rm -fr gnome-colors-icon-theme
+  mv gnome-colors 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 \
+    -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 {} \; )
+
+tar xvf $CWD/oomoxify-$OOMOXIFYVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/oomoxify
 ( cd $PKG/opt/oomox/plugins/oomoxify
   rm -fr .git*
   chown -R root:root .
@@ -116,19 +130,18 @@ mkdir -p $PKG/usr/bin
 cp -a packaging/bin/* $PKG/usr/bin
 
 mkdir -p $PKG/usr/share/appdata
-cp -a packaging/com.github.actionless.oomox.appdata.xml $PKG/usr/share/appdata
+cp -a packaging/com.github.themix_project.Oomox.appdata.xml $PKG/usr/share/appdata
 
 mkdir -p $PKG/usr/share/applications
-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
+cp -a packaging/com.github.themix_project.Oomox.desktop $PKG/usr/share/applications
 
-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/symbolic/apps
+cp -a packaging/com.github.themix_project.Oomox-symbolic.svg $PKG/usr/share/icons/hicolor/symbolic/apps/com.github.themix_project.Oomox-symbolic.svg
 
-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
+for SIZE in 16 24 32 48 512; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+  cp -a packaging/com.github.themix_project.Oomox-$SIZE.png $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/com.github.themix_project.Oomox.png
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CREDITS LICENSE README.md \
diff --git a/desktop/oomox/oomox.info b/desktop/oomox/oomox.info
index 2e6711cc96..cbaf575a19 100644
--- a/desktop/oomox/oomox.info
+++ b/desktop/oomox/oomox.info
@@ -1,20 +1,22 @@
 PRGNAM="oomox"
-VERSION="1.5.0.5"
-HOMEPAGE="https://github.com/actionless/oomox"
-DOWNLOAD="https://github.com/actionless/oomox/archive/1.5.0.5/oomox-1.5.0.5.tar.gz \
+VERSION="1.7.0.1"
+HOMEPAGE="https://github.com/themix-project/oomox"
+DOWNLOAD="https://github.com/themix-project/oomox/archive/1.7.0.1/oomox-1.7.0.1.tar.gz \
+          https://github.com/horst3180/arc-theme/archive/20170302/arc-theme-20170302.tar.gz \
           https://github.com/themix-project/archdroid-icon-theme/archive/1.0.2/archdroid-icon-theme-1.0.2.tar.gz \
           https://github.com/themix-project/gnome-colors-icon-theme/archive/5.5.3/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 \
+          https://github.com/nana-4/materia-theme/archive/v20180519/materia-theme-20180519.tar.gz \
+          https://github.com/themix-project/oomox-gtk-theme/archive/1.9.0/oomox-gtk-theme-1.9.0.tar.gz \
+          https://github.com/themix-project/oomoxify/archive/1.0/oomoxify-1.0.tar.gz"
+MD5SUM="cac9a25ed295cfaadb81be0f7c174ea6 \
+        fe3e397ffc3633c1b5ba3b1d6e2456a7 \
         cb669130685dcbf03a8f7f5738c71dc6 \
         ae3250f1dce9505dbaa60d92dcb9a239 \
-        f8a91a6406ef6faacfc7f88b89a5ffdf \
-        982ef08f7d5d6229e3b0fcbd1896ebfc \
-        7b86af8b2a5eb1f9b0152ea609060b31"
+        354428d8d720437ccaacd36fc69af14c \
+        0769a6c072d8ad7661a16b67a6bcdd48 \
+        df970e658de7668a7088bd445e4634fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pygobject3-python3 sassc"
+REQUIRES="pygobject3-python3 python3-pillow sassc"
 MAINTAINER="Leo C."
 EMAIL="leoc@gmx.com"
diff --git a/desktop/oomox/slack-desc b/desktop/oomox/slack-desc
index 3f7deec8f9..e05c63d671 100644
--- a/desktop/oomox/slack-desc
+++ b/desktop/oomox/slack-desc
@@ -9,11 +9,11 @@
 oomox: oomox (gtk theme designer)
 oomox:
 oomox: Oomox is a graphical application for generating different color
-oomox: variations of a Numix-based and Flat-Plat themes (GTK2, GTK3),
-oomox: Gnome-Colors and Archdroid icon themes.
-oomox:
-oomox: Homepage: https://github.com/actionless/oomox
+oomox: variations of a Oomox (Numix-based), Materia and Arc themes (GTK2,
+oomox: GTK3, Cinnamon, GNOME, Openbox, Xfwm), Gnome-Colors and Archdroid
+oomox: icon themes.
 oomox:
+oomox: Homepage: https://github.com/themix-project/oomox
 oomox:
 oomox:
 oomox: