1 |
commit: 54a50878f160e4b9d77a2b97346a58f670910a62 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 28 23:47:59 2014 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 28 23:47:59 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54a50878 |
7 |
|
8 |
[dev-qt/qtgui:5] Fix session management support. |
9 |
|
10 |
Enable -sm unconditionally because it's also used outside the xcb |
11 |
platform plugin. The deps are left unchanged because only the plugin |
12 |
links against libSM. |
13 |
|
14 |
Package-Manager: portage-2.2.10 |
15 |
|
16 |
--- |
17 |
dev-qt/qtgui/qtgui-5.3.1.ebuild | 6 ++++-- |
18 |
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 6 ++++-- |
19 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 6 ++++-- |
20 |
3 files changed, 12 insertions(+), 6 deletions(-) |
21 |
|
22 |
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
23 |
index 88324f7..d301791 100644 |
24 |
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild |
25 |
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
26 |
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=( |
27 |
png:png: |
28 |
png:system-png:IMAGEFORMAT_PNG |
29 |
!png:no-png: |
30 |
+ ::SESSIONMANAGER |
31 |
udev:libudev: |
32 |
xcb:xcb: |
33 |
xcb:xcb-glx: |
34 |
xcb:xcb-plugin: |
35 |
xcb:xcb-render: |
36 |
- xcb:xcb-sm:SESSIONMANAGER |
37 |
+ xcb:xcb-sm: |
38 |
xcb:xcb-xlib: |
39 |
xcb:xinput2: |
40 |
xcb::XKB |
41 |
@@ -144,10 +145,11 @@ src_configure() { |
42 |
$(qt_use jpeg libjpeg system) |
43 |
$(qt_use kms) |
44 |
$(qt_use png libpng system) |
45 |
+ -sm |
46 |
$(qt_use udev libudev) |
47 |
$(qt_use xcb xcb system) |
48 |
$(qt_use xcb xkbcommon system) |
49 |
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
50 |
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) |
51 |
) |
52 |
qt5-build_src_configure |
53 |
} |
54 |
|
55 |
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
56 |
index 88324f7..d301791 100644 |
57 |
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
58 |
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
59 |
@@ -99,12 +99,13 @@ QT5_GENTOO_CONFIG=( |
60 |
png:png: |
61 |
png:system-png:IMAGEFORMAT_PNG |
62 |
!png:no-png: |
63 |
+ ::SESSIONMANAGER |
64 |
udev:libudev: |
65 |
xcb:xcb: |
66 |
xcb:xcb-glx: |
67 |
xcb:xcb-plugin: |
68 |
xcb:xcb-render: |
69 |
- xcb:xcb-sm:SESSIONMANAGER |
70 |
+ xcb:xcb-sm: |
71 |
xcb:xcb-xlib: |
72 |
xcb:xinput2: |
73 |
xcb::XKB |
74 |
@@ -144,10 +145,11 @@ src_configure() { |
75 |
$(qt_use jpeg libjpeg system) |
76 |
$(qt_use kms) |
77 |
$(qt_use png libpng system) |
78 |
+ -sm |
79 |
$(qt_use udev libudev) |
80 |
$(qt_use xcb xcb system) |
81 |
$(qt_use xcb xkbcommon system) |
82 |
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
83 |
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) |
84 |
) |
85 |
qt5-build_src_configure |
86 |
} |
87 |
|
88 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
89 |
index 8f5e29e..d4a7bd2 100644 |
90 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
91 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
92 |
@@ -100,12 +100,13 @@ QT5_GENTOO_CONFIG=( |
93 |
png:png: |
94 |
png:system-png:IMAGEFORMAT_PNG |
95 |
!png:no-png: |
96 |
+ ::SESSIONMANAGER |
97 |
udev:libudev: |
98 |
xcb:xcb: |
99 |
xcb:xcb-glx: |
100 |
xcb:xcb-plugin: |
101 |
xcb:xcb-render: |
102 |
- xcb:xcb-sm:SESSIONMANAGER |
103 |
+ xcb:xcb-sm: |
104 |
xcb:xcb-xlib: |
105 |
xcb:xinput2: |
106 |
xcb::XKB |
107 |
@@ -145,10 +146,11 @@ src_configure() { |
108 |
$(qt_use jpeg libjpeg system) |
109 |
$(qt_use kms) |
110 |
$(qt_use png libpng system) |
111 |
+ -sm |
112 |
$(qt_use udev libudev) |
113 |
$(qt_use xcb xcb system) |
114 |
$(qt_use xcb xkbcommon system) |
115 |
- $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
116 |
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) |
117 |
) |
118 |
qt5-build_src_configure |
119 |
} |