1 |
commit: f7f5d84c85b6c7f946b94808849648b4cb6ea667 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 2 18:44:18 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 2 18:44:18 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f7f5d84c |
7 |
|
8 |
[kde-base/systemsettings] Introduce kscreen USE flag to disable randr KCM in favour of kde-misc/kscreen wrt bug #524266. |
9 |
|
10 |
Package-Manager: portage-2.2.12 |
11 |
|
12 |
--- |
13 |
.../files/systemsettings-kcm-randr.patch | 20 ++++++++++++++++++++ |
14 |
kde-base/systemsettings/metadata.xml | 1 + |
15 |
.../systemsettings-4.11.49.9999.ebuild | 6 +++++- |
16 |
3 files changed, 26 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/kde-base/systemsettings/files/systemsettings-kcm-randr.patch b/kde-base/systemsettings/files/systemsettings-kcm-randr.patch |
19 |
new file mode 100644 |
20 |
index 0000000..43019fc |
21 |
--- /dev/null |
22 |
+++ b/kde-base/systemsettings/files/systemsettings-kcm-randr.patch |
23 |
@@ -0,0 +1,20 @@ |
24 |
+Adds option to disable the randr KCM (to use KScreen instead) wrt bug #524266. |
25 |
+ |
26 |
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/plain/kde-workspace-4.10.2-BUILD_KCM_RANDR.patch |
27 |
+ |
28 |
+diff -up kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR kde-workspace-4.10.2/kcontrol/CMakeLists.txt |
29 |
+--- kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR 2013-03-01 00:32:25.040847159 -0600 |
30 |
++++ kde-workspace-4.10.2/kcontrol/CMakeLists.txt 2013-04-18 08:58:31.086753204 -0500 |
31 |
+@@ -6,9 +6,10 @@ macro_log_feature(FREETYPE_FOUND "FreeTy |
32 |
+ set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp ) |
33 |
+ |
34 |
+ |
35 |
+-if( X11_Xrandr_FOUND ) |
36 |
++OPTION(BUILD_KCM_RANDR "Build kcontrol/randr module" ON) |
37 |
++if(BUILD_KCM_RANDR AND X11_Xrandr_FOUND) |
38 |
+ add_subdirectory( randr ) |
39 |
+-endif(X11_Xrandr_FOUND ) |
40 |
++endif(BUILD_KCM_RANDR AND X11_Xrandr_FOUND) |
41 |
+ |
42 |
+ if(X11_Xkb_FOUND) |
43 |
+ add_subdirectory( keyboard ) |
44 |
|
45 |
diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml |
46 |
index 2d94d9b..e8fa71c 100644 |
47 |
--- a/kde-base/systemsettings/metadata.xml |
48 |
+++ b/kde-base/systemsettings/metadata.xml |
49 |
@@ -3,6 +3,7 @@ |
50 |
<pkgmetadata> |
51 |
<herd>kde</herd> |
52 |
<use> |
53 |
+ <flag name="kscreen">Use <pkg>kde-misc/kscreen</pkg> for screen management</flag> |
54 |
<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag> |
55 |
</use> |
56 |
</pkgmetadata> |
57 |
|
58 |
diff --git a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild |
59 |
index 706193d..4ee7da0 100644 |
60 |
--- a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild |
61 |
+++ b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild |
62 |
@@ -13,7 +13,7 @@ inherit kde4-meta |
63 |
|
64 |
DESCRIPTION="System settings utility" |
65 |
HOMEPAGE+=" http://userbase.kde.org/System_Settings" |
66 |
-IUSE="debug gtk nepomuk +usb" |
67 |
+IUSE="debug gtk +kscreen nepomuk +usb" |
68 |
KEYWORDS="" |
69 |
|
70 |
COMMONDEPEND=" |
71 |
@@ -45,6 +45,7 @@ RDEPEND="${COMMONDEPEND} |
72 |
x11-apps/setxkbmap |
73 |
x11-misc/xkeyboard-config |
74 |
gtk? ( kde-misc/kde-gtk-config ) |
75 |
+ kscreen? ( kde-misc/kscreen ) |
76 |
nepomuk? ( $(add_kdebase_dep nepomuk) ) |
77 |
" |
78 |
|
79 |
@@ -62,6 +63,8 @@ KMEXTRACTONLY=" |
80 |
# fails to connect to a kded instance |
81 |
RESTRICT="test" |
82 |
|
83 |
+PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" ) |
84 |
+ |
85 |
src_unpack() { |
86 |
if use handbook; then |
87 |
KMEXTRA+=" |
88 |
@@ -88,6 +91,7 @@ src_configure() { |
89 |
local mycmakeargs=( |
90 |
-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON |
91 |
-DWITH_GLIB2=ON -DWITH_GObject=ON |
92 |
+ -DBUILD_KCM_RANDR=$(usex !kscreen) |
93 |
$(cmake-utils_use_with opengl OpenGL) |
94 |
$(cmake-utils_use_with usb) |
95 |
) |