* [PR PATCH] flatpak: fix setting environment variables on gdm
@ 2022-09-13 18:31 oreo639
2022-09-13 18:35 ` [PR PATCH] [Updated] " oreo639
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: oreo639 @ 2022-09-13 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1530 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gdmenv
https://github.com/void-linux/void-packages/pull/39265
flatpak: fix setting environment variables on gdm
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This doesn't affect `GDM -> gnome` due to: https://github.com/void-linux/void-packages/pull/9126
However it does affect `GDM -> <anything other than gnome>`
See: https://wiki.gnome.org/Initiatives/Wayland/SessionStart
(`/etc/profile` never gets loaded in GDM)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39265.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdmenv-39265.patch --]
[-- Type: text/x-diff, Size: 1986 bytes --]
From 8318666af3251c1a79844b568ede983c299c6ad4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:27:34 -0700
Subject: [PATCH 1/2] gdm: create env.d
---
srcpkgs/gdm/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..af7e4adae380 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="
@@ -32,6 +32,9 @@ conf_files="
/etc/pam.d/gdm-launch-environment
/etc/pam.d/gdm-password
/etc/pam.d/gdm-smartcard"
+make_dirs="
+ /usr/share/gdm/env.d 0755 root root
+ /etc/gdm/env.d 0755 root root"
# Create the 'gdm' system user/group.
system_accounts="gdm"
gdm_homedir="/var/lib/gdm"
@@ -52,7 +55,6 @@ post_install() {
vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
fi
done
- rm -rf ${DESTDIR}/tmp
# runit service
vsv gdm
From fd28467092ff888e54ffaf7fa3ba1ad963520783 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:28:55 -0700
Subject: [PATCH 2/2] flatpak: fix setting environment variables on gdm
---
srcpkgs/flatpak/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 778ab0e681d8..e9fefbf33925 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,7 +1,7 @@
# Template file for 'flatpak'
pkgname=flatpak
version=1.14.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="
@@ -9,6 +9,7 @@ configure_args="
--with-system-dbus-proxy
--with-system-helper-user=_flatpak
--enable-selinux-module=no
+ --enable-gdm-env-file
$(vopt_enable gir introspection)"
hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] flatpak: fix setting environment variables on gdm
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
@ 2022-09-13 18:35 ` oreo639
2022-10-02 21:00 ` paper42
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: oreo639 @ 2022-09-13 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gdmenv
https://github.com/void-linux/void-packages/pull/39265
flatpak: fix setting environment variables on gdm
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This doesn't affect `GDM -> gnome` due to: https://github.com/void-linux/void-packages/pull/9126
However it does affect `GDM -> <anything other than gnome>`
See: https://wiki.gnome.org/Initiatives/Wayland/SessionStart
(`/etc/profile` never gets loaded in GDM)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39265.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdmenv-39265.patch --]
[-- Type: text/x-diff, Size: 2553 bytes --]
From 6f25ed384ff82aa670571c6759b76e59c4c81a1a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:27:34 -0700
Subject: [PATCH 1/2] gdm: create env.d
---
srcpkgs/gdm/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..e2b2fcfc2eb9 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="
@@ -10,7 +10,8 @@ configure_args="
-Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
-Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
-Dselinux=disabled -Dlibaudit=disabled
- -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp"
+ -Dsystemdsystemunitdir=/usr/lib/systemd/system
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="dconf gettext itstool pkg-config"
makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
@@ -32,6 +33,9 @@ conf_files="
/etc/pam.d/gdm-launch-environment
/etc/pam.d/gdm-password
/etc/pam.d/gdm-smartcard"
+make_dirs="
+ /usr/share/gdm/env.d 0755 root root
+ /etc/gdm/env.d 0755 root root"
# Create the 'gdm' system user/group.
system_accounts="gdm"
gdm_homedir="/var/lib/gdm"
@@ -52,7 +56,6 @@ post_install() {
vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
fi
done
- rm -rf ${DESTDIR}/tmp
# runit service
vsv gdm
From 46f6abaa6ea4bbdcb63d579caee9215008ea3dd5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:28:55 -0700
Subject: [PATCH 2/2] flatpak: fix setting environment variables on gdm
---
srcpkgs/flatpak/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 778ab0e681d8..e9fefbf33925 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,7 +1,7 @@
# Template file for 'flatpak'
pkgname=flatpak
version=1.14.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="
@@ -9,6 +9,7 @@ configure_args="
--with-system-dbus-proxy
--with-system-helper-user=_flatpak
--enable-selinux-module=no
+ --enable-gdm-env-file
$(vopt_enable gir introspection)"
hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: flatpak: fix setting environment variables on gdm
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
2022-09-13 18:35 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-02 21:00 ` paper42
2022-10-02 21:03 ` [PR REVIEW] " paper42
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-02 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39265#issuecomment-1264732074
Comment:
This also seems to be an issue on GNOME Xorg now
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] flatpak: fix setting environment variables on gdm
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
2022-09-13 18:35 ` [PR PATCH] [Updated] " oreo639
2022-10-02 21:00 ` paper42
@ 2022-10-02 21:03 ` paper42
2022-10-02 21:22 ` paper42
2022-10-02 21:22 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-02 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39265#discussion_r985296562
Comment:
these should be probably indented by a single space
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] flatpak: fix setting environment variables on gdm
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
` (2 preceding siblings ...)
2022-10-02 21:03 ` [PR REVIEW] " paper42
@ 2022-10-02 21:22 ` paper42
2022-10-02 21:22 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-02 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39265#discussion_r985298491
Comment:
hmm, it seems like I was wrong, other packages also use tabs, interesting
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: flatpak: fix setting environment variables on gdm
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
` (3 preceding siblings ...)
2022-10-02 21:22 ` paper42
@ 2022-10-02 21:22 ` paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-02 21:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]
There's a merged pull request on the void-packages repository
flatpak: fix setting environment variables on gdm
https://github.com/void-linux/void-packages/pull/39265
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This doesn't affect `GDM -> gnome` due to: https://github.com/void-linux/void-packages/pull/9126
However it does affect `GDM -> <anything other than gnome>`
See: https://wiki.gnome.org/Initiatives/Wayland/SessionStart
(`/etc/profile` never gets loaded in GDM)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-02 21:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-13 18:31 [PR PATCH] flatpak: fix setting environment variables on gdm oreo639
2022-09-13 18:35 ` [PR PATCH] [Updated] " oreo639
2022-10-02 21:00 ` paper42
2022-10-02 21:03 ` [PR REVIEW] " paper42
2022-10-02 21:22 ` paper42
2022-10-02 21:22 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).