revision

2 files changed, 24 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e85d9eb2d6af..079529cb23a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = lumina-desktop-git
 	pkgdesc = A Lightweight QT5 Desktop for FreeBSD -- git version
-	pkgver = v1.4.0.r410.g3c8c8f7f
+	pkgver = 1.6.0.r102.ge38d5fe4
 	pkgrel = 1
-	url = https://github.com/pcbsd/lumina
+	url = https://lumina-desktop.org/
 	arch = x86_64
 	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = BSD
 	makedepends = git
-	makedepends = qt5-base
 	makedepends = qt5-tools
 	makedepends = qt5-svg
 	depends = poppler-qt5
 	depends = qt5-x11extras
 	depends = qt5-multimedia
-	depends = libmupdf
 	optdepends = xorg-xbacklight: required for changing screen brightness
 	optdepends = alsa-utils: required for adjusting audio volume
 	optdepends = acpi: required for monitoring battery life
@@ -23,13 +25,10 @@ pkgbase = lumina-desktop-git
 	optdepends = network-manager-applet: Manage network connections from panel
 	optdepends = xterm: Terminal emulator
 	optdepends = fluxbox: window manager for Lumina DE
-	provides = lumina
-	provides = insight-fm
+	provides = lumina-desktop
 	conflicts = lumina-desktop
-	conflicts = lumina-de-git
 	conflicts = insight-fm
-	source = git+https://github.com/trueos/lumina.git
+	source = git+https://github.com/lumina-desktop/lumina
 	md5sums = SKIP
 
 pkgname = lumina-desktop-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5fe4bf0d5e59..448c73940686 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: Chad "crossroads1112" Sharp <crossroads1112@riseup.net>
 # Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+
 pkgname=lumina-desktop-git
-pkgver=v1.4.0.r410.g3c8c8f7f
+pkgver=1.6.0.r102.ge38d5fe4
 pkgrel=1
 pkgdesc="A Lightweight QT5 Desktop for FreeBSD -- git version"
-arch=('x86_64' 'i686')
-url="https://github.com/pcbsd/lumina"
-license=('BSD')
-depends=('poppler-qt5' 'qt5-x11extras' 'qt5-multimedia' 'libmupdf')
+arch=(x86_64 i686 arm armv6h armv7h aarch64)
+url="https://lumina-desktop.org/"
+license=(BSD)
+depends=(poppler-qt5 qt5-x11extras qt5-multimedia)
 optdepends=('xorg-xbacklight: required for changing screen brightness'
             'alsa-utils: required for adjusting audio volume'
             'acpi: required for monitoring battery life'
@@ -18,30 +20,26 @@ optdepends=('xorg-xbacklight: required for changing screen brightness'
             'network-manager-applet: Manage network connections from panel'
             'xterm: Terminal emulator'
             'fluxbox: window manager for Lumina DE')
-provides=("${pkgname%-*}" "insight-fm")
-makedepends=('git' 'qt5-base' 'qt5-tools' 'qt5-svg')
-conflicts=("${pkgname%-*}" "lumina-de-git" "insight-fm")
-provides=("${pkgname%-*-*}" "insight-fm")
-source=(git+https://github.com/trueos/lumina.git)
+makedepends=(git qt5-tools qt5-svg)
+conflicts=(lumina-desktop insight-fm)
+provides=(lumina-desktop)
+source=("git+https://github.com/lumina-desktop/lumina")
 md5sums=(SKIP)
 
 pkgver() {
   cd "$srcdir/lumina"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build(){
-    cd "$srcdir/lumina/"
-    find $srcdir/lumina -name *.desktop -exec sed -i 's/usr\/local/usr/' {} \;
+  cd "$srcdir/lumina"
+    find "$srcdir/lumina" -name *.desktop -exec sed -i 's/usr\/local/usr/' {} \;
     qmake QMAKE_CFLAGS_ISYSTEM= PREFIX="/usr" LIBPREFIX=/usr/lib QT5LIBDIR=/usr/lib/qt CONFIG+=WITH_I18N L_MANDIR=/usr/share/man L_ETCDIR="/etc"
     make
 }
 
 package() {
-    cd "$srcdir/lumina"
+  cd "$srcdir/lumina"
     make INSTALL_ROOT="${pkgdir}" install
     install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-
-