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

Merge pull request #12985 from atom/ns-fix-keymap-ctrl-issue

Browse Source 
Fix keystroke resolution problems on Linux
This commit is contained in:
Nathan Sobo
2016-10-24 19:29:12 -06:00
committed by GitHub
parent 574e69c63f e13a4534c8
commit 9d970711fd
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -49,3 +49,5 @@ addons:
- git
- libgnome-keyring-dev
- rpm
- libx11-dev
- libxkbfile-dev

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

@@ -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
sudo apt-get install build-essential git libgnome-keyring-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,11 +51,11 @@ To also install the newly built application, use `--create-debian-package` or `-
### Fedora / CentOS / RHEL
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
### Arch
* `sudo pacman -S --needed gconf base-devel git nodejs npm libgnome-keyring python2`
* `sudo pacman -S --needed gconf base-devel git nodejs npm libgnome-keyring python2 libX11-devel libxkbfile-devel`
* `export PYTHON=/usr/bin/python2` before building Atom.
### Slackware
@@ -64,7 +64,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`
* `sudo zypper install nodejs nodejs-devel make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
## Troubleshooting

2
package.json
View File

@@ -15,7 +15,7 @@
"electronVersion": "1.3.6",
"dependencies": {
"async": "0.2.6",
"atom-keymap": "7.0.6",
"atom-keymap": "7.0.7",
"atom-ui": "0.4.1",
"babel-core": "5.8.38",
"cached-run-in-this-context": "0.4.1",