commit: bfce22f8e295ec853b5daff772aea8812595438e Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Dec 23 00:02:29 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Dec 23 02:03:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfce22f8
gnome-base/gnome-session: bump to 3.24.2, revert to Xorg default Reverts back to defaulting to Xorg for the "gnome" session, and replaces "GNOME on Xorg" session with "GNOME on Wayland" session. Closes: https://bugs.gentoo.org/641988 Package-Manager: Portage-2.3.19, Repoman-2.3.6 gnome-base/gnome-session/Manifest | 2 + .../gnome-session/gnome-session-3.24.2.ebuild | 138 +++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 3563aacbfb6..da9528e45a0 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,2 +1,4 @@ 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/gnome-session-3.24.2.ebuild b/gnome-base/gnome-session/gnome-session-3.24.2.ebuild new file mode 100644 index 00000000000..bfa0c6c63c3 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.24.2.ebuild @@ -0,0 +1,138 @@ +# 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"; +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~leio/distfiles/${P}-xorg-default-translations.patch.xz"; + +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 ) + + 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-base/gnome-common +" +# gnome-common needed for eautoreconf +# gnome-base/gdm does not provide gnome.desktop anymore + +PATCHES=( + # Restore Xorg as the default GNOME session instead of Wayland for the 3.24 release, bug 641988 + "${FILESDIR}/3.22.3-xorg-default.patch" # remove ewarn about this below when removing for 3.26; also eautoreconf if possible + "${WORKDIR}/${P}-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.24 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.26 will default to Wayland again as upstream GNOME does, if" + ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will remain a choice." + ewarn "Default enabling USE=wayland via gnome profiles is planned with 3.26 as well." + + 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 +}
