head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.4 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.2.0.10 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.8 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.6 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.4 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.2 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.1.1.1.0.10 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.8 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.6 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.4 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.2 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2012.03.19.19.44.02; author markd; state dead; branches; next 1.2; 1.2 date 2010.10.25.20.55.28; author markd; state Exp; branches; next 1.1; 1.1 date 2009.10.02.19.37.22; author markd; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.10.02.19.37.22; author markd; state Exp; branches; next ; desc @@ 1.3 log @Update to KDE SC 4.8.0 add kactivities rename kdebase4 -> kde-baseapps4 rename kdebase-runtime4 -> kde-runtime4 rename kdebase-workspace4 -> kde-workspace4 rename kdebindings4-python -> py-kde4 @ text @$NetBSD: patch-ac,v 1.2 2010/10/25 20:55:28 markd Exp $ --- kcontrol/kdm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000 +++ kcontrol/kdm/main.cpp @@@@ -281,8 +281,12 @@@@ KConfig *KDModule::createTempConfig() pTempConfigFile->open(); QString tempConfigName = pTempConfigFile->fileName(); + QFile confFile (QString::fromLatin1( "@@PKG_SYSCONFDIR@@" "/kdm/kdmrc" )); + if ( !confFile.exists() ) + confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + KConfig *pSystemKDMConfig = new KConfig( - QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig); + confFile.fileName(), KConfig::SimpleConfig); KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName); pTempConfig->sync(); @ 1.2 log @Update to KDE SC 4.5.2 4.5.2 translation updates, performance and stability improvements and other bugfixes. 4.5.0 new versions of the Plasma Workspaces, the KDE Applications and the KDE Development Platform in version 4.5.0. While focus within this release cycle lay on stability, the overall polish and performance gain is well noticable. Features such as the reworked notification area, Marble's map routing and support for WebKit in Konqueror round up this release. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- kcontrol/kdm/main.cpp.orig 2008-07-03 17:05:24.000000000 +1200 d5 3 a7 3 @@@@ -188,7 +188,11 @@@@ KDModule::KDModule( QWidget *parent, con kWarning() << "user(s) '" << tgmapci.value().join( "," ) << "' have unknown GID " << tgmapci.key() << endl; d9 3 a11 4 - config = new KConfig( QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig ); + QFile confFile (QString::fromLatin1( "@@PKG_SYSCONFDIR@@" "/kdm/kdmrc" )); + if ( !confFile.exists() ) + confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); d13 3 a15 1 + config = new KConfig( confFile.fileName(), KConfig::SimpleConfig ); d17 2 a18 2 QVBoxLayout *top = new QVBoxLayout( this ); top->setMargin( 0 ); @ 1.1.1.1 log @Import KDE4.3.1 from wip OKed during freeze by wiz and agc @ text @@