commit kdebase3

6 Aug 2007

Hello community,

here is the log from the commit of package kdebase3
checked in at Mon Aug 6 21:41:57 CEST 2007.

--------

--- KDE/kdebase3/kdebase3.changes	2007-08-04 18:49:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes	2007-08-06 18:44:40.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug  6 18:43:51 CEST 2007 - dmueller@suse.de
+
+- add krandr 0.5.2.1 (part of fate 300481)
+
+-------------------------------------------------------------------

New:
----
  krandr-0.5.2.1.diff.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.E10298/_old	2007-08-06 21:39:34.000000000 +0200
+++ /var/tmp/diff_new_pack.E10298/_new	2007-08-06 21:39:34.000000000 +0200
@@ -52,7 +52,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.kde.org/
 Version:        3.5.7
-Release:        41
+Release:        43
 %define	kde_version	3.5.7
 Source0:        kdebase-%{kde_version}.tar.bz2
 Source3:        startkde.suse.sh
@@ -196,6 +196,7 @@
 Patch212:       minicli-combo-editor.diff
 Patch214:       kdm-color-scheme.diff
 Patch215:       kdm-consolekit.diff
+Patch216:       krandr-0.5.2.1.diff.bz2
 
 %description
 This package contains kdebase, one of the basic packages of the K
@@ -383,7 +384,7 @@
 Summary:        Set and list fileshares
 Group:          System/Management
 Version:        2.0
-Release:        326
+Release:        328
 
 %description -n fileshareset
 This package contains the the fileshareset utility to allow users to
@@ -534,7 +535,6 @@
 %endif
 %patch190
 %patch195
-%patch197
 %if %suse_version > 1020
 %patch198
 %patch199
@@ -546,7 +546,6 @@
 %patch203
 %patch204
 %patch205
-%patch206
 %patch207
 %patch208
 %patch209
@@ -554,6 +553,11 @@
 %patch212
 %patch214
 %patch215
+pushd kcontrol
+%patch216
+popd
+#%patch197
+%patch206
 rm -rf kappfinder
 cp %SOURCE17 l10n/tw/flag.png
 . /etc/opt/kde3/common_options
@@ -1569,6 +1573,8 @@
 %endif
 
 %changelog
+* Mon Aug 06 2007 - dmueller@suse.de
+- add krandr 0.5.2.1 (part of fate 300481)
 * Sat Aug 04 2007 - stbinner@suse.de
 - update 3_5_BRANCH.diff a last time before freeze
 * Fri Aug 03 2007 - dmueller@suse.de











++++++ krandr-0.5.2.1.diff.bz2 ++++++
++++ 5556 lines (skipped)



