[Pkg-kde-commits] rev 1072 - branches/kde-3.4.0/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-15 17:12:03 +0000 (Sun, 15 May 2005)
New Revision: 1072

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Update default-fonts patch. The lack of Helvetica was causing a check to fail that
really shouldn't have. Also, don't let KDE pick fonts under any circumstance - it
should always use the defaults we give it.

This should fix some strange problems where anti-aliasing wasn't being enabled on
start.


Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-05-15 01:11:42 UTC (rev 1071)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff	2005-05-15 17:12:03 UTC (rev 1072)
@@ -48,28 +48,6 @@
      <StandardFont value="" object="FMSettings" />
    </fonts>
  </ktheme>
---- kde.orig/kpersonalizer/keyecandypage.cpp
-+++ kde.patched/kpersonalizer/keyecandypage.cpp
-@@ -717,13 +717,13 @@
- 	b_useXft=QSettings().readBoolEntry("/qt/useXft");
- 	b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
- 	KGlobal::config()->setGroup("General");
--	userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
--	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("font", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
- 	KGlobal::config()->setGroup("WM");
--	userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
-+	userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans Serif,10,-1,5,75,0,0,0,0,0"));
- 
- 	KGlobal::config()->setGroup("PanelIcons");
- 	st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
 --- kde.orig/kdm/config.def
 +++ kde.patched/kdm/config.def
 @@ -2051,7 +2051,7 @@
@@ -122,3 +100,47 @@
  }
  
  #include "kdm-font.moc"
+--- kde.orig/kpersonalizer/keyecandypage.cpp
++++ kde.patched/kpersonalizer/keyecandypage.cpp
+@@ -594,20 +594,9 @@
+ void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){
+ 	if (!reset){
+ 		if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() )
+-		     && sys->getRenderSupport()
+-		     && (*userFonts.at(1)).contains("elvetica")) {
++		     && sys->getRenderSupport() ) {
+ 			QSettings().writeEntry("/qt/useXft", enable);
+ 			QSettings().writeEntry("/qt/enableXft", enable);
+-			if (enable) {
+-				KGlobal::config()->setGroup("General");
+-				KGlobal::config()->writeEntry("fixed", sys->getFixedWidthFont().toString(), true, true);
+-				KGlobal::config()->writeEntry("font", sys->getNormalFont().toString(), true, true);
+-				KGlobal::config()->writeEntry("menuFont", sys->getNormalFont().toString(), true, true);
+-				KGlobal::config()->writeEntry("taskbarFont", sys->getSmallFont().toString(), true, true);
+-				KGlobal::config()->writeEntry("toolBarFont", sys->getNormalFont().toString(), true, true);
+-				KGlobal::config()->setGroup("WM");
+-				KGlobal::config()->writeEntry("activeFont", sys->getBoldFont().toString(), true, true);
+-			}
+ 		}
+ 	} else {
+ 		QSettings().writeEntry("/qt/useXft", b_useXft);
+@@ -717,13 +706,13 @@
+ 	b_useXft=QSettings().readBoolEntry("/qt/useXft");
+ 	b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
+ 	KGlobal::config()->setGroup("General");
+-	userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
+-	userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
+-	userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
+-	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
+-	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("font", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans Serif,10,-1,5,50,0,0,0,0,0"));
+ 	KGlobal::config()->setGroup("WM");
+-	userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
++	userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans Serif,10,-1,5,75,0,0,0,0,0"));
+ 
+ 	KGlobal::config()->setGroup("PanelIcons");
+ 	st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");