summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2017-06-12 21:00:19 -0700
committerDonald Carr2017-06-12 21:00:19 -0700
commit1d726f5b3145a252faa9cff26a05afcdde3520b2 (patch)
tree6ac1b60737cd5abf57ccd3b652f7b5d70f0bc3ee
parenta3b8f516c6c249d0adb75eb736f36bc9cb51ecf2 (diff)
downloadaur-1d726f5b3145a252faa9cff26a05afcdde3520b2.tar.gz
Clean up quint packaging
Change-Id: I4c5162645ab043579314f4eb985f066e7602837c
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD24
-rw-r--r--quint@.service (renamed from pi-launcher@.service)6
3 files changed, 24 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e649bf6f77b..c74daa4aaae3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
# Generated by mksrcinfo v8
-# Fri Aug 12 01:20:55 UTC 2016
+# Tue Jun 13 04:00:05 UTC 2017
pkgbase = quint
pkgdesc = Live coding demo for the Raspberry Pi
pkgver = 0.0.1
- pkgrel = 3
+ pkgrel = 1
url = https://github.com/sirspudd/quint
arch = any
- makedepends = qt-sdk-raspberry-pi2
- depends = qt-sdk-raspberry-pi2-target-libs
- provides = pi-launcher
+ makedepends = qt-sdk-raspberry-pi
+ depends = qt-sdk-raspberry-pi-target-libs
options = !strip
source = git://github.com/sirspudd/quint.git
sha256sums = SKIP
pkgname = quint
+
diff --git a/PKGBUILD b/PKGBUILD
index 6f17e2c4dcc4..a279f96d31a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,35 @@
# Maintainer: Donald Carr <sirspudd@gmail.com>
-set -e
+#set -e
+
+_qmake="qmake"
+_piver=""
+
+if [[ -z $_piver ]] && [[ -n $LOCAL_PI_VER ]]; then
+ _piver=$LOCAL_PI_VER
+fi
+
+if [[ -n "$_piver" ]]; then
+ _qmake="/opt/qt-sdk-raspberry-pi${_piver}/bin/qmake"
+fi
-_pi_ver=2
pkgname="quint"
pkgver=0.0.1
-pkgrel=3
-provides=("pi-launcher")
+pkgrel=1
pkgdesc="Live coding demo for the Raspberry Pi"
arch=("any")
url="https://github.com/sirspudd/quint"
-makedepends=("qt-sdk-raspberry-pi${_pi_ver}")
-depends=("qt-sdk-raspberry-pi${_pi_ver}-target-libs")
+makedepends=("qt-sdk-raspberry-pi${_piver}")
+depends=("qt-sdk-raspberry-pi-target-libs")
source=("git://github.com/sirspudd/${pkgname}.git")
sha256sums=("SKIP")
options=('!strip')
build() {
local repo_src=${srcdir}/${pkgname}
- local qmake=/opt/qt-sdk-raspberry-pi${_pi_ver}/bin/qmake
cd ${repo_src}
- $qmake
+ $_qmake
make
}
diff --git a/pi-launcher@.service b/quint@.service
index 319383f34e6e..3375d2bf355e 100644
--- a/pi-launcher@.service
+++ b/quint@.service
@@ -2,8 +2,7 @@
[Unit]
Description=quint session for user %i
-After=x@vt7.service systemd-user-sessions.service
-Wants=x@vt7.service
+After=systemd-user-sessions.service
Conflicts=getty@tty7.service
[Service]
@@ -11,7 +10,8 @@ User=%i
WorkingDirectory=~
TTYPath=/dev/tty7
PAMName=login
-ExecStart=/opt/quint/quint
+ExecStart=/opt/quint/quint -platform eglfs
[Install]
WantedBy=graphical.target
+Alias=display-manager.service