From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
Date: Thu, 12 Dec 2013 23:20:58 +0000 (UTC) [thread overview]
Message-ID: <1386890445.45cc24f626ec32d1fd18a64cb66dca829a5cc0d0.eva@gentoo> (raw)
commit: 45cc24f626ec32d1fd18a64cb66dca829a5cc0d0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:04:45 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=45cc24f6
gnome-base/gnome-session: 3.8.4-r1 → 3.10.1
---
gnome-base/gnome-session/ChangeLog | 11 +++++++++
.../files/gnome-session-3.8.4-blacklist-nv25.patch | 22 ++++++++++++++++++
...ion-9999.ebuild => gnome-session-3.10.1.ebuild} | 26 ++++++++++------------
gnome-base/gnome-session/gnome-session-9999.ebuild | 17 +++++++++-----
4 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
new file mode 100644
index 0000000..6967e50
--- /dev/null
+++ b/gnome-base/gnome-session/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for gnome-base/gnome-session
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*gnome-session-3.10.1 (12 Dec 2013)
+
+ 12 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org>
+ +gnome-session-3.10.1.ebuild, gnome-session-9999.ebuild,
+ +files/gnome-session-3.8.4-blacklist-nv25.patch:
+ 3.8.4-r1 → 3.10.1
+
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
new file mode 100644
index 0000000..3f28c2b
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
@@ -0,0 +1,22 @@
+From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 12 Nov 2013 13:32:45 +0000
+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-9999.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
similarity index 84%
copy from gnome-base/gnome-session/gnome-session-9999.ebuild
copy to gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 9713b80..d1081e8 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
@@ -5,21 +5,14 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit eutils gnome2
DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-if [[ ${PV} = 9999 ]]; 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
@@ -27,11 +20,12 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# 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.33.4:2
+ >=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=
>=sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -66,7 +60,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
>=dev-util/intltool-0.40.6
- x11-libs/pango[X]
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
doc? (
@@ -77,8 +70,12 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
- # Silence errors due to weird checks for libX11
- sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+ # Allow people to configure startup apps, bug #464968, upstream bug #663767
+ sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+ # Blacklist nv25 (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
+
gnome2_src_prepare
}
@@ -86,6 +83,7 @@ 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) \
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 9713b80..edfb7f4 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -5,13 +5,13 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
@@ -27,11 +27,12 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# 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.33.4:2
+ >=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=
>=sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -66,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
>=dev-util/intltool-0.40.6
- x11-libs/pango[X]
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
doc? (
@@ -77,8 +77,12 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
- # Silence errors due to weird checks for libX11
- sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+ # Allow people to configure startup apps, bug #464968, upstream bug #663767
+ sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+ # Blacklist nv25 (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
+
gnome2_src_prepare
}
@@ -86,6 +90,7 @@ 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) \
next reply other threads:[~2013-12-12 23:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 23:20 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:59 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/ Mart Raudsepp
2014-04-20 18:17 Gilles Dartiguelongue
2013-02-06 3:32 Alexandre Rostovtsev
2012-03-27 6:18 Alexandre Restovtsev
2011-04-08 10:52 Gilles Dartiguelongue
2011-03-23 22:07 Nirbheek Chauhan
2011-03-23 21:59 Nirbheek Chauhan
2011-03-05 19:59 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386890445.45cc24f626ec32d1fd18a64cb66dca829a5cc0d0.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox