| 1 |
commit: 4c7137e0bd7c261a323f4f8ae378ac59ba7a0a68 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 29 21:45:31 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 29 21:45:31 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4c7137e0 |
| 7 |
|
| 8 |
[qt5-build.eclass] Enable session management globally and unconditionally. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-qt/qtgui/qtgui-5.3.1.ebuild | 2 -- |
| 12 |
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 2 -- |
| 13 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 2 -- |
| 14 |
eclass/qt5-build.eclass | 6 +++++- |
| 15 |
4 files changed, 5 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 18 |
index d301791..a82e0eb 100644 |
| 19 |
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 20 |
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 21 |
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=( |
| 22 |
png:png: |
| 23 |
png:system-png:IMAGEFORMAT_PNG |
| 24 |
!png:no-png: |
| 25 |
- ::SESSIONMANAGER |
| 26 |
udev:libudev: |
| 27 |
xcb:xcb: |
| 28 |
xcb:xcb-glx: |
| 29 |
@@ -145,7 +144,6 @@ src_configure() { |
| 30 |
$(qt_use jpeg libjpeg system) |
| 31 |
$(qt_use kms) |
| 32 |
$(qt_use png libpng system) |
| 33 |
- -sm |
| 34 |
$(qt_use udev libudev) |
| 35 |
$(qt_use xcb xcb system) |
| 36 |
$(qt_use xcb xkbcommon system) |
| 37 |
|
| 38 |
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 39 |
index d301791..a82e0eb 100644 |
| 40 |
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 41 |
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 42 |
@@ -99,7 +99,6 @@ QT5_GENTOO_CONFIG=( |
| 43 |
png:png: |
| 44 |
png:system-png:IMAGEFORMAT_PNG |
| 45 |
!png:no-png: |
| 46 |
- ::SESSIONMANAGER |
| 47 |
udev:libudev: |
| 48 |
xcb:xcb: |
| 49 |
xcb:xcb-glx: |
| 50 |
@@ -145,7 +144,6 @@ src_configure() { |
| 51 |
$(qt_use jpeg libjpeg system) |
| 52 |
$(qt_use kms) |
| 53 |
$(qt_use png libpng system) |
| 54 |
- -sm |
| 55 |
$(qt_use udev libudev) |
| 56 |
$(qt_use xcb xcb system) |
| 57 |
$(qt_use xcb xkbcommon system) |
| 58 |
|
| 59 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 60 |
index d4a7bd2..abb068c 100644 |
| 61 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 62 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 63 |
@@ -100,7 +100,6 @@ QT5_GENTOO_CONFIG=( |
| 64 |
png:png: |
| 65 |
png:system-png:IMAGEFORMAT_PNG |
| 66 |
!png:no-png: |
| 67 |
- ::SESSIONMANAGER |
| 68 |
udev:libudev: |
| 69 |
xcb:xcb: |
| 70 |
xcb:xcb-glx: |
| 71 |
@@ -146,7 +145,6 @@ src_configure() { |
| 72 |
$(qt_use jpeg libjpeg system) |
| 73 |
$(qt_use kms) |
| 74 |
$(qt_use png libpng system) |
| 75 |
- -sm |
| 76 |
$(qt_use udev libudev) |
| 77 |
$(qt_use xcb xcb system) |
| 78 |
$(qt_use xcb xkbcommon system) |
| 79 |
|
| 80 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 81 |
index ed92ab5..80f4886 100644 |
| 82 |
--- a/eclass/qt5-build.eclass |
| 83 |
+++ b/eclass/qt5-build.eclass |
| 84 |
@@ -534,13 +534,17 @@ qt5_base_configure() { |
| 85 |
|
| 86 |
# disable undocumented X11-related flags, override in qtgui |
| 87 |
# (not shown in ./configure -help output) |
| 88 |
- -no-sm -no-xkb -no-xrender |
| 89 |
+ -no-xkb -no-xrender |
| 90 |
|
| 91 |
# disable obsolete/unused X11-related flags |
| 92 |
# (not shown in ./configure -help output) |
| 93 |
-no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput |
| 94 |
-no-xrandr -no-xshape -no-xsync -no-xvideo |
| 95 |
|
| 96 |
+ # always enable session management support: it doesn't need extra deps |
| 97 |
+ # at configure time and turning it off is dangerous, see bug 518262 |
| 98 |
+ -sm |
| 99 |
+ |
| 100 |
# typedef qreal to double (warning: changing this flag breaks the ABI) |
| 101 |
-qreal double |
Archives