summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
Diffstat (limited to 'development')
-rw-r--r--development/atom/atom.SlackBuild22
-rw-r--r--development/atom/atom.info6
-rw-r--r--development/atom/disableMetrics.diff11
3 files changed, 13 insertions, 26 deletions
diff --git a/development/atom/atom.SlackBuild b/development/atom/atom.SlackBuild
index 4bf7ef4685..f3a3af9afb 100644
--- a/development/atom/atom.SlackBuild
+++ b/development/atom/atom.SlackBuild
@@ -23,11 +23,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=atom
-VERSION=${VERSION:-0.103.0}
+VERSION=${VERSION:-0.115.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
#Some variables needed for compile tar version
-GITSHA1='d8d378e0832d52d505bc92367b61a32bc010911a'
+GITSHA1='cdb5fe15d2c8e8b756cec6fe7ac1b0df528d5d7b'
GITBRANCH='master'
#Disable send metrics to Google Analytics module
@@ -75,10 +75,10 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
if [ "$DISABLE_METRICS" == "yes" ]; then
- patch -p1 < $CWD/disableMetrics.diff
+ sed -i '/"metrics":/d' package.json
fi
echo '*********************************************************************'
@@ -96,8 +96,7 @@ BUILD_DIR=$PWD/destbuild
JANKY_SHA1=$GITSHA1 \
JANKY_BRANCH=$GITBRANCH \
PYTHON=python2 \
- INSTALL_PREFIX=$PKG/usr \
- ./script/grunt --build-dir=$BUILD_DIR install
+ ./script/grunt --build-dir=$BUILD_DIR --install-dir=$PKG/usr install
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -110,8 +109,9 @@ mkdir -p $PKG/usr/share/pixmaps
cp -a resources/atom.png \
$PKG/usr/share/pixmaps
mkdir -p $PKG/usr/share/applications
-sed -e "s#<%=.*%>#Hackable text editor#" \
- -e "s#/usr.*atom#/usr/bin/atom#" \
+sed -e "s#<%= description %>#Hackable text editor#" \
+ -e "s#<%= installDir %>.*atom#/usr/bin/atom#" \
+ -e "s#<%= iconName %>#atom#" \
resources/linux/Atom.desktop.in > \
$PKG/usr/share/applications/Atom.desktop
@@ -123,10 +123,8 @@ if [ "$DELETE_CACHE" == "yes" ]; then
fi
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar LICENSE.md README.md CONTRIBUTING.md docs \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > \
- $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -ar LICENSE.md README.md CONTRIBUTING.md docs $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/atom/atom.info b/development/atom/atom.info
index 6d463307b2..792df20632 100644
--- a/development/atom/atom.info
+++ b/development/atom/atom.info
@@ -1,8 +1,8 @@
PRGNAM="atom"
-VERSION="0.103.0"
+VERSION="0.115.0"
HOMEPAGE="https://atom.io/"
-DOWNLOAD="https://codeload.github.com/atom/atom/tar.gz/v0.103.0"
-MD5SUM="08b6d92a3c16f5516965584e1241ee09"
+DOWNLOAD="https://codeload.github.com/atom/atom/tar.gz/v0.115.0"
+MD5SUM="3b713c1f3a3b3a6dd4d3d4e5db1be3a9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="node"
diff --git a/development/atom/disableMetrics.diff b/development/atom/disableMetrics.diff
deleted file mode 100644
index b931f47598..0000000000
--- a/development/atom/disableMetrics.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur atom-0.103.0/package.json atom-0.103.0.a/package.json
---- atom-0.103.0/package.json 2014-06-09 13:58:09.000000000 -0600
-+++ atom-0.103.0.a/package.json 2014-06-16 13:01:47.926728494 -0600
-@@ -90,7 +90,6 @@
- "keybinding-resolver": "0.18.0",
- "link": "0.22.0",
- "markdown-preview": "0.74.0",
-- "metrics": "0.32.0",
- "open-on-github": "0.28.0",
- "package-generator": "0.30.0",
- "release-notes": "0.32.0",