From 9347922a72ebabd4d0a46746061b8164aa4ecdaa Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 14 Oct 2016 07:41:30 -0600 Subject: [PATCH 1/4] :arrow_up: atom-keymap --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 108db5904..663998c37 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "electronVersion": "1.3.6", "dependencies": { "async": "0.2.6", - "atom-keymap": "7.0.3", + "atom-keymap": "7.0.4-beta0", "atom-ui": "0.4.1", "babel-core": "5.8.38", "cached-run-in-this-context": "0.4.1", From d1e70691788a44b5a08fc0f56eb2c4262a77f19b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 14 Oct 2016 08:01:46 -0600 Subject: [PATCH 2/4] Add atom-keymap build dependencies on Travis - libx11-dev - libxkbfile-dev --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 505d56b40..d5918dc8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,3 +49,5 @@ addons: - git - libgnome-keyring-dev - rpm + - libx11-dev + - libxkbfile-dev From a759e5f17dbf470183d1aa1795615a508da0e4ff Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 14 Oct 2016 08:06:15 -0600 Subject: [PATCH 3/4] Document X11 dependencies in Linux build instructions I'm a bit fuzzy on some of the more obscure package managers, but Linux users on those platforms can help us improve the docs if I screwed up the names on those platforms. --- docs/build-instructions/linux.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index fb7e96bef..a05bbff16 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -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 From 56b8f427400f3ec31587cce35071a5961a25ccd7 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 17 Oct 2016 12:58:56 -0600 Subject: [PATCH 4/4] :arrow_up: atom-keymap --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 663998c37..1d1598fb3 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "electronVersion": "1.3.6", "dependencies": { "async": "0.2.6", - "atom-keymap": "7.0.4-beta0", + "atom-keymap": "7.0.6-beta0", "atom-ui": "0.4.1", "babel-core": "5.8.38", "cached-run-in-this-context": "0.4.1",