rev 12862 - in branches/kde4.2/packages/kdelibs/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sat Dec 6 15:17:20 UTC 2008
Author: ana
Date: 2008-12-06 15:17:20 +0000 (Sat, 06 Dec 2008)
New Revision: 12862
Added:
branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff.old
Modified:
branches/kde4.2/packages/kdelibs/debian/changelog
branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
Log:
20_use_dejavu_as_default_font.diff (due to:
http://websvn.kde.org/?view=rev&revision=893249)
Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog 2008-12-06 02:11:56 UTC (rev 12861)
+++ branches/kde4.2/packages/kdelibs/debian/changelog 2008-12-06 15:17:20 UTC (rev 12862)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.82+svn893099-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.82+svn893271-0r1) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -62,8 +62,9 @@
+++ Changes by Ana Beatriz Guerrero Lopez:
* Rework slightly patch 15_kfreebsd_support.diff.
+ * Redo patch 20_use_dejavu_as_default_font.diff.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 06 Dec 2008 03:48:59 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 06 Dec 2008 16:02:04 +0100
kde4libs (4:4.1.3-2) experimental; urgency=low
Modified: branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2008-12-06 02:11:56 UTC (rev 12861)
+++ branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2008-12-06 15:17:20 UTC (rev 12862)
@@ -1,65 +1,29 @@
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -322,7 +322,7 @@
- _generalFont = new QFont("Lucida Grande", 13);
- #else
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _generalFont = new QFont("Sans Serif", 10);
-+ _generalFont = new QFont("DejaVu Sans", 9);
- #endif
- _generalFont->setStyleHint(QFont::SansSerif);
+@@ -373,7 +373,7 @@
-@@ -341,7 +341,7 @@
- _fixedFont = new QFont("Monaco", 10);
- #else
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _fixedFont = new QFont("Monospace", 10);
-+ _fixedFont = new QFont("DejaVu Sans Mon", 9);
+ // 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
- _fixedFont->setStyleHint(QFont::TypeWriter);
-
-@@ -360,7 +360,7 @@
- _toolBarFont = new QFont("Lucida Grande", 11);
+@@ -386,13 +386,13 @@
+ { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
+ { GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _toolBarFont = new QFont("Sans Serif", 8);
-+ _toolBarFont = new QFont("DejaVu Sans", 8);
+- { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif },
+- { GeneralId, "fixed", "Monospace", 10, -1, QFont::TypeWriter },
++ { GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
++ { GeneralId, "fixed", "DejaVu Sans Mon", 9, -1, QFont::TypeWriter },
+ { GeneralId, "toolBarFont", DefaultFont, 8, -1, QFont::SansSerif },
+- { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif },
++ { GeneralId, "menuFont", DefaultFont, 9, -1, QFont::SansSerif },
#endif
- _toolBarFont->setStyleHint(QFont::SansSerif);
+ { "WM", "activeFont", DefaultFont, 9, QFont::Bold, QFont::SansSerif },// inconsistency
+- { GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif },
++ { GeneralId, "taskbarFont", DefaultFont, 9, -1, QFont::SansSerif },
+ { GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif }
+ };
-@@ -379,7 +379,7 @@
- _menuFont = new QFont("Lucida Grande", 13);
- #else
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _menuFont = new QFont("Sans Serif", 10);
-+ _menuFont = new QFont("DejaVu Sans", 9);
- #endif
- _menuFont->setStyleHint(QFont::SansSerif);
-
-@@ -395,7 +395,7 @@
- return *_windowTitleFont;
-
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _windowTitleFont = new QFont("Sans Serif", 9, QFont::Bold);
-+ _windowTitleFont = new QFont("DejaVu Sans", 9, QFont::Bold);
- _windowTitleFont->setStyleHint(QFont::SansSerif);
-
- KConfigGroup g( KGlobal::config(), "WM" );
-@@ -410,7 +410,7 @@
- return *_taskbarFont;
-
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _taskbarFont = new QFont("Sans Serif", 10);
-+ _taskbarFont = new QFont("DejaVu Sans", 9);
- _taskbarFont->setStyleHint(QFont::SansSerif);
-
- KConfigGroup g( KGlobal::config(), "General" );
-@@ -486,7 +486,7 @@
- return *_smallestReadableFont;
-
- // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
-- _smallestReadableFont = new QFont("Sans Serif", 8);
-+ _smallestReadableFont = new QFont("DejaVu Sans", 8);
- _smallestReadableFont->setStyleHint(QFont::SansSerif);
-
- KConfigGroup g( KGlobal::config(), "General" );
Added: branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff.old
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff.old (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff.old 2008-12-06 15:17:20 UTC (rev 12862)
@@ -0,0 +1,65 @@
+--- a/kdeui/kernel/kglobalsettings.cpp
++++ b/kdeui/kernel/kglobalsettings.cpp
+@@ -322,7 +322,7 @@
+ _generalFont = new QFont("Lucida Grande", 13);
+ #else
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _generalFont = new QFont("Sans Serif", 10);
++ _generalFont = new QFont("DejaVu Sans", 9);
+ #endif
+ _generalFont->setStyleHint(QFont::SansSerif);
+
+@@ -341,7 +341,7 @@
+ _fixedFont = new QFont("Monaco", 10);
+ #else
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _fixedFont = new QFont("Monospace", 10);
++ _fixedFont = new QFont("DejaVu Sans Mon", 9);
+ #endif
+ _fixedFont->setStyleHint(QFont::TypeWriter);
+
+@@ -360,7 +360,7 @@
+ _toolBarFont = new QFont("Lucida Grande", 11);
+ #else
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _toolBarFont = new QFont("Sans Serif", 8);
++ _toolBarFont = new QFont("DejaVu Sans", 8);
+ #endif
+ _toolBarFont->setStyleHint(QFont::SansSerif);
+
+@@ -379,7 +379,7 @@
+ _menuFont = new QFont("Lucida Grande", 13);
+ #else
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _menuFont = new QFont("Sans Serif", 10);
++ _menuFont = new QFont("DejaVu Sans", 9);
+ #endif
+ _menuFont->setStyleHint(QFont::SansSerif);
+
+@@ -395,7 +395,7 @@
+ return *_windowTitleFont;
+
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _windowTitleFont = new QFont("Sans Serif", 9, QFont::Bold);
++ _windowTitleFont = new QFont("DejaVu Sans", 9, QFont::Bold);
+ _windowTitleFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "WM" );
+@@ -410,7 +410,7 @@
+ return *_taskbarFont;
+
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _taskbarFont = new QFont("Sans Serif", 10);
++ _taskbarFont = new QFont("DejaVu Sans", 9);
+ _taskbarFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
+@@ -486,7 +486,7 @@
+ return *_smallestReadableFont;
+
+ // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
+- _smallestReadableFont = new QFont("Sans Serif", 8);
++ _smallestReadableFont = new QFont("DejaVu Sans", 8);
+ _smallestReadableFont->setStyleHint(QFont::SansSerif);
+
+ KConfigGroup g( KGlobal::config(), "General" );
More information about the pkg-kde-commits
mailing list