From d0134e21bfd727df2d10c9963eacaddb9408ef20 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jan 2019 14:52:04 +0100 Subject: [PATCH 1/5] Atom: Update from version 1.28.0 to 1.34.0 add tar.gz to SRCURL --- atom.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atom.be0 b/atom.be0 index cea613ea4..a26cc74ca 100755 --- a/atom.be0 +++ b/atom.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION atom-1.29.0-0 +# BEE_VERSION atom-1.34.0-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://github.com/atom/atom/archive/v${PKGVERSION}.tar.gz atom-${PKGVERSION}" +SRCURL[0]="https://github.com/atom/atom/archive/v${PKGVERSION}.tar.gz atom-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 958fb670f022726e70e94d6ccbadc7b4215d2bd0 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jan 2019 15:13:17 +0100 Subject: [PATCH 2/5] Atom: dont build with with new node build as normal user with node-8.11 get 'Head out of memory! - Cannot allocate memory' as root user --- atom.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atom.be0 b/atom.be0 index a26cc74ca..b15cd14ee 100755 --- a/atom.be0 +++ b/atom.be0 @@ -62,6 +62,8 @@ mee_build() { # some scripts in their stupid build system do strange things # when they see SUDO environment + start_cmd source /package/node/profile + unset SUDO_USER SUDO_UID SUDO_COMMAND SUDO_GID HOME=${S} start_cmd script/build --install ${D}${PREFIX} } From d65725f3b8a9b61a1c0d2533cc821a3ef9f4df36 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jan 2019 15:37:32 +0100 Subject: [PATCH 3/5] Atom: build script read env XDG_DATA_DIRS for saving png's there --- atom.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atom.be0 b/atom.be0 index b15cd14ee..72c1093d4 100755 --- a/atom.be0 +++ b/atom.be0 @@ -64,8 +64,10 @@ mee_build() { start_cmd source /package/node/profile + start_cmd mkdir -p ${D}${DATADIR}/applications + start_cmd mkdir -p ${D}${DATADIR}/icons/hicolor unset SUDO_USER SUDO_UID SUDO_COMMAND SUDO_GID - HOME=${S} start_cmd script/build --install ${D}${PREFIX} + XDG_DATA_DIRS=${D}${DATADIR} HOME=${S} start_cmd script/build --install ${D}${PREFIX} } mee_install() { From a50f66007441486d5da1b016da581649176c0f65 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jan 2019 15:38:52 +0100 Subject: [PATCH 4/5] Atom: use desktop-file from atom installer --- atom.be0 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/atom.be0 b/atom.be0 index 72c1093d4..baf4c9008 100755 --- a/atom.be0 +++ b/atom.be0 @@ -71,18 +71,7 @@ mee_build() { } mee_install() { - cat <${D}${DATADIR}/applications/atom.desktop -[Desktop Entry] -Name=Atom -Comment=A hackable text editor for the 21st Century. -GenericName=Text Editor -Exec=${DATADIR}/atom/atom %F -Icon=${DATADIR}/atom/atom.png -Type=Application -StartupNotify=true -Categories=GNOME;GTK;Utility;TextEditor;Development; -MimeType=text/plain; -EOF + sed 's%/scratch/local2/bee-schrader/atom/atom-1.34.0-0/image%%' -i ${D}${DATADIR}/applications/atom.desktop } ## by default this may be 'make install DESTDIR="${D}"' From f7cf1dc95a7fa9cbd4a1d4125e8c3d945011d820 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jan 2019 15:39:10 +0100 Subject: [PATCH 5/5] remove empty line --- atom.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/atom.be0 b/atom.be0 index baf4c9008..219080005 100755 --- a/atom.be0 +++ b/atom.be0 @@ -58,7 +58,6 @@ build_in_sourcedir #} mee_build() { - # some scripts in their stupid build system do strange things # when they see SUDO environment