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

[Davide Pesavento]

commit:     54a50878f160e4b9d77a2b97346a58f670910a62
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 28 23:47:59 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 23:47:59 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54a50878

[dev-qt/qtgui:5] Fix session management support.

Enable -sm unconditionally because it's also used outside the xcb
platform plugin. The deps are left unchanged because only the plugin
links against libSM.

Package-Manager: portage-2.2.10

---
 dev-qt/qtgui/qtgui-5.3.1.ebuild    | 6 ++++--
 dev-qt/qtgui/qtgui-5.3.9999.ebuild | 6 ++++--
 dev-qt/qtgui/qtgui-5.9999.ebuild   | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild
index 88324f7..d301791 100644
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=(
        png:png:
        png:system-png:IMAGEFORMAT_PNG
        !png:no-png:
+       ::SESSIONMANAGER
        udev:libudev:
        xcb:xcb:
        xcb:xcb-glx:
        xcb:xcb-plugin:
        xcb:xcb-render:
-       xcb:xcb-sm:SESSIONMANAGER
+       xcb:xcb-sm:
        xcb:xcb-xlib:
        xcb:xinput2:
        xcb::XKB
@@ -144,10 +145,11 @@ 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)
-               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+               $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild 
b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
index 88324f7..d301791 100644
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=(
        png:png:
        png:system-png:IMAGEFORMAT_PNG
        !png:no-png:
+       ::SESSIONMANAGER
        udev:libudev:
        xcb:xcb:
        xcb:xcb-glx:
        xcb:xcb-plugin:
        xcb:xcb-render:
-       xcb:xcb-sm:SESSIONMANAGER
+       xcb:xcb-sm:
        xcb:xcb-xlib:
        xcb:xinput2:
        xcb::XKB
@@ -144,10 +145,11 @@ 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)
-               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+               $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }

diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 8f5e29e..d4a7bd2 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -100,12 +100,13 @@ QT5_GENTOO_CONFIG=(
        png:png:
        png:system-png:IMAGEFORMAT_PNG
        !png:no-png:
+       ::SESSIONMANAGER
        udev:libudev:
        xcb:xcb:
        xcb:xcb-glx:
        xcb:xcb-plugin:
        xcb:xcb-render:
-       xcb:xcb-sm:SESSIONMANAGER
+       xcb:xcb-sm:
        xcb:xcb-xlib:
        xcb:xinput2:
        xcb::XKB
@@ -145,10 +146,11 @@ 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)
-               $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender)
+               $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
        )
        qt5-build_src_configure
 }