github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-15 01:48:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14269 from atom/mkt-upgrade-apm-to-use-async-keytar-with-libsecret

Browse Source 
Update apm to use async keytar with libsecret
This commit is contained in:
Michelle Tilley
2017-04-30 08:35:46 -07:00
committed by GitHub
parent 714d2bfe2c 241d758083
commit 211b486a6f
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -4,9 +4,10 @@ git:
matrix:
include:
- os: linux
dist: trusty
env: NODE_VERSION=6.9.4 DISPLAY=:99.0 CC=clang CXX=clang++ npm_config_clang=1
sudo: false
sudo: required
before_install:
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
@@ -50,7 +51,7 @@ addons:
- clang-3.3
- fakeroot
- git
- libgnome-keyring-dev
- libsecret-1-dev
- rpm
- libx11-dev
- libxkbfile-dev

2
Dockerfile
View File

@@ -11,7 +11,7 @@ RUN yum install -y \
gcc-c++ \
glibc-devel \
git-core \
libgnome-keyring-devel \
libsecret-devel \
rpmdevtools
RUN npm install -g npm --loglevel error

2
apm/package.json
View File

@@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "1.17.0"
"atom-package-manager": "1.18.0"
}
}

12
docs/build-instructions/linux.md
View File

@@ -10,7 +10,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
* Node.js 6.x (we recommend installing it via [nvm](https://github.com/creationix/nvm))
* npm 3.10.x or later (run `npm install -g npm`)
* Ensure node-gyp uses python2 (run `npm config set python /usr/bin/python2 -g`, use `sudo` if you didn't install node via nvm)
* Development headers for [GNOME Keyring](https://wiki.gnome.org/Projects/GnomeKeyring).
* Development headers for [libsecret](https://wiki.gnome.org/Projects/Libsecret).
For more details, scroll down to find how to setup a specific Linux distro.
@@ -36,7 +36,7 @@ To also install the newly built application, use `--create-debian-package` or `-
* Install GNOME headers and other basic prerequisites:
```sh
sudo apt-get install build-essential git libgnome-keyring-dev fakeroot rpm libx11-dev libxkbfile-dev
sudo apt-get install build-essential git libsecret-1-dev fakeroot rpm libx11-dev libxkbfile-dev
```
* If `script/build` exits with an error, you may need to install a newer C++ compiler with C++11:
@@ -51,15 +51,15 @@ To also install the newly built application, use `--create-debian-package` or `-
### Fedora 22+
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libsecret-devel rpmdevtools libX11-devel libxkbfile-devel`
### Fedora 21 / CentOS / RHEL
* `sudo yum install -y make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
* `sudo yum install -y make gcc gcc-c++ glibc-devel git-core libsecret-devel rpmdevtools`
### Arch
* `sudo pacman -S --needed gconf base-devel git nodejs npm libgnome-keyring python2 libx11 libxkbfile`
* `sudo pacman -S --needed gconf base-devel git nodejs npm libsecret python2 libx11 libxkbfile`
* `export PYTHON=/usr/bin/python2` before building Atom.
### Slackware
@@ -68,7 +68,7 @@ To also install the newly built application, use `--create-debian-package` or `-
### openSUSE
* `sudo zypper install nodejs nodejs-devel make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
* `sudo zypper install nodejs nodejs-devel make gcc gcc-c++ glibc-devel git-core libsecret-devel rpmdevtools libX11-devel libxkbfile-devel`
## Troubleshooting

2
resources/linux/debian/control.in
View File

@@ -2,7 +2,7 @@ Package: <%= appFileName %>
Version: <%= version %>
Depends: git, gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11 | libgcrypt20, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils, libcap2
Recommends: lsb-release
Suggests: libgnome-keyring0, gir1.2-gnomekeyring-1.0
Suggests: libsecret-1-0, gir1.2-gnomekeyring-1.0
Section: devel
Priority: optional
Architecture: <%= arch %>

4
resources/linux/redhat/atom.spec.in
View File

@@ -8,9 +8,9 @@ AutoReqProv: no # Avoid libchromiumcontent.so missing dependency
Prefix: <%= installDir %>
%ifarch i386 i486 i586 i686
Requires: lsb-core-noarch, libXss.so.1
Requires: lsb-core-noarch, libXss.so.1 libsecret-1.so.0
%else
Requires: lsb-core-noarch, libXss.so.1()(64bit)
Requires: lsb-core-noarch, libXss.so.1()(64bit) libsecret-1.so.0()(64bit)
%endif
%description