Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=17aa1996eed587202e9750e78bb491170c9e5aa2

commit 17aa1996eed587202e9750e78bb491170c9e5aa2
Author: crazy <cr...@frugalware.org>
Date:   Tue Jan 19 12:01:02 2010 +0100

kdelibs-4.3.4-1-x86_64
* added default font patch
* not yet bumped

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index a2e66ea..f09bd40 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -10,7 +10,7 @@ depends=('libpng' 'libxrandr' 'libxinerama' 'libqtsvg' 
'strigi' 'libxft' \
'pcre' 'libqttest>=4.4.0' 'libxslt' 'heimdal' 'libqtsql>=4.4.0' \
'libqtdesigner>=4.4.0' 'openexr' 'jasper' 'shared-mime-info' 'libqtphonon' \
'libungif' 'libqtwebkit' 'libqtopengl' 'libxdamage' 'soprano' \
-       'libxtst' 'libxcursor' )
+       'libxtst' 'libxcursor')
makedepends=('enchant' 'hspell' 'avahi-compat' 'aspell' 'libqtxml>=4.4.0' \
'libstrigiqtdbusclient' 'strigi' 'libqtgui>=4.4.0' 'libxrender' \
'libxpm' 'libqt3support>=4.4.0' 'alsa-lib' 'libungif' \
@@ -21,7 +21,9 @@ replaces=('kat')
archs=('i686' 'x86_64')
_F_cmakekde_final=OFF
Finclude kde
-sha1sums=('1af2d185c88898b71f36b57f033e3a6d9839ab3d')
+source=("${sour...@]}" default-fonts.patch)
+sha1sums=('1af2d185c88898b71f36b57f033e3a6d9839ab3d' \
+          '930a92c4ca784ed30dc7b1d3d42137434445d75f')


# optimization OK
diff --git a/source/kde/kdelibs/default-fonts.patch 
b/source/kde/kdelibs/default-fonts.patch
new file mode 100644
index 0000000..9dcfc87
--- /dev/null
+++ b/source/kde/kdelibs/default-fonts.patch
@@ -0,0 +1,52 @@
+diff -Naur kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp 
kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp
+--- kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp     2009-10-30 
13:26:22.000000000 +0100
++++ kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp   2010-01-19 
11:18:12.000000000 +0100
+@@ -94,6 +94,7 @@
+         WindowTitleFont,
+         TaskbarFont ,
+         SmallestReadableFont,
++      DesktopFont,
+         FontTypesCount
+     };
+
+@@ -381,7 +382,7 @@
+
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+ static const char GeneralId[] =      "General";
+-static const char DefaultFont[] =    "Sans Serif";
++static const char DefaultFont[] =    "DejaVu Sans";
+ #ifdef Q_WS_MAC
+ static const char DefaultMacFont[] = "Lucida Grande";
+ #endif
+@@ -394,14 +395,15 @@
+     { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
+     { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
+ #else
+-    { GeneralId, "font",        DefaultFont, 10, -1, QFont::SansSerif },
+-    { GeneralId, "fixed",       "Monospace", 10, -1, QFont::TypeWriter },
+-    { GeneralId, "toolBarFont", DefaultFont,  8, -1, QFont::SansSerif },
+-    { GeneralId, "menuFont",    DefaultFont, 10, -1, QFont::SansSerif },
+-#endif
+-    { "WM",      "activeFont",           DefaultFont,  9, QFont::Bold, 
QFont::SansSerif },// inconsistency
+-    { GeneralId, "taskbarFont",          DefaultFont, 10, -1, 
QFont::SansSerif },
+-    { GeneralId, "smallestReadableFont", DefaultFont,  8, -1, 
QFont::SansSerif }
++    { GeneralId, "font",        DefaultFont, 10, -1},
++    { GeneralId, "fixed",       "DejaVu Sans Mono", 10, -1},
++    { GeneralId, "toolBarFont", DefaultFont,  10, -1},
++    { GeneralId, "menuFont",    DefaultFont, 11, -1},
++#endif
++    { "WM",      "activeFont",           DefaultFont,  10, QFont::Bold},// 
inconsistency
++    { GeneralId, "taskbarFont",          DefaultFont, 10, -1},
++    { GeneralId, "smallestReadableFont", DefaultFont,  8, -1},
++    { GeneralId, "desktopFont",        DefaultFont,  9, -1}
+ };
+
+ QFont KGlobalSettingsData::font( FontTypes fontType )
+@@ -462,6 +464,7 @@
+     // most preferred last
+     static const char* const PreferredFontNames[] =
+     {
++      "DejaVu Sans",
+         "Arial",
+         "Sans Serif",
+         "Verdana",
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to