[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
commit: b735fccdc72e56af6dd1a36f4b6cb41381f1f5f7
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Sep 27 21:44:46 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Thu Sep 27 21:44:46 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b735fccd
gnome-base/gnome-session: remove, in ::gentoo with tweaks
Also removes live ebuild, as it's too outdated (upstream git uses meson)
.../files/10-user-dirs-update-gnome-r1 | 10 -
.../gnome-session/files/15-xdg-data-gnome-r1 | 9 -
.../gnome-session/files/90-xcursor-theme-gnome | 11 -
gnome-base/gnome-session/files/Gnome | 109 ---
gnome-base/gnome-session/files/defaults.list-r3| 334 -
.../gnome-session/gnome-session-3.26.1.ebuild | 123
gnome-base/gnome-session/gnome-session-.ebuild | 129
gnome-base/gnome-session/metadata.xml | 8 -
8 files changed, 733 deletions(-)
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
deleted file mode 100644
index 61fd08c5..
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
- if type xdg-user-dirs-update &>/dev/null; then
- xdg-user-dirs-update
- fi
-fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
deleted file mode 100644
index 5eaa6985..
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
- if [ -z "$XDG_DATA_DIRS" ]; then
- export
XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
- else
- export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
- fi
-fi
diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome
b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
deleted file mode 100644
index 13bc453c..
--- a/gnome-base/gnome-session/files/90-xcursor-theme-gnome
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
-XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2>
/dev/null
-if [ x"$XCURSOR_THEME" = "x" ]; then
-export XCURSOR_THEME="Adwaita"
-else
-# 'dconf read' wraps string output in single quotes
-eval export "XCURSOR_THEME=$XCURSOR_THEME"
-fi
-fi
diff --git a/gnome-base/gnome-session/files/Gnome
b/gnome-base/gnome-session/files/Gnome
deleted file mode 100644
index 55d39b63..
--- a/gnome-base/gnome-session/files/Gnome
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# This file has bitrotted badly. Someone needs to clean this up.
-#
-
-if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
- export XDG_MENU_PREFIX=gnome-
-fi
-
-for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER"
"/tmp/gnomerc-$USER"
-do
- if ( cp /dev/null "$errfile" 2> /dev/null )
- then
- chmod 600 "$errfile"
- exec > "$errfile" 2>&1
- break
- fi
-done
-#
-# Distributors:
-# You should modify the paths here to fit your distro
-# If you need to do so, send me (ji...@5z.com) a patch
-# and I'll try to make the script detect the distro stuff
-#
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-if [ -x "$HOME/.gnomerc" ]; then
- command="$HOME/.gnomerc"
-elif [ -x /etc/X11/gdm/gnomerc ]; then
- command="/etc/X11/gdm/gnomerc"
-else
- # as fallback in case the config is screwed
- command=`which gnome-session`
-fi
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-setxkbmap `cat "$sysxkbmap"`
-XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-setxkbmap `cat "$userxkbmap"`
-XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
-if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f
/etc/X11/XF86Config ]; then
- xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p'
/etc/X11/XF86Config`
- if [ -n "$xkbsymbols" ];
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: 8e08e8ebff22c240d4e10262f1da89dc5e54c1f5
Author: Sobhan Mohammadpour gentoo org>
AuthorDate: Wed Feb 14 19:35:03 2018 +
Commit: Sobhan Mohammadpour gentoo org>
CommitDate: Wed Feb 14 19:35:03 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8e08e8eb
gnome-base/gnome-session: version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1
.../gnome-session/gnome-session-3.26.1.ebuild | 123 +
1 file changed, 123 insertions(+)
diff --git a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
new file mode 100644
index ..0b3dac4a
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
@@ -0,0 +1,123 @@
+# 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-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
+ !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
+}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: 68f3096fbb5c987b2a2dcb65377595256ad3742f
Author: Dennis Lamm gentoo org>
AuthorDate: Fri Jan 12 12:55:08 2018 +
Commit: Dennis Lamm gentoo org>
CommitDate: Fri Jan 12 12:55:08 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=68f3096f
gnome-base/gnome-session: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../gnome-session/gnome-session-3.20.0.ebuild | 123 -
gnome-base/gnome-session/gnome-session-.ebuild | 3 +-
gnome-base/gnome-session/metadata.xml | 12 +-
3 files changed, 5 insertions(+), 133 deletions(-)
diff --git a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.20.0.ebuild
deleted file mode 100644
index 016129fc..
--- a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 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 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 )
-
- 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
-
- 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
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- !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
-}
diff --git a/gnome-base/gnome-session/gnome-session-.ebuild
b/gnome-base/gnome-session/gnome-session-.ebuild
index f4f5ad62..1c0186cc 100644
--- a/gnome-base/gnome-session/gnome-session-.ebuild
+++ b/gnome-base/gnome-session/gnome-session-.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-base/gnome-session/metadata.xml
b/gnome-base/gnome-session/metadata.xml
index 06d13a57..996e7cac 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -1,12 +1,8 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- gn...@gentoo.org
- Gentoo GNOME Desktop
-
-
- Optional support for gnome-base/gconf
- configuration storage system
-
+
+ gn...@gentoo.org
+ Gentoo GNOME Desktop
+
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: 8d5aee5a2ffb4374100078b8cf3406856ac2ea30
Author: Ole Reifschneider gentoo org>
AuthorDate: Sun Mar 20 18:13:58 2016 +
Commit: Ole Reifschneider gentoo org>
CommitDate: Fri Mar 25 00:55:46 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8d5aee5a
gnome-base/gnome-session: Bump version to 3.20.0
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
...-session-3.18.0.ebuild => gnome-session-3.20.0.ebuild} | 15 ---
gnome-base/gnome-session/gnome-session-.ebuild| 15 ---
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-session/gnome-session-3.18.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.20.0.ebuild
similarity index 92%
rename from gnome-base/gnome-session/gnome-session-3.18.0.ebuild
rename to gnome-base/gnome-session/gnome-session-3.20.0.ebuild
index 4de1d8a..016129f 100644
--- a/gnome-base/gnome-session/gnome-session-3.18.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,18 +13,18 @@ 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"
+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.40.0:2
+ >=dev-libs/glib-2.46.0:2[dbus]
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.7:3
+ >=x11-libs/gtk+-3.18.0:3
>=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.9.91:3=
+ >=gnome-base/gnome-desktop-3.18:3=
elibc_FreeBSD? ( dev-libs/libexecinfo )
virtual/opengl
@@ -40,7 +40,6 @@ COMMON_DEPEND="
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
@@ -75,11 +74,13 @@ 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 gconf) \
$(use_enable ipv6) \
$(use_enable systemd) \
$(use_enable !systemd consolekit) \
diff --git a/gnome-base/gnome-session/gnome-session-.ebuild
b/gnome-base/gnome-session/gnome-session-.ebuild
index fa06d05..f4f5ad6 100644
--- a/gnome-base/gnome-session/gnome-session-.ebuild
+++ b/gnome-base/gnome-session/gnome-session-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,18 +20,18 @@ if [[ ${PV} = ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
+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.40.0:2
+ >=dev-libs/glib-2.46.0:2[dbus]
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.7:3
+ >=x11-libs/gtk+-3.18.0:3
>=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.9.91:3=
+ >=gnome-base/gnome-desktop-3.18:3=
elibc_FreeBSD? ( dev-libs/libexecinfo )
virtual/opengl
@@ -47,7 +47,6 @@ COMMON_DEPEND="
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
@@ -82,11 +81,13 @@ 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
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: dabb8cbb9678165379cf93dda79720a54a98c754
Author: Ole Reifschneider gentoo org>
AuthorDate: Fri Oct 2 09:58:31 2015 +
Commit: Ole Reifschneider gentoo org>
CommitDate: Fri Oct 2 09:58:31 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dabb8cbb
gnome-base/gnome-session: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
.../gnome-session/gnome-session-3.18.0.ebuild | 122 +
1 file changed, 122 insertions(+)
diff --git a/gnome-base/gnome-session/gnome-session-3.18.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.18.0.ebuild
new file mode 100644
index 000..4de1d8a
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.18.0.ebuild
@@ -0,0 +1,122 @@
+# 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
+ >=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
+ >=dev-libs/dbus-glib-0.76
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-lang/perl-5
+ >=sys-devel/gettext-0.10.40
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ !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
+}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/
commit: 59a821aad81528229bfdb3338699360c849d8b73
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Fri May 1 15:43:03 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Fri May 1 15:43:03 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=59a821aa
Fix missing file problem for gnome-session
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 7E8B4D42
.../files/{defaults.list-r2 = defaults.list-r3} | 278 ++---
1 file changed, 139 insertions(+), 139 deletions(-)
diff --git a/gnome-base/gnome-session/files/defaults.list-r2
b/gnome-base/gnome-session/files/defaults.list-r3
similarity index 67%
rename from gnome-base/gnome-session/files/defaults.list-r2
rename to gnome-base/gnome-session/files/defaults.list-r3
index 0d98512..6c62e32 100644
--- a/gnome-base/gnome-session/files/defaults.list-r2
+++ b/gnome-base/gnome-session/files/defaults.list-r3
@@ -6,10 +6,10 @@
text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.d
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-nautilus.desktop;
-x-content/blank-dvd=brasero-nautilus.desktop;
-x-content/blank-cd=brasero-nautilus.desktop;
-x-content/blank-hddvd=brasero-nautilus.desktop;
+x-content/blank-bd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero-org.gnome.Nautilus.desktop;
application/x-dia-diagram=dia.desktop;
image/bmp=eog.desktop;
image/gif=eog.desktop;
@@ -104,33 +104,33 @@ 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=gedit.desktop;
-text/css=gedit.desktop;
-text/javascript=gedit.desktop;
-text/mathml=gedit.desktop;
-text/x-csrc=gedit.desktop;
-text/x-chdr=gedit.desktop;
-text/x-dtd=gedit.desktop;
-text/x-java=gedit.desktop;
-text/x-javascript=gedit.desktop;
-text/x-patch=gedit.desktop;
+text/plain=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=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=gedit.destkop
text/x-php=gedit.destkop
text/x-python=gedit.destkop
-text/x-sql=gedit.desktop;
-text/xml=gedit.desktop;
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
application/javascript=gedit.destkop
-application/x-cgi=gedit.desktop;
-application/x-javascript=gedit.desktop;
-application/x-perl=gedit.desktop;
-application/x-php=gedit.desktop;
-application/x-python=gedit.desktop;
-application/xml=gedit.desktop;
-application/xml-dtd=gedit.desktop;
-application/x-font-ttf=gnome-font-viewer.desktop;
-application/x-font-pcf=gnome-font-viewer.desktop;
-application/x-font-type1=gnome-font-viewer.desktop;
-application/x-font-otf=gnome-font-viewer.desktop;
+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;
@@ -164,10 +164,10 @@
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=nautilus-folder-handler.desktop;nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;nautilus.desktop;
+x-directory/gnome-default-handler=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
+inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/
commit: d03307987f872ed43e8a975eb4583188d5c5a5dc Author: Ole Reifschneider tranquility AT gentoo DOT org AuthorDate: Fri May 1 15:52:06 2015 + Commit: Ole Reifschneider tranquility AT gentoo DOT org CommitDate: Fri May 1 15:52:06 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d0330798 Add another missing file for gnome-session Package-Manager: portage-2.2.18 Manifest-Sign-Key: 7E8B4D42 gnome-base/gnome-session/files/90-xcursor-theme-gnome | 11 +++ 1 file changed, 11 insertions(+) diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome new file mode 100644 index 000..13bc453 --- /dev/null +++ b/gnome-base/gnome-session/files/90-xcursor-theme-gnome @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ $DESKTOP_SESSION = gnome -o $DESKTOP_SESSION = cinnamon ]; then +XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2 /dev/null +if [ x$XCURSOR_THEME = x ]; then +export XCURSOR_THEME=Adwaita +else +# 'dconf read' wraps string output in single quotes +eval export XCURSOR_THEME=$XCURSOR_THEME +fi +fi
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: ca31ccdb82a4332695c60482776c82d60c361fb5
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Fri May 1 14:31:33 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Fri May 1 14:31:33 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ca31ccdb
Bump gnome-session to 3.16.0
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 7E8B4D42
...ion-.ebuild = gnome-session-3.16.0.ebuild} | 30 +++---
gnome-base/gnome-session/gnome-session-.ebuild | 19 +-
2 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/gnome-base/gnome-session/gnome-session-.ebuild
b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
similarity index 79%
copy from gnome-base/gnome-session/gnome-session-.ebuild
copy to gnome-base/gnome-session/gnome-session-3.16.0.ebuild
index 2e040da..8a5b21e 100644
--- a/gnome-base/gnome-session/gnome-session-.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild,v
1.1 2015/03/22 17:50:31 tetromino Exp $
EAPI=5
GCONF_DEBUG=yes
inherit gnome2
-if [[ ${PV} = ]]; then
- inherit gnome2-live
-fi
DESCRIPTION=Gnome session manager
HOMEPAGE=https://git.gnome.org/browse/gnome-session;
LICENSE=GPL-2 LGPL-2 FDL-1.1
SLOT=0
-if [[ ${PV} = ]]; then
- KEYWORDS=
-else
- KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-fi
+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
@@ -31,7 +24,6 @@ COMMON_DEPEND=
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 )
@@ -60,7 +52,10 @@ RDEPEND=${COMMON_DEPEND}
=gnome-base/gsettings-desktop-schemas-0.1.7
=x11-themes/gnome-themes-standard-2.91.92
sys-apps/dbus[X]
- !systemd? ( sys-auth/consolekit )
+ !systemd? (
+ sys-auth/consolekit
+ =dev-libs/dbus-glib-0.76
+ )
DEPEND=${COMMON_DEPEND}
=dev-lang/perl-5
@@ -87,6 +82,7 @@ src_configure() {
$(use_enable gconf) \
$(use_enable ipv6) \
$(use_enable systemd) \
+ $(use_enable !systemd consolekit) \
UPOWER_CFLAGS= \
UPOWER_LIBS=
# gnome-session-selector pre-generated man page is missing
@@ -100,9 +96,8 @@ src_install() {
exeinto /etc/X11/Sessions
doexe ${FILESDIR}/Gnome
- dodir /usr/share/gnome/applications/
- insinto /usr/share/gnome/applications/
- newins ${FILESDIR}/defaults.list-r2 defaults.list
+ insinto /usr/share/applications
+ newins ${FILESDIR}/defaults.list-r3 gnome-mimeapps.list
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
@@ -110,6 +105,11 @@ src_install() {
# 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() {
diff --git a/gnome-base/gnome-session/gnome-session-.ebuild
b/gnome-base/gnome-session/gnome-session-.ebuild
index 2e040da..0a00fd7 100644
--- a/gnome-base/gnome-session/gnome-session-.ebuild
+++ b/gnome-base/gnome-session/gnome-session-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -31,7 +31,6 @@ COMMON_DEPEND=
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 )
@@ -60,7 +59,10 @@ RDEPEND=${COMMON_DEPEND}
=gnome-base/gsettings-desktop-schemas-0.1.7
=x11-themes/gnome-themes-standard-2.91.92
sys-apps/dbus[X]
- !systemd? ( sys-auth/consolekit )
+ !systemd? (
+ sys-auth/consolekit
+ =dev-libs/dbus-glib-0.76
+ )
DEPEND=${COMMON_DEPEND}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: 93b50207b1e7574709001afe30aab478d5b8cf58
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Dec 22 23:06:00 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Dec 22 23:06:00 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=93b50207
gnome-base/gnome-session: moved to gentoo-x86
---
.../gnome-session/gnome-session-3.14.0.ebuild | 115 -
1 file changed, 115 deletions(-)
diff --git a/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
deleted file mode 100644
index 323a886..000
--- a/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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_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
-
- dodir /usr/share/gnome/applications/
- insinto /usr/share/gnome/applications/
- newins ${FILESDIR}/defaults.list-r2 defaults.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
-}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
commit: a7f88142c85368ee38e755ce023d60a3f5b1aa1f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Oct 11 23:21:12 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sat Oct 11 23:30:27 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a7f88142
gnome-base/gnome-session: 3.12.1-r1 → 3.14.0
---
.../files/{defaults.list-r1 = defaults.list-r2} | 86 +++---
...n-3.12.1.ebuild = gnome-session-3.14.0.ebuild} | 7 +-
gnome-base/gnome-session/gnome-session-.ebuild | 7 +-
3 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/gnome-base/gnome-session/files/defaults.list-r1
b/gnome-base/gnome-session/files/defaults.list-r2
similarity index 86%
rename from gnome-base/gnome-session/files/defaults.list-r1
rename to gnome-base/gnome-session/files/defaults.list-r2
index e3aa854..0d98512 100644
--- a/gnome-base/gnome-session/files/defaults.list-r1
+++ b/gnome-base/gnome-session/files/defaults.list-r2
@@ -61,49 +61,49 @@ image/tiff=evince.desktop;
application/x-cbr=evince.desktop;
application/x-cbz=evince.desktop;
application/x-cb7=evince.desktop;
-application/x-7z-compressed=file-roller.desktop;
-application/x-7z-compressed-tar=file-roller.desktop;
-application/x-ace=file-roller.desktop;
-application/x-alz=file-roller.desktop;
-application/x-ar=file-roller.desktop;
-application/x-arj=file-roller.desktop;
-application/x-bzip=file-roller.desktop;
-application/x-bzip-compressed-tar=file-roller.desktop;
-application/x-bzip1=file-roller.desktop;
-application/x-bzip1-compressed-tar=file-roller.desktop;
-application/x-cabinet=file-roller.desktop;
-application/x-cd-image=file-roller.desktop;
-application/x-compress=file-roller.desktop;
-application/x-compressed-tar=file-roller.desktop;
-application/x-cpio=file-roller.desktop;
-application/x-deb=file-roller.desktop;
-application/x-ear=file-roller.desktop;
-application/x-gtar=file-roller.desktop;
-application/x-gzip=file-roller.desktop;
-application/x-java-archive=file-roller.desktop;
-application/x-lha=file-roller.desktop;
-application/x-lhz=file-roller.desktop;
-application/x-lzip=file-roller.desktop;
-application/x-lzip-compressed-tar=file-roller.desktop;
-application/x-lzma=file-roller.desktop;
-application/x-lzma-compressed-tar=file-roller.desktop;
-application/x-lzop=file-roller.desktop;
-application/x-lzop-compressed-tar=file-roller.desktop;
-application/x-rar=file-roller.desktop;
-application/x-rar-compressed=file-roller.desktop;
-application/x-rpm=file-roller.desktop;
-application/x-rzip=file-roller.desktop;
-application/x-tar=file-roller.desktop;
-application/x-tarz=file-roller.desktop;
-application/x-stuffit=file-roller.desktop;
-application/x-war=file-roller.desktop;
-application/x-xz=file-roller.desktop;
-application/x-xz-compressed-tar=file-roller.desktop;
-application/x-zip=file-roller.desktop;
-application/x-zip-compressed=file-roller.desktop;
-application/x-zoo=file-roller.desktop;
-application/zip=file-roller.desktop;
-multipart/x-zip=file-roller.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-stuffit=org.gnome.FileRoller.desktop;
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: a000b69a79f4180c660951d4a337f3429fe19f49
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Thu Apr 24 22:00:57 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Thu Apr 24 22:34:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a000b69a
gnome-base/gnome-session: 3.12.0 → 3.12.1
---
.../{gnome-session-3.12.0.ebuild = gnome-session-3.12.1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.12.1.ebuild
similarity index 100%
rename from gnome-base/gnome-session/gnome-session-3.12.0.ebuild
rename to gnome-base/gnome-session/gnome-session-3.12.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/
commit: 8ede976f85fe25ff16a1465780b5e9f2e65ccdac
Author: Mike Auty ikelos AT gentoo DOT org
AuthorDate: Thu Apr 17 00:31:20 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8ede976f
gnome-base/gnome-session: 3.10.1 → 3.12.0
Removed a sed that seemed unnecessary and a patch that had already been
applied. Otherwise a upower dep change was all that was different.
---
.../gnome-session/gnome-session-3.12.0.ebuild | 108 +
1 file changed, 108 insertions(+)
diff --git a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
new file mode 100644
index 000..cc3cd8d
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v
1.6 2014/03/29 21:00:14 tetromino Exp $
+
+EAPI=5
+GCONF_DEBUG=yes
+
+inherit eutils 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.35.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-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_configure() {
+ gnome2_src_configure \
+ --disable-deprecation-flags \
+ --docdir=${EPREFIX}/usr/share/doc/${PF} \
+ --enable-session-selector \
+ $(use_enable doc docbook-docs) \
+ $(use_enable gconf) \
+ $(use_enable ipv6) \
+ $(use_enable systemd)
+}
+
+src_install() {
+ gnome2_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe ${FILESDIR}/Gnome
+
+ dodir /usr/share/gnome/applications/
+ insinto /usr/share/gnome/applications/
+ newins ${FILESDIR}/defaults.list-r1 defaults.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
+}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
commit: 5a05ec26ffd5f6acd7fa998dbb5b2924fd4c0360
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 14:47:21 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5a05ec26
gnome-base/gnome-session: QAed
gnome-session-properties is no more.
Fix a potential problem on install where xsltproc would not be found yet
needed for configure to succeed due to --enable-man being the default.
This is an issue inherited from previous ebuilds.
* Avoid automagic for old upower, the rest of gnome 3.12 will pull a
more modern version and we cannot have both on the system.
* Drop unneeded patch.
* Fix keywords.
* Sync live ebuild.
---
.../files/gnome-session-3.8.4-blacklist-nv25.patch | 22 --
.../gnome-session/gnome-session-3.12.0.ebuild | 16 +
gnome-base/gnome-session/gnome-session-.ebuild | 27 ++
3 files changed, 24 insertions(+), 41 deletions(-)
diff --git
a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
deleted file mode 100644
index 3f28c2b..000
--- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
-From: Ray Strode rstr...@redhat.com
-Date: Tue, 12 Nov 2013 13:32:45 +
-Subject: data: blacklist nv25
-
-It doesn't work very well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711347
-diff --git a/data/hardware-compatibility b/data/hardware-compatibility
-index 927ba8b..48b7946 100644
a/data/hardware-compatibility
-+++ b/data/hardware-compatibility
-@@ -27,3 +27,6 @@
-
- # Gallium has softpipe; we explicitly enable llvmpipe
- -softpipe
-+
-+# nouveau vieux NV25 doesn't work too well
-+-Mesa DRI nv25
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
index cc3cd8d..bb2c3ff 100644
--- a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v
1.6 2014/03/29 21:00:14 tetromino Exp $
+# $Header: $
EAPI=5
GCONF_DEBUG=yes
@@ -12,7 +12,7 @@ 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
+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
@@ -58,6 +58,7 @@ RDEPEND=${COMMON_DEPEND}
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
@@ -69,14 +70,21 @@ DEPEND=${COMMON_DEPEND}
# 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
gnome2_src_configure \
--disable-deprecation-flags \
- --docdir=${EPREFIX}/usr/share/doc/${PF} \
+ --docdir=${EPREFIX}/usr/share/doc/${PF} \
--enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
$(use_enable ipv6) \
- $(use_enable systemd)
+ $(use_enable systemd) \
+ UPOWER_CFLAGS= \
+ UPOWER_LIBS=
+ # gnome-session-selector pre-generated man page is missing
+ #$(usex !doc XSLTPROC=$(type -P true))
}
src_install() {
diff --git a/gnome-base/gnome-session/gnome-session-.ebuild
b/gnome-base/gnome-session/gnome-session-.ebuild
index edfb7f4..263c849 100644
--- a/gnome-base/gnome-session/gnome-session-.ebuild
+++ b/gnome-base/gnome-session/gnome-session-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -33,7 +33,6 @@ COMMON_DEPEND=
=dev-libs/json-glib-0.10
=dev-libs/dbus-glib-0.76
=gnome-base/gnome-desktop-3.9.91:3=
- =sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
virtual/opengl
@@ -50,6 +49,7 @@ COMMON_DEPEND=
x11-apps/xdpyinfo
gconf? (
