summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorModelmat2019-04-22 18:24:56 +1000
committerModelmat2019-04-22 18:24:56 +1000
commite1fefa79dc5f23840a6236f90de83e71e8e6343e (patch)
treef030cbcb3452d9abb12a033aae8b2e4eebff1971
parent5413e4414d3ae2e8d91044ce88ab027f858e258d (diff)
downloadaur-e1fefa79dc5f23840a6236f90de83e71e8e6343e.tar.gz
Fix building; build from compiled deb
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD73
-rw-r--r--ao.desktop10
-rw-r--r--ao.sh3
4 files changed, 61 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4466da5a6b1..9f31954ca85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
pkgbase = ao-git
- pkgdesc = An Electron wrapper for Microsoft Todo
- pkgver = v5.2.0.r2.g94eac0c
+ pkgdesc = An Electron wrapper for Microsoft To-Do
+ pkgver = 6.8.0.r6.gf3fe9b0
pkgrel = 1
- url = https://klauscfhq.github.io/ao/
+ url = https://github.com/klaussinani/ao
arch = x86_64
license = MIT
- makedepends = nodejs
+ makedepends = npm
makedepends = electron
makedepends = git
- depends = nodejs
- source = git+https://github.com/klauscfhq/ao.git
- source = ao.desktop
- source = ao.sh
- sha256sums = SKIP
- sha256sums = f0704b8b0a39cabacdc8a9294855f41923f9cd29d5607ceafb189dd7f6522c4b
- sha256sums = e36cb7ed66e0c1f4f45be133d5b63ddad37687a8f5ae25889b88dc69ad4183be
+ depends = gconf
+ depends = libnotify
+ depends = libappindicator
+ depends = libxtst
+ depends = nss
+ depends = libxss
+ provides = ao-git
+ conflicts = ao
+ source = git+https://github.com/klaussinani/ao.git
+ md5sums = SKIP
pkgname = ao-git
diff --git a/PKGBUILD b/PKGBUILD
index 7410bd52ed4..f7e42c0fab0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,60 @@
-# Maintainer: Paul Oppenheimer <redg3ar@airmail.cc>
+# Maintainer: Modelmat <modelmat@outlook.com.au>
+# Contributor: Paul Oppenheimer <redg3ar@airmail.cc>
+# Contributor: David Naramski <david.naramski@gmail.com>
pkgname=ao-git
-_pkgname=ao
-pkgver=v5.2.0.r2.g94eac0c
+_pkgname=${pkgname%%-git}
+pkgver=6.8.0.r6.gf3fe9b0
+_pkgver=6.8.0
pkgrel=1
-pkgdesc="An Electron wrapper for Microsoft Todo"
+pkgdesc="An Electron wrapper for Microsoft To-Do"
arch=('x86_64')
-url="https://klauscfhq.github.io/ao/"
+url="https://github.com/klaussinani/ao"
license=('MIT')
-groups=()
-depends=('nodejs')
-makedepends=('nodejs' 'electron' 'git')
-install=
-changelog=
-source=(
- git+https://github.com/klauscfhq/$_pkgname.git
- $_pkgname.desktop
- $_pkgname.sh
-)
-sha256sums=('SKIP'
- 'f0704b8b0a39cabacdc8a9294855f41923f9cd29d5607ceafb189dd7f6522c4b'
- 'e36cb7ed66e0c1f4f45be133d5b63ddad37687a8f5ae25889b88dc69ad4183be')
+depends=('gconf' 'libnotify' 'libappindicator' 'libxtst' 'nss' 'libxss')
+makedepends=('npm' 'electron' 'git')
+provides=('ao-git')
+conflicts=('ao')
+source=(git+$url.git)
+md5sums=('SKIP')
pkgver() {
- cd "$_pkgname"
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ cd $_pkgname
+ git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
+
+_pkgver() {
+ cd $_pkgname
+ echo ${git describe --abbrev=0:1}
+}
+
build() {
cd ao
npm install
- npm run pack
+ npx electron-builder --linux deb
}
+
package() {
- install -D "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
- install -D "${srcdir}/ao/static/Icon.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png"
- install -d "${pkgdir}/usr/share/${_pkgname}"
- cp -r --preserve=mode $srcdir/ao/dist/linux-unpacked/* "${pkgdir}/usr/share/${_pkgname}/"
- install -Dm=0755 "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+ bsdtar -xf "${srcdir}/ao/dist/${_pkgname}_${_pkgver}_amd64.deb" \
+ -C "${srcdir}" --include data.tar.xz
+ tar xfJ ${srcdir}/data.tar.xz -C ${pkgdir}
+ install -d ${pkgdir}/usr/bin/
+ ln -s /opt/Ao/ao-app ${pkgdir}/usr/bin/ao
}
+
+# package() {
+
+# }
+
+#
+# build() {
+# cd ao
+# npm install
+# npm run pack
+# }
+# package() {
+# install -D "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+# install -D "${srcdir}/ao/static/Icon.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png"
+# install -d "${pkgdir}/usr/share/${_pkgname}"
+# cp -r --preserve=mode $srcdir/ao/dist/linux-unpacked/* "${pkgdir}/usr/share/${_pkgname}/"
+# install -Dm=0755 "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+# }
diff --git a/ao.desktop b/ao.desktop
deleted file mode 100644
index 0e2fd2802b8..00000000000
--- a/ao.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=ao
-Comment=An Electron wrapper for Microsoft Todo
-GenericName=ao
-Exec=/usr/share/ao/ao-app %U
-Icon=/usr/share/ao/Icon.png
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Office;Calendar;
-
diff --git a/ao.sh b/ao.sh
deleted file mode 100644
index a1036dbb6bc..00000000000
--- a/ao.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/ao/
-./ao-app