* [PR PATCH] [RFC] atom: remove package.
@ 2021-04-27 16:58 ericonr
2021-04-27 17:01 ` [PR PATCH] [Updated] " ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages atom
https://github.com/void-linux/void-packages/pull/30550
[RFC] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30550.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-atom-30550.patch --]
[-- Type: text/x-diff, Size: 14115 bytes --]
From 41c5a028892453d6f3a8653a0cfdc062f96b2e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:56:41 -0300
Subject: [PATCH] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
---
srcpkgs/atom/patches/fixes.patch | 181 ----------------------
srcpkgs/atom/patches/git-utils.patch | 23 ---
srcpkgs/atom/patches/use-system-git.patch | 51 ------
srcpkgs/atom/template | 54 -------
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 309 deletions(-)
delete mode 100644 srcpkgs/atom/patches/fixes.patch
delete mode 100644 srcpkgs/atom/patches/git-utils.patch
delete mode 100644 srcpkgs/atom/patches/use-system-git.patch
delete mode 100644 srcpkgs/atom/template
diff --git a/srcpkgs/atom/patches/fixes.patch b/srcpkgs/atom/patches/fixes.patch
deleted file mode 100644
index 5bb7f9814ba2..000000000000
--- a/srcpkgs/atom/patches/fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -Naurp0 a/atom.sh b/atom.sh
---- a/atom.sh 2019-11-08 22:04:23.210260827 +0300
-+++ b/atom.sh 2019-11-08 22:08:36.721968851 +0300
-@@ -2,25 +1,0 @@
--
--if [ "$(uname)" == 'Darwin' ]; then
-- OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-- OS='Linux'
--else
-- echo "Your platform ($(uname -a)) is not supported."
-- exit 1
--fi
--
--case $(basename $0) in
-- atom-beta)
-- CHANNEL=beta
-- ;;
-- atom-nightly)
-- CHANNEL=nightly
-- ;;
-- atom-dev)
-- CHANNEL=dev
-- ;;
-- *)
-- CHANNEL=stable
-- ;;
--esac
--
-@@ -91,0 +67 @@ mkdir -p "$ATOM_HOME"
-+ATOM_PATH="/usr/libexec/atom/atom"
-@@ -93,9 +69,5 @@ mkdir -p "$ATOM_HOME"
--if [ $OS == 'Mac' ]; then
-- if [ -L "$0" ]; then
-- SCRIPT="$(readlink "$0")"
-- else
-- SCRIPT="$0"
-- fi
-- ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
-- if [ "$ATOM_APP" == . ]; then
-- unset ATOM_APP
-+if [ $EXPECT_OUTPUT ]; then
-+ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+ ATOM_EXIT=$?
-+ if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+ exit "${EXIT_CODE_OVERRIDE}"
-@@ -103,2 +75 @@ if [ $OS == 'Mac' ]; then
-- ATOM_PATH="$(dirname "$ATOM_APP")"
-- ATOM_APP_NAME="$(basename "$ATOM_APP")"
-+ exit ${ATOM_EXIT}
-@@ -106,85 +77,6 @@ if [ $OS == 'Mac' ]; then
--
-- if [ ! -z "${ATOM_APP_NAME}" ]; then
-- # If ATOM_APP_NAME is known, use it as the executable name
-- ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
-- else
-- # Else choose it from the inferred channel name
-- if [ "$CHANNEL" == 'beta' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Beta"
-- elif [ "$CHANNEL" == 'nightly' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Nightly"
-- elif [ "$CHANNEL" == 'dev' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Dev"
-- else
-- ATOM_EXECUTABLE_NAME="Atom"
-- fi
-- fi
--
-- if [ -z "${ATOM_PATH}" ]; then
-- # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
-- if [ -x "/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="/Applications"
-- elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="$HOME/Applications"
-- else
-- # We haven't found an Atom.app, use spotlight to search for Atom
-- ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
-- # Exit if Atom can't be found
-- if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-- echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
-- exit 1
-- fi
-- fi
-- fi
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
-- fi
--elif [ $OS == 'Linux' ]; then
-- SCRIPT=$(readlink -f "$0")
-- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
-- case $CHANNEL in
-- beta)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
-- ;;
-- nightly)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
-- ;;
-- dev)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
-- ;;
-- *)
-- ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-- ;;
-- esac
--
-- : ${TMPDIR:=/tmp}
--
-- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- (
-- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-- if [ $? -ne 0 ]; then
-- cat "$ATOM_HOME/nohup.out"
-- exit $?
-- fi
-- ) &
-+else
-+ (
-+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+ if [ $? -ne 0 ]; then
-+ cat "$ATOM_HOME/nohup.out"
-+ exit $?
-@@ -191,0 +84 @@ elif [ $OS == 'Linux' ]; then
-+ ) &
-diff -Naurp0 a/resources/linux/atom.desktop.in b/resources/linux/atom.desktop.in
---- a/resources/linux/atom.desktop.in 2019-11-08 22:29:18.312985700 +0300
-+++ b/resources/linux/atom.desktop.in 2019-11-08 22:31:30.748437296 +0300
-@@ -2,2 +2,2 @@
--Name=<%= appName %>
--Comment=<%= description %>
-+Name=Atom
-+Comment=Chrome-based text editor from Github
-@@ -5,2 +5,2 @@ GenericName=Text Editor
--Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false <%= installDir %>/bin/<%= appFileName %> %F
--Icon=<%= iconPath %>
-+Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false /usr/bin/atom %F
-+Icon=atom
-diff -Naurp0 a/script/lib/install-application.js b/script/lib/install-application.js
---- a/script/lib/install-application.js 2019-11-08 22:32:22.593396868 +0300
-+++ b/script/lib/install-application.js 2019-11-08 22:58:19.347068485 +0300
-@@ -90 +90 @@ module.exports = function(packagedAppPat
-- const shareDirPath = path.join(prefixDirPath, 'share');
-+ const shareDirPath = path.join(prefixDirPath, 'libexec');
-@@ -103 +103 @@ module.exports = function(packagedAppPat
-- const baseIconThemeDirPath = findBaseIconThemeDirPath();
-+ const baseIconThemeDirPath = path.join(prefixDirPath, 'share/icons/hicolor')
-@@ -216 +216 @@ module.exports = function(packagedAppPat
-- 'share',
-+ 'libexec',
-diff -Naurp0 a/src/main-process/atom-application.js b/src/main-process/atom-application.js
---- a/src/main-process/atom-application.js 2019-11-08 22:12:01.212764247 +0300
-+++ b/src/main-process/atom-application.js 2019-11-08 22:16:34.637836128 +0300
-@@ -719 +719 @@ module.exports = class AtomApplication e
-- path.join(process.resourcesPath, 'LICENSE.md')
-+ '/usr/share/licenses/atom/LICENSE.md'
-diff -Naurp0 a/src/workspace.js b/src/workspace.js
---- a/src/workspace.js 2019-11-08 22:14:27.324474946 +0300
-+++ b/src/workspace.js 2019-11-08 22:15:49.853005612 +0300
-@@ -1303 +1303 @@ module.exports = class Workspace extends
-- return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
-+ return this.open('/usr/share/licenses/atom/LICENSE.md');
diff --git a/srcpkgs/atom/patches/git-utils.patch b/srcpkgs/atom/patches/git-utils.patch
deleted file mode 100644
index afb56568bf7f..000000000000
--- a/srcpkgs/atom/patches/git-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 13:26:20.083698872 +0300
-@@ -67 +67 @@
-- "git-utils": "5.6.1",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:45:30.215685265 +0300
-@@ -3187,3 +3187 @@
-- "version": "5.6.1",
-- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
-- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
-+ "version": "file:packages/git-utils",
-@@ -5761 +5759 @@
-- "git-utils": "^5.6.0",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
---- a/packages/git-utils/binding.gyp 2019-06-20 18:40:36.000000000 +0300
-+++ b/packages/git-utils/binding.gyp 2019-12-19 13:28:15.623981924 +0300
-@@ -164,0 +165,2 @@
-+ 'deps/libgit2/src/net.c',
-+ 'deps/libgit2/src/net.h',
diff --git a/srcpkgs/atom/patches/use-system-git.patch b/srcpkgs/atom/patches/use-system-git.patch
deleted file mode 100644
index 246c80f7a02d..000000000000
--- a/srcpkgs/atom/patches/use-system-git.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 17:00:25.029132872 +0300
-@@ -52,0 +53 @@
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:44:18.175132282 +0300
-@@ -2530,3 +2530 @@
-- "version": "1.87.5",
-- "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.87.5.tgz",
-- "integrity": "sha512-Rfl1pJ7SaIk8kW9knOGFvVl/aRWAL7RnESs/0GMUCay/yOtVejkrDGlK8JciN5dluJbIg/4bMp0KeK3HGuQqEQ==",
-+ "version": "file:packages/dugite",
-@@ -3212 +3210 @@
-- "dugite": "1.87.5",
-+ "dugite": "file:packages/dugite",
-@@ -6992 +6990 @@
-- "dugite": "^1.86.0",
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/packages/dugite/build/lib/git-environment.js b/packages/dugite/build/lib/git-environment.js
---- a/packages/dugite/build/lib/git-environment.js 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/build/lib/git-environment.js 2019-12-19 15:13:56.919818081 +0300
-@@ -4,12 +3,0 @@ const path = require("path");
--function resolveEmbeddedGitDir() {
-- if (process.platform === 'darwin' ||
-- process.platform === 'linux' ||
-- process.platform === 'android' ||
-- process.platform === 'win32') {
-- const s = path.sep;
-- return path
-- .resolve(__dirname, '..', '..', 'git')
-- .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`);
-- }
-- throw new Error('Git not supported on platform: ' + process.platform);
--}
-@@ -27 +15 @@ function resolveGitDir() {
-- return resolveEmbeddedGitDir();
-+ return '/usr';
-@@ -108,7 +95,0 @@ function setupEnvironment(environmentVar
-- if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
-- // use the SSL certificate bundle included in the distribution only
-- // when using embedded Git and not providing your own bundle
-- const distDir = resolveEmbeddedGitDir();
-- const sslCABundle = `${distDir}/ssl/cacert.pem`;
-- env.GIT_SSL_CAINFO = sslCABundle;
-- }
-diff -Naurp0 a/packages/dugite/package.json b/packages/dugite/package.json
---- a/packages/dugite/package.json 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/package.json 2019-12-19 15:19:07.645889964 +0300
-@@ -16 +15,0 @@
-- "postinstall": "node ./script/download-git.js",
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
deleted file mode 100644
index 928ae28c373b..000000000000
--- a/srcpkgs/atom/template
+++ /dev/null
@@ -1,54 +0,0 @@
-# Template file for 'atom'
-_dugite_ver=1.88.1
-_git_utils_ver=5.6.2
-pkgname=atom
-version=1.44.0
-revision=1
-archs="x86_64"
-hostmakedepends="git pkg-config python-devel nodejs-lts-10 nodejs-lts-10-devel curl gtk+3
- libXtst libXScrnSaver nss python alsa-lib"
-makedepends="python-devel GConf-devel libgnome-keyring-devel gtk+3-devel
- libX11-devel libxkbfile-devel libsecret-devel"
-depends="git"
-short_desc="Chrome-based text editor from Github"
-maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
-homepage="https://atom.io"
-distfiles="
- https://github.com/atom/atom/archive/v${version}.tar.gz
- https://registry.npmjs.org/dugite/-/dugite-${_dugite_ver}.tgz
- https://registry.npmjs.org/git-utils/-/git-utils-${_git_utils_ver}.tgz"
-checksum="
- 8d79697b0c969f22ee8dc2c1d27c608036e92deaf63574f8cd1509ea506eded9
- ddb5479cc78cf863f05b1c35420d66dde55f2bfa66f30cd7bac484ffd5fd6782
- b430ee53a09317df5b6677e5625950baefe840258f2e9d55cf4fc448c9d8576e"
-skip_extraction="
- dugite-${_dugite_ver}.tgz
- git-utils-${_git_utils_ver}.tgz"
-shlib_provides="libGLESv2.so"
-patch_args="-Np1"
-nocross=yes
-nostrip=yes
-python_version=2
-
-post_extract() {
- mkdir -p packages/dugite packages/git-utils
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/dugite-${_dugite_ver}.tgz \
- --strip-components=1 -C packages/dugite
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/git-utils-${_git_utils_ver}.tgz \
- --strip-components=1 -C packages/git-utils
-}
-
-pre_build() {
- npm install -g gyp
- vmkdir /usr/share/icons/hicolor
-}
-
-do_build() {
- script/build --install=$DESTDIR/usr
-}
-
-do_install() {
- mv $DESTDIR/usr/libexec/applications $DESTDIR/usr/share
- vlicense LICENSE.md
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a13a60849e36..1850b4b5bfb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -17,6 +17,7 @@ replaces="
appdata-tools<=0.1.8_2
arm-mem-git<=20131108_2
arptables<=0.0.4_3
+ atom<=1.44.0_1
avogadro<=1.2.0_8
avogadro-devel<=1.2.0_8
bokken<=1.8_3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] atom: remove package.
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
@ 2021-04-27 17:01 ` ericonr
2021-04-27 17:04 ` ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages atom
https://github.com/void-linux/void-packages/pull/30550
[RFC] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30550.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-atom-30550.patch --]
[-- Type: text/x-diff, Size: 14242 bytes --]
From be61ed9922b902dae4f0ba35c78d4422a6597ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:56:41 -0300
Subject: [PATCH] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
- as seen in [1], depends on outdated electron9 (which void no longer
provides)
[1] https://github.com/atom/atom/pull/21777
---
srcpkgs/atom/patches/fixes.patch | 181 ----------------------
srcpkgs/atom/patches/git-utils.patch | 23 ---
srcpkgs/atom/patches/use-system-git.patch | 51 ------
srcpkgs/atom/template | 54 -------
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 309 deletions(-)
delete mode 100644 srcpkgs/atom/patches/fixes.patch
delete mode 100644 srcpkgs/atom/patches/git-utils.patch
delete mode 100644 srcpkgs/atom/patches/use-system-git.patch
delete mode 100644 srcpkgs/atom/template
diff --git a/srcpkgs/atom/patches/fixes.patch b/srcpkgs/atom/patches/fixes.patch
deleted file mode 100644
index 5bb7f9814ba2..000000000000
--- a/srcpkgs/atom/patches/fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -Naurp0 a/atom.sh b/atom.sh
---- a/atom.sh 2019-11-08 22:04:23.210260827 +0300
-+++ b/atom.sh 2019-11-08 22:08:36.721968851 +0300
-@@ -2,25 +1,0 @@
--
--if [ "$(uname)" == 'Darwin' ]; then
-- OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-- OS='Linux'
--else
-- echo "Your platform ($(uname -a)) is not supported."
-- exit 1
--fi
--
--case $(basename $0) in
-- atom-beta)
-- CHANNEL=beta
-- ;;
-- atom-nightly)
-- CHANNEL=nightly
-- ;;
-- atom-dev)
-- CHANNEL=dev
-- ;;
-- *)
-- CHANNEL=stable
-- ;;
--esac
--
-@@ -91,0 +67 @@ mkdir -p "$ATOM_HOME"
-+ATOM_PATH="/usr/libexec/atom/atom"
-@@ -93,9 +69,5 @@ mkdir -p "$ATOM_HOME"
--if [ $OS == 'Mac' ]; then
-- if [ -L "$0" ]; then
-- SCRIPT="$(readlink "$0")"
-- else
-- SCRIPT="$0"
-- fi
-- ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
-- if [ "$ATOM_APP" == . ]; then
-- unset ATOM_APP
-+if [ $EXPECT_OUTPUT ]; then
-+ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+ ATOM_EXIT=$?
-+ if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+ exit "${EXIT_CODE_OVERRIDE}"
-@@ -103,2 +75 @@ if [ $OS == 'Mac' ]; then
-- ATOM_PATH="$(dirname "$ATOM_APP")"
-- ATOM_APP_NAME="$(basename "$ATOM_APP")"
-+ exit ${ATOM_EXIT}
-@@ -106,85 +77,6 @@ if [ $OS == 'Mac' ]; then
--
-- if [ ! -z "${ATOM_APP_NAME}" ]; then
-- # If ATOM_APP_NAME is known, use it as the executable name
-- ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
-- else
-- # Else choose it from the inferred channel name
-- if [ "$CHANNEL" == 'beta' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Beta"
-- elif [ "$CHANNEL" == 'nightly' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Nightly"
-- elif [ "$CHANNEL" == 'dev' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Dev"
-- else
-- ATOM_EXECUTABLE_NAME="Atom"
-- fi
-- fi
--
-- if [ -z "${ATOM_PATH}" ]; then
-- # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
-- if [ -x "/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="/Applications"
-- elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="$HOME/Applications"
-- else
-- # We haven't found an Atom.app, use spotlight to search for Atom
-- ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
-- # Exit if Atom can't be found
-- if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-- echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
-- exit 1
-- fi
-- fi
-- fi
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
-- fi
--elif [ $OS == 'Linux' ]; then
-- SCRIPT=$(readlink -f "$0")
-- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
-- case $CHANNEL in
-- beta)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
-- ;;
-- nightly)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
-- ;;
-- dev)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
-- ;;
-- *)
-- ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-- ;;
-- esac
--
-- : ${TMPDIR:=/tmp}
--
-- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- (
-- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-- if [ $? -ne 0 ]; then
-- cat "$ATOM_HOME/nohup.out"
-- exit $?
-- fi
-- ) &
-+else
-+ (
-+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+ if [ $? -ne 0 ]; then
-+ cat "$ATOM_HOME/nohup.out"
-+ exit $?
-@@ -191,0 +84 @@ elif [ $OS == 'Linux' ]; then
-+ ) &
-diff -Naurp0 a/resources/linux/atom.desktop.in b/resources/linux/atom.desktop.in
---- a/resources/linux/atom.desktop.in 2019-11-08 22:29:18.312985700 +0300
-+++ b/resources/linux/atom.desktop.in 2019-11-08 22:31:30.748437296 +0300
-@@ -2,2 +2,2 @@
--Name=<%= appName %>
--Comment=<%= description %>
-+Name=Atom
-+Comment=Chrome-based text editor from Github
-@@ -5,2 +5,2 @@ GenericName=Text Editor
--Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false <%= installDir %>/bin/<%= appFileName %> %F
--Icon=<%= iconPath %>
-+Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false /usr/bin/atom %F
-+Icon=atom
-diff -Naurp0 a/script/lib/install-application.js b/script/lib/install-application.js
---- a/script/lib/install-application.js 2019-11-08 22:32:22.593396868 +0300
-+++ b/script/lib/install-application.js 2019-11-08 22:58:19.347068485 +0300
-@@ -90 +90 @@ module.exports = function(packagedAppPat
-- const shareDirPath = path.join(prefixDirPath, 'share');
-+ const shareDirPath = path.join(prefixDirPath, 'libexec');
-@@ -103 +103 @@ module.exports = function(packagedAppPat
-- const baseIconThemeDirPath = findBaseIconThemeDirPath();
-+ const baseIconThemeDirPath = path.join(prefixDirPath, 'share/icons/hicolor')
-@@ -216 +216 @@ module.exports = function(packagedAppPat
-- 'share',
-+ 'libexec',
-diff -Naurp0 a/src/main-process/atom-application.js b/src/main-process/atom-application.js
---- a/src/main-process/atom-application.js 2019-11-08 22:12:01.212764247 +0300
-+++ b/src/main-process/atom-application.js 2019-11-08 22:16:34.637836128 +0300
-@@ -719 +719 @@ module.exports = class AtomApplication e
-- path.join(process.resourcesPath, 'LICENSE.md')
-+ '/usr/share/licenses/atom/LICENSE.md'
-diff -Naurp0 a/src/workspace.js b/src/workspace.js
---- a/src/workspace.js 2019-11-08 22:14:27.324474946 +0300
-+++ b/src/workspace.js 2019-11-08 22:15:49.853005612 +0300
-@@ -1303 +1303 @@ module.exports = class Workspace extends
-- return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
-+ return this.open('/usr/share/licenses/atom/LICENSE.md');
diff --git a/srcpkgs/atom/patches/git-utils.patch b/srcpkgs/atom/patches/git-utils.patch
deleted file mode 100644
index afb56568bf7f..000000000000
--- a/srcpkgs/atom/patches/git-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 13:26:20.083698872 +0300
-@@ -67 +67 @@
-- "git-utils": "5.6.1",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:45:30.215685265 +0300
-@@ -3187,3 +3187 @@
-- "version": "5.6.1",
-- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
-- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
-+ "version": "file:packages/git-utils",
-@@ -5761 +5759 @@
-- "git-utils": "^5.6.0",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
---- a/packages/git-utils/binding.gyp 2019-06-20 18:40:36.000000000 +0300
-+++ b/packages/git-utils/binding.gyp 2019-12-19 13:28:15.623981924 +0300
-@@ -164,0 +165,2 @@
-+ 'deps/libgit2/src/net.c',
-+ 'deps/libgit2/src/net.h',
diff --git a/srcpkgs/atom/patches/use-system-git.patch b/srcpkgs/atom/patches/use-system-git.patch
deleted file mode 100644
index 246c80f7a02d..000000000000
--- a/srcpkgs/atom/patches/use-system-git.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 17:00:25.029132872 +0300
-@@ -52,0 +53 @@
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:44:18.175132282 +0300
-@@ -2530,3 +2530 @@
-- "version": "1.87.5",
-- "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.87.5.tgz",
-- "integrity": "sha512-Rfl1pJ7SaIk8kW9knOGFvVl/aRWAL7RnESs/0GMUCay/yOtVejkrDGlK8JciN5dluJbIg/4bMp0KeK3HGuQqEQ==",
-+ "version": "file:packages/dugite",
-@@ -3212 +3210 @@
-- "dugite": "1.87.5",
-+ "dugite": "file:packages/dugite",
-@@ -6992 +6990 @@
-- "dugite": "^1.86.0",
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/packages/dugite/build/lib/git-environment.js b/packages/dugite/build/lib/git-environment.js
---- a/packages/dugite/build/lib/git-environment.js 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/build/lib/git-environment.js 2019-12-19 15:13:56.919818081 +0300
-@@ -4,12 +3,0 @@ const path = require("path");
--function resolveEmbeddedGitDir() {
-- if (process.platform === 'darwin' ||
-- process.platform === 'linux' ||
-- process.platform === 'android' ||
-- process.platform === 'win32') {
-- const s = path.sep;
-- return path
-- .resolve(__dirname, '..', '..', 'git')
-- .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`);
-- }
-- throw new Error('Git not supported on platform: ' + process.platform);
--}
-@@ -27 +15 @@ function resolveGitDir() {
-- return resolveEmbeddedGitDir();
-+ return '/usr';
-@@ -108,7 +95,0 @@ function setupEnvironment(environmentVar
-- if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
-- // use the SSL certificate bundle included in the distribution only
-- // when using embedded Git and not providing your own bundle
-- const distDir = resolveEmbeddedGitDir();
-- const sslCABundle = `${distDir}/ssl/cacert.pem`;
-- env.GIT_SSL_CAINFO = sslCABundle;
-- }
-diff -Naurp0 a/packages/dugite/package.json b/packages/dugite/package.json
---- a/packages/dugite/package.json 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/package.json 2019-12-19 15:19:07.645889964 +0300
-@@ -16 +15,0 @@
-- "postinstall": "node ./script/download-git.js",
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
deleted file mode 100644
index 928ae28c373b..000000000000
--- a/srcpkgs/atom/template
+++ /dev/null
@@ -1,54 +0,0 @@
-# Template file for 'atom'
-_dugite_ver=1.88.1
-_git_utils_ver=5.6.2
-pkgname=atom
-version=1.44.0
-revision=1
-archs="x86_64"
-hostmakedepends="git pkg-config python-devel nodejs-lts-10 nodejs-lts-10-devel curl gtk+3
- libXtst libXScrnSaver nss python alsa-lib"
-makedepends="python-devel GConf-devel libgnome-keyring-devel gtk+3-devel
- libX11-devel libxkbfile-devel libsecret-devel"
-depends="git"
-short_desc="Chrome-based text editor from Github"
-maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
-homepage="https://atom.io"
-distfiles="
- https://github.com/atom/atom/archive/v${version}.tar.gz
- https://registry.npmjs.org/dugite/-/dugite-${_dugite_ver}.tgz
- https://registry.npmjs.org/git-utils/-/git-utils-${_git_utils_ver}.tgz"
-checksum="
- 8d79697b0c969f22ee8dc2c1d27c608036e92deaf63574f8cd1509ea506eded9
- ddb5479cc78cf863f05b1c35420d66dde55f2bfa66f30cd7bac484ffd5fd6782
- b430ee53a09317df5b6677e5625950baefe840258f2e9d55cf4fc448c9d8576e"
-skip_extraction="
- dugite-${_dugite_ver}.tgz
- git-utils-${_git_utils_ver}.tgz"
-shlib_provides="libGLESv2.so"
-patch_args="-Np1"
-nocross=yes
-nostrip=yes
-python_version=2
-
-post_extract() {
- mkdir -p packages/dugite packages/git-utils
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/dugite-${_dugite_ver}.tgz \
- --strip-components=1 -C packages/dugite
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/git-utils-${_git_utils_ver}.tgz \
- --strip-components=1 -C packages/git-utils
-}
-
-pre_build() {
- npm install -g gyp
- vmkdir /usr/share/icons/hicolor
-}
-
-do_build() {
- script/build --install=$DESTDIR/usr
-}
-
-do_install() {
- mv $DESTDIR/usr/libexec/applications $DESTDIR/usr/share
- vlicense LICENSE.md
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a13a60849e36..1850b4b5bfb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -17,6 +17,7 @@ replaces="
appdata-tools<=0.1.8_2
arm-mem-git<=20131108_2
arptables<=0.0.4_3
+ atom<=1.44.0_1
avogadro<=1.2.0_8
avogadro-devel<=1.2.0_8
bokken<=1.8_3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] atom: remove package.
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
2021-04-27 17:01 ` [PR PATCH] [Updated] " ericonr
@ 2021-04-27 17:04 ` ericonr
2021-04-27 17:05 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30550#issuecomment-827765774
Comment:
Going to let this sit for a few days.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] atom: remove package.
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
2021-04-27 17:01 ` [PR PATCH] [Updated] " ericonr
2021-04-27 17:04 ` ericonr
@ 2021-04-27 17:05 ` ericonr
2021-04-27 19:40 ` kwshi
2021-04-30 15:28 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages atom
https://github.com/void-linux/void-packages/pull/30550
[RFC] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30550.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-atom-30550.patch --]
[-- Type: text/x-diff, Size: 14790 bytes --]
From 220e4d27708fdf4810ba7ad71457a6413de442c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:56:41 -0300
Subject: [PATCH] atom: remove package.
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
- as seen in [1], depends on outdated electron9 (which void no longer
provides, if we wanted to use system electron), and that's a recent
development
[1] https://github.com/atom/atom/pull/21777
---
common/shlibs | 1 -
srcpkgs/atom/patches/fixes.patch | 181 ----------------------
srcpkgs/atom/patches/git-utils.patch | 23 ---
srcpkgs/atom/patches/use-system-git.patch | 51 ------
srcpkgs/atom/template | 54 -------
srcpkgs/removed-packages/template | 1 +
6 files changed, 1 insertion(+), 310 deletions(-)
delete mode 100644 srcpkgs/atom/patches/fixes.patch
delete mode 100644 srcpkgs/atom/patches/git-utils.patch
delete mode 100644 srcpkgs/atom/patches/use-system-git.patch
delete mode 100644 srcpkgs/atom/template
diff --git a/common/shlibs b/common/shlibs
index bbe55668e47c..8dab6fdfe7a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -114,7 +114,6 @@ libGLESv1_CM.so.1 libGLES-1.0_1
libGLESv2.so.2 libGLES-1.0_1
libEGL.so rpi-userland-0.0.0.0.20150907_1
libGLESv2.so rpi-userland-0.0.0.0.20150907_1
-libGLESv2.so atom-1.41.0_1
libGLESv2.so opera-55.0.2994.37_2
libGLESv2.so discord-0.0.7_1
libGLESv2.so keybase-desktop-3.1.2_1
diff --git a/srcpkgs/atom/patches/fixes.patch b/srcpkgs/atom/patches/fixes.patch
deleted file mode 100644
index 5bb7f9814ba2..000000000000
--- a/srcpkgs/atom/patches/fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -Naurp0 a/atom.sh b/atom.sh
---- a/atom.sh 2019-11-08 22:04:23.210260827 +0300
-+++ b/atom.sh 2019-11-08 22:08:36.721968851 +0300
-@@ -2,25 +1,0 @@
--
--if [ "$(uname)" == 'Darwin' ]; then
-- OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-- OS='Linux'
--else
-- echo "Your platform ($(uname -a)) is not supported."
-- exit 1
--fi
--
--case $(basename $0) in
-- atom-beta)
-- CHANNEL=beta
-- ;;
-- atom-nightly)
-- CHANNEL=nightly
-- ;;
-- atom-dev)
-- CHANNEL=dev
-- ;;
-- *)
-- CHANNEL=stable
-- ;;
--esac
--
-@@ -91,0 +67 @@ mkdir -p "$ATOM_HOME"
-+ATOM_PATH="/usr/libexec/atom/atom"
-@@ -93,9 +69,5 @@ mkdir -p "$ATOM_HOME"
--if [ $OS == 'Mac' ]; then
-- if [ -L "$0" ]; then
-- SCRIPT="$(readlink "$0")"
-- else
-- SCRIPT="$0"
-- fi
-- ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
-- if [ "$ATOM_APP" == . ]; then
-- unset ATOM_APP
-+if [ $EXPECT_OUTPUT ]; then
-+ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+ ATOM_EXIT=$?
-+ if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+ exit "${EXIT_CODE_OVERRIDE}"
-@@ -103,2 +75 @@ if [ $OS == 'Mac' ]; then
-- ATOM_PATH="$(dirname "$ATOM_APP")"
-- ATOM_APP_NAME="$(basename "$ATOM_APP")"
-+ exit ${ATOM_EXIT}
-@@ -106,85 +77,6 @@ if [ $OS == 'Mac' ]; then
--
-- if [ ! -z "${ATOM_APP_NAME}" ]; then
-- # If ATOM_APP_NAME is known, use it as the executable name
-- ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
-- else
-- # Else choose it from the inferred channel name
-- if [ "$CHANNEL" == 'beta' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Beta"
-- elif [ "$CHANNEL" == 'nightly' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Nightly"
-- elif [ "$CHANNEL" == 'dev' ]; then
-- ATOM_EXECUTABLE_NAME="Atom Dev"
-- else
-- ATOM_EXECUTABLE_NAME="Atom"
-- fi
-- fi
--
-- if [ -z "${ATOM_PATH}" ]; then
-- # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
-- if [ -x "/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="/Applications"
-- elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
-- ATOM_PATH="$HOME/Applications"
-- else
-- # We haven't found an Atom.app, use spotlight to search for Atom
-- ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
-- # Exit if Atom can't be found
-- if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-- echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
-- exit 1
-- fi
-- fi
-- fi
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
-- fi
--elif [ $OS == 'Linux' ]; then
-- SCRIPT=$(readlink -f "$0")
-- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
-- case $CHANNEL in
-- beta)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
-- ;;
-- nightly)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
-- ;;
-- dev)
-- ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
-- ;;
-- *)
-- ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-- ;;
-- esac
--
-- : ${TMPDIR:=/tmp}
--
-- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
-- if [ $EXPECT_OUTPUT ]; then
-- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-- ATOM_EXIT=$?
-- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-- exit "${EXIT_CODE_OVERRIDE}"
-- else
-- exit ${ATOM_EXIT}
-- fi
-- else
-- (
-- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-- if [ $? -ne 0 ]; then
-- cat "$ATOM_HOME/nohup.out"
-- exit $?
-- fi
-- ) &
-+else
-+ (
-+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+ if [ $? -ne 0 ]; then
-+ cat "$ATOM_HOME/nohup.out"
-+ exit $?
-@@ -191,0 +84 @@ elif [ $OS == 'Linux' ]; then
-+ ) &
-diff -Naurp0 a/resources/linux/atom.desktop.in b/resources/linux/atom.desktop.in
---- a/resources/linux/atom.desktop.in 2019-11-08 22:29:18.312985700 +0300
-+++ b/resources/linux/atom.desktop.in 2019-11-08 22:31:30.748437296 +0300
-@@ -2,2 +2,2 @@
--Name=<%= appName %>
--Comment=<%= description %>
-+Name=Atom
-+Comment=Chrome-based text editor from Github
-@@ -5,2 +5,2 @@ GenericName=Text Editor
--Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false <%= installDir %>/bin/<%= appFileName %> %F
--Icon=<%= iconPath %>
-+Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false /usr/bin/atom %F
-+Icon=atom
-diff -Naurp0 a/script/lib/install-application.js b/script/lib/install-application.js
---- a/script/lib/install-application.js 2019-11-08 22:32:22.593396868 +0300
-+++ b/script/lib/install-application.js 2019-11-08 22:58:19.347068485 +0300
-@@ -90 +90 @@ module.exports = function(packagedAppPat
-- const shareDirPath = path.join(prefixDirPath, 'share');
-+ const shareDirPath = path.join(prefixDirPath, 'libexec');
-@@ -103 +103 @@ module.exports = function(packagedAppPat
-- const baseIconThemeDirPath = findBaseIconThemeDirPath();
-+ const baseIconThemeDirPath = path.join(prefixDirPath, 'share/icons/hicolor')
-@@ -216 +216 @@ module.exports = function(packagedAppPat
-- 'share',
-+ 'libexec',
-diff -Naurp0 a/src/main-process/atom-application.js b/src/main-process/atom-application.js
---- a/src/main-process/atom-application.js 2019-11-08 22:12:01.212764247 +0300
-+++ b/src/main-process/atom-application.js 2019-11-08 22:16:34.637836128 +0300
-@@ -719 +719 @@ module.exports = class AtomApplication e
-- path.join(process.resourcesPath, 'LICENSE.md')
-+ '/usr/share/licenses/atom/LICENSE.md'
-diff -Naurp0 a/src/workspace.js b/src/workspace.js
---- a/src/workspace.js 2019-11-08 22:14:27.324474946 +0300
-+++ b/src/workspace.js 2019-11-08 22:15:49.853005612 +0300
-@@ -1303 +1303 @@ module.exports = class Workspace extends
-- return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
-+ return this.open('/usr/share/licenses/atom/LICENSE.md');
diff --git a/srcpkgs/atom/patches/git-utils.patch b/srcpkgs/atom/patches/git-utils.patch
deleted file mode 100644
index afb56568bf7f..000000000000
--- a/srcpkgs/atom/patches/git-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 13:26:20.083698872 +0300
-@@ -67 +67 @@
-- "git-utils": "5.6.1",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:45:30.215685265 +0300
-@@ -3187,3 +3187 @@
-- "version": "5.6.1",
-- "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
-- "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
-+ "version": "file:packages/git-utils",
-@@ -5761 +5759 @@
-- "git-utils": "^5.6.0",
-+ "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
---- a/packages/git-utils/binding.gyp 2019-06-20 18:40:36.000000000 +0300
-+++ b/packages/git-utils/binding.gyp 2019-12-19 13:28:15.623981924 +0300
-@@ -164,0 +165,2 @@
-+ 'deps/libgit2/src/net.c',
-+ 'deps/libgit2/src/net.h',
diff --git a/srcpkgs/atom/patches/use-system-git.patch b/srcpkgs/atom/patches/use-system-git.patch
deleted file mode 100644
index 246c80f7a02d..000000000000
--- a/srcpkgs/atom/patches/use-system-git.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json 2019-12-19 17:00:25.029132872 +0300
-@@ -52,0 +53 @@
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json 2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json 2019-12-19 16:44:18.175132282 +0300
-@@ -2530,3 +2530 @@
-- "version": "1.87.5",
-- "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.87.5.tgz",
-- "integrity": "sha512-Rfl1pJ7SaIk8kW9knOGFvVl/aRWAL7RnESs/0GMUCay/yOtVejkrDGlK8JciN5dluJbIg/4bMp0KeK3HGuQqEQ==",
-+ "version": "file:packages/dugite",
-@@ -3212 +3210 @@
-- "dugite": "1.87.5",
-+ "dugite": "file:packages/dugite",
-@@ -6992 +6990 @@
-- "dugite": "^1.86.0",
-+ "dugite": "file:packages/dugite",
-diff -Naurp0 a/packages/dugite/build/lib/git-environment.js b/packages/dugite/build/lib/git-environment.js
---- a/packages/dugite/build/lib/git-environment.js 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/build/lib/git-environment.js 2019-12-19 15:13:56.919818081 +0300
-@@ -4,12 +3,0 @@ const path = require("path");
--function resolveEmbeddedGitDir() {
-- if (process.platform === 'darwin' ||
-- process.platform === 'linux' ||
-- process.platform === 'android' ||
-- process.platform === 'win32') {
-- const s = path.sep;
-- return path
-- .resolve(__dirname, '..', '..', 'git')
-- .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`);
-- }
-- throw new Error('Git not supported on platform: ' + process.platform);
--}
-@@ -27 +15 @@ function resolveGitDir() {
-- return resolveEmbeddedGitDir();
-+ return '/usr';
-@@ -108,7 +95,0 @@ function setupEnvironment(environmentVar
-- if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
-- // use the SSL certificate bundle included in the distribution only
-- // when using embedded Git and not providing your own bundle
-- const distDir = resolveEmbeddedGitDir();
-- const sslCABundle = `${distDir}/ssl/cacert.pem`;
-- env.GIT_SSL_CAINFO = sslCABundle;
-- }
-diff -Naurp0 a/packages/dugite/package.json b/packages/dugite/package.json
---- a/packages/dugite/package.json 1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/package.json 2019-12-19 15:19:07.645889964 +0300
-@@ -16 +15,0 @@
-- "postinstall": "node ./script/download-git.js",
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
deleted file mode 100644
index 928ae28c373b..000000000000
--- a/srcpkgs/atom/template
+++ /dev/null
@@ -1,54 +0,0 @@
-# Template file for 'atom'
-_dugite_ver=1.88.1
-_git_utils_ver=5.6.2
-pkgname=atom
-version=1.44.0
-revision=1
-archs="x86_64"
-hostmakedepends="git pkg-config python-devel nodejs-lts-10 nodejs-lts-10-devel curl gtk+3
- libXtst libXScrnSaver nss python alsa-lib"
-makedepends="python-devel GConf-devel libgnome-keyring-devel gtk+3-devel
- libX11-devel libxkbfile-devel libsecret-devel"
-depends="git"
-short_desc="Chrome-based text editor from Github"
-maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
-homepage="https://atom.io"
-distfiles="
- https://github.com/atom/atom/archive/v${version}.tar.gz
- https://registry.npmjs.org/dugite/-/dugite-${_dugite_ver}.tgz
- https://registry.npmjs.org/git-utils/-/git-utils-${_git_utils_ver}.tgz"
-checksum="
- 8d79697b0c969f22ee8dc2c1d27c608036e92deaf63574f8cd1509ea506eded9
- ddb5479cc78cf863f05b1c35420d66dde55f2bfa66f30cd7bac484ffd5fd6782
- b430ee53a09317df5b6677e5625950baefe840258f2e9d55cf4fc448c9d8576e"
-skip_extraction="
- dugite-${_dugite_ver}.tgz
- git-utils-${_git_utils_ver}.tgz"
-shlib_provides="libGLESv2.so"
-patch_args="-Np1"
-nocross=yes
-nostrip=yes
-python_version=2
-
-post_extract() {
- mkdir -p packages/dugite packages/git-utils
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/dugite-${_dugite_ver}.tgz \
- --strip-components=1 -C packages/dugite
- bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/git-utils-${_git_utils_ver}.tgz \
- --strip-components=1 -C packages/git-utils
-}
-
-pre_build() {
- npm install -g gyp
- vmkdir /usr/share/icons/hicolor
-}
-
-do_build() {
- script/build --install=$DESTDIR/usr
-}
-
-do_install() {
- mv $DESTDIR/usr/libexec/applications $DESTDIR/usr/share
- vlicense LICENSE.md
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a13a60849e36..1850b4b5bfb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -17,6 +17,7 @@ replaces="
appdata-tools<=0.1.8_2
arm-mem-git<=20131108_2
arptables<=0.0.4_3
+ atom<=1.44.0_1
avogadro<=1.2.0_8
avogadro-devel<=1.2.0_8
bokken<=1.8_3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RFC] atom: remove package.
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
` (2 preceding siblings ...)
2021-04-27 17:05 ` [PR PATCH] [Updated] " ericonr
@ 2021-04-27 19:40 ` kwshi
2021-04-30 15:28 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: kwshi @ 2021-04-27 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by kwshi on void-packages repository
https://github.com/void-linux/void-packages/pull/30550#issuecomment-827868767
Comment:
:'( RIP in peace atom
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: [RFC] atom: remove package.
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
` (3 preceding siblings ...)
2021-04-27 19:40 ` kwshi
@ 2021-04-30 15:28 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-30 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]
There's a merged pull request on the void-packages repository
[RFC] atom: remove package.
https://github.com/void-linux/void-packages/pull/30550
Description:
- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
lack of interest for the package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-30 15:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-27 16:58 [PR PATCH] [RFC] atom: remove package ericonr
2021-04-27 17:01 ` [PR PATCH] [Updated] " ericonr
2021-04-27 17:04 ` ericonr
2021-04-27 17:05 ` [PR PATCH] [Updated] " ericonr
2021-04-27 19:40 ` kwshi
2021-04-30 15:28 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).