++++++ simplify-randr-settings.diff ++++++
--- /var/tmp/diff_new_pack.E10298/_old	2007-08-06 21:39:39.000000000 +0200
+++ /var/tmp/diff_new_pack.E10298/_new	2007-08-06 21:39:39.000000000 +0200
@@ -1,29 +1,6 @@
-Index: kcontrol/randr/randr.cpp
-===================================================================
---- kcontrol/randr/randr.cpp	(revision 650813)
-+++ kcontrol/randr/randr.cpp	(working copy)
-@@ -661,7 +661,7 @@
- bool RandRDisplay::applyOnStartup(KConfig& config)
- {
- 	config.setGroup("Display");
--	return config.readBoolEntry("ApplyOnStartup", false);
-+	return config.readBoolEntry("ApplyOnStartup", true);
- }
- 
- bool RandRDisplay::syncTrayApp(KConfig& config)
-@@ -676,7 +676,6 @@
- 
- 	config.setGroup("Display");
- 	config.writeEntry("ApplyOnStartup", applyOnStartup);
--	config.writeEntry("SyncTrayApp", syncTrayApp);
- 
- 	for (RandRScreen* s = m_screens.first(); s; s = m_screens.next())
- 		s->save(config);
-Index: kcontrol/randr/krandrmodule.cpp
-===================================================================
---- kcontrol/randr/krandrmodule.cpp	(revision 650813)
-+++ kcontrol/randr/krandrmodule.cpp	(working copy)
-@@ -125,23 +125,15 @@
+--- kcontrol/randr/krandrmodule.cpp
++++ kcontrol/randr/krandrmodule.cpp
+@@ -114,23 +114,15 @@ KRandRModule::KRandRModule(QWidget *parent, const char *name, const QStringList&
  	m_rotationGroup->setRadioButtonExclusive(true);
  	QWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
  
@@ -31,18 +8,18 @@
 -	topLayout->addWidget(m_applyOnStartup);
 -	QWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts."));
 -	connect(m_applyOnStartup, SIGNAL(clicked()), SLOT(setChanged()));
-+	m_applyOnlySession = new QCheckBox(i18n("Change settings only for current session"), this);
-+	topLayout->addWidget(m_applyOnlySession);
-+	QWhatsThis::add(m_applyOnlySession, i18n("If this option is enabled the size and orientation settings will be only changed for the current session."));
-+	connect(m_applyOnlySession, SIGNAL(clicked()), SLOT(setChanged()));
- 
+-
 -	QHBox* syncBox = new QHBox(this);
 -	syncBox->layout()->addItem(new QSpacerItem(20, 1, QSizePolicy::Maximum));
 -	m_syncTrayApp = new QCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
 -	topLayout->addWidget(syncBox);
 -	QWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary."));
 -	connect(m_syncTrayApp, SIGNAL(clicked()), SLOT(setChanged()));
--
++	m_applyOnlySession = new QCheckBox(i18n("Change settings only for current session"), this);
++	topLayout->addWidget(m_applyOnlySession);
++	QWhatsThis::add(m_applyOnlySession, i18n("If this option is enabled the size and orientation settings will be only changed for the current session."));
++	connect(m_applyOnlySession, SIGNAL(clicked()), SLOT(setChanged()));
+ 
  	topLayout->addStretch(1);
  
  	// just set the "apply settings on startup" box
@@ -51,7 +28,7 @@
  
  	slotScreenChanged(QApplication::desktop()->primaryScreen());
  
-@@ -278,8 +270,7 @@
+@@ -272,8 +264,7 @@ void KRandRModule::load( bool useDefaults )
  	m_oldApply = loadDisplay(config, false);
  	m_oldSyncTrayApp = syncTrayApp(config);
  
@@ -61,7 +38,7 @@
  
  	emit changed( useDefaults ); 
  }
-@@ -291,8 +282,7 @@
+@@ -291,8 +282,7 @@ void KRandRModule::save()
  
  	apply();
  
@@ -71,21 +48,19 @@
  	KConfig config("kcmrandrrc");
  	saveDisplay(config, m_oldApply, m_oldSyncTrayApp);
  
-@@ -301,8 +291,7 @@
+@@ -308,8 +298,7 @@ void KRandRModule::setChanged()
+ #endif
+ 
  
- void KRandRModule::setChanged()
- {
 -	bool isChanged = (m_oldApply != m_applyOnStartup->isChecked()) || (m_oldSyncTrayApp != m_syncTrayApp->isChecked());
 -	m_syncTrayApp->setEnabled(m_applyOnStartup->isChecked());
 +	bool isChanged = (m_oldApply != !m_applyOnlySession->isChecked());
  
  	if (!isChanged)
  		for (int screenIndex = 0; screenIndex < numScreens(); screenIndex++) {
-Index: kcontrol/randr/krandrmodule.h
-===================================================================
---- kcontrol/randr/krandrmodule.h	(revision 650813)
-+++ kcontrol/randr/krandrmodule.h	(working copy)
-@@ -57,8 +57,7 @@
+--- kcontrol/randr/krandrmodule.h
++++ kcontrol/randr/krandrmodule.h
+@@ -79,8 +79,7 @@ protected:
  	KComboBox*		m_sizeCombo;
  	QButtonGroup*	m_rotationGroup;
  	KComboBox*		m_refreshRates;
@@ -95,3 +70,22 @@
  	bool			m_oldApply;
  	bool			m_oldSyncTrayApp;
  
+--- kcontrol/randr/randrdisplay.cpp
++++ kcontrol/randr/randrdisplay.cpp
+@@ -241,7 +241,7 @@ bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens)
+ bool RandRDisplay::applyOnStartup(KConfig& config)
+ {
+ 	config.setGroup("Display");
+-	return config.readBoolEntry("ApplyOnStartup", false);
++	return config.readBoolEntry("ApplyOnStartup", true);
+ }
+ 
+ bool RandRDisplay::syncTrayApp(KConfig& config)
+@@ -254,7 +254,6 @@ void RandRDisplay::saveDisplay(KConfig& config, bool applyOnStartup, bool syncTr
+ {
+ 	config.setGroup("Display");
+ 	config.writeEntry("ApplyOnStartup", applyOnStartup);
+-	config.writeEntry("SyncTrayApp", syncTrayApp);
+ 
+ #ifdef HAS_RANDR_1_2
+ 	if (RandR::has_1_2)






++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)