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 <[email protected]> -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 -}
