Implementing Salamandar's fixes

2 files changed, 51 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8244cd7e5da..782f98e40b49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 16 06:21:39 UTC 2017
+# Wed Nov  1 12:43:57 UTC 2017
 pkgbase = atom-editor-git
 	pkgdesc = Hackable text editor for the 21st Century, based on web technologies - git channel.
-	pkgver = 1.14.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.40.1.v0.3.2.c30697
+	pkgver = 1.23.0.dev.33610
 	pkgrel = 1
 	url = https://github.com/atom/atom
 	install = atom-git.install
diff --git a/PKGBUILD b/PKGBUILD
index eeb5de949c44..d5804c40aa04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,8 @@
 _pkgname=atom
 _version=git
 
-# Module Versions
-_fus_url="https://github.com/fusion809"
-_language_gfm2_ver=0.92.2
-_language_ini_desktop_ver=1.18.3
-_language_liquid_ver=0.5.1
-_language_patch2_url="${_fus_url}/language-patch2"
-_language_patch2_ver=1.0.0
-_language_unix_shell_ver=0.40.1
-_language_vala_modern_ver=0.3.2
-
 pkgname=${_pkgname}-editor-${_version}
-pkgver=1.14.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.40.1.v0.3.2.c30697
+pkgver=1.23.0.dev.33610
 pkgrel=1
 pkgdesc='Hackable text editor for the 21st Century, based on web technologies - git channel.'
 arch=('x86_64' 'i686')
