rev 10813 - in branches/kde4/packages: kdebase-workspace/debian/patches kdelibs/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Sat May 31 17:20:00 UTC 2008
Author: fabo
Date: 2008-05-31 17:19:59 +0000 (Sat, 31 May 2008)
New Revision: 10813
Modified:
branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff
branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
Log:
Update default font patches as discussed: replace 10 pt font size by 9 pt.
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -1,26 +1,6 @@
---- a/doc/kdm/kdmrc-ref.docbook
-+++ b/doc/kdm/kdmrc-ref.docbook
-@@ -1463,7 +1463,7 @@
- <para>
- The normal font used in the greeter.
- </para>
--<para>The default is <quote>Sans Serif,10</quote>.</para>
-+<para>The default is <quote>DejaVu,8</quote>.</para>
- </listitem>
- </varlistentry>
-
-@@ -1473,7 +1473,7 @@
- <para>
- The font used for the <quote>Login Failed</quote> message.
- </para>
--<para>The default is <quote>Sans Serif,10,bold</quote>.</para>
-+<para>The default is <quote>DejaVu,8,bold</quote>.</para>
- </listitem>
- </varlistentry>
-
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
-@@ -513,18 +513,18 @@
+@@ -513,19 +513,12 @@
// Keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
@@ -30,79 +10,19 @@
- QFont f3("Sans Serif", 9, QFont::Bold);
- QFont f4("Sans Serif", 10);
- QFont f5("Sans Serif", 8); // smallestReadableFont
-+ QFont f0("DejaVu Sans", 8);
-+ QFont f1("DejaVu Sans Mono", 8);
-+ QFont f2("DejaVu Sans", 8);
-+ QFont f3("DejaVu Sans", 8, QFont::Bold);
-+ QFont f4("DejaVu Sans", 8);
-+ QFont f5("DejaVu Sans", 8); // smallestReadableFont
-
+-
- f0.setPointSize(10);
- f1.setPointSize(10);
-+ f0.setPointSize(8);
-+ f1.setPointSize(8);
- f2.setPointSize(8);
+- f2.setPointSize(8);
- f3.setPointSize(9);
- f4.setPointSize(10);
-+ f3.setPointSize(8);
-+ f4.setPointSize(8);
- f5.setPointSize(8);
+- f5.setPointSize(8);
++ QFont f0("DejaVu Sans", 9);
++ QFont f1("DejaVu Sans Mono", 9);
++ QFont f2("DejaVu Sans", 8);
++ QFont f3("DejaVu Sans", 9, QFont::Bold);
++ QFont f4("DejaVu Sans", 9);
++ QFont f5("DejaVu Sans", 8); // smallestReadableFont
defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0;
---- a/kcontrol/kdm/kdm-gen.cpp
-+++ b/kcontrol/kdm/kdm-gen.cpp
-@@ -204,9 +204,9 @@
- void KDMGeneralWidget::set_def()
- {
-- stdFontChooser->setFont( QFont( "Sans Serif", 10 ) );
-- failFontChooser->setFont( QFont( "Sans Serif", 10, QFont::Bold ) );
-- greetingFontChooser->setFont( QFont( "Serif", 20 ) );
-+ stdFontChooser->setFont( QFont( "DejaVu Sans", 8 ) );
-+ failFontChooser->setFont( QFont( "DejaVu Sans", 8, QFont::Bold ) );
-+ greetingFontChooser->setFont( QFont( "DejaVu", 16 ) );
- }
-
- void KDMGeneralWidget::save()
---- a/kdm/config.def
-+++ b/kdm/config.def
-@@ -2160,30 +2160,30 @@
-
- Key: GreetFont
- Type: string
--Default: "Serif,20,5,0,50,0"
--CDefault: "Serif,20,bold"
-+Default: "DejaVu,16,5,0,50,0"
-+CDefault: "DejaVu,16,bold"
- User: greeter:font
--Instance: #*/"Serif,20,5,0,50,0"
-+Instance: #*/"DejaVu,16,5,0,50,0"
- Comment: &
- Description:
- The font for the greeter headline.
-
- Key: StdFont
- Type: string
--Default: "Sans Serif,10,5,0,50,0"
--CDefault: "Sans Serif,10"
-+Default: "DejaVu Sans,8,5,0,50,0"
-+CDefault: "DejaVu Sans,8"
- User: greeter(normalFont):font
--Instance: #*/"Sans Serif,10,5,0,50,0"
-+Instance: #*/"DejaVu Sans,8,5,0,50,0"
- Comment: &
- Description:
- The normal font used in the greeter.
-
- Key: FailFont
- Type: string
--Default: "Sans Serif,10,5,0,75,0"
--CDefault: "Sans Serif,10,bold"
-+Default: "DejaVu Sans,8,5,0,75,0"
-+CDefault: "DejaVu Sans,8,bold"
- User: greeter:font
--Instance: #*/"Sans Serif,10,5,0,75,0"
-+Instance: #*/"DejaVu Sans,8,5,0,75,0"
- Comment: &
- Description:
- The font used for the <quote>Login Failed</quote> message.
Modified: branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -6,7 +6,7 @@
Debug output is not completely disabled, because QT_NO_DEBUG is not set.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -923,11 +923,13 @@
+@@ -906,11 +906,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
Modified: branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -1,6 +1,6 @@
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1479,7 +1479,7 @@
+@@ -1476,7 +1476,7 @@
#ifdef Q_WS_MACX
localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/";
#else
Modified: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -1,6 +1,6 @@
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
-@@ -1427,10 +1427,9 @@
+@@ -1428,10 +1428,9 @@
IF(UNIX)
# on OS X X11 may not be required
IF (Q_WS_X11)
Modified: branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -1,75 +1,84 @@
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -327,8 +327,8 @@
- _generalFont->setPointSize(13);
+@@ -324,11 +324,9 @@
+
+ #ifdef Q_WS_MAC
+ _generalFont = new QFont("Lucida Grande", 13);
+- _generalFont->setPointSize(13);
#else
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _generalFont = new QFont("Sans Serif", 10);
- _generalFont->setPointSize(10);
-+ _generalFont = new QFont("DejaVu Sans", 8);
-+ _generalFont->setPointSize(8);
++ _generalFont = new QFont("DejaVu Sans", 9);
#endif
_generalFont->setStyleHint(QFont::SansSerif);
-@@ -348,8 +348,8 @@
- _fixedFont->setPointSize(10);
+@@ -345,11 +343,9 @@
+
+ #ifdef Q_WS_MAC
+ _fixedFont = new QFont("Monaco", 10);
+- _fixedFont->setPointSize(10);
#else
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _fixedFont = new QFont("Monospace", 10);
- _fixedFont->setPointSize(10);
-+ _fixedFont = new QFont("DejaVu Sans Mono", 8);
-+ _fixedFont->setPointSize(8);
++ _fixedFont = new QFont("DejaVu Sans Mono", 9);
#endif
_fixedFont->setStyleHint(QFont::TypeWriter);
-@@ -369,7 +369,7 @@
- _toolBarFont->setPointSize(11);
+@@ -366,11 +362,9 @@
+
+ #ifdef Q_WS_MAC
+ _toolBarFont = new QFont("Lucida Grande", 11);
+- _toolBarFont->setPointSize(11);
#else
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _toolBarFont = new QFont("Sans Serif", 8);
+- _toolBarFont->setPointSize(8);
+ _toolBarFont = new QFont("DejaVu Sans", 8);
- _toolBarFont->setPointSize(8);
#endif
_toolBarFont->setStyleHint(QFont::SansSerif);
-@@ -390,8 +390,8 @@
- _menuFont->setPointSize(13);
+
+@@ -387,11 +381,9 @@
+
+ #ifdef Q_WS_MAC
+ _menuFont = new QFont("Lucida Grande", 13);
+- _menuFont->setPointSize(13);
#else
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _menuFont = new QFont("Sans Serif", 10);
- _menuFont->setPointSize(10);
-+ _menuFont = new QFont("DejaVu Sans", 8);
-+ _menuFont->setPointSize(8);
++ _menuFont = new QFont("DejaVu Sans", 9);
#endif
_menuFont->setStyleHint(QFont::SansSerif);
-@@ -407,8 +407,8 @@
+@@ -407,8 +399,7 @@
return *_windowTitleFont;
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _windowTitleFont = new QFont("Sans Serif", 9, QFont::Bold);
- _windowTitleFont->setPointSize(10);
-+ _windowTitleFont = new QFont("DejaVu Sans", 8, QFont::Bold);
-+ _windowTitleFont->setPointSize(8);
++ _windowTitleFont = new QFont("DejaVu Sans", 9, QFont::Bold);
_windowTitleFont->setStyleHint(QFont::SansSerif);
KConfigGroup g( KGlobal::config(), "WM" );
-@@ -423,8 +423,8 @@
+@@ -423,8 +414,7 @@
return *_taskbarFont;
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _taskbarFont = new QFont("Sans Serif", 10);
- _taskbarFont->setPointSize(10);
-+ _taskbarFont = new QFont("DejaVu Sans", 8);
-+ _taskbarFont->setPointSize(8);
++ _taskbarFont = new QFont("DejaVu Sans", 9);
_taskbarFont->setStyleHint(QFont::SansSerif);
KConfigGroup g( KGlobal::config(), "General" );
-@@ -498,7 +498,7 @@
+@@ -498,8 +488,7 @@
return *_smallestReadableFont;
// Sync default with kdebase/kcontrol/fonts/fonts.cpp
- _smallestReadableFont = new QFont("Sans Serif", 8);
+- _smallestReadableFont->setPointSize(8);
+ _smallestReadableFont = new QFont("DejaVu Sans", 8);
- _smallestReadableFont->setPointSize(8);
_smallestReadableFont->setStyleHint(QFont::SansSerif);
+ KConfigGroup g( KGlobal::config(), "General" );
Modified: branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -1,8 +1,6 @@
-Index: kstandarddirs.cpp
-===================================================================
---- a/kdecore/kernel/kstandarddirs.cpp (revision 813271)
-+++ b/kdecore/kernel/kstandarddirs.cpp (working copy)
-@@ -1021,8 +1021,13 @@
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
+@@ -1018,8 +1018,13 @@
break;
}
}
@@ -16,5 +14,5 @@
+ }
+ }
}
-
+
dirs = d->absolutes.value(type);
Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -45,7 +45,7 @@
install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
--- a/kate/CMakeLists.txt
+++ b/kate/CMakeLists.txt
-@@ -145,7 +145,7 @@
+@@ -152,7 +152,7 @@
kde4_add_plugin(katepart ${katepart_PART_SRCS})
# linking
@@ -117,7 +117,7 @@
set_source_files_properties(su.cpp
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
-@@ -292,7 +292,8 @@
+@@ -293,7 +293,8 @@
kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
@@ -127,7 +127,7 @@
if(MINGW)
target_link_libraries(kdeui gdi32)
-@@ -314,6 +315,10 @@
+@@ -315,6 +316,10 @@
target_link_libraries(kdeui ${X11_Xrender_LIB})
endif(X11_Xrender_FOUND)
@@ -138,7 +138,7 @@
set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
-@@ -547,7 +552,7 @@
+@@ -548,7 +553,7 @@
endif ( Q_WS_QWS )
kde4_add_plugin( kded_globalaccel ${kded_globalaccel_SRCS} )
Modified: branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff 2008-05-31 12:03:16 UTC (rev 10812)
+++ branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff 2008-05-31 17:19:59 UTC (rev 10813)
@@ -22,7 +22,7 @@
VERSION ${KDE_NON_GENERIC_LIB_VERSION}
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
-@@ -293,7 +293,7 @@
+@@ -294,7 +294,7 @@
kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
target_link_libraries(kdeui ${QT_QTSVG_LIBRARY} ${KDE4_KDECORE_LIBS} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
More information about the pkg-kde-commits
mailing list