* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2015-11-14 19:46 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-11-14 19:46 UTC (permalink / raw
To: gentoo-commits
commit: d275fff07db6d2de9d604784e76c8ba10792a5ff
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 19:16:55 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 19:45:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d275fff0
gnome-base/gnome-session: Drop old
Package-Manager: portage-2.2.24
gnome-base/gnome-session/Manifest | 1 -
.../gnome-session-3.14.0-validate-autostart.patch | 74 ------------
.../gnome-session/gnome-session-3.14.0-r1.ebuild | 120 --------------------
.../gnome-session/gnome-session-3.14.0-r2.ebuild | 125 ---------------------
4 files changed, 320 deletions(-)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 09fe879..35d4cc3 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-session-3.14.0.tar.xz 736128 SHA256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184 SHA512 7a1b1bd229e38963d5e104fd9b649ab597b4026a59b87820c8517699e63cb066f2aa52b74eb30a052dc4017c30eb16dc16a779a14580af9c1e876edcdd9bd020 WHIRLPOOL a756904a53c7e84dee6d85a2066fe8993f338021e1c07d65c025b1cbae03fedaa169fd19c02203dfc962b69b99d8d3926c17324f15e62e7b6c7e633927140cfa
DIST gnome-session-3.16.0.tar.xz 764808 SHA256 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d SHA512 4f02e73ab632ce0c2b961f1d88d93ef62fb6ebfa39d98bf12e672ca7cd9680d07aeffcd3c8792eddcbd9b5e13b0ef87d064352d8f209b3befd8445c1ba17e485 WHIRLPOOL 18ae75ccf4c3b67dfb8b941552317f5739a9ac54d9e8ef2c220e388f2f91687bee05127dcdbd132137b8f7996585ce1ba2a82877cc00eb787d7c5e24d032faf2
DIST gnome-session-3.18.1.2.tar.xz 758552 SHA256 b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45 SHA512 741da4ebdc6eccef35ee3e1be124785ad7e2e6de49c2fbb88568cff91c8cd5133e71064d8c74181052a9ce4df446fad7358bb61fc1d1a5746ab76a655d35f72a WHIRLPOOL 1c47dd8bc186c3a22519a306ec15f332d00824110202296508211cf0efb4f7def29d72795b6987e8795bd9b974758f8f269ed1fbfb646da3655f0e8429655def
diff --git a/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch b/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
deleted file mode 100644
index eec1484..0000000
--- a/gnome-base/gnome-session/files/gnome-session-3.14.0-validate-autostart.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3442740ad4808f91fb857fb2dda3c24992f0bbdf Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 14 Nov 2014 09:49:21 -0500
-Subject: autostart: validate autostart condition gsettings key
-
-gnome-session will crash if fed a desktop file with an
-autostart condition that references an invalid key for
-a given schema.
-
-This commit validates that the key associated with the
-autostart condition is defined in the schema and defined
-to have a boolean type.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=740119
-
-diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
-index 21a6004..437fb0c 100644
---- a/gnome-session/gsm-autostart-app.c
-+++ b/gnome-session/gsm-autostart-app.c
-@@ -337,12 +337,16 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
- GSettingsSchemaSource *source;
- GSettingsSchema *schema;
- GSettings *settings;
-+ GSettingsSchemaKey *schema_key;
-+ const GVariantType *key_type;
- char **elems;
- gboolean retval = FALSE;
- char *signal;
-
- retval = FALSE;
-
-+ schema = NULL;
-+
- elems = g_strsplit (key, " ", 2);
-
- if (elems == NULL)
-@@ -358,9 +362,24 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
- if (schema == NULL)
- goto out;
-
-+ if (!g_settings_schema_has_key (schema, elems[1]))
-+ goto out;
-+
-+ schema_key = g_settings_schema_get_key (schema, elems[1]);
-+
-+ g_assert (schema_key != NULL);
-+
-+ key_type = g_settings_schema_key_get_value_type (schema_key);
-+
-+ g_settings_schema_key_unref (schema_key);
-+
-+ g_assert (key_type != NULL);
-+
-+ if (!g_variant_type_equal (key_type, G_VARIANT_TYPE_BOOLEAN))
-+ goto out;
-+
- settings = g_settings_new_full (schema, NULL, NULL);
- retval = g_settings_get_boolean (settings, elems[1]);
-- g_settings_schema_unref (schema);
-
- signal = g_strdup_printf ("changed::%s", elems[1]);
- g_signal_connect (G_OBJECT (settings), signal,
-@@ -370,6 +389,8 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
- app->priv->condition_settings = settings;
-
- out:
-+ if (schema)
-+ g_settings_schema_unref (schema);
- g_strfreev (elems);
-
- return retval;
---
-cgit v0.10.1
-
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
deleted file mode 100644
index 29afbb8..0000000
--- a/gnome-base/gnome-session/gnome-session-3.14.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.40.0:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.7:3
- >=dev-libs/json-glib-0.10
- >=dev-libs/dbus-glib-0.76
- >=gnome-base/gnome-desktop-3.9.91:3=
- elibc_FreeBSD? ( dev-libs/libexecinfo )
-
- virtual/opengl
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- gconf? ( >=gnome-base/gconf-2:2 )
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gnome-settings-daemon
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- >=x11-themes/gnome-themes-standard-2.91.92
- sys-apps/dbus[X]
- !systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_prepare() {
- # Validate autostart condition gsettings key (from '3.14')
- epatch "${FILESDIR}"/${P}-validate-autostart.patch
- gnome2_src_prepare
-}
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- gnome2_src_configure \
- --disable-deprecation-flags \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable gconf) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
deleted file mode 100644
index 3ce88e5..0000000
--- a/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.40.0:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.7:3
- >=dev-libs/json-glib-0.10
- >=dev-libs/dbus-glib-0.76
- >=gnome-base/gnome-desktop-3.9.91:3=
- elibc_FreeBSD? ( dev-libs/libexecinfo )
-
- virtual/opengl
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- gconf? ( >=gnome-base/gconf-2:2 )
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gnome-settings-daemon
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- >=x11-themes/gnome-themes-standard-2.91.92
- sys-apps/dbus[X]
- !systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_prepare() {
- # Validate autostart condition gsettings key (from '3.14')
- epatch "${FILESDIR}"/${P}-validate-autostart.patch
- gnome2_src_prepare
-}
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- gnome2_src_configure \
- --disable-deprecation-flags \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable gconf) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2017-03-18 12:25 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2017-03-18 12:25 UTC (permalink / raw
To: gentoo-commits
commit: a62f7893203807969ae4fd725fa3a61e1dc97e65
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 12:22:57 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 12:24:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62f7893
gnome-base/gnome-session: 3.22.3 bump, revert to Xorg session default, make wayland session be a login shell
The upstream bump from 3.22.2 to 3.22.3 just reduces the data traffic for VT switch monitoring.
Gentoo-bug: 604110
Backport upstream patch from 3.23.4.1 to re-launch itself as a "bash" login shell when /usr/bin/gnome-session
is started for a wayland based session without a login shell. This makes GNOME wayland session to
do all the shell setup that a login shell does, which means e.g Gentoo /etc/env.d things get processed
via shell profile, fixing all the variable and other setups we rely on heavily in Gentoo.
Because this currently re-launches with bash, it will probably only source bash and generic setups, not e.g
zsh specific paths.
Gentoo-bug: 611146
Forward port upstream patch from 3.19 days that reverted default "gnome" session back to Xorg for 3.20,
to do it again in Gentoo 3.22. Also manually forward port translations for the "GNOME on Wayland" string
change, where available as a translated string in 3.20.
3.24 should be available faster in Gentoo now, which will get us to Wayland then, as in 3.24 it'll also
work with nvidia-drivers and be generally even more mature.
Package-Manager: Portage-2.3.4, Repoman-2.3.1
gnome-base/gnome-session/Manifest | 1 +
.../files/3.22.3-wayland-login-shell.patch | 43 ++
.../files/3.22.3-xorg-default-translations.patch | 619 +++++++++++++++++++++
.../gnome-session/files/3.22.3-xorg-default.patch | 58 ++
.../gnome-session/gnome-session-3.22.3.ebuild | 137 +++++
5 files changed, 858 insertions(+)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index fb53f1a5736..860e4d1eeff 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,3 +1,4 @@
DIST gnome-session-3.20.2.tar.xz 785952 SHA256 025f97e0b9f5431890598d6130040e1e7071771cc29e1d29d8e2e7c84d95f6da SHA512 0973c9763195a79038d99139f56eff8d7ad1fccc4c4e41a6439b5c65c615059a21446545af70f4ed83ec6925fd61a7664e70eec844dfe5e2a1001dffdbbea13a WHIRLPOOL 4a3cf1580b966a0b617e78db45635ec66d7bdfb6d5b183390edb07aaae3911876ff4af774cb0ae93c6ee4316555303812fcff40efce1827946457cb2a0646f61
DIST gnome-session-3.22.2.tar.xz 776772 SHA256 361a31edb4f8c6d410f1029eee089422e25a2da6c287ead40fccdea5bda450f5 SHA512 2c84a3a791d740c8edc2af96e8ed0b56f56dfac20fde6e8bc23a7aa75c0a004e98fcb9bb85b043ed3b1cd57cdc889348c461d9536cd2631dd53d8a0d6f8e2acf WHIRLPOOL b2fbfb0ecbd5b54714a900d8615c04b1ac0bee51e6c2d8ff11c2592769cd42292af0db9f86a51655bda943c7cc880155d403854629ec8810578f02232dfec29f
+DIST gnome-session-3.22.3.tar.xz 777420 SHA256 cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd WHIRLPOOL 35e78d60b16ee9027d2c664f2a222a48083736e032e1be41fd015403fb8e9dcf4b2560299b1c9c9e81bde95cb9ed86da41ed0cc44a816f71e83a1a4e1a704fb9
DIST gnome-session-3.23.91.tar.xz 779536 SHA256 50bde3aed35bd48ac73c6cbc322f627925f914ebcdab90f032d4f29488c9cc38 SHA512 cb8f21619e92784ad61b4b873625073bf32d29dd943243298879d765e76964031042ea22462dec87332a5fb89ae9b0617d5444e8ba98ed45fb02065fc5db8b9f WHIRLPOOL b9a7aebadfb7ce44c933ac19ef5d7daa89a74a39f4bd51e92e64d720a7195a1adce88c202880d32fcea89d692cf1de359eea4d3da7d3633616a178376291eeb0
diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
new file mode 100644
index 00000000000..f82825f4822
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
@@ -0,0 +1,43 @@
+From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 5 Jan 2017 10:02:58 -0500
+Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login
+ shell
+
+Users expect their shell profiles to get sourced at startup, which
+doesn't happen with wayland sessions.
+
+This commit brings back that feature, by making the gnome-session
+wrapper script run a login shell.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=736660
+---
+ gnome-session/gnome-session.in | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index 530299d..04ea741 100644
+--- a/gnome-session/gnome-session.in
++++ b/gnome-session/gnome-session.in
+@@ -1,5 +1,18 @@
+ #!/bin/sh
+
++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
++ [ -n "$SHELL" ] &&
++ grep -q "$SHELL" /etc/shells &&
++ ! (echo "$SHELL" | grep -q "false") &&
++ ! (echo "$SHELL" | grep -q "nologin"); then
++ if [ "$1" != '-l' ]; then
++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
++ else
++ shift
++ fi
++fi
++
+ SETTING=$(gsettings get org.gnome.system.locale region)
+ REGION=${SETTING#\'}
+ REGION=${REGION%\'}
+--
+2.10.1
+
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
new file mode 100644
index 00000000000..8c259de9d15
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
@@ -0,0 +1,619 @@
+From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 18 Mar 2017 11:42:40 +0200
+Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations
+
+---
+ po/POTFILES.in | 2 +-
+ po/bg.po | 4 ++++
+ po/cs.po | 4 ++++
+ po/da.po | 4 ++++
+ po/de.po | 4 ++++
+ po/el.po | 4 ++++
+ po/es.po | 4 ++++
+ po/eu.po | 4 ++++
+ po/fa.po | 4 ++++
+ po/fi.po | 4 ++++
+ po/fr.po | 4 ++++
+ po/fur.po | 4 ++++
+ po/gd.po | 4 ++++
+ po/gl.po | 4 ++++
+ po/gu.po | 4 ++++
+ po/he.po | 4 ++++
+ po/hr.po | 4 ++++
+ po/hu.po | 4 ++++
+ po/id.po | 4 ++++
+ po/is.po | 4 ++++
+ po/it.po | 4 ++++
+ po/kk.po | 4 ++++
+ po/ko.po | 4 ++++
+ po/lt.po | 4 ++++
+ po/lv.po | 4 ++++
+ po/nb.po | 4 ++++
+ po/pl.po | 4 ++++
+ po/pt.po | 4 ++++
+ po/pt_BR.po | 4 ++++
+ po/ru.po | 4 ++++
+ po/sk.po | 4 ++++
+ po/sr.po | 4 ++++
+ po/sr@latin.po | 4 ++++
+ po/sv.po | 4 ++++
+ po/tr.po | 4 ++++
+ po/uk.po | 4 ++++
+ po/vi.po | 4 ++++
+ po/zh_CN.po | 4 ++++
+ 38 files changed, 149 insertions(+), 1 deletion(-)
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index cc1170a..0feb5cf 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -2,9 +2,9 @@
+ # Please keep this file sorted alphabetically.
+ data/gnome-custom-session.desktop.in
+ data/gnome.desktop.in
+-data/gnome-xorg.desktop.in
+ data/gnome-dummy.session.desktop.in.in
+ data/gnome.session.desktop.in.in
++data/gnome-wayland.desktop.in
+ [type: gettext/glade]data/session-selector.ui
+ gnome-session/gsm-fail-whale-dialog.c
+ gnome-session/gsm-manager.c
+diff --git a/po/bg.po b/po/bg.po
+index 7d243fc..7bb73b6 100644
+--- a/po/bg.po
++++ b/po/bg.po
+@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME — фиктивна"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME с Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Друга сесия"
+diff --git a/po/cs.po b/po/cs.po
+index a9acc59..4efd144 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME na Waylandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Vlastní sezení"
+diff --git a/po/da.po b/po/da.po
+index de709ac..62a49c3 100644
+--- a/po/da.po
++++ b/po/da.po
+@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME-attrap"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME på Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Tilpasset session"
+diff --git a/po/de.po b/po/de.po
+index 051c9ee..a283114 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME Platzhalter"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME unter Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Benutzerdefinierte Sitzung"
+diff --git a/po/el.po b/po/el.po
+index 99f92ba..9f1d419 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg"
+ msgid "GNOME dummy"
+ msgstr "Εικονικό GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME σε Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Προσαρμοσμένη συνεδρία"
+diff --git a/po/es.po b/po/es.po
+index 79e3a6d..a9b73b2 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME «dummy»"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME en Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesión personalizada"
+diff --git a/po/eu.po b/po/eu.po
+index da3969d..6b57df1 100644
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean"
+ msgid "GNOME dummy"
+ msgstr "Probako GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland gainean"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Saio pertsonalizatua"
+diff --git a/po/fa.po b/po/fa.po
+index 1737204..8b1b6e5 100644
+--- a/po/fa.po
++++ b/po/fa.po
+@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg"
+ msgid "GNOME dummy"
+ msgstr "گنوم ساختگی"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "گنوم بر روی Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "نشست سفارشی"
+diff --git a/po/fi.po b/po/fi.po
+index a3cd0ca..8b5025c 100644
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen"
+ msgid "GNOME dummy"
+ msgstr "Gnome-malli-istunto (dummy)"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Gnome Waylandia käyttäen"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Omavalintainen istunto"
+diff --git a/po/fr.po b/po/fr.po
+index e209804..5fe647a 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME factice"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME sur Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Session personnalisée"
+diff --git a/po/fur.po b/po/fur.po
+index 8245a6f..1dc5f85 100644
+--- a/po/fur.po
++++ b/po/fur.po
+@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME su Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Session personalizade"
+diff --git a/po/gd.po b/po/gd.po
+index beb1618..ebb67bc 100644
+--- a/po/gd.po
++++ b/po/gd.po
+@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg"
+ msgid "GNOME dummy"
+ msgstr "Caochag GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME air Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Seisean gnàthaichte"
+diff --git a/po/gl.po b/po/gl.po
+index 02b9879..2d9c944 100644
+--- a/po/gl.po
++++ b/po/gl.po
+@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME de proba"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME en Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesión personalizada"
+diff --git a/po/gu.po b/po/gu.po
+index c83ed6b..fa92f6a 100644
+--- a/po/gu.po
++++ b/po/gu.po
+@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME ડમી"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland પર GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "વૈવિધ્ય સત્ર"
+diff --git a/po/he.po b/po/he.po
+index 22045b6..c197658 100644
+--- a/po/he.po
++++ b/po/he.po
+@@ -45,6 +45,10 @@ msgstr "GNOME על גבי Xorg"
+ msgid "GNOME dummy"
+ msgstr "מדומה של GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME על גבי Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "הפעלה מותאמת אישית"
+diff --git a/po/hr.po b/po/hr.po
+index db64d1a..46ba1af 100644
+--- a/po/hr.po
++++ b/po/hr.po
+@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu"
+ msgid "GNOME dummy"
+ msgstr "GNOME lažno"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME na Waylandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Prilagođena sesija"
+diff --git a/po/hu.po b/po/hu.po
+index 403b0a1..f207056 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon"
+ msgid "GNOME dummy"
+ msgstr "GNOME példa"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland-en"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Egyéni környezet"
+diff --git a/po/id.po b/po/id.po
+index 04848d8..3519b35 100644
+--- a/po/id.po
++++ b/po/id.po
+@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME pada Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sesi Gubahan"
+diff --git a/po/is.po b/po/is.po
+index 5cfbfa2..a95c1e7 100644
+--- a/po/is.po
++++ b/po/is.po
+@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME sýnishorn"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME á Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sérsniðin seta"
+diff --git a/po/it.po b/po/it.po
+index 3a95eff..6119ff2 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME su Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessione personalizzata"
+diff --git a/po/kk.po b/po/kk.po
+index 7168f0d..8fede72 100644
+--- a/po/kk.po
++++ b/po/kk.po
+@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME жалған сессиясы"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland негізіндегі GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Таңдауыңызша сесия"
+diff --git a/po/ko.po b/po/ko.po
+index 8c90323..359a65d 100644
+--- a/po/ko.po
++++ b/po/ko.po
+@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)"
+ msgid "GNOME dummy"
+ msgstr "그놈 더미"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "그놈, 웨일랜드"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "사용자 지정 세션"
+diff --git a/po/lt.po b/po/lt.po
+index 9a4bfb9..221c293 100644
+--- a/po/lt.po
++++ b/po/lt.po
+@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje"
+ msgid "GNOME dummy"
+ msgstr "GNOME netikra"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME Wayland aplinkoje"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Pasirinktinis seansas"
+diff --git a/po/lv.po b/po/lv.po
+index 14e4180..688efe2 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME makets"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME ar Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Pielāgota sesija"
+diff --git a/po/nb.po b/po/nb.po
+index afad648..471fb14 100644
+--- a/po/nb.po
++++ b/po/nb.po
+@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME på Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Egendefinert økt"
+diff --git a/po/pl.po b/po/pl.po
+index 92b0cfe..1b92056 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)"
+ msgid "GNOME dummy"
+ msgstr "Pusta sesja GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME (Wayland)"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Niestandardowa sesja"
+diff --git a/po/pt.po b/po/pt.po
+index fc4bb99..573908d 100644
+--- a/po/pt.po
++++ b/po/pt.po
+@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME de teste"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME no Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessão personalizada"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 6a2a88a..7d6a66a 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME experimental"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME sobre Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Sessão personalizada"
+diff --git a/po/ru.po b/po/ru.po
+index 4378126..52eda37 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg"
+ msgid "GNOME dummy"
+ msgstr "Фиктивный сеанс GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME на Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Другой сеанс"
+diff --git a/po/sk.po b/po/sk.po
+index 0f75b10..49fbf5d 100644
+--- a/po/sk.po
++++ b/po/sk.po
+@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg"
+ msgid "GNOME dummy"
+ msgstr "Fingované GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME cez Wayland"
++
+ # GtkWindow title
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+diff --git a/po/sr.po b/po/sr.po
+index 7ec002a..2a71f45 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу"
+ msgid "GNOME dummy"
+ msgstr "Гномов лажњак"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Гном на Вејланду"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Прилагођена сесија"
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index 677444e..b148d70 100644
+--- a/po/sr@latin.po
++++ b/po/sr@latin.po
+@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru"
+ msgid "GNOME dummy"
+ msgstr "Gnomov lažnjak"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Gnom na Vejlandu"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Prilagođena sesija"
+diff --git a/po/sv.po b/po/sv.po
+index 2894eec..3072075 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg"
+ msgid "GNOME dummy"
+ msgstr "GNOME-attrapp"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME med Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Anpassad session"
+diff --git a/po/tr.po b/po/tr.po
+index 3ede169..87bba43 100644
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "Wayland üzerinde GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Özel Oturum"
+diff --git a/po/uk.po b/po/uk.po
+index de980dc..c98fd8d 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg"
+ msgid "GNOME dummy"
+ msgstr "Несправжній GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME через Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Власний сеанс"
+diff --git a/po/vi.po b/po/vi.po
+index 1cdee0a..cf249e3 100644
+--- a/po/vi.po
++++ b/po/vi.po
+@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg"
+ msgid "GNOME dummy"
+ msgstr "Giả lập GNOME"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "GNOME trên Wayland"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "Phiên làm việc tự chọn"
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 6f07716..8d36444 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME"
+ msgid "GNOME dummy"
+ msgstr "GNOME dummy"
+
++#: ../data/gnome-wayland.desktop.in.h:1
++msgid "GNOME on Wayland"
++msgstr "基于 Wayland 的 GNOME"
++
+ #: ../data/session-selector.ui.h:1
+ msgid "Custom Session"
+ msgstr "自定义会话"
+--
+2.10.1
+
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
new file mode 100644
index 00000000000..02eea39715c
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
@@ -0,0 +1,58 @@
+From a709a07bff91a7b2dd4e4a412090850a73937999 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 7 Mar 2016 13:36:32 -0500
+Subject: [PATCH 2/3] data: switch back to Xorg by default
+
+Consensus seems to be that switching to wayland for user sessions
+by default is a bit premature.
+
+This commit moves it back to Xorg by default.
+
+We'll save wayland by default for 3.22
+
+https://bugzilla.gnome.org/show_bug.cgi?id=763266
+---
+ data/Makefile.am | 4 ++--
+ data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index ae08730..d0a7310 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir)
+ hwcompat_DATA = hardware-compatibility
+
+ xsessiondir = $(datadir)/xsessions
+-xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
++xsession_in_files = gnome.desktop.in
+
+ if BUILD_SESSION_SELECTOR
+ xsession_in_files += gnome-custom-session.desktop.in
+@@ -18,7 +18,7 @@ endif
+ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+
+ wayland_sessiondir = $(datadir)/wayland-sessions
+-wayland_session_in_files = gnome.desktop.in
++wayland_session_in_files = gnome-wayland.desktop.in
+ wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
+
+ sessiondir = $(datadir)/gnome-session/sessions
+diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
+similarity index 85%
+rename from data/gnome-xorg.desktop.in
+rename to data/gnome-wayland.desktop.in
+index d00b3dc..852be87 100644
+--- a/data/gnome-xorg.desktop.in
++++ b/data/gnome-wayland.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-_Name=GNOME on Xorg
++_Name=GNOME on Wayland
+ _Comment=This session logs you into GNOME
+ Exec=gnome-session
+ TryExec=gnome-session
+--
+2.10.1
+
diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
new file mode 100644
index 00000000000..31635ea1378
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+ >=dev-libs/glib-2.46.0:2[dbus]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.18.0:3
+ >=dev-libs/json-glib-0.10
+ >=gnome-base/gnome-desktop-3.18:3=
+ elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+ media-libs/mesa[egl,gles2]
+
+ media-libs/libepoxy
+ x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+ x11-apps/xdpyinfo
+
+ systemd? ( >=sys-apps/systemd-183:0= )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gnome-settings-daemon
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ x11-themes/adwaita-icon-theme
+ sys-apps/dbus[X]
+ !systemd? (
+ sys-auth/consolekit
+ >=dev-libs/dbus-glib-0.76
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ >=sys-devel/gettext-0.10.40
+ virtual/pkgconfig
+ !<gnome-base/gdm-2.20.4
+ doc? (
+ app-text/xmlto
+ dev-libs/libxslt )
+ gnome-base/gnome-common
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+PATCHES=(
+ # Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110
+ "${FILESDIR}/${PV}-wayland-login-shell.patch"
+ # Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146
+ "${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24
+ "${FILESDIR}/${PV}-xorg-default-translations.patch"
+)
+
+src_configure() {
+ # 1. Avoid automagic on old upower releases
+ # 2. xsltproc is always checked due to man configure
+ # switch, even if USE=-doc
+ # 3. Disable old gconf support as other distributions did long time
+ # ago
+ gnome2_src_configure \
+ --disable-deprecation-flags \
+ --disable-gconf \
+ --enable-session-selector \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6) \
+ $(use_enable systemd) \
+ $(use_enable !systemd consolekit) \
+ UPOWER_CFLAGS="" \
+ UPOWER_LIBS=""
+ # gnome-session-selector pre-generated man page is missing
+ #$(usex !doc XSLTPROC=$(type -P true))
+}
+
+src_install() {
+ gnome2_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ insinto /usr/share/applications
+ newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
+
+ dodir /etc/X11/xinit/xinitrc.d/
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
+ ewarn "Wayland for GNOME 3.22 stable version, even if USE=wayland is set on applicable"
+ ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
+ ewarn "desired. GNOME 3.24 will default to Wayland again as upstream GNOME does, if"
+ ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice."
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2018-02-03 20:56 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2018-02-03 20:56 UTC (permalink / raw
To: gentoo-commits
commit: d0309b1a38018cd7e41b08e635cab3682e11af5d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 20:07:41 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 20:54:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0309b1a
gnome-base/gnome-session: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
gnome-base/gnome-session/Manifest | 2 -
.../files/3.22.3-wayland-login-shell.patch | 43 --
.../files/3.22.3-xorg-default-translations.patch | 619 ---------------------
.../gnome-session/gnome-session-3.22.3.ebuild | 137 -----
.../gnome-session/gnome-session-3.24.1.ebuild | 121 ----
5 files changed, 922 deletions(-)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index da9528e45a0..673d207a12a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,4 +1,2 @@
-DIST gnome-session-3.22.3.tar.xz 777420 BLAKE2B 34d438e1fefcd197f2c51ce9c2866a6d10848c28c2f2cab24ae9ca7b69a6b149aa698fa62c34415ee3c34e72f153b5f62028047604a332ebad73b8f05fbfae66 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd
-DIST gnome-session-3.24.1.tar.xz 780632 BLAKE2B efd1c297d4af08e9bbf47e74aa28b4899b22d00248eb4d786afdd688f5c6117f4865561ca5cf4a47bb6fb003e1d9c365a585f7009f24992fe9752391607a3cfb SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb
DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
deleted file mode 100644
index f82825f4822..00000000000
--- a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 5 Jan 2017 10:02:58 -0500
-Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login
- shell
-
-Users expect their shell profiles to get sourced at startup, which
-doesn't happen with wayland sessions.
-
-This commit brings back that feature, by making the gnome-session
-wrapper script run a login shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=736660
----
- gnome-session/gnome-session.in | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
-index 530299d..04ea741 100644
---- a/gnome-session/gnome-session.in
-+++ b/gnome-session/gnome-session.in
-@@ -1,5 +1,18 @@
- #!/bin/sh
-
-+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
-+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
-+ [ -n "$SHELL" ] &&
-+ grep -q "$SHELL" /etc/shells &&
-+ ! (echo "$SHELL" | grep -q "false") &&
-+ ! (echo "$SHELL" | grep -q "nologin"); then
-+ if [ "$1" != '-l' ]; then
-+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
-+ else
-+ shift
-+ fi
-+fi
-+
- SETTING=$(gsettings get org.gnome.system.locale region)
- REGION=${SETTING#\'}
- REGION=${REGION%\'}
---
-2.10.1
-
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
deleted file mode 100644
index 8c259de9d15..00000000000
--- a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch
+++ /dev/null
@@ -1,619 +0,0 @@
-From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 18 Mar 2017 11:42:40 +0200
-Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations
-
----
- po/POTFILES.in | 2 +-
- po/bg.po | 4 ++++
- po/cs.po | 4 ++++
- po/da.po | 4 ++++
- po/de.po | 4 ++++
- po/el.po | 4 ++++
- po/es.po | 4 ++++
- po/eu.po | 4 ++++
- po/fa.po | 4 ++++
- po/fi.po | 4 ++++
- po/fr.po | 4 ++++
- po/fur.po | 4 ++++
- po/gd.po | 4 ++++
- po/gl.po | 4 ++++
- po/gu.po | 4 ++++
- po/he.po | 4 ++++
- po/hr.po | 4 ++++
- po/hu.po | 4 ++++
- po/id.po | 4 ++++
- po/is.po | 4 ++++
- po/it.po | 4 ++++
- po/kk.po | 4 ++++
- po/ko.po | 4 ++++
- po/lt.po | 4 ++++
- po/lv.po | 4 ++++
- po/nb.po | 4 ++++
- po/pl.po | 4 ++++
- po/pt.po | 4 ++++
- po/pt_BR.po | 4 ++++
- po/ru.po | 4 ++++
- po/sk.po | 4 ++++
- po/sr.po | 4 ++++
- po/sr@latin.po | 4 ++++
- po/sv.po | 4 ++++
- po/tr.po | 4 ++++
- po/uk.po | 4 ++++
- po/vi.po | 4 ++++
- po/zh_CN.po | 4 ++++
- 38 files changed, 149 insertions(+), 1 deletion(-)
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index cc1170a..0feb5cf 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -2,9 +2,9 @@
- # Please keep this file sorted alphabetically.
- data/gnome-custom-session.desktop.in
- data/gnome.desktop.in
--data/gnome-xorg.desktop.in
- data/gnome-dummy.session.desktop.in.in
- data/gnome.session.desktop.in.in
-+data/gnome-wayland.desktop.in
- [type: gettext/glade]data/session-selector.ui
- gnome-session/gsm-fail-whale-dialog.c
- gnome-session/gsm-manager.c
-diff --git a/po/bg.po b/po/bg.po
-index 7d243fc..7bb73b6 100644
---- a/po/bg.po
-+++ b/po/bg.po
-@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME — фиктивна"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME с Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Друга сесия"
-diff --git a/po/cs.po b/po/cs.po
-index a9acc59..4efd144 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME na Waylandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Vlastní sezení"
-diff --git a/po/da.po b/po/da.po
-index de709ac..62a49c3 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME-attrap"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME på Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Tilpasset session"
-diff --git a/po/de.po b/po/de.po
-index 051c9ee..a283114 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME Platzhalter"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME unter Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Benutzerdefinierte Sitzung"
-diff --git a/po/el.po b/po/el.po
-index 99f92ba..9f1d419 100644
---- a/po/el.po
-+++ b/po/el.po
-@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg"
- msgid "GNOME dummy"
- msgstr "Εικονικό GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME σε Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Προσαρμοσμένη συνεδρία"
-diff --git a/po/es.po b/po/es.po
-index 79e3a6d..a9b73b2 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME «dummy»"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME en Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesión personalizada"
-diff --git a/po/eu.po b/po/eu.po
-index da3969d..6b57df1 100644
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean"
- msgid "GNOME dummy"
- msgstr "Probako GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland gainean"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Saio pertsonalizatua"
-diff --git a/po/fa.po b/po/fa.po
-index 1737204..8b1b6e5 100644
---- a/po/fa.po
-+++ b/po/fa.po
-@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg"
- msgid "GNOME dummy"
- msgstr "گنوم ساختگی"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "گنوم بر روی Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "نشست سفارشی"
-diff --git a/po/fi.po b/po/fi.po
-index a3cd0ca..8b5025c 100644
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen"
- msgid "GNOME dummy"
- msgstr "Gnome-malli-istunto (dummy)"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Gnome Waylandia käyttäen"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Omavalintainen istunto"
-diff --git a/po/fr.po b/po/fr.po
-index e209804..5fe647a 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME factice"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME sur Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Session personnalisée"
-diff --git a/po/fur.po b/po/fur.po
-index 8245a6f..1dc5f85 100644
---- a/po/fur.po
-+++ b/po/fur.po
-@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME su Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Session personalizade"
-diff --git a/po/gd.po b/po/gd.po
-index beb1618..ebb67bc 100644
---- a/po/gd.po
-+++ b/po/gd.po
-@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg"
- msgid "GNOME dummy"
- msgstr "Caochag GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME air Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Seisean gnàthaichte"
-diff --git a/po/gl.po b/po/gl.po
-index 02b9879..2d9c944 100644
---- a/po/gl.po
-+++ b/po/gl.po
-@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME de proba"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME en Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesión personalizada"
-diff --git a/po/gu.po b/po/gu.po
-index c83ed6b..fa92f6a 100644
---- a/po/gu.po
-+++ b/po/gu.po
-@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME ડમી"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland પર GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "વૈવિધ્ય સત્ર"
-diff --git a/po/he.po b/po/he.po
-index 22045b6..c197658 100644
---- a/po/he.po
-+++ b/po/he.po
-@@ -45,6 +45,10 @@ msgstr "GNOME על גבי Xorg"
- msgid "GNOME dummy"
- msgstr "מדומה של GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME על גבי Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "הפעלה מותאמת אישית"
-diff --git a/po/hr.po b/po/hr.po
-index db64d1a..46ba1af 100644
---- a/po/hr.po
-+++ b/po/hr.po
-@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu"
- msgid "GNOME dummy"
- msgstr "GNOME lažno"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME na Waylandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Prilagođena sesija"
-diff --git a/po/hu.po b/po/hu.po
-index 403b0a1..f207056 100644
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon"
- msgid "GNOME dummy"
- msgstr "GNOME példa"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland-en"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Egyéni környezet"
-diff --git a/po/id.po b/po/id.po
-index 04848d8..3519b35 100644
---- a/po/id.po
-+++ b/po/id.po
-@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME pada Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sesi Gubahan"
-diff --git a/po/is.po b/po/is.po
-index 5cfbfa2..a95c1e7 100644
---- a/po/is.po
-+++ b/po/is.po
-@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME sýnishorn"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME á Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sérsniðin seta"
-diff --git a/po/it.po b/po/it.po
-index 3a95eff..6119ff2 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME su Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessione personalizzata"
-diff --git a/po/kk.po b/po/kk.po
-index 7168f0d..8fede72 100644
---- a/po/kk.po
-+++ b/po/kk.po
-@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME жалған сессиясы"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland негізіндегі GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Таңдауыңызша сесия"
-diff --git a/po/ko.po b/po/ko.po
-index 8c90323..359a65d 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)"
- msgid "GNOME dummy"
- msgstr "그놈 더미"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "그놈, 웨일랜드"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "사용자 지정 세션"
-diff --git a/po/lt.po b/po/lt.po
-index 9a4bfb9..221c293 100644
---- a/po/lt.po
-+++ b/po/lt.po
-@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje"
- msgid "GNOME dummy"
- msgstr "GNOME netikra"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME Wayland aplinkoje"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Pasirinktinis seansas"
-diff --git a/po/lv.po b/po/lv.po
-index 14e4180..688efe2 100644
---- a/po/lv.po
-+++ b/po/lv.po
-@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME makets"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME ar Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Pielāgota sesija"
-diff --git a/po/nb.po b/po/nb.po
-index afad648..471fb14 100644
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME på Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Egendefinert økt"
-diff --git a/po/pl.po b/po/pl.po
-index 92b0cfe..1b92056 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)"
- msgid "GNOME dummy"
- msgstr "Pusta sesja GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME (Wayland)"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Niestandardowa sesja"
-diff --git a/po/pt.po b/po/pt.po
-index fc4bb99..573908d 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME de teste"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME no Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessão personalizada"
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 6a2a88a..7d6a66a 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME experimental"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME sobre Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Sessão personalizada"
-diff --git a/po/ru.po b/po/ru.po
-index 4378126..52eda37 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg"
- msgid "GNOME dummy"
- msgstr "Фиктивный сеанс GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME на Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Другой сеанс"
-diff --git a/po/sk.po b/po/sk.po
-index 0f75b10..49fbf5d 100644
---- a/po/sk.po
-+++ b/po/sk.po
-@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg"
- msgid "GNOME dummy"
- msgstr "Fingované GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME cez Wayland"
-+
- # GtkWindow title
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
-diff --git a/po/sr.po b/po/sr.po
-index 7ec002a..2a71f45 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу"
- msgid "GNOME dummy"
- msgstr "Гномов лажњак"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Гном на Вејланду"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Прилагођена сесија"
-diff --git a/po/sr@latin.po b/po/sr@latin.po
-index 677444e..b148d70 100644
---- a/po/sr@latin.po
-+++ b/po/sr@latin.po
-@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru"
- msgid "GNOME dummy"
- msgstr "Gnomov lažnjak"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Gnom na Vejlandu"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Prilagođena sesija"
-diff --git a/po/sv.po b/po/sv.po
-index 2894eec..3072075 100644
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg"
- msgid "GNOME dummy"
- msgstr "GNOME-attrapp"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME med Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Anpassad session"
-diff --git a/po/tr.po b/po/tr.po
-index 3ede169..87bba43 100644
---- a/po/tr.po
-+++ b/po/tr.po
-@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "Wayland üzerinde GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Özel Oturum"
-diff --git a/po/uk.po b/po/uk.po
-index de980dc..c98fd8d 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg"
- msgid "GNOME dummy"
- msgstr "Несправжній GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME через Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Власний сеанс"
-diff --git a/po/vi.po b/po/vi.po
-index 1cdee0a..cf249e3 100644
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg"
- msgid "GNOME dummy"
- msgstr "Giả lập GNOME"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "GNOME trên Wayland"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "Phiên làm việc tự chọn"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 6f07716..8d36444 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME"
- msgid "GNOME dummy"
- msgstr "GNOME dummy"
-
-+#: ../data/gnome-wayland.desktop.in.h:1
-+msgid "GNOME on Wayland"
-+msgstr "基于 Wayland 的 GNOME"
-+
- #: ../data/session-selector.ui.h:1
- msgid "Custom Session"
- msgstr "自定义会话"
---
-2.10.1
-
diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
deleted file mode 100644
index 311a3798511..00000000000
--- a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.18.0:3
- >=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.18:3=
- elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
- media-libs/mesa[egl,gles2]
-
- media-libs/libepoxy
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gnome-settings-daemon
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- x11-themes/adwaita-icon-theme
- sys-apps/dbus[X]
- !systemd? (
- sys-auth/consolekit
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- >=sys-devel/gettext-0.10.40
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
- gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-PATCHES=(
- # Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110
- "${FILESDIR}/${PV}-wayland-login-shell.patch"
- # Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146
- "${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24
- "${FILESDIR}/${PV}-xorg-default-translations.patch"
-)
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- # 3. Disable old gconf support as other distributions did long time
- # ago
- gnome2_src_configure \
- --disable-deprecation-flags \
- --disable-gconf \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(use_enable !systemd consolekit) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
- ewarn "Wayland for GNOME 3.22 stable version, even if USE=wayland is set on applicable"
- ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
- ewarn "desired. GNOME 3.24 will default to Wayland again as upstream GNOME does, if"
- ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice."
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
deleted file mode 100644
index ccbcf813026..00000000000
--- a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.18.0:3
- >=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.18:3=
- elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
- media-libs/mesa[egl,gles2]
-
- media-libs/libepoxy
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-settings-daemon-3.23.2
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- x11-themes/adwaita-icon-theme
- sys-apps/dbus[X]
- !systemd? (
- sys-auth/consolekit
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- >=sys-devel/gettext-0.10.40
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- # 3. Disable old gconf support as other distributions did long time
- # ago
- gnome2_src_configure \
- --disable-deprecation-flags \
- --disable-gconf \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(use_enable !systemd consolekit) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2020-08-19 12:36 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2020-08-19 12:36 UTC (permalink / raw
To: gentoo-commits
commit: b7877a14aa43343a20a8ea8a3e3ba816b82b4727
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 12:36:06 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 12:36:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7877a14
gnome-base/gnome-session: Update gnome-mimeapps.list
With 3.36 eog renamed its desktop file, also allow precompiled
firefox/chrome, fix sound-juicer desktop file, add forgotten entry for
src.rpm files.
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
gnome-base/gnome-session/files/defaults.list-r5 | 336 +++++++++++++++++++++
.../gnome-session/gnome-session-3.36.0-r1.ebuild | 129 ++++++++
2 files changed, 465 insertions(+)
diff --git a/gnome-base/gnome-session/files/defaults.list-r5 b/gnome-base/gnome-session/files/defaults.list-r5
new file mode 100644
index 00000000000..9ec18d1b8a6
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r5
@@ -0,0 +1,336 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
+application/x-dia-diagram=dia.desktop;
+image/bmp=org.gnome.eog.desktop;
+image/gif=org.gnome.eog.desktop;
+image/jpeg=org.gnome.eog.desktop;
+image/jpg=org.gnome.eog.desktop;
+image/pjpeg=org.gnome.eog.desktop;
+image/png=org.gnome.eog.desktop;
+image/svg+xml=org.gnome.eog.desktop;
+image/svg+xml-compressed=org.gnome.eog.desktop;
+image/x-bmp=org.gnome.eog.desktop;
+image/x-gray=org.gnome.eog.desktop;
+image/x-icb=org.gnome.eog.desktop;
+image/x-ico=org.gnome.eog.desktop;
+image/x-pcx=org.gnome.eog.desktop;
+image/x-png=org.gnome.eog.desktop;
+image/x-portable-anymap=org.gnome.eog.desktop;
+image/x-portable-bitmap=org.gnome.eog.desktop;
+image/x-portable-graymap=org.gnome.eog.desktop;
+image/x-portable-pixmap=org.gnome.eog.desktop;
+image/x-xbitmap=org.gnome.eog.desktop;
+image/x-xpixmap=org.gnome.eog.desktop;
+image/vnd.wap.wbmp=org.gnome.eog.desktop;
+image/g3fax=gimp.desktop;zzz-gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-fits=gimp.desktop;zzz-gimp.desktop;
+image/x-icon=gimp.desktop;zzz-gimp.desktop;
+image/x-psd=gimp.desktop;zzz-gimp.desktop;
+image/x-sgi=gimp.desktop;zzz-gimp.desktop;
+image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
+image/x-tga=gimp.desktop;zzz-gimp.desktop;
+image/x-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+application/pdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/postscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
+image/x-eps=org.gnome.Evince.desktop;evince.desktop;
+image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
+image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
+application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
+image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
+image/tiff=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
+application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-source-rpm=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
+text/plain=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=org.gnome.gedit.desktop;
+text/markdown=org.gnome.gedit.desktop;
+text/mathml=org.gnome.gedit.desktop;
+text/x-csrc=org.gnome.gedit.desktop;
+text/x-chdr=org.gnome.gedit.desktop;
+text/x-dtd=org.gnome.gedit.desktop;
+text/x-java=org.gnome.gedit.desktop;
+text/x-javascript=org.gnome.gedit.desktop;
+text/x-patch=org.gnome.gedit.desktop;
+text/x-perl=org.gnome.gedit.destkop
+text/x-php=org.gnome.gedit.destkop
+text/x-python=org.gnome.gedit.destkop
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
+application/javascript=org.gnome.gedit.destkop
+application/x-cgi=org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.gedit.desktop;
+application/x-perl=org.gnome.gedit.desktop;
+application/x-php=org.gnome.gedit.desktop;
+application/x-python=org.gnome.gedit.desktop;
+application/xml=org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.gedit.desktop;
+application/x-font-ttf=org.gnome.font-viewer.desktop;
+application/x-font-pcf=org.gnome.font-viewer.desktop;
+application/x-font-type1=org.gnome.font-viewer.desktop;
+application/x-font-otf=org.gnome.font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-sc=gnumeric.desktop;
+application/x-sylk=gnumeric.desktop;
+application/x-xbase=gnumeric.desktop;
+application/x-xls=gnumeric.desktop;
+application/xls=gnumeric.desktop;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
+x-directory/normal=org.gnome.Nautilus.desktop;
+inode/directory=org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+x-content/audio-player=rhythmbox.desktop;
+x-content/audio-cdda=org.gnome.SoundJuicer.desktop;
+application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/mxf=org.gnome.Totem.desktop;
+application/ogg=org.gnome.Totem.desktop;
+application/ram=org.gnome.Totem.desktop;
+application/sdp=org.gnome.Totem.desktop;
+application/smil=org.gnome.Totem.desktop;
+application/smil+xml=org.gnome.Totem.desktop;
+application/vnd.ms-wpl=org.gnome.Totem.desktop;
+application/vnd.rn-realmedia=org.gnome.Totem.desktop;
+application/x-extension-m4a=org.gnome.Totem.desktop;
+application/x-extension-mp4=org.gnome.Totem.desktop;
+application/x-flac=org.gnome.Totem.desktop;
+application/x-flash-video=org.gnome.Totem.desktop;
+application/x-matroska=org.gnome.Totem.desktop;
+application/x-netshow-channel=org.gnome.Totem.desktop;
+application/x-ogg=org.gnome.Totem.desktop;
+application/x-quicktime-media-link=org.gnome.Totem.desktop;
+application/x-quicktimeplayer=org.gnome.Totem.desktop;
+application/x-shorten=org.gnome.Totem.desktop;
+application/x-smil=org.gnome.Totem.desktop;
+application/xspf+xml=org.gnome.Totem.desktop;
+audio/3gpp=org.gnome.Totem.desktop;
+audio/ac3=org.gnome.Totem.desktop;
+audio/AMR=org.gnome.Totem.desktop;
+audio/AMR-WB=org.gnome.Totem.desktop;
+audio/basic=org.gnome.Totem.desktop;
+audio/midi=org.gnome.Totem.desktop;
+audio/mp4=org.gnome.Totem.desktop;
+audio/mpeg=org.gnome.Totem.desktop;
+audio/mpegurl=org.gnome.Totem.desktop;
+audio/ogg=org.gnome.Totem.desktop;
+audio/prs.sid=org.gnome.Totem.desktop;
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
+audio/x-ape=org.gnome.Totem.desktop;
+audio/x-flac=org.gnome.Totem.desktop;
+audio/x-gsm=org.gnome.Totem.desktop;
+audio/x-it=org.gnome.Totem.desktop;
+audio/x-m4a=org.gnome.Totem.desktop;
+audio/x-matroska=org.gnome.Totem.desktop;
+audio/x-mod=org.gnome.Totem.desktop;
+audio/x-mp3=org.gnome.Totem.desktop;
+audio/x-mpeg=org.gnome.Totem.desktop;
+audio/x-mpegurl=org.gnome.Totem.desktop;
+audio/x-ms-asf=org.gnome.Totem.desktop;
+audio/x-ms-asx=org.gnome.Totem.desktop;
+audio/x-ms-wax=org.gnome.Totem.desktop;
+audio/x-ms-wma=org.gnome.Totem.desktop;
+audio/x-musepack=org.gnome.Totem.desktop;
+audio/x-pn-aiff=org.gnome.Totem.desktop;
+audio/x-pn-au=org.gnome.Totem.desktop;
+audio/x-pn-realaudio=org.gnome.Totem.desktop;
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
+audio/x-pn-wav=org.gnome.Totem.desktop;
+audio/x-pn-windows-acm=org.gnome.Totem.desktop;
+audio/x-realaudio=org.gnome.Totem.desktop;
+audio/x-real-audio=org.gnome.Totem.desktop;
+audio/x-sbc=org.gnome.Totem.desktop;
+audio/x-scpls=org.gnome.Totem.desktop;
+audio/x-speex=org.gnome.Totem.desktop;
+audio/x-tta=org.gnome.Totem.desktop;
+audio/x-vorbis=org.gnome.Totem.desktop;
+audio/x-vorbis+ogg=org.gnome.Totem.desktop;
+audio/x-wav=org.gnome.Totem.desktop;
+audio/x-wavpack=org.gnome.Totem.desktop;
+audio/x-xm=org.gnome.Totem.desktop;
+image/vnd.rn-realpix=org.gnome.Totem.desktop;
+image/x-pict=org.gnome.Totem.desktop;
+misc/ultravox=org.gnome.Totem.desktop;
+text/google-video-pointer=org.gnome.Totem.desktop;
+text/x-google-video-pointer=org.gnome.Totem.desktop;
+video/3gpp=org.gnome.Totem.desktop;
+video/dv=org.gnome.Totem.desktop;
+video/fli=org.gnome.Totem.desktop;
+video/flv=org.gnome.Totem.desktop;
+video/mp2t=org.gnome.Totem.desktop;
+video/mp4=org.gnome.Totem.desktop;
+video/mp4v-es=org.gnome.Totem.desktop;
+video/mpeg=org.gnome.Totem.desktop;
+video/msvideo=org.gnome.Totem.desktop;
+video/ogg=org.gnome.Totem.desktop;
+video/quicktime=org.gnome.Totem.desktop;
+video/vivo=org.gnome.Totem.desktop;
+video/vnd.divx=org.gnome.Totem.desktop;
+video/vnd.rn-realvideo=org.gnome.Totem.desktop;
+video/vnd.vivo=org.gnome.Totem.desktop;
+video/webm=org.gnome.Totem.desktop;
+video/x-anim=org.gnome.Totem.desktop;
+video/x-avi=org.gnome.Totem.desktop;
+video/x-flc=org.gnome.Totem.desktop;
+video/x-fli=org.gnome.Totem.desktop;
+video/x-flic=org.gnome.Totem.desktop;
+video/x-flv=org.gnome.Totem.desktop;
+video/x-m4v=org.gnome.Totem.desktop;
+video/x-matroska=org.gnome.Totem.desktop;
+video/x-mpeg=org.gnome.Totem.desktop;
+video/x-ms-asf=org.gnome.Totem.desktop;
+video/x-ms-asx=org.gnome.Totem.desktop;
+video/x-msvideo=org.gnome.Totem.desktop;
+video/x-ms-wm=org.gnome.Totem.desktop;
+video/x-ms-wmv=org.gnome.Totem.desktop;
+video/x-ms-wmx=org.gnome.Totem.desktop;
+video/x-ms-wvx=org.gnome.Totem.desktop;
+video/x-nsv=org.gnome.Totem.desktop;
+video/x-ogm+ogg=org.gnome.Totem.desktop;
+video/x-theora+ogg=org.gnome.Totem.desktop;
+video/x-totem-stream=org.gnome.Totem.desktop;
+x-content/video-dvd=org.gnome.Totem.desktop;
+x-content/video-vcd=org.gnome.Totem.desktop;
+x-content/video-svcd=org.gnome.Totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
new file mode 100644
index 00000000000..3e4be186878
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.18.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/mesa[egl,gles2,X(+)]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-183:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+ consolekit? ( >=dev-libs/dbus-glib-0.76 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+ consolekit? ( sys-auth/consolekit )
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ x11-libs/xtrans
+ virtual/pkgconfig
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+ # Various patches from master (no 3-36 branch yet) + elogind support
+ "${WORKDIR}"/patches/
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Install USE=doc in $PF if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ $(meson_use elogind)
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ -Dsystemd_session=$(usex systemd default disable)
+ $(meson_use systemd systemd_journal)
+ $(meson_use consolekit)
+ $(meson_use doc docbook)
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ insinto /usr/share/applications
+ newins "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+ dodir /etc/X11/xinit/xinitrc.d/
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use elogind && ! use consolekit; then
+ ewarn "You are building without systemd, elogind and/or consolekit support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2020-11-16 14:06 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-11-16 14:06 UTC (permalink / raw
To: gentoo-commits
commit: b26933a4a27362ac7a3206959e0693629153aa6b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 00:12:44 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 14:05:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26933a4
gnome-base/gnome-session: Version bump to 3.38.0
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
gnome-base/gnome-session/Manifest | 1 +
...nome-session-3.38.0-meson-Support-elogind.patch | 68 ++++++++++++
.../gnome-session/gnome-session-3.38.0.ebuild | 121 +++++++++++++++++++++
3 files changed, 190 insertions(+)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 2958231bfc7..523411c90c5 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,2 +1,3 @@
DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
+DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
new file mode 100644
index 00000000000..37bb6921ed3
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch
@@ -0,0 +1,68 @@
+From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 15 Mar 2020 14:34:39 +0200
+Subject: [PATCH] meson: Support elogind
+
+---
+ meson.build | 12 +++++++++---
+ meson_options.txt | 1 +
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ef5132c6..7f68aaae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
+ enable_systemd_session = get_option('systemd_session') != 'disable'
+ use_systemd_session = get_option('systemd_session') == 'default'
+ enable_systemd_journal = get_option('systemd_journal')
++enable_elogind = get_option('elogind')
+ enable_consolekit = get_option('consolekit')
+-if enable_systemd or enable_consolekit
++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
++if enable_systemd or enable_elogind or enable_consolekit
+ session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
+
+ # Check for systemd
+@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
+ endif
+
+ session_tracking = 'systemd'
++ elif enable_elogind
++ libelogind_dep = dependency('libelogind', version: '>= 239.4')
++ session_bin_deps += libelogind_dep
++ session_tracking = 'elogind'
+ endif
+
+ # Check for ConsoleKit
+@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
+
+ session_bin_deps += dbus_glib_dep
+
+- if enable_systemd
++ if enable_systemd or enable_elogind
+ session_tracking += ' (with fallback to ConsoleKit)'
+ else
+ session_tracking = 'ConsoleKit'
+@@ -171,7 +177,7 @@ endif
+ if enable_systemd_session
+ assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
+ endif
+-config_h.set('HAVE_SYSTEMD', enable_systemd)
++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+ config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
+ config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
+ config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
+diff --git a/meson_options.txt b/meson_options.txt
+index 4c05dc6e..512d1528 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
++option('elogind', type: 'boolean', value: true, description: 'Use elogind')
+ option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
+ option('systemd', type: 'boolean', value: true, description: 'Use systemd')
+ option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
+--
+2.26.2
+
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
new file mode 100644
index 00000000000..8d4354bec09
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.22.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/mesa[egl,gles2,X(+)]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-242:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ x11-libs/xtrans
+ virtual/pkgconfig
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-Support-elogind.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Install USE=doc in $PF if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ $(meson_use elogind)
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ -Dsystemd_session=$(usex systemd default disable)
+ $(meson_use systemd systemd_journal)
+ $(meson_use doc docbook)
+ -Dconsolekit=false
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use elogind; then
+ ewarn "You are building without systemd or elogind support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2024-02-11 14:21 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2024-02-11 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 7757892eaca0389251d0dc5b5d716914ce801b77
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 14:09:53 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 14:21:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7757892e
gnome-base/gnome-session: drop 44.0-r1, 45.0
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-session/Manifest | 1 -
gnome-base/gnome-session/files/defaults.list-r5 | 336 ---------------------
.../gnome-session/gnome-session-44.0-r1.ebuild | 128 --------
gnome-base/gnome-session/gnome-session-45.0.ebuild | 128 --------
4 files changed, 593 deletions(-)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 57bf2624cd8e..a21e381f049d 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,2 +1 @@
-DIST gnome-session-44.0.tar.xz 485372 BLAKE2B aacfbec2c59f41b7b36107a59f8e9177ab45dca4c82a6aa3982951eda8ef2b2aae22a43a5d9d43b30f6ab010529ba20754f3de87df2abd5ca812bb0e878c6357 SHA512 0e8672531bc1818cfb6dbb5b133374e4041ec471e04968a587a93d0ee9697393ee976e1aa5dfacf707a46d816da6be6b1ef52e89f47d9d206a319eb79aae1078
DIST gnome-session-45.0.tar.xz 485992 BLAKE2B 473f0b3d94ffa8c1e2bf45884d053c753e5d5ad791b7cd9f889ce7952a273c4631c9867f038edaa6fe8e6ce16b9659c479755ce8028076016a658ad23291eeb7 SHA512 3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba
diff --git a/gnome-base/gnome-session/files/defaults.list-r5 b/gnome-base/gnome-session/files/defaults.list-r5
deleted file mode 100644
index 9ec18d1b8a63..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r5
+++ /dev/null
@@ -1,336 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
-application/x-dia-diagram=dia.desktop;
-image/bmp=org.gnome.eog.desktop;
-image/gif=org.gnome.eog.desktop;
-image/jpeg=org.gnome.eog.desktop;
-image/jpg=org.gnome.eog.desktop;
-image/pjpeg=org.gnome.eog.desktop;
-image/png=org.gnome.eog.desktop;
-image/svg+xml=org.gnome.eog.desktop;
-image/svg+xml-compressed=org.gnome.eog.desktop;
-image/x-bmp=org.gnome.eog.desktop;
-image/x-gray=org.gnome.eog.desktop;
-image/x-icb=org.gnome.eog.desktop;
-image/x-ico=org.gnome.eog.desktop;
-image/x-pcx=org.gnome.eog.desktop;
-image/x-png=org.gnome.eog.desktop;
-image/x-portable-anymap=org.gnome.eog.desktop;
-image/x-portable-bitmap=org.gnome.eog.desktop;
-image/x-portable-graymap=org.gnome.eog.desktop;
-image/x-portable-pixmap=org.gnome.eog.desktop;
-image/x-xbitmap=org.gnome.eog.desktop;
-image/x-xpixmap=org.gnome.eog.desktop;
-image/vnd.wap.wbmp=org.gnome.eog.desktop;
-image/g3fax=gimp.desktop;zzz-gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-fits=gimp.desktop;zzz-gimp.desktop;
-image/x-icon=gimp.desktop;zzz-gimp.desktop;
-image/x-psd=gimp.desktop;zzz-gimp.desktop;
-image/x-sgi=gimp.desktop;zzz-gimp.desktop;
-image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
-image/x-tga=gimp.desktop;zzz-gimp.desktop;
-image/x-xcf=gimp.desktop;zzz-gimp.desktop;
-image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-application/pdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
-application/postscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
-image/x-eps=org.gnome.Evince.desktop;evince.desktop;
-image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
-image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
-application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
-application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
-image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
-image/tiff=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
-application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
-application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
-application/x-7z-compressed=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-source-rpm=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=org.gnome.gedit.destkop
-text/x-php=org.gnome.gedit.destkop
-text/x-python=org.gnome.gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=org.gnome.gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-sc=gnumeric.desktop;
-application/x-sylk=gnumeric.desktop;
-application/x-xbase=gnumeric.desktop;
-application/x-xls=gnumeric.desktop;
-application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
-x-directory/normal=org.gnome.Nautilus.desktop;
-inode/directory=org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=org.gnome.SoundJuicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
-x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-44.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-44.0-r1.ebuild
deleted file mode 100644
index 2ef7f5cb7590..000000000000
--- a/gnome-base/gnome-session/gnome-session-44.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2
- >=x11-libs/gtk+-3.22.0:3
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=gnome-base/gnome-desktop-3.34.2:3=
- >=dev-libs/json-glib-0.10
- media-libs/libglvnd[X]
- media-libs/libepoxy
- x11-libs/libXcomposite
-
- systemd? ( >=sys-apps/systemd-242:0= )
- elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-settings-daemon-3.35.91
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- sys-apps/dbus[X]
-
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
-"
-DEPEND="${COMMON_DEPEND}
- x11-libs/xtrans
-"
-BDEPEND="
- dev-libs/libxslt
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- doc? (
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
- default
- xdg_environment_reset
-
- # Install USE=doc in ${PF} if enabled
- sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Ddeprecation_flags=false
- $(meson_use elogind)
- -Dsession_selector=true # gnome-custom-session
- $(meson_use systemd)
- -Dsystemd_session=$(usex systemd default disable)
- $(meson_use systemd systemd_journal)
- $(meson_use doc docbook)
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- -Dconsolekit=false
- -Dman=true
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-
- if ! use systemd && ! use elogind; then
- ewarn "You are building without systemd or elogind support."
- ewarn "gnome-session won't be able to correctly track and manage your session."
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-session/gnome-session-45.0.ebuild b/gnome-base/gnome-session/gnome-session-45.0.ebuild
deleted file mode 100644
index db7184751985..000000000000
--- a/gnome-base/gnome-session/gnome-session-45.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2
- >=x11-libs/gtk+-3.22.0:3
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=gnome-base/gnome-desktop-3.34.2:3=
- >=dev-libs/json-glib-0.10
- media-libs/libglvnd[X]
- media-libs/libepoxy
- x11-libs/libXcomposite
-
- systemd? ( >=sys-apps/systemd-242:0= )
- elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-settings-daemon-3.35.91
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- sys-apps/dbus[X]
-
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
-"
-DEPEND="${COMMON_DEPEND}
- x11-libs/xtrans
-"
-BDEPEND="
- dev-libs/libxslt
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- doc? (
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
- default
- xdg_environment_reset
-
- # Install USE=doc in ${PF} if enabled
- sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Ddeprecation_flags=false
- $(meson_use elogind)
- -Dsession_selector=true # gnome-custom-session
- $(meson_use systemd)
- -Dsystemd_session=$(usex systemd default disable)
- $(meson_use systemd systemd_journal)
- $(meson_use doc docbook)
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- -Dconsolekit=false
- -Dman=true
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-
- if ! use systemd && ! use elogind; then
- ewarn "You are building without systemd or elogind support."
- ewarn "gnome-session won't be able to correctly track and manage your session."
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-11 14:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-16 14:06 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2024-02-11 14:21 Mart Raudsepp
2020-08-19 12:36 Pacho Ramos
2018-02-03 20:56 Mart Raudsepp
2017-03-18 12:25 Mart Raudsepp
2015-11-14 19:46 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox