summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Jug2016-04-13 09:44:43 -0400
committerSebastian Jug2016-04-13 09:44:43 -0400
commit276db3d0b4e88103bd7121d672f00c18bdd16ca4 (patch)
tree890e78b3f4d3a3293d38fcd7417eb2a498d6f3fa
parent058d467cab0d7636ddc3b56df557ce7fd543cd50 (diff)
downloadaur-276db3d0b4e88103bd7121d672f00c18bdd16ca4.tar.gz
atom-editor: upstream bugfix patches applied
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--package.patch20
3 files changed, 31 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3ccc14717c9..25a4da855f93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Apr 13 01:21:59 UTC 2016
+# Wed Apr 13 13:41:11 UTC 2016
pkgbase = atom-editor
pkgdesc = Chrome-based text editor from Github
pkgver = 1.7.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/atom/atom
install = atom.install
arch = x86_64
@@ -25,7 +25,9 @@ pkgbase = atom-editor
conflicts = atom-editor-bin
conflicts = atom-editor-git
source = https://github.com/atom/atom/archive/v1.7.0.tar.gz
+ source = package.patch
sha256sums = 1629c6688bccf7180482b4b5ccacf0d68d9b33172007d2c05c6458da80be046a
+ sha256sums = 5acaea28a0b895b8657cc98a231da0c85a276e2f499d4438529060fb80cbf722
pkgname = atom-editor
diff --git a/PKGBUILD b/PKGBUILD
index 84eda7ba42ab..cd268f500f80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=atom-editor
pkgver=1.7.0
-pkgrel=1
+pkgrel=2
pkgdesc='Chrome-based text editor from Github'
arch=('x86_64' 'i686')
url='https://github.com/atom/atom'
@@ -17,11 +17,15 @@ optdepends=('gvfs: file deletion support')
makedepends=('git' 'npm')
conflicts=('atom-editor-bin' 'atom-editor-git')
install=atom.install
-source=("https://github.com/atom/atom/archive/v${pkgver}.tar.gz")
-sha256sums=('1629c6688bccf7180482b4b5ccacf0d68d9b33172007d2c05c6458da80be046a')
+source=("https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+ 'package.patch')
+sha256sums=('1629c6688bccf7180482b4b5ccacf0d68d9b33172007d2c05c6458da80be046a'
+ '5acaea28a0b895b8657cc98a231da0c85a276e2f499d4438529060fb80cbf722')
prepare() {
cd "atom-$pkgver"
+
+ patch -Np0 -i "$srcdir/package.patch"
sed -i -e "/exception-reporting/d" \
-e "/metrics/d" package.json
diff --git a/package.patch b/package.patch
new file mode 100644
index 000000000000..7aea0c0b40e4
--- /dev/null
+++ b/package.patch
@@ -0,0 +1,20 @@
+--- package.json 2016-04-13 09:13:10.216678408 -0400
++++ package.json 2016-04-13 09:22:50.416683431 -0400
+@@ -12,7 +12,7 @@
+ "url": "https://github.com/atom/atom/issues"
+ },
+ "license": "MIT",
+- "electronVersion": "0.36.8",
++ "electronVersion": "0.36.12",
+ "dependencies": {
+ "async": "0.2.6",
+ "atom-keymap": "6.3.2",
+@@ -37,7 +37,7 @@
+ "less-cache": "0.23",
+ "line-top-index": "0.2.0",
+ "marked": "^0.3.4",
+- "nodegit": "0.12.0",
++ "nodegit": "0.12.2",
+ "normalize-package-data": "^2.0.0",
+ "nslog": "^3",
+ "oniguruma": "^5",