diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-12-06 11:52:42 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-12-06 11:56:22 +0100 |
| commit | c98da3423b1b9e0662f00b0a2f517a7ca7340cde (patch) | |
| tree | f86c480bfa2ecd1f1f6658dc9decaf0ade2ad976 /community/gnome-session | |
| parent | c82fce8db7e27fbdf126b415b8d46409444a12af (diff) | |
| download | aports-c98da3423b1b9e0662f00b0a2f517a7ca7340cde.tar.bz2 aports-c98da3423b1b9e0662f00b0a2f517a7ca7340cde.tar.xz | |
community/gnome-session: upgrade to 3.34.2
* Revert upstream commit to fix starting w/o systemd, see
https://gitlab.gnome.org/GNOME/gnome-session/issues/44 for more information.
* Set pkgrel to 1 so everyone is upgraded to this, even if they previously
upgraded to 3.34.2-r0 before we reverted that bump.
Diffstat (limited to 'community/gnome-session')
| -rw-r--r-- | community/gnome-session/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch | 67 | ||||
| -rw-r--r-- | community/gnome-session/APKBUILD | 10 |
2 files changed, 73 insertions, 4 deletions
diff --git a/community/gnome-session/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch b/community/gnome-session/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch new file mode 100644 index 0000000000..af8350b8d9 --- /dev/null +++ b/community/gnome-session/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch @@ -0,0 +1,67 @@ +From 1de3575a1ea9cdb3579ad538108c51818847797c Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <oss@cogitri.dev> +Date: Fri, 6 Dec 2019 11:48:02 +0100 +Subject: [PATCH] revert: autostart-app: Strip blacklisted variables from + autostart environment + +This breaks gnome-session on non-systemd systems. + +https://gitlab.gnome.org/GNOME/gnome-session/issues/44 +--- + gnome-session/gsm-autostart-app.c | 5 ----- + gnome-session/gsm-util.c | 6 ------ + gnome-session/gsm-util.h | 1 - + 3 files changed, 12 deletions(-) + +diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c +index 6fd5915..01ba5f9 100644 +--- a/gnome-session/gsm-autostart-app.c ++++ b/gnome-session/gsm-autostart-app.c +@@ -997,7 +997,6 @@ autostart_app_start_spawn (GsmAutostartApp *app, + gboolean success; + GError *local_error; + const char *startup_id; +- const char * const *variable_blacklist; + const char * const *child_environment; + int i; + GAppLaunchContext *ctx; +@@ -1014,10 +1013,6 @@ autostart_app_start_spawn (GsmAutostartApp *app, + local_error = NULL; + ctx = g_app_launch_context_new (); + +- variable_blacklist = gsm_util_get_variable_blacklist (); +- for (i = 0; variable_blacklist[i] != NULL; i++) +- g_app_launch_context_unsetenv (ctx, variable_blacklist[i]); +- + child_environment = gsm_util_listenv (); + for (i = 0; child_environment[i] != NULL; i++) { + char **environment_tuple; +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index 02bc4a5..ada1225 100644 +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c +@@ -808,9 +808,3 @@ gsm_util_listenv (void) + return (const char * const *) child_environment; + + } +- +-const char * const * +-gsm_util_get_variable_blacklist (void) +-{ +- return variable_blacklist; +-} +diff --git a/gnome-session/gsm-util.h b/gnome-session/gsm-util.h +index bd7b698..8bca5f4 100644 +--- a/gnome-session/gsm-util.h ++++ b/gnome-session/gsm-util.h +@@ -50,7 +50,6 @@ char * gsm_util_generate_startup_id (void); + void gsm_util_setenv (const char *variable, + const char *value); + const char * const * gsm_util_listenv (void); +-const char * const * gsm_util_get_variable_blacklist(void); + + gboolean gsm_util_export_activation_environment (GError **error); + #ifdef HAVE_SYSTEMD +-- +2.24.0 + diff --git a/community/gnome-session/APKBUILD b/community/gnome-session/APKBUILD index f697a7f50e..9b4825d778 100644 --- a/community/gnome-session/APKBUILD +++ b/community/gnome-session/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gnome-session -pkgver=3.34.1 -pkgrel=0 +pkgver=3.34.2 +pkgrel=1 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" arch="all !s390x !ppc64le" @@ -14,7 +14,8 @@ makedepends="gnome-settings-daemon-dev libsm-dev docbook-xml" options="!check" #no tests subpackages="$pkgname-lang $pkgname-doc" -source="https://download.gnome.org/sources/gnome-session/${pkgver%.*}/gnome-session-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gnome-session/${pkgver%.*}/gnome-session-$pkgver.tar.xz + 0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch" build() { meson \ @@ -34,4 +35,5 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="a8c0c2e7613639dd48416d4bb560aa4b5ed664268cee6b6c372d5d196e49350c13f1361e02bba57711992860189637ce542351bee01000a44a82f66dd4f79f7f gnome-session-3.34.1.tar.xz" +sha512sums="23388420ee117596b73ac057d2376857db726fb727fdeff4e4f420e7742622e81baef439adb04d8659a6979e5b7043c72ea334c1179974950476489a8c397182 gnome-session-3.34.2.tar.xz +3d61a847da175b780fce8b2646264836656e6cdc6294e0af6c667a64f30e6d837ef22ce54b3ac51c4f569a7e09844bdcd058417292ea014826256157fa7dbdc3 0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch" |