svn commit: r551827 - in branches/2020Q4: sysutils/gnome-settings-daemon sysutils/gnome-settings-daemon/files x11/gdm x11/gdm/files x11/gnome-shell x11/gnome-shell/files
Baptiste Daroussin
bapt at FreeBSD.org
Fri Oct 9 21:06:17 UTC 2020
Author: bapt
Date: Fri Oct 9 21:06:14 2020
New Revision: 551827
URL: https://svnweb.freebsd.org/changeset/ports/551827
Log:
MFH: r551325 r551326 r551789 r551814 r551815
This all bunch of patches fixes GDM with gnome
x11/gdm: @sample-ify some GDM files in etc/
It's been reported that it would be desired to treat the following
files as samples:
- etc/dbus-1/system.d/gdm.conf.sample
- etc/gdm/Init/Default.sample
- etc/gdm/Xsession.sample
- etc/pam.d/gdm-autologin.sample
- etc/pam.d/gdm-launch-environment.sample
- etc/pam.d/gdm-password.sample
PR: 187558
Submitted by: Eugene M. Kim <astralblue at gmail.com
Reported by: robmessick at gmail.com
Approved by: maintainer timeout
x11/gdm: Switch to USES=localbase
Approved by: portmgr blanket
Properly handle logind -> consolekit
Grab a patch from openbsd and extend it do other components which requires it
Remove from the gnome session a list of required dbus services that no
longer exists
Gnome-shell: fix the login manager interface
gdm call gnome-shell to provide its login manager. with the upgrade of gnome-shell
this wasn't patched to be able to talk to consolekit. Fix this by incorporating patches
from OpenBSD
Added:
branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
- copied unchanged from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c
- copied unchanged from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c
branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c
- copied unchanged from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c
branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in
- copied unchanged from r551814, head/x11/gdm/files/patch-data_gnome-login.session.in
branches/2020Q4/x11/gnome-shell/files/
- copied from r551815, head/x11/gnome-shell/files/
Modified:
branches/2020Q4/sysutils/gnome-settings-daemon/Makefile
branches/2020Q4/x11/gdm/Makefile
branches/2020Q4/x11/gdm/pkg-plist
branches/2020Q4/x11/gnome-shell/Makefile
Directory Properties:
branches/2020Q4/ (props changed)
Modified: branches/2020Q4/sysutils/gnome-settings-daemon/Makefile
==============================================================================
--- branches/2020Q4/sysutils/gnome-settings-daemon/Makefile Fri Oct 9 21:00:14 2020 (r551826)
+++ branches/2020Q4/sysutils/gnome-settings-daemon/Makefile Fri Oct 9 21:06:14 2020 (r551827)
@@ -3,6 +3,7 @@
PORTNAME= gnome-settings-daemon
PORTVERSION= 3.38.0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
Copied: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c (from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c Fri Oct 9 21:06:14 2020 (r551827, copy of r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-plugins_media-keys_gsd-media-keys-manager_c,v 1.17 2020/05/14 15:04:21 ajacoutot Exp $
+
+Inhibit support (login1 -> ConsoleKit).
+
+Index: plugins/media-keys/gsd-media-keys-manager.c
+--- plugins/media-keys/gsd-media-keys-manager.c.orig 2020-09-13 22:34:14 UTC
++++ plugins/media-keys/gsd-media-keys-manager.c
+@@ -123,9 +123,9 @@ static const gchar introspection_xml[] =
+ #define VOLUME_STEP_PRECISE 2
+ #define MAX_VOLUME 65536.0
+
+-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
+-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1"
+-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit"
++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+
+ #define AUDIO_SELECTION_DBUS_NAME "org.gnome.Shell.AudioDeviceSelection"
+ #define AUDIO_SELECTION_DBUS_PATH "/org/gnome/Shell/AudioDeviceSelection"
Copied: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c (from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c Fri Oct 9 21:06:14 2020 (r551827, copy of r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c)
@@ -0,0 +1,15 @@
+--- plugins/power/gsd-backlight.c.orig 2020-09-13 22:34:14 UTC
++++ plugins/power/gsd-backlight.c
+@@ -61,9 +61,9 @@ enum {
+ PROP_LAST,
+ };
+
+-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
+-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1/session/auto"
+-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Session"
++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit"
++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+
+ static GParamSpec *props[PROP_LAST];
+
Copied: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c (from r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c Fri Oct 9 21:06:14 2020 (r551827, copy of r551789, head/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c)
@@ -0,0 +1,15 @@
+--- plugins/power/gsd-power-manager.c.orig 2020-09-13 22:34:14 UTC
++++ plugins/power/gsd-power-manager.c
+@@ -70,9 +70,9 @@
+ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */
+ #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */
+
+-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1"
+-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1"
+-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
++#define SYSTEMD_DBUS_NAME "org.freedesktop.ConsoleKit"
++#define SYSTEMD_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+
+ /* Time between notifying the user about a critical action and the action itself in UPower. */
+ #define GSD_ACTION_DELAY 20
Modified: branches/2020Q4/x11/gdm/Makefile
==============================================================================
--- branches/2020Q4/x11/gdm/Makefile Fri Oct 9 21:00:14 2020 (r551826)
+++ branches/2020Q4/x11/gdm/Makefile Fri Oct 9 21:06:14 2020 (r551827)
@@ -3,8 +3,7 @@
PORTNAME= gdm
PORTVERSION= 3.28.4
-PORTREVISION= 2
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -44,7 +43,7 @@ GROUPS= gdm video
PORTSCOUT= limitw:1,even
-USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz xorg
+USES= cpe gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz xorg
CPE_VENDOR= gnome
CPE_PRODUCT= gnome_display_manager
USE_GNOME= cairo dconf gconf2 gtk30 intltool introspection
@@ -83,8 +82,7 @@ CONFIGURE_ARGS= --disable-static \
# this is a hack until we can get our own pam dir and dir in order.
CONFIGURE_ARGS+=--with-default-pam-config=redhat
-CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN
-LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -DHAS_SA_LEN
INSTALL_TARGET= install-strip
SUB_FILES+= gdm-launch-environment \
@@ -139,6 +137,12 @@ post-install:
${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default.sample
${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default \
${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default.sample
+ ${MV} ${STAGEDIR}${PREFIX}/etc/gdm/Init/Default \
+ ${STAGEDIR}${PREFIX}/etc/gdm/Init/Default.sample
+ ${MV} ${STAGEDIR}${PREFIX}/etc/gdm/Xsession \
+ ${STAGEDIR}${PREFIX}/etc/gdm/Xsession.sample
+ ${MV} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/gdm.conf \
+ ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/gdm.conf.sample
${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
@@ -148,11 +152,11 @@ post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
${INSTALL_DATA} ${WRKDIR}/gdm-autologin \
- ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin.sample
${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment \
- ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment.sample
${INSTALL_DATA} ${WRKDIR}/gdm-password \
- ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password.sample
${INSTALL_DATA} ${WRKDIR}/client.conf \
${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/client.conf.sample
Copied: branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in (from r551814, head/x11/gdm/files/patch-data_gnome-login.session.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in Fri Oct 9 21:06:14 2020 (r551827, copy of r551814, head/x11/gdm/files/patch-data_gnome-login.session.in)
@@ -0,0 +1,7 @@
+--- data/gnome-login.session.in.orig 2018-08-01 19:00:01 UTC
++++ data/gnome-login.session.in
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ Name=Display Manager
+-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
Modified: branches/2020Q4/x11/gdm/pkg-plist
==============================================================================
--- branches/2020Q4/x11/gdm/pkg-plist Fri Oct 9 21:00:14 2020 (r551826)
+++ branches/2020Q4/x11/gdm/pkg-plist Fri Oct 9 21:06:14 2020 (r551827)
@@ -1,17 +1,17 @@
bin/gdm-screenshot
bin/gdmflexiserver
-etc/dbus-1/system.d/gdm.conf
-%%ETCDIR%%/Init/Default
+ at sample etc/dbus-1/system.d/gdm.conf.sample
+ at sample %%ETCDIR%%/Init/Default.sample
@sample %%ETCDIR%%/PostLogin/Default.sample
@sample %%ETCDIR%%/PostSession/Default.sample
@sample %%ETCDIR%%/PreSession/Default.sample
-%%ETCDIR%%/Xsession
+ at sample %%ETCDIR%%/Xsession.sample
@sample %%ETCDIR%%/custom.conf.sample
@sample %%ETCDIR%%/home/.pulse/client.conf.sample
@sample %%ETCDIR%%/locale.conf.sample
-etc/pam.d/gdm-autologin
-etc/pam.d/gdm-launch-environment
-etc/pam.d/gdm-password
+ at sample etc/pam.d/gdm-autologin.sample
+ at sample etc/pam.d/gdm-launch-environment.sample
+ at sample etc/pam.d/gdm-password.sample
include/gdm/gdm-client-glue.h
include/gdm/gdm-client.h
include/gdm/gdm-sessions.h
Modified: branches/2020Q4/x11/gnome-shell/Makefile
==============================================================================
--- branches/2020Q4/x11/gnome-shell/Makefile Fri Oct 9 21:00:14 2020 (r551826)
+++ branches/2020Q4/x11/gnome-shell/Makefile Fri Oct 9 21:06:14 2020 (r551827)
@@ -3,6 +3,7 @@
PORTNAME= gnome-shell
PORTVERSION= 3.36.6
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -72,6 +73,9 @@ GLIB_SCHEMAS= org.gnome.shell.gschema.xml \
# Work around "New rpath must not be longer than the old one."
LDFLAGS+= -fuse-ld=lld
.endif
+
+post-extract:
+ ${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces
post-patch:
${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \
More information about the svn-ports-all
mailing list