From 3fd66abe7860f5940808b99a5d459a7d6ce31f55 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 10 Mar 2020 08:29:28 +0100 Subject: [PATCH] atom: update from 1.38.1 to 1.44.0 - fixed SRCURL - patch '--unsafe-perm' into build pipeline - burn in python2 - burn in npm 10.16 - nicify be0 --- atom.be0 | 80 +++++++++++++------------------------------------------- 1 file changed, 18 insertions(+), 62 deletions(-) diff --git a/atom.be0 b/atom.be0 index deebd6a18..1f983e22d 100755 --- a/atom.be0 +++ b/atom.be0 @@ -1,50 +1,17 @@ #!/usr/bin/env beesh -# BEE_VERSION atom-1.38.1-0 +# BEE_VERSION atom-1.44.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.) +#SRCURL[0]="https://github.com/atom/atom/archive/v${PKGVERSION}.tar.gz atom-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/e0060f63ac463d0d0f3440afae78f712/atom-1.44.0.tar.gz" -############################################################################### -## 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}.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. +PATCHURL+=(/src/mariux/patches/atom-install-dep-verbose.patch) +PATCHURL+=(/src/mariux/patches/atom-script-lib-install-apm-unsafe-perm.patch) build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - #mee_extract() { # bee_extract "${@}" #} @@ -61,12 +28,18 @@ mee_build() { # some scripts in their stupid build system do strange things # when they see SUDO environment - start_cmd source /package/node/profile + . /package/pkg/node-10.16.0-0/profile + . $(python2-config --prefix)/profile - start_cmd mkdir -p ${D}${DATADIR}/applications - start_cmd mkdir -p ${D}${DATADIR}/icons/hicolor + mkdir -p ${D}${DATADIR}/applications + mkdir -p ${D}${DATADIR}/icons/hicolor unset SUDO_USER SUDO_UID SUDO_COMMAND SUDO_GID - XDG_DATA_DIRS=${D}${DATADIR} HOME=${S} start_cmd script/build --install ${D}${PREFIX} + + XDG_DATA_DIRS=${D}${DATADIR} \ + HOME=${S} \ + script/build \ + --install ${D}${PREFIX} \ + --loglevel=verbose } mee_install() { @@ -74,24 +47,7 @@ mee_install() { } mee_install_post() { - start_cmd rm -rf ${D}${DATADIR}/atom/resources/app/apm/node_modules/git-utils/deps/libgit2/tests + rm -rf ${D}${DATADIR}/atom/resources/app/apm/node_modules/git-utils/deps/libgit2/tests } -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[${PKGVERSION}] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## + +