LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File no-randr-1.3.diff of Package kdebase4-workspace (Project openSUSE:11.4)

--- kcontrol/randr/randrscreen.cpp.orig	2010-11-29 22:14:50.652047425 +0100
+++ kcontrol/randr/randrscreen.cpp	2010-11-29 22:17:53.429902553 +0100
@@ -25,10 +25,15 @@
 #include <KConfigGroup>
 #include <QAction>
 
+#ifdef HAS_RANDR_1_3
 RandRScreen::RandRScreen(int screenIndex)
 : m_originalPrimaryOutput(0),
   m_proposedPrimaryOutput(0),
   m_resources(0)
+#else
+RandRScreen::RandRScreen(int screenIndex)
+: m_resources(0)
+#endif //HAS_RANDR_1_3
 {
 	m_index = screenIndex;
 	m_rect = QRect(0, 0, XDisplayWidth(QX11Info::display(), m_index),
@@ -39,9 +44,9 @@ RandRScreen::RandRScreen(int screenIndex
 
 	loadSettings();
 	load();
-
+#ifdef HAS_RANDR_1_3
 	m_originalPrimaryOutput = primaryOutput();
-
+#endif
 	// select for randr input events
 	int mask = RRScreenChangeNotifyMask | 
 		   RRCrtcChangeNotifyMask   | 
--- kcontrol/randr/randroutput.cpp.orig	2010-11-29 22:13:57.662467561 +0100
+++ kcontrol/randr/randroutput.cpp	2010-11-29 22:14:32.102294890 +0100
@@ -524,6 +524,7 @@ void RandROutput::slotEnable()
 
 void RandROutput::slotSetAsPrimary(bool primary)
 {
+#ifdef HAS_RANDR_1_3
 	if (!primary)
 	{
 		if (m_screen->primaryOutput() == this)
@@ -537,6 +538,7 @@ void RandROutput::slotSetAsPrimary(bool
 		kDebug() << "Setting" << m_name << "as primary output";
 		m_screen->setPrimaryOutput(this);
 	}
+#endif //HAS_RANDR_1_3
 }
 
 RandRCrtc *RandROutput::findEmptyCrtc()
--- ./powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig	2010-11-29 22:49:13.578111272 +0100
+++ ./powerdevil/daemon/backends/upower/xrandrbrightness.cpp	2010-11-29 22:49:06.039024698 +0100
@@ -53,9 +53,11 @@ XRandrBrightness::XRandrBrightness()
         return;
     }
 
+#ifdef HAS_RANDR_1_3
     if (minor > 2)
         m_resources = XRRGetScreenResourcesCurrent(QX11Info::display(), QX11Info::appRootWindow()); // version 1.3, faster version
     else
+#endif //HAS_RANDR_1_3
         m_resources = XRRGetScreenResources(QX11Info::display(), QX11Info::appRootWindow());
 
     if (!m_resources)