@@ -33,70 +23,66 @@ sha256sums=('SKIP'
             '20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9')
 
 pkgver() {
-  cd $srcdir/$_pkgname
-  _basever=$(cat package.json | grep version | sed 's/version//g' | sed 's/://g' | sed 's/ //g' |  sed 's/"//g' | sed 's/,//g' | sed 's/-/./g')
-  _commitno=$(git rev-list --count HEAD)
-  printf "${_basever}.i${_language_ini_desktop_ver}.l${_language_liquid_ver}.m${_language_gfm2_ver}.p${_language_patch2_ver}.u${_language_unix_shell_ver}.v${_language_vala_modern_ver}.c${_commitno}"
+    cd $srcdir/$_pkgname
+    _basever=$(cat package.json | grep version | sed 's/version//g' | sed 's/://g' | sed 's/ //g' |  sed 's/"//g' | sed 's/,//g' | sed 's/-/./g')
+    _commitno=$(git rev-list --count HEAD)
+    printf "${_basever}.${_commitno}"
 }
 
 prepare() {
-	cd "$srcdir/${_pkgname}"
-
-  sed -i -e "/exception-reporting/d" \
-	       -e "/metrics/d" \
-         -e "/\"dependencies\": {/a \
-            \"language-patch2\": \"${_language_patch2_url}\"," \
-         -e "s/\"language-gfm\": \".*\",/\"language-gfm2\": \"${_language_gfm2_ver}\",\n    \"language-ini-desktop\": \"${_language_ini_desktop_ver}\",\n    \"language-liquid\": \"${_language_liquid_ver}\",\n    \"language-patch2\": \"${_language_patch2_ver}\",/g" \
-         -e "s/\"language-shellscript\": \".*\",/\"language-unix-shell\": \"${_language_unix_shell_ver}\",\n    \"language-vala-modern\": \"${_language_vala_modern_ver}\",/g" \
-         package.json
-
-	chmod 755 -R package.json
+    cd "$srcdir/${_pkgname}"
 
-  sed -i -e 's@node script/bootstrap@node script/bootstrap --no-quiet@g' \
-  ./script/build || die "Fail fixing verbosity of script/build"
-
-  sed -i -e "s/<%=Desc=%>/$pkgdesc/g" ${srcdir}/${_pkgname}-${_version}.desktop
+    sed -i -e 's@node script/bootstrap@node script/bootstrap --no-quiet@g' \
+    ./script/build || die "Fail fixing verbosity of script/build"
 }
 
 build() {
-  cd $srcdir/${_pkgname}
-  export PYTHON=/usr/bin/python2
-  until ./script/build; do :; done
+    # Fix : GYP does not support python3 but uses python, not python2
+    export PYTHON=/usr/bin/python2
+    cd "${srcdir}"
+    mkdir -p pypath
+    ln -fs /usr/bin/python2 ./pypath/python
+    export PATH=$(pwd)/pypath:$PATH
+
+    cd "${srcdir}/${_pkgname}"
+    # Cleanup a non-clean srcdir
+    rm -f ./apm/package-lock.json ./node_modules/github/node_modules.bak
+    ./script/build # use until ./script/build; do :; done instead if network errors occur
 }
 
 package() {
-	cd "$srcdir/${_pkgname}"
+    cd "$srcdir/${_pkgname}"
 
-  _ver=$(cat package.json | grep version | sed 's/version//g' | sed 's/://g' | sed 's/ //g' |  sed 's/"//g' | sed 's/,//g')
-  _commit=$(git rev-parse --short HEAD)
+    _ver=$(cat package.json | grep version | sed 's/version//g' | sed 's/://g' | sed 's/ //g' |  sed 's/"//g' | sed 's/,//g')
+    _commit=$(git rev-parse --short HEAD)
 
-  _arch=amd64
-  if [ "${CARCH}" = "i686" ]; then
-  _arch=i386
-  fi
-  install -dm755 ${pkgdir}/usr/bin
-  install -dm755 ${pkgdir}/usr/share/${_pkgname}-${_version}
-  install -dm755 ${pkgdir}/usr/share/applications
-  install -dm755 ${pkgdir}/usr/share/licenses/$pkgname
-  install -dm755 ${pkgdir}/usr/share/pixmaps
+    _arch=amd64
+    if [ "${CARCH}" = "i686" ]; then
+         _arch=i386
+    fi
+    install -dm755 ${pkgdir}/usr/bin
+    install -dm755 ${pkgdir}/usr/share/${_pkgname}-${_version}
+    install -dm755 ${pkgdir}/usr/share/applications
+    install -dm755 ${pkgdir}/usr/share/licenses/$pkgname
+    install -dm755 ${pkgdir}/usr/share/pixmaps
 
-  cp -r out/atom-${_ver}-${_commit}-${_arch}/* ${pkgdir}/usr/share/${_pkgname}-${_version}/
-  mv ${pkgdir}/usr/share/${_pkgname}-${_version}/atom.png ${pkgdir}/usr/share/pixmaps/${_pkgname}-${_version}.png
-  mv ${pkgdir}/usr/share/${_pkgname}-${_version}/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-  install -Dm755 $srcdir/${_pkgname}-${_version} ${pkgdir}/usr/bin/${_pkgname}-${_version}
-  install -Dm644 $srcdir/${_pkgname}-${_version}.desktop ${pkgdir}/usr/share/applications/${_pkgname}-${_version}.desktop
-  rm ${pkgdir}/usr/share/${_pkgname}-${_version}/resources/app/atom.sh
-  rm -rf ${pkgdir}/usr/share/${_pkgname}-${_version}/resources/app.asar.unpacked/resources
-  ln -sf "/usr/share/${_pkgname}-${_version}/resources/app/apm/node_modules/.bin/apm" "${pkgdir}/usr/bin/apm-${_version}"
+    cp -r out/atom-${_ver}-${_commit}-${_arch}/* ${pkgdir}/usr/share/${_pkgname}-${_version}/
+    mv ${pkgdir}/usr/share/${_pkgname}-${_version}/atom.png ${pkgdir}/usr/share/pixmaps/${_pkgname}-${_version}.png
+    mv ${pkgdir}/usr/share/${_pkgname}-${_version}/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+    install -Dm755 $srcdir/${_pkgname}-${_version} ${pkgdir}/usr/bin/${_pkgname}-${_version}
+    install -Dm644 $srcdir/${_pkgname}-${_version}.desktop ${pkgdir}/usr/share/applications/${_pkgname}-${_version}.desktop
+    rm ${pkgdir}/usr/share/${_pkgname}-${_version}/resources/app/atom.sh
+    rm -rf ${pkgdir}/usr/share/${_pkgname}-${_version}/resources/app.asar.unpacked/resources
+    ln -sf "/usr/share/${_pkgname}-${_version}/resources/app/apm/node_modules/.bin/apm" "${pkgdir}/usr/bin/apm-${_version}"
 
-  find "$pkgdir" \
-    -name "*.a" -exec rm '{}' \; \
-    -or -name "*.bat" -exec rm '{}' \; \
-    -or -name "benchmark" -prune -exec rm -r '{}' \; \
-    -or -name "doc" -prune -exec rm -r '{}' \; \
-    -or -name "html" -prune -exec rm -r '{}' \; \
-    -or -name "man" -prune -exec rm -r '{}' \; \
-    -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
-    -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; \
-    -or -name "package.json" -exec sed -i -e "s|${srcdir}/atom/apm|/usr/share/${_pkgname}-${_version}/resources/app/apm|g" '{}' +
+    find "$pkgdir" \
+      -name "*.a" -exec rm '{}' \; \
+      -or -name "*.bat" -exec rm '{}' \; \
+      -or -name "benchmark" -prune -exec rm -r '{}' \; \
+      -or -name "doc" -prune -exec rm -r '{}' \; \
+      -or -name "html" -prune -exec rm -r '{}' \; \
+      -or -name "man" -prune -exec rm -r '{}' \; \
+      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
+      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; \
+      -or -name "package.json" -exec sed -i -e "s|${srcdir}/atom/apm|/usr/share/${_pkgname}-${_version}/resources/app/apm|g" '{}' +
 }