2 files changed, 16 insertions, 34 deletions
diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild
index c0f84d78c6..d869010bf8 100644
--- a/desktop/lumina/lumina.SlackBuild
+++ b/desktop/lumina/lumina.SlackBuild
@@ -25,8 +25,8 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=lumina
-VERSION=${VERSION:-0.7.2}
-SRCVERSION=${SRCVERSION:-f4fa5f2ea50cc47bfd276ba4b4d70aa2c0646ec5}
+VERSION=${VERSION:-0.8.4}
+SRCVERSION=${SRCVERSION:-P1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,13 +62,13 @@ set -eu
 rm -rf $PKG
 mkdir -pv $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-if [ -e $CWD/$SRCVERSION.tar.gz ]; then
-  tar xvf $CWD/$SRCVERSION.tar.gz
+rm -rf $PRGNAM-$VERSION-Release-$SRCVERSION
+if [ -e $CWD/v$VERSION-Release-$SRCVERSION.tar.gz ]; then
+  tar xvf $CWD/v$VERSION-Release-$SRCVERSION.tar.gz
 else
-  tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
+  tar xvf $CWD/$PRGNAM-$VERSION-Release-$SRCVERSION.tar.gz
 fi
-cd $PRGNAM-$SRCVERSION
+cd $PRGNAM-$VERSION-Release-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,36 +76,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-## capitilization matters ;-)
-sed -i 's@#include\ <Phonon@#include\ <phonon@g' lumina-desktop/LSession.cpp
-sed -i 's@#include\ <Phonon@#include\ <phonon@g' lumina-desktop/LSession.h
-sed -i 's@#include\ <Phonon@#include\ <phonon@g' lumina-fm/MainUI.h
-sed -i 's@#include\ <Phonon@#include\ <phonon@g' lumina-fm/BackgroundWorker.cpp
-
-## fix lrelease variable
-find $PWD/ -name '*.pro' -exec sed -i 's/lrelease-qt4/lrelease/g' "{}" \;
-
-qmake \
+qmake-qt5 \
   PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+  LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \
   QMAKE_CFLAGS="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS="$SLKCFLAGS"
-
-make -j1 \
-  OPTS="$SLKCFLAGS" \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  PREFIX=/usr
+  QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5
 
+make
 make install \
   INSTALL_ROOT=$PKG \
   DESTDIR=$PKG
 
-if [ $LIBDIRSUFFIX = "64" ]; then
-  mkdir -pv $PKG/usr/lib${LIBDIRSUFFIX}
-  mv -v $PKG/usr/lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
-  rm -rf $PKG/usr/lib
-fi
-
 mkdir -p $PKG/etc/X11/xinit
 install -m 0755 $CWD/xinitrc.lumina $PKG/etc/X11/xinit/xinitrc.lumina
 
diff --git a/desktop/lumina/lumina.info b/desktop/lumina/lumina.info
index 49d38b3056..a9c04eba6e 100644
--- a/desktop/lumina/lumina.info
+++ b/desktop/lumina/lumina.info
@@ -1,10 +1,10 @@
 PRGNAM="lumina"
-VERSION="0.7.2"
+VERSION="0.8.4-P1"
 HOMEPAGE="http://wiki.pcbsd.org/index.php/Lumina/10.1"
-DOWNLOAD="https://github.com/pcbsd/lumina/archive/f4fa5f2ea50cc47bfd276ba4b4d70aa2c0646ec5.tar.gz"
-MD5SUM="5a888b19a0a9a5e521cad9e137979993"
+DOWNLOAD="https://github.com/pcbsd/lumina/archive/v0.8.4-Release-P1.tar.gz"
+MD5SUM="7f6fe869e99ee0816bcea12c0da92acd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"