Index: branches/2020Q4/sysutils/gnome-settings-daemon/Makefile =================================================================== --- branches/2020Q4/sysutils/gnome-settings-daemon/Makefile (revision 551826) +++ branches/2020Q4/sysutils/gnome-settings-daemon/Makefile (revision 551827) @@ -1,73 +1,74 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= gnome-settings-daemon PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 settings daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:sysutils/polkit \ libfontconfig.so:x11-fonts/fontconfig \ libcolord.so:graphics/colord \ liblcms2.so:graphics/lcms2 \ libpulse.so:audio/pulseaudio \ libnotify.so:devel/libnotify \ libgeoclue-2.so:net/geoclue \ libupower-glib.so:sysutils/upower \ libgeocode-glib.so:net/geocode-glib \ libgweather-3.so:net/libgweather \ libcups.so:print/cups \ libnss3.so:security/nss \ libnspr4.so:devel/nspr PORTSCOUT= limitw:1,even USE_XORG= x11 xext xi xtst USE_GNOME= cairo gnomedesktop3 gtk30 USES= gettext gnome localbase:ldflags meson perl5 \ pkgconfig python:3.6+,build tar:xz xorg USE_PERL5= build INSTALLS_ICONS= yes # -Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt MESON_ARGS= -Dnssdb_dir=${LOCALBASE}/share/certs/ \ -Dalsa=false \ -Drfkill=false \ -Dnetwork_manager=false \ -Dsystemd=false \ -Dwwan=false \ -Dcups=true \ -Dsmartcard=true BINARY_ALIAS= python3=${PYTHON_VERSION} # wayland doesn't build yet, undefined symbol MESON_ARGS+= -Dwayland=false -Dgudev=false #WAYLAND_MESON_TRUE= wayland gudev #WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \ # libwayland-client.so:graphics/wayland GLIB_SCHEMAS= org.gnome.settings-daemon.enums.xml \ org.gnome.settings-daemon.peripherals.gschema.xml \ org.gnome.settings-daemon.peripherals.wacom.gschema.xml \ org.gnome.settings-daemon.plugins.color.gschema.xml \ org.gnome.settings-daemon.plugins.gschema.xml \ org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \ org.gnome.settings-daemon.plugins.media-keys.gschema.xml \ org.gnome.settings-daemon.plugins.power.gschema.xml \ org.gnome.settings-daemon.plugins.power.gschema.xml.override \ org.gnome.settings-daemon.plugins.sharing.gschema.xml \ org.gnome.settings-daemon.plugins.xsettings.gschema.xml post-install: ${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \ ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/ .include Index: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c =================================================================== --- branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c (nonexistent) +++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c (revision 551827) @@ -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" Property changes on: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c =================================================================== --- branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c (nonexistent) +++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c (revision 551827) @@ -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]; + Property changes on: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-backlight.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c =================================================================== --- branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c (nonexistent) +++ branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c (revision 551827) @@ -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 Property changes on: branches/2020Q4/sysutils/gnome-settings-daemon/files/patch-plugins_power_gsd-power-manager.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gdm/Makefile =================================================================== --- branches/2020Q4/x11/gdm/Makefile (revision 551826) +++ branches/2020Q4/x11/gdm/Makefile (revision 551827) @@ -1,167 +1,171 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= gdm PORTVERSION= 3.28.4 -PORTREVISION= 2 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 display manager LICENSE= GPLv2 LICENSE_FILES= ${WRKSRC}/COPYING BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \ itstool:textproc/itstool \ iso-codes>=0:misc/iso-codes LIB_DEPENDS= libck-connector.so:sysutils/consolekit2 \ libaccountsservice.so:sysutils/accountsservice \ libfribidi.so:converters/fribidi \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 RUN_DEPENDS= zenity>=3.0.0:x11/zenity \ gnome-settings-daemon>=3.0.0:sysutils/gnome-settings-daemon \ gnome-keyring-3:security/gnome-keyring \ gnome-session>=3.0.0:x11/gnome-session \ gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \ polkit-gnome>=0.105:sysutils/polkit-gnome \ at-spi2-core>=0:accessibility/at-spi2-core \ iso-codes>=0:misc/iso-codes # used in scripts RUN_DEPENDS+= xrdb:x11/xrdb \ setxkbmap:x11/setxkbmap \ xsetroot:x11/xsetroot \ xhost:x11/xhost \ xmodmap:x11/xmodmap \ xterm:x11/xterm USERS= gdm 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 USE_LDCONFIG= yes USE_XORG= x11 xau xcb xdmcp xorgproto INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes GNU_CONFIGURE= yes GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml CONFIGURE_ARGS= --disable-static \ --mandir=${PREFIX}/man \ --with-lang-file=${PREFIX}/etc/gdm/locale.conf \ --with-at-spi-registryd-directory=${LOCALBASE}/libexec \ --with-custom-conf=${PREFIX}/etc/gdm/custom.conf \ --with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \ --with-log-dir=/var/log/gdm \ --localstatedir=/var \ --without-selinux \ --without-libaudit \ --with-console-kit \ --with-working-directory=${PREFIX}/etc/gdm/home \ --with-sysconfsubdir=gdm \ --with-pid-file=/var/run/gdm.pid \ --with-dmconfdir=${LOCALBASE}/share/xsessions \ --with-screenshot-dir=/var/run/gdm/greeter \ --enable-authentication-scheme=pam \ --without-plymouth \ --without-systemd \ --with-user=gdm \ --with-group=gdm \ --with-initial-vt=09 \ --enable-gdm-xsession \ --disable-wayland-support \ --with-systemd=no # 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 \ gdm-password \ gdm-autologin \ client.conf \ locale.conf GDMDIR?= ${PREFIX}/etc/gdm GNOME_LOCALSTATEDIR= /var OPTIONS_DEFINE= IPV6 IPV6_CONFIGURE_ENABLE= ipv6 .include .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif post-patch: @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/data/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/daemon/gdm-session-worker.c @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \ -e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \ ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po @${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \ ${WRKSRC}/chooser/gdm-host-chooser.c \ ${WRKSRC}/chooser/chooser-main.c @${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \ ${WRKSRC}/data/Init.in \ ${WRKSRC}/data/PostLogin \ ${WRKSRC}/data/PostSession.in \ ${WRKSRC}/data/PreSession.in \ ${WRKSRC}/data/Xsession.in @${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \ ${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \ ${WRKSRC}/data/applications/gnome-shell.desktop \ post-install: ${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \ ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.sample @${RM} ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf ${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default \ ${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 ${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home ${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 ${INSTALL_DATA} ${WRKDIR}/locale.conf \ ${STAGEDIR}${PREFIX}/etc/gdm/locale.conf.sample @${RM} ${STAGEDIR}${PREFIX}/lib/udev/rules.d/61-gdm.rules @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev/rules.d @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev .include Index: branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in =================================================================== --- branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in (nonexistent) +++ branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in (revision 551827) @@ -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; Property changes on: branches/2020Q4/x11/gdm/files/patch-data_gnome-login.session.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gdm/pkg-plist =================================================================== --- branches/2020Q4/x11/gdm/pkg-plist (revision 551826) +++ branches/2020Q4/x11/gdm/pkg-plist (revision 551827) @@ -1,219 +1,219 @@ bin/gdm-screenshot bin/gdmflexiserver -etc/dbus-1/system.d/gdm.conf -%%ETCDIR%%/Init/Default +@sample etc/dbus-1/system.d/gdm.conf.sample +@sample %%ETCDIR%%/Init/Default.sample @sample %%ETCDIR%%/PostLogin/Default.sample @sample %%ETCDIR%%/PostSession/Default.sample @sample %%ETCDIR%%/PreSession/Default.sample -%%ETCDIR%%/Xsession +@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 +@sample etc/pam.d/gdm-autologin.sample +@sample etc/pam.d/gdm-launch-environment.sample +@sample etc/pam.d/gdm-password.sample include/gdm/gdm-client-glue.h include/gdm/gdm-client.h include/gdm/gdm-sessions.h include/gdm/gdm-user-switching.h lib/girepository-1.0/Gdm-1.0.typelib lib/libgdm.so lib/libgdm.so.1 lib/libgdm.so.1.0.0 libdata/pkgconfig/gdm.pc libexec/gdm-disable-wayland libexec/gdm-host-chooser libexec/gdm-session-worker libexec/gdm-simple-chooser libexec/gdm-wayland-session libexec/gdm-x-session sbin/gdm share/dconf/profile/gdm %%DATADIR%%/gdb-cmd %%DATADIR%%/gdm.schemas %%DATADIR%%/greeter-dconf-defaults %%DATADIR%%/greeter/applications/mime-dummy-handler.desktop %%DATADIR%%/greeter/applications/mimeapps.list %%DATADIR%%/greeter/autostart/orca-autostart.desktop %%DATADIR%%/locale.alias share/gir-1.0/Gdm-1.0.gir share/gnome-session/sessions/gnome-login.session share/help/C/gdm/index.docbook share/help/C/gdm/legal.xml share/help/ca/gdm/index.docbook share/help/ca/gdm/legal.xml share/help/cs/gdm/index.docbook share/help/cs/gdm/legal.xml share/help/de/gdm/index.docbook share/help/de/gdm/legal.xml share/help/el/gdm/index.docbook share/help/el/gdm/legal.xml share/help/en_GB/gdm/index.docbook share/help/en_GB/gdm/legal.xml share/help/es/gdm/index.docbook share/help/es/gdm/legal.xml share/help/fr/gdm/index.docbook share/help/fr/gdm/legal.xml share/help/gl/gdm/index.docbook share/help/gl/gdm/legal.xml share/help/hu/gdm/index.docbook share/help/hu/gdm/legal.xml share/help/id/gdm/index.docbook share/help/id/gdm/legal.xml share/help/it/gdm/index.docbook share/help/it/gdm/legal.xml share/help/ko/gdm/index.docbook share/help/ko/gdm/legal.xml share/help/oc/gdm/index.docbook share/help/oc/gdm/legal.xml share/help/pt_BR/gdm/index.docbook share/help/pt_BR/gdm/legal.xml share/help/ro/gdm/index.docbook share/help/ro/gdm/legal.xml share/help/ru/gdm/index.docbook share/help/ru/gdm/legal.xml share/help/sl/gdm/index.docbook share/help/sl/gdm/legal.xml share/help/sv/gdm/index.docbook share/help/sv/gdm/legal.xml share/help/te/gdm/index.docbook share/help/te/gdm/legal.xml share/help/tr/gdm/index.docbook share/help/tr/gdm/legal.xml share/help/uk/gdm/index.docbook share/help/uk/gdm/legal.xml share/help/zh_CN/gdm/index.docbook share/help/zh_CN/gdm/legal.xml share/icons/hicolor/16x16/apps/gdm-xnest.png share/icons/hicolor/32x32/apps/gdm-setup.png share/icons/hicolor/32x32/apps/gdm-xnest.png share/locale/af/LC_MESSAGES/gdm.mo share/locale/am/LC_MESSAGES/gdm.mo share/locale/an/LC_MESSAGES/gdm.mo share/locale/ar/LC_MESSAGES/gdm.mo share/locale/as/LC_MESSAGES/gdm.mo share/locale/ast/LC_MESSAGES/gdm.mo share/locale/az/LC_MESSAGES/gdm.mo share/locale/be/LC_MESSAGES/gdm.mo share/locale/be@latin/LC_MESSAGES/gdm.mo share/locale/bg/LC_MESSAGES/gdm.mo share/locale/bn/LC_MESSAGES/gdm.mo share/locale/bn_IN/LC_MESSAGES/gdm.mo share/locale/br/LC_MESSAGES/gdm.mo share/locale/bs/LC_MESSAGES/gdm.mo share/locale/ca/LC_MESSAGES/gdm.mo share/locale/ca@valencia/LC_MESSAGES/gdm.mo share/locale/crh/LC_MESSAGES/gdm.mo share/locale/cs/LC_MESSAGES/gdm.mo share/locale/csb/LC_MESSAGES/gdm.mo share/locale/cy/LC_MESSAGES/gdm.mo share/locale/da/LC_MESSAGES/gdm.mo share/locale/de/LC_MESSAGES/gdm.mo share/locale/dz/LC_MESSAGES/gdm.mo share/locale/el/LC_MESSAGES/gdm.mo share/locale/en@shaw/LC_MESSAGES/gdm.mo share/locale/en_CA/LC_MESSAGES/gdm.mo share/locale/en_GB/LC_MESSAGES/gdm.mo share/locale/eo/LC_MESSAGES/gdm.mo share/locale/es/LC_MESSAGES/gdm.mo share/locale/et/LC_MESSAGES/gdm.mo share/locale/eu/LC_MESSAGES/gdm.mo share/locale/fa/LC_MESSAGES/gdm.mo share/locale/fi/LC_MESSAGES/gdm.mo share/locale/fr/LC_MESSAGES/gdm.mo share/locale/fur/LC_MESSAGES/gdm.mo share/locale/fy/LC_MESSAGES/gdm.mo share/locale/ga/LC_MESSAGES/gdm.mo share/locale/gd/LC_MESSAGES/gdm.mo share/locale/gl/LC_MESSAGES/gdm.mo share/locale/gu/LC_MESSAGES/gdm.mo share/locale/gv/LC_MESSAGES/gdm.mo share/locale/he/LC_MESSAGES/gdm.mo share/locale/hi/LC_MESSAGES/gdm.mo share/locale/hr/LC_MESSAGES/gdm.mo share/locale/hu/LC_MESSAGES/gdm.mo share/locale/hy/LC_MESSAGES/gdm.mo share/locale/id/LC_MESSAGES/gdm.mo share/locale/is/LC_MESSAGES/gdm.mo share/locale/it/LC_MESSAGES/gdm.mo share/locale/ja/LC_MESSAGES/gdm.mo share/locale/ka/LC_MESSAGES/gdm.mo share/locale/kab/LC_MESSAGES/gdm.mo share/locale/kk/LC_MESSAGES/gdm.mo share/locale/km/LC_MESSAGES/gdm.mo share/locale/kn/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo share/locale/ky/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo share/locale/lv/LC_MESSAGES/gdm.mo share/locale/mai/LC_MESSAGES/gdm.mo share/locale/mg/LC_MESSAGES/gdm.mo share/locale/mi/LC_MESSAGES/gdm.mo share/locale/mk/LC_MESSAGES/gdm.mo share/locale/ml/LC_MESSAGES/gdm.mo share/locale/mn/LC_MESSAGES/gdm.mo share/locale/mr/LC_MESSAGES/gdm.mo share/locale/ms/LC_MESSAGES/gdm.mo share/locale/nb/LC_MESSAGES/gdm.mo share/locale/nds/LC_MESSAGES/gdm.mo share/locale/ne/LC_MESSAGES/gdm.mo share/locale/nl/LC_MESSAGES/gdm.mo share/locale/nn/LC_MESSAGES/gdm.mo share/locale/nso/LC_MESSAGES/gdm.mo share/locale/oc/LC_MESSAGES/gdm.mo share/locale/or/LC_MESSAGES/gdm.mo share/locale/pa/LC_MESSAGES/gdm.mo share/locale/pl/LC_MESSAGES/gdm.mo share/locale/ps/LC_MESSAGES/gdm.mo share/locale/pt/LC_MESSAGES/gdm.mo share/locale/pt_BR/LC_MESSAGES/gdm.mo share/locale/ro/LC_MESSAGES/gdm.mo share/locale/ru/LC_MESSAGES/gdm.mo share/locale/rw/LC_MESSAGES/gdm.mo share/locale/si/LC_MESSAGES/gdm.mo share/locale/sk/LC_MESSAGES/gdm.mo share/locale/sl/LC_MESSAGES/gdm.mo share/locale/sq/LC_MESSAGES/gdm.mo share/locale/sr/LC_MESSAGES/gdm.mo share/locale/sr@latin/LC_MESSAGES/gdm.mo share/locale/sv/LC_MESSAGES/gdm.mo share/locale/ta/LC_MESSAGES/gdm.mo share/locale/te/LC_MESSAGES/gdm.mo share/locale/tg/LC_MESSAGES/gdm.mo share/locale/th/LC_MESSAGES/gdm.mo share/locale/tr/LC_MESSAGES/gdm.mo share/locale/ug/LC_MESSAGES/gdm.mo share/locale/uk/LC_MESSAGES/gdm.mo share/locale/uz/LC_MESSAGES/gdm.mo share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo share/locale/vi/LC_MESSAGES/gdm.mo share/locale/wa/LC_MESSAGES/gdm.mo share/locale/xh/LC_MESSAGES/gdm.mo share/locale/zh_CN/LC_MESSAGES/gdm.mo share/locale/zh_HK/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo share/pixmaps/gdm-foot-logo.png share/pixmaps/gdm-setup.png share/pixmaps/gdm-xnest.png share/pixmaps/gdm.png share/pixmaps/nobody.png share/pixmaps/nohost.png @postexec mkdir -p %D/share/xsessions @postexec dconf update @postunexec dconf update @mode 1775 @dir etc/gdm/home @mode @postunexec rm -rf %D/etc/gdm/home/.gconf* @dir %%ETCDIR%%/Sessions @dir %%ETCDIR%%/home/.local/share/applications @dir etc/dm @dir etc/dm/Sessions @dir share/xsessions @dir /var/cache/gdm/ @dir /var/run/gdm/greeter @dir /var/run/gdm/ @dir /var/log/gdm/ @postunexec rm -fr /var/gdm Index: branches/2020Q4/x11/gnome-shell/Makefile =================================================================== --- branches/2020Q4/x11/gnome-shell/Makefile (revision 551826) +++ branches/2020Q4/x11/gnome-shell/Makefile (revision 551827) @@ -1,80 +1,84 @@ # Created by: Pawel Worach # $FreeBSD$ PORTNAME= gnome-shell PORTVERSION= 3.36.6 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ sassc:textproc/sassc \ gnome-control-center:sysutils/gnome-control-center \ a2x:textproc/asciidoc LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \ libdrm.so:graphics/libdrm \ libmutter-6.so:x11-wm/mutter \ libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libsecret-1.so:security/libsecret \ libpolkit-agent-1.so:sysutils/polkit \ libp11-kit.so:security/p11-kit \ libical.so:devel/libical \ libgcr-3.so:security/gcr \ libicuuc.so:devel/icu \ libpulse.so:audio/pulseaudio \ libcroco-0.6.so:textproc/libcroco \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libp11-kit.so:security/p11-kit \ libgjs.so:lang/gjs \ libgraphene-1.0.so:graphics/graphene \ libgnome-autoar-0.so:archivers/gnome-autoar RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center \ gdm:x11/gdm PORTSCOUT= limitw:1,even USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \ pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \ webplugin:native xorg USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 introspection \ libxslt:build libxml2 gnomedesktop3 USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst USE_GL= egl gbm USE_GSTREAMER1= yes USE_PERL5= build USE_LDCONFIG= yes SHEBANG_FILES= src/gnome-shell-perf-tool.in \ src/gnome-shell-extension-tool.in BINARY_ALIAS= python3=${PYTHON_CMD} WEBPLUGIN_NAME= libgnome-shell-browser-plugin.so WEBPLUGIN_DIR= ${PREFIX}/lib/mozilla/plugins/ WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so MESON_ARGS= -Dsystemd=false \ -Dnetworkmanager=false \ -Dpython=${PYTHON_CMD} CPE_VENDOR= gnome GLIB_SCHEMAS= org.gnome.shell.gschema.xml \ 00_org.gnome.shell.gschema.override .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # 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" \ ${WRKSRC}/meson.build .include Index: branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml =================================================================== --- branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml (nonexistent) +++ branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml (revision 551827) @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml =================================================================== --- branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml (nonexistent) +++ branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml (revision 551827) @@ -0,0 +1,11 @@ + + + + + + + + + + + Property changes on: branches/2020Q4/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml =================================================================== --- branches/2020Q4/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml (nonexistent) +++ branches/2020Q4/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml (revision 551827) @@ -0,0 +1,11 @@ +--- data/gnome-shell-dbus-interfaces.gresource.xml.orig 2020-09-07 20:29:58 UTC ++++ data/gnome-shell-dbus-interfaces.gresource.xml +@@ -12,6 +12,8 @@ + org.freedesktop.impl.portal.Access.xml + org.freedesktop.impl.portal.PermissionStore.xml + org.freedesktop.impl.portal.Request.xml ++ org.freedesktop.ConsoleKit.Manager.xml ++ org.freedesktop.ConsoleKit.Session.xml + org.freedesktop.login1.Manager.xml + org.freedesktop.login1.Session.xml + org.freedesktop.login1.User.xml Property changes on: branches/2020Q4/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gnome-shell/files/patch-js_misc_loginManager_js =================================================================== --- branches/2020Q4/x11/gnome-shell/files/patch-js_misc_loginManager_js (nonexistent) +++ branches/2020Q4/x11/gnome-shell/files/patch-js_misc_loginManager_js (revision 551827) @@ -0,0 +1,119 @@ +$OpenBSD: patch-js_misc_loginManager_js,v 1.10 2020/05/14 15:28:46 jasper Exp $ + +Index: js/misc/loginManager.js +--- js/misc/loginManager.js.orig ++++ js/misc/loginManager.js +@@ -14,6 +14,12 @@ const SystemdLoginManager = Gio.DBusProxy.makeProxyWra + const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface); + const SystemdLoginUser = Gio.DBusProxy.makeProxyWrapper(SystemdLoginUserIface); + ++const ConsoleKitManagerIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Manager'); ++const ConsoleKitSessionIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Session'); ++ ++const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface); ++const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface); ++ + function haveSystemd() { + return GLib.access("/run/systemd/seats", 0) >= 0; + } +@@ -43,7 +49,7 @@ function canLock() { + -1, null); + + let version = result.deep_unpack()[0].deep_unpack(); +- return haveSystemd() && versionCompare('3.5.91', version); ++ return versionCompare('3.5.91', version); + } catch (e) { + return false; + } +@@ -84,7 +90,7 @@ function getLoginManager() { + if (haveSystemd()) + _loginManager = new LoginManagerSystemd(); + else +- _loginManager = new LoginManagerDummy(); ++ _loginManager = new LoginManagerConsoleKit(); + } + + return _loginManager; +@@ -199,6 +205,82 @@ var LoginManagerSystemd = class { + } + }; + Signals.addSignalMethods(LoginManagerSystemd.prototype); ++ ++var LoginManagerConsoleKit = class { ++ constructor () { ++ this._proxy = new ConsoleKitManager(Gio.DBus.system, ++ 'org.freedesktop.ConsoleKit', ++ '/org/freedesktop/ConsoleKit/Manager'); ++ this._proxy.connectSignal('PrepareForSleep', ++ this._prepareForSleep.bind(this)); ++ } ++ ++ // Having this function is a bit of a hack since the Systemd and ConsoleKit ++ // session objects have different interfaces - but in both cases there are ++ // Lock/Unlock signals, and that's all we count upon at the moment. ++ ++ ++ getCurrentSessionProxy(callback) { ++ if (this._currentSession) { ++ callback (this._currentSession); ++ return; ++ } ++ ++ this._proxy.GetCurrentSessionRemote((result, error) => { ++ if (error) { ++ logError(error, 'Could not get a proxy for the current session'); ++ } else { ++ this._currentSession = new ConsoleKitSession(Gio.DBus.system, ++ 'org.freedesktop.ConsoleKit', ++ result[0]); ++ callback(this._currentSession); ++ } ++ }); ++ } ++ ++ canSuspend(asyncCallback) { ++ this._proxy.CanSuspendRemote((result, error) => { ++ if (error) { ++ asyncCallback(false, false); ++ } else { ++ asyncCallback(result[0], false); ++ } ++ }); ++ } ++ ++ listSessions(asyncCallback) { ++ asyncCallback([]); ++ } ++ ++ suspend() { ++ this._proxy.SuspendRemote(true); ++ } ++ ++ inhibit(reason, callback) { ++ let inVariant = GLib.Variant.new('(ssss)', ++ ['sleep', ++ 'GNOME Shell', ++ reason, ++ 'delay']); ++ this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null, ++ (proxy, result) => { ++ let fd = -1; ++ try { ++ let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result); ++ fd = fdList.steal_fds()[0]; ++ callback(new Gio.UnixInputStream({ fd: fd })); ++ } catch(e) { ++ logError(e, "Error getting ConsoleKit inhibitor"); ++ callback(null); ++ } ++ }); ++ } ++ ++ _prepareForSleep(proxy, sender, [aboutToSuspend]) { ++ this.emit('prepare-for-sleep', aboutToSuspend); ++ } ++} ++Signals.addSignalMethods(LoginManagerConsoleKit.prototype); + + var LoginManagerDummy = class { + getCurrentSessionProxy(_callback) { Property changes on: branches/2020Q4/x11/gnome-shell/files/patch-js_misc_loginManager_js ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4/x11/gnome-shell/files/patch-js_ui_status_keyboard_js =================================================================== --- branches/2020Q4/x11/gnome-shell/files/patch-js_ui_status_keyboard_js (nonexistent) +++ branches/2020Q4/x11/gnome-shell/files/patch-js_ui_status_keyboard_js (revision 551827) @@ -0,0 +1,27 @@ +$OpenBSD: patch-js_ui_status_keyboard_js,v 1.6 2020/05/14 15:28:46 jasper Exp $ + +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235009 + +Index: js/ui/status/keyboard.js +--- js/ui/status/keyboard.js.orig ++++ js/ui/status/keyboard.js +@@ -242,6 +242,19 @@ var InputSourceSystemSettings = class extends InputSou + id += '+%s'.format(variants[i]); + sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id }); + } ++ ++ // fallback: retrieve input source from current locale if we don't ++ // support the org.freedesktop.locale1 interface ++ if (sourcesList.length == 0) { ++ let _keyboardManagerLayout = KeyboardManager.getKeyboardManager()._getLocaleLayout(); ++ if (_keyboardManagerLayout) { ++ let _kMLid = _keyboardManagerLayout.layout; ++ if (!!_keyboardManagerLayout.variant) ++ _kMLid = _kMLid + '+' + _keyboardManagerLayout.variant; ++ sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: _kMLid }); ++ } ++ } ++ + return sourcesList; + } + Property changes on: branches/2020Q4/x11/gnome-shell/files/patch-js_ui_status_keyboard_js ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 551826) +++ branches/2020Q4 (revision 551827) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r551325-551326,551789,551814-551815