[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, eclass/

[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, eclass/

[Davide Pesavento]

commit:     4c7137e0bd7c261a323f4f8ae378ac59ba7a0a68
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 21:45:31 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 21:45:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4c7137e0

[qt5-build.eclass] Enable session management globally and unconditionally.

---
 dev-qt/qtgui/qtgui-5.3.1.ebuild    | 2 --
 dev-qt/qtgui/qtgui-5.3.9999.ebuild | 2 --
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 2 --
 eclass/qt5-build.eclass            | 6 +++++-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index d301791..a82e0eb 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
-	::SESSIONMANAGER
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -145,7 +144,6 @@ src_configure() {
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
 		$(qt_use png libpng system)
-		-sm
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)

diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index d301791..a82e0eb 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
-	::SESSIONMANAGER
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -145,7 +144,6 @@ src_configure() {
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
 		$(qt_use png libpng system)
-		-sm
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index d4a7bd2..abb068c 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -100,7 +100,6 @@ QT5_GENTOO_CONFIG=(
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
-	::SESSIONMANAGER
 	udev:libudev:
 	xcb:xcb:
 	xcb:xcb-glx:
@@ -146,7 +145,6 @@ src_configure() {
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
 		$(qt_use png libpng system)
-		-sm
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ed92ab5..80f4886 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -534,13 +534,17 @@ qt5_base_configure() {
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
-		-no-sm -no-xkb -no-xrender
+		-no-xkb -no-xrender
 
 		# disable obsolete/unused X11-related flags
 		# (not shown in ./configure -help output)
 		-no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput
 		-no-xrandr -no-xshape -no-xsync -no-xvideo
 
+		# always enable session management support: it doesn't need extra deps
+		# at configure time and turning it off is dangerous, see bug 518262
+		-sm
+
 		# typedef qreal to double (warning: changing this flag breaks the ABI)
 		-qreal double