3 files changed, 38 insertions, 16 deletions
diff --git a/desktop/murrine-themes/README b/desktop/murrine-themes/README
index f4e3a0769c811..5401fb9edc5d8 100644
--- a/desktop/murrine-themes/README
+++ b/desktop/murrine-themes/README
@@ -2,4 +2,5 @@ This is a collection of Murrine family themes for GTK2, GTK3 and XFWM.
 Also, there are a few themes for metacity and openbox window managers
 that can be used if you have these installed.
 
-This includes also the default Murrina XFWM theme from xfce-look.org
+This includes also the default Murrina XFWM theme from xfce-look.org and
+several themes from ROSA Linux.
diff --git a/desktop/murrine-themes/murrine-themes.SlackBuild b/desktop/murrine-themes/murrine-themes.SlackBuild
index d34760af026fc..19fc6b73dc240 100644
--- a/desktop/murrine-themes/murrine-themes.SlackBuild
+++ b/desktop/murrine-themes/murrine-themes.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for murrine-themes
 
-# Copyright 2011-2016  Petar Petrov slackalaxy@gmail.com
+# Copyright 2011-2018  Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Many thanks to Debian for bundling all these themes together!
+# Many thanks to Debian and ROSA Linux for bundling these themes together!
+# Note about the version. The script combines the themes in Debian (version
+# 0.98.11) with the themes from ROSA Linux (version 2.0), therefore we pack:
+# 0.98.11 + 2.0 = 2.98.11. We also include the default Xfwm Murrina theme:
+# http://xfce-look.org/content/show.php/Murrine++Xfwm+Theme?content=43083
 
 PRGNAM=murrine-themes
-VERSION=${VERSION:-0.98.11}
+ORIGINAL=Murrine # Default theme for XFWM
+VERSION=${VERSION:-2.98.11} # Version of our package
+DEBIVER=${DEBIVER:-0.98.11} # Version of Debian's package
+ROSAVER=${ROSAVER:-2.0} # Version of ROSA's package
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
-ORIGINAL=Murrine # Default theme for XFWM
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -42,9 +48,26 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.xz
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+# Debian's themes.
+tar xvf $CWD/${PRGNAM}_${DEBIVER}.tar.xz
+
+# Default Xfwm theme. Let's extract it together with Debian's themes.
 tar xvf $CWD/${ORIGINAL}Xfwm.tar.bz2 -C $PRGNAM/usr/share/themes
+
+# Several extra themes from ROSA. Place them with the rest.
+rpm2cpio $CWD/$PRGNAM-$ROSAVER-9.src.rpm | cpio -imdv
+lzma -cd Murreza.tar.lzma | tar xvf -
+lzma -cd MurrinaOransun.tar.lzma | tar xvf -
+lzma -cd MurrinaTango.tar.lzma | tar xvf -
+
+cp -a \
+ Murreza/* MurrinaOransun MurrinaTango \
+$PRGNAM/usr/share/themes
+
 cd $PRGNAM
 chown -R root:root .
 # Zap Debian's executable .png and .xpm files :)
@@ -52,15 +75,11 @@ find -L . \
  -type d -exec chmod 755 {} \; -o \
  -type f -exec chmod 644 {} \;
 
-cd $TMP/$PRGNAM/usr/share/themes
-# Copy everything, including the original XFCE Murrina theme from here:
-# http://xfce-look.org/content/show.php/Murrine++Xfwm+Theme?content=43083
 mkdir -p $PKG/usr/share/themes
-cp -a * $PKG/usr/share/themes
+cp -a usr/share/themes/* $PKG/usr/share/themes
 
-cd $TMP/$PRGNAM/debian
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a changelog copyright README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a debian/{changelog,copyright,README} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/murrine-themes/murrine-themes.info b/desktop/murrine-themes/murrine-themes.info
index 8ae94ba3f5934..107bbfd2cc2ef 100644
--- a/desktop/murrine-themes/murrine-themes.info
+++ b/desktop/murrine-themes/murrine-themes.info
@@ -1,10 +1,12 @@
 PRGNAM="murrine-themes"
-VERSION="0.98.11"
+VERSION="2.98.11"
 HOMEPAGE="https://launchpad.net/murrine-themes"
 DOWNLOAD="http://sourceforge.net/projects/sboppetrov/files/murrine-themes/murrine-themes_0.98.11.tar.xz \
-	http://sourceforge.net/projects/sboppetrov/files/murrine-themes/MurrineXfwm.tar.bz2"
+        http://sourceforge.net/projects/sboppetrov/files/murrine-themes/MurrineXfwm.tar.bz2 \
+        http://sourceforge.net/projects/sboppetrov/files/murrine-themes/murrine-themes-2.0-9.src.rpm"
 MD5SUM="de785a60d018fcfadc6eb0b258c6f788 \
-	faf23fcc477239c7e6f1cd627b27fd72"
+        faf23fcc477239c7e6f1cd627b27fd72 \
+        b37b54c8d2240ae9ee441fb418c6dc2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="murrine"