Merge branch 'master' of code.chakralinux.org:packages/gtk

atom/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=atom
-pkgver=1.28.0
-pkgrel=1
+pkgver=1.28.1
+pkgrel=2
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
@@ -13,7 +13,7 @@ options=(!emptydirs)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
         'fix-license-path.patch'
 	'fix-restart.patch')
-sha256sums=('8d31c74870b7c0813f14eeae55aa85e13bffdfb33a087ad08f1f5eec319331f4'
+sha256sums=('24df7ea2017fb7a4c19f685a228af4f6f64b96de42da99084ab6dff29b417247'
             '67ecd71b08292218388205ee49e02d176a15bd0c3e74d30cb720b79c6946f4c9'
             'a6fa960741823a52b2f82684285e26eb84ce54825dc7ed008fdaca974b60957e')
 
@@ -31,12 +31,14 @@ prepare() {
   cd electron-link
   git checkout v0.2.0
 
+  # FIXME: won't build if manually fix npm warnings
   # npm audit fix, remove package-lock to apply the fix
-  sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' \
-      -e 's/"electron": "1.7.10"/"electron": "^2.0.4"/' \
-      -e 's/"electron-mocha": "^3.3.0"/"electron-mocha": "^6.0.4"/' \
-      -e 's/"mocha": "^3.2.0"/"mocha": "^5.2.0"/' -i package.json
-  rm package-lock.json
+  #sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' \
+  #    -e 's/"electron": "1.7.10"/"electron": "^2.0.4"/' \
+  #    -e 's/"electron-mocha": "^3.3.0"/"electron-mocha": "^6.0.4"/' \
+  #    -e 's/"mocha": "^3.2.0"/"mocha": "^5.2.0"/' -i package.json
+  #rm package-lock.json
+  sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' -i package.json
   npm install
   npx babel src -d lib
   cd node_modules/levelup
@@ -53,12 +55,13 @@ build() {
 
   cd script
 
+  # FIXME: won't build if manually fix npm warnings
   # npm audit fix
-  sed -e 's/"babel-core": "5.8.38"/"babel-core": "^6.26.3"/' \
-      -e 's/"coffeelint": "1.15.7"/"coffeelint": "^2.1.0"/' \
-      -e 's/"electron-packager": "7.3.0"/"electron-packager": "^12.1.0"/' \
-      -e 's/"npm": "5.3.0"/"npm": "^6.1.0"/' \
-      -e 's/"webdriverio": "2.4.5"/"webdriverio": "^4.13.1"/' -i package.json
+  #sed -e 's/"babel-core": "5.8.38"/"babel-core": "^6.26.3"/' \
+  #    -e 's/"coffeelint": "1.15.7"/"coffeelint": "^2.1.0"/' \
+  #    -e 's/"electron-packager": "7.3.0"/"electron-packager": "^12.1.0"/' \
+  #    -e 's/"npm": "5.3.0"/"npm": "^6.1.0"/' \
+  #    -e 's/"webdriverio": "2.4.5"/"webdriverio": "^4.13.1"/' -i package.json
 
   npm install
   ./build
@@ -92,17 +95,4 @@ package() {
   msg "installing license"
   install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
   node -e "require('./script/lib/get-license-text')().then((licenseText) => require('fs').writeFileSync('${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md', licenseText))"
-
-  # Remove useless stuff
-  find "${pkgdir}"/usr/lib/atom/node_modules \
-      -name "*.a" -exec rm '{}' \; \
-      -or -name "*.bat" -exec rm '{}' \; \
-      -or -name "*.node" -exec chmod a-x '{}' \; \
-      -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 -name "scripts" -prune -exec rm -r '{}' \; \
-      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
-      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
 }