From 388da2b60c67093a42e057444c54ad9095453471 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 20 Apr 2017 09:33:07 -0700 Subject: [PATCH 1/6] :arrow_up: atom-package-manager@1.18.0 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index 5e3dcb1e0..6b6c2b01c 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "1.17.0" + "atom-package-manager": "1.18.0" } } From 8838b6273778362f70a2a3685f6cac549510647b Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 20 Apr 2017 09:33:34 -0700 Subject: [PATCH 2/6] Update Travis manifest to use libsecret --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c3f25c49..253732808 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 9655bdf5e7b10dfbc9d6af9d4adf9942c997abd6 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 20 Apr 2017 09:37:09 -0700 Subject: [PATCH 3/6] Update Linux build instructions to specify libsecret dependency --- docs/build-instructions/linux.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index 3c1bc49db..b5b3325ee 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -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 From 0c32fcc57340d8803acb453e4323572f35384ad6 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 20 Apr 2017 09:37:21 -0700 Subject: [PATCH 4/6] Update builds to include libsecret --- Dockerfile | 2 +- resources/linux/debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22a101743..7fbacdc96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index d06095f4b..e8cb1c90e 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -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 %> From 9a4234f49f6a010e7786be1260b2d8b36adee8a0 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 27 Apr 2017 15:05:03 -0700 Subject: [PATCH 5/6] Add libsecret to RedHat deps --- resources/linux/redhat/atom.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in index 306f1029e..ec0f03646 100644 --- a/resources/linux/redhat/atom.spec.in +++ b/resources/linux/redhat/atom.spec.in @@ -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) ibsecret-1.so.0()(64bit) %endif %description From 241d758083746106477f4e098322551b8b806738 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 27 Apr 2017 15:05:15 -0700 Subject: [PATCH 6/6] :keyboard: --- resources/linux/redhat/atom.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in index ec0f03646..471d4b82a 100644 --- a/resources/linux/redhat/atom.spec.in +++ b/resources/linux/redhat/atom.spec.in @@ -10,7 +10,7 @@ Prefix: <%= installDir %> %ifarch i386 i486 i586 i686 Requires: lsb-core-noarch, libXss.so.1 libsecret-1.so.0 %else -Requires: lsb-core-noarch, libXss.so.1()(64bit) ibsecret-1.so.0()(64bit) +Requires: lsb-core-noarch, libXss.so.1()(64bit) libsecret-1.so.0()(64bit) %endif %description