From 63466a88241ee8087be56a56cf83ee44c07ba3b8 Mon Sep 17 00:00:00 2001 From: Maarten Fonville Date: Thu, 1 Oct 2020 23:21:02 +0200 Subject: [PATCH 1/5] Update Debian dependencies, fixes Ubuntu Groovy Atom is not install-able on Ubuntu Groovy because of outdated dependencies as described in #21422 This fixes and updates Atom dependencies after investigation with @DeeDeeG Some dependencies are not required by Electron anymore, some packages are unavailable/outdated and need alternatives Some dependencies are less strict and can be a suggestion or recommendation. For details see bugreport #21422 --- resources/linux/debian/control.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index 2bc02364a..0af022bad 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,8 +1,8 @@ Package: <%= appFileName %> Version: <%= version %> -Depends: git, libgconf-2-4 (>= 3.2.5) | libgconf2-4, libgtk-3-0 (>= 3.9.10), libgcrypt11 | libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libasound2 (>= 1.0.16), libxkbfile1, libcurl3 | libcurl4, policykit-1 -Recommends: lsb-release -Suggests: libsecret-1-0, gir1.2-gnomekeyring-1.0 +Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libcurl3 | libcurl4 +Recommends: libasound2 (>= 1.0.16), policykit-1 +Suggests: lsb-release Section: devel Priority: optional Architecture: <%= arch %> From 94657fd226c46fbecf88e2f26a754e1c355bba3b Mon Sep 17 00:00:00 2001 From: Maarten Fonville Date: Fri, 2 Oct 2020 00:38:43 +0200 Subject: [PATCH 2/5] Update control.in Keep libsecret-1-0 in suggests --- resources/linux/debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index 0af022bad..1afc67c6f 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -2,7 +2,7 @@ Package: <%= appFileName %> Version: <%= version %> Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libcurl3 | libcurl4 Recommends: libasound2 (>= 1.0.16), policykit-1 -Suggests: lsb-release +Suggests: libsecret-1-0, lsb-release Section: devel Priority: optional Architecture: <%= arch %> From d2a60dc2423aee574b192b2c0662ab680d9623c7 Mon Sep 17 00:00:00 2001 From: Maarten Fonville Date: Fri, 2 Oct 2020 11:55:57 +0200 Subject: [PATCH 3/5] Add gnome-keyring `gnome-keyring` is necessary to run the secret service itself. A KDE-equivalent is not (yet) available. Without its daemon service, libsecret cannot store any secrets. Put it in recommends so that it is installed by default (majority of use-cases) --- resources/linux/debian/control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index 1afc67c6f..a438d03b0 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,8 +1,8 @@ Package: <%= appFileName %> Version: <%= version %> Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libcurl3 | libcurl4 -Recommends: libasound2 (>= 1.0.16), policykit-1 -Suggests: libsecret-1-0, lsb-release +Recommends: libasound2 (>= 1.0.16), policykit-1, libsecret-1-0, gnome-keyring +Suggests: lsb-release Section: devel Priority: optional Architecture: <%= arch %> From f2be31248759b9dd411599408ed97be655bb5eb2 Mon Sep 17 00:00:00 2001 From: Maarten Fonville Date: Fri, 2 Oct 2020 13:22:39 +0200 Subject: [PATCH 4/5] Keep libxkbfile1 dependency ldd doesn't see libxkbfile1 as dependency, but when typing in the Atom-editor, missing this library spawns an error --- resources/linux/debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index a438d03b0..07cc1d390 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,6 +1,6 @@ Package: <%= appFileName %> Version: <%= version %> -Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libcurl3 | libcurl4 +Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libxkbfile1, libcurl3 | libcurl4 Recommends: libasound2 (>= 1.0.16), policykit-1, libsecret-1-0, gnome-keyring Suggests: lsb-release Section: devel From bc85b5e39f5ab291e3323a87bd3746cb5825e0af Mon Sep 17 00:00:00 2001 From: Maarten Fonville Date: Sun, 4 Oct 2020 13:10:18 +0200 Subject: [PATCH 5/5] Updated dependencies for trash-handling According to findings of @DeeDeeG dependencies for trash-handling should be even more limited: https://github.com/atom/atom/issues/21422#issuecomment-703132449 because `ELECTRON_TRASH` variable would otherwise have to be set. --- resources/linux/debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/debian/control.in b/resources/linux/debian/control.in index 07cc1d390..345c0dac4 100644 --- a/resources/linux/debian/control.in +++ b/resources/linux/debian/control.in @@ -1,6 +1,6 @@ Package: <%= appFileName %> Version: <%= version %> -Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), kde-cli-tools | kde-runtime | trash-cli | libglib2.0-bin | gvfs-bin, xdg-utils, libx11-xcb1, libxss1, libxkbfile1, libcurl3 | libcurl4 +Depends: git, libgconf-2-4 (>= 3.2.5), libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), libglib2.0-bin | kde-cli-tools | kde-runtime, xdg-utils, libx11-xcb1, libxss1, libxkbfile1, libcurl3 | libcurl4 Recommends: libasound2 (>= 1.0.16), policykit-1, libsecret-1-0, gnome-keyring Suggests: lsb-release Section: devel