summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD45
-rw-r--r--patch12
3 files changed, 28 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eeae779ace3d..1b62f5ffe613 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
# Generated by mksrcinfo v8
-# Mon Mar 7 23:36:37 UTC 2016
+# Fri Apr 8 06:27:29 UTC 2016
pkgbase = tagspaces
pkgdesc = TagSpaces is an open source personal data manager. It helps you organize files with tags on every platform.
- pkgver = 2.1.2
+ pkgver = 2.2.1
pkgrel = 1
url = http://tagspaces.org
arch = i686
arch = x86_64
license = AGPL
+ makedepends = bower
makedepends = gendesk
- makedepends = npm
- depends = node-webkit
- source = https://github.com/uggrock/tagspaces/archive/v2.1.2.tar.gz
- source = patch
- sha256sums = 00665595b6b2b63b7792271219ac88808bcc5b2cd41cbefd59af7e92b8010d6c
- sha256sums = 5b7605288e221a852a9d7138efbccf15ca524607074b663527ce32e159a49596
+ depends = electron
+ source = https://github.com/tagspaces/tagspaces/archive/v2.2.1.tar.gz
+ sha256sums = 3997522914c6809503147abd200213811eba559cd346a35fc4b3b61b5c02987c
pkgname = tagspaces
diff --git a/PKGBUILD b/PKGBUILD
index 75af3e509d23..ab71a5613c3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,41 @@
# Maintainer: Samuel Walladge <samuel at swalladge dot id dot au>
pkgname=tagspaces
-pkgver=2.1.2
+pkgver=2.2.1
pkgrel=1
pkgdesc="TagSpaces is an open source personal data manager. It helps you organize files with tags on every platform."
arch=("i686" "x86_64")
url="http://tagspaces.org"
license=("AGPL")
-depends=("node-webkit")
-makedepends=("gendesk" "npm")
-sha256sums=('00665595b6b2b63b7792271219ac88808bcc5b2cd41cbefd59af7e92b8010d6c'
- '5b7605288e221a852a9d7138efbccf15ca524607074b663527ce32e159a49596')
-source=("https://github.com/uggrock/tagspaces/archive/v${pkgver}.tar.gz"
- "patch")
+depends=("electron")
+makedepends=("bower" "gendesk")
+sha256sums=('3997522914c6809503147abd200213811eba559cd346a35fc4b3b61b5c02987c')
+source=("https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
prepare() {
- gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec='nw /opt/'${pkgname}'/data/node-webkit/'
- echo "nw /opt/${pkgname}/data/node-webkit/" > $pkgname
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ${srcdir}/${source[1]}
+ # create desktop file and run script
+ gendesk -f -n --pkgname ${pkgname} --pkgdesc "${pkgdesc}" --exec="cd /opt/${pkgname}/data/ && electron ."
+ echo "cd /opt/${pkgname}/data/ && electron ." > ${pkgname}
}
build() {
(
- cd $srcdir/${pkgname}-${pkgver}/data
- npm install bower
- ./node_modules/bower/bin/bower install
+ cd ${srcdir}/${pkgname}-${pkgver}/data
+ bower install
)
}
package() {
- msg2 "create path and copy files"
- mkdir -p $pkgdir/opt/${pkgname}
- cp -R $srcdir/${pkgname}-${pkgver}/* $pkgdir/opt/${pkgname}
- sed -i "s/@@VERSION.@@BUILD.@@BID/${pkgver}-${pkgrel}/g" $pkgdir/opt/tagspaces/data/about.html
- sed -i "s/@@VERSION.@@BUILD/${pkgver}/g" $pkgdir/opt/tagspaces/data/about.html
-# patch -d $pkgdir/opt/tagspaces -p1 < patch.patch
- install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
- install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
- install -Dm644 "$srcdir/${pkgname}-${pkgver}/data/assets/icon.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+ # copy files
+ mkdir -p ${pkgdir}/opt/${pkgname}
+ cp -R ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/opt/${pkgname}
+
+ # modify version info for this package
+ sed -i "s/@@VERSION.@@BUILD.@@BID/${pkgver}-${pkgrel}/g" ${pkgdir}/opt/tagspaces/data/about.html
+ sed -i "s/@@VERSION.@@BUILD/${pkgver}/g" ${pkgdir}/opt/tagspaces/data/about.html
+
+ # install desktop file, icon, and run script
+ install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+ install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+ install -Dm644 ${srcdir}/${pkgname}-${pkgver}/data/assets/icon.svg ${pkgdir}/usr/share/pixmaps/${pkgname}.svg
}
diff --git a/patch b/patch
deleted file mode 100644
index 32439f6578f6..000000000000
--- a/patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/data/node-webkit/package.json b/data/node-webkit/package.json
-index 56cbf96..f170e78 100644
---- a/data/node-webkit/package.json
-+++ b/data/node-webkit/package.json
-@@ -18,6 +18,5 @@
- "dependencies": {
- "fs-extra": "~0.24.0",
- "trash": "~3.4.1"
-- },
-- "chromium-args" : "--data-path='../../nwjsdata/'"
-+ }
- }