rev 4400 - in trunk/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-08-26 15:06:57 +0000 (Sat, 26 Aug 2006)
New Revision: 4400

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Read the changelog for a description. And feel free to test :)


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-08-26 14:55:36 UTC (rev 4399)
+++ trunk/packages/kdebase/debian/changelog	2006-08-26 15:06:57 UTC (rev 4400)
@@ -4,6 +4,8 @@
     + Reorders the paths which kxkb searches. This should prevent it from
       mistakenly thinking that it's found it's data; this was breaking
       keyboard layouts for many users. (Closes: #382988)
+    + Fix kxkb with multiple users - create properly named files in /tmp.
+      (Closes: #383893)
 
   * TODO: check bugs fixed since last branch pull !!!
 
@@ -14,12 +16,19 @@
   * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt
     provides its own better .desktop file. (Closes: #383412)
 
-  +++ Changes by Fathi Boudra:
+  * Revamp patches/18_default_fonts.diff, not only to sync it with the latest
+    changes in the KDE_3_5_BRANCH, but also to fix a number of recent problems
+    with KDE's font handling. These include mismatches between defaults in
+    different parts of KDE, which led to different apps using different
+    settings, with respect to the enabling of anti-aliasing, subpixel
+    rendering, and other settings. Also, set the default font hinting level
+    to 'full', since anything other than that has the effect of actually
+    disabling hinting with Debian's fontconfig. This probably led many users
+    to wonder why their fonts suddenly became so ugly after they ran KControl
+    and accepted then default 'medium' hinting level. (Closes: #381232)
 
-  + Invert search path in X11DirList. (Closes: #382988)
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Aug 2006 11:02:31 -0400
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  7 Aug 2006 14:42:22 -0400
-
 kdebase (4:3.5.4-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r567687).

Modified: trunk/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/18_default_fonts.diff	2006-08-26 14:55:36 UTC (rev 4399)
+++ trunk/packages/kdebase/debian/patches/18_default_fonts.diff	2006-08-26 15:06:57 UTC (rev 4400)
@@ -1,30 +1,3 @@
---- kde.orig/kcontrol/fonts/fonts.cpp
-+++ kde.patched/kcontrol/fonts/fonts.cpp
-@@ -385,7 +385,7 @@
- 
- void FontAASettings::defaults()
- {
--  excludeRange->setChecked(true);
-+  excludeRange->setChecked(false);
-   excludeFrom->setValue(8.0);
-   excludeTo->setValue(15.0);
-   useSubPixel->setChecked(false);
-@@ -511,13 +511,13 @@
-   QFont f0("Sans Serif", 10);
-   QFont f1("Monospace", 10);
-   QFont f2("Sans Serif", 10);
--  QFont f3("Sans Serif", 9, QFont::Bold);
-+  QFont f3("Sans Serif", 10, QFont::Bold);
-   QFont f4("Sans Serif", 10);
- 
-   f0.setPointSize(10);
-   f1.setPointSize(10);
-   f2.setPointSize(10);
--  f3.setPointSize(9);
-+  f3.setPointSize(10);
-   f4.setPointSize(10);
- 
-   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
 --- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
 +++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
 @@ -113,12 +113,12 @@
@@ -92,3 +65,56 @@
  Comment: &
  Description:
   The font for the greeter headline.
+--- kde.orig/kcontrol/fonts/fonts.cpp
++++ kde.patched/kcontrol/fonts/fonts.cpp
+@@ -320,7 +320,7 @@
+     kglobals.setReadDefaults( useDefaults );
+ 
+     kglobals.setGroup("General");
+-    hStyle=KXftConfig::Hint::Medium;
++    hStyle=KXftConfig::Hint::Full;
+     xft.setHintStyle(hStyle);
+     xft.apply();  // Save this setting
+     kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
+@@ -438,7 +438,7 @@
+     if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8()))
+       return (KXftConfig::Hint::Style)s;
+ 
+-  return KXftConfig::Hint::Medium;
++  return KXftConfig::Hint::Full;
+ }
+ #endif
+ 
+@@ -503,13 +503,13 @@
+   QFont f0("Sans Serif", 10);
+   QFont f1("Monospace", 10);
+   QFont f2("Sans Serif", 10);
+-  QFont f3("Sans Serif", 9, QFont::Bold);
++  QFont f3("Sans Serif", 10, QFont::Bold);
+   QFont f4("Sans Serif", 10);
+ 
+   f0.setPointSize(10);
+   f1.setPointSize(10);
+   f2.setPointSize(10);
+-  f3.setPointSize(9);
++  f3.setPointSize(10);
+   f4.setPointSize(10);
+ 
+   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
+--- kde.orig/kcontrol/krdb/krdb.cpp
++++ kde.patched/kcontrol/krdb/krdb.cpp
+@@ -511,11 +511,11 @@
+   {
+     kglobals.setGroup("General");
+ 
+-    QString hintStyle(kglobals.readEntry("XftHintStyle", "hintmedium")),
+-            subPixel(kglobals.readEntry("XftSubPixel"));
++    QString hintStyle(kglobals.readEntry("XftHintStyle", "hintfull")),
++            subPixel(kglobals.readEntry("XftSubPixel", "none"));
+ 
+     contents += "Xft.antialias: ";
+-    if(kglobals.readBoolEntry("XftAntialias", false))
++    if(kglobals.readBoolEntry("XftAntialias", true))
+       contents += "1";
+     else
+       contents += "0";