[Frugalware-darcs] frugalware-current: kdebase-3.5.1-5-i686

crazy crazy at frugalware.org
Fri Mar 10 21:47:10 CET 2006


[kdebase-3.5.1-5-i686
crazy <crazy at frugalware.org>**20060310201314
 * added default fonts patch
 * some misc fixes 
 
] {
hunk ./source/kde/kdebase/FrugalBuild 1
-# Last modified: Tue, 07 Mar 2006 06:41:42 +0100
+# Last modified: Fri, 10 Mar 2006 21:03:50 +0100
hunk ./source/kde/kdebase/FrugalBuild 8
-pkgrel=4
+pkgrel=5
hunk ./source/kde/kdebase/FrugalBuild 10
-depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.1-3' 'libraw1394' 'hal>=0.5.5-2' 'libusb' 'mtools' 'shadow' \
+depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.1-5' 'libraw1394' 'hal>=0.5.5-2' 'libusb' 'mtools' 'shadow' \
hunk ./source/kde/kdebase/FrugalBuild 12
-makedepends=('samba' 'j2re' 'cyrus-sasl' 'imake')
+makedepends=('samba' 'j2re' 'cyrus-sasl' 'imake' 'doxygen')
hunk ./source/kde/kdebase/FrugalBuild 25
-        $pkgname-$pkgver-KDE-BUG_121087.patch)
-## see http://bugs.kde.org/show_bug.cgi?id=121087 ..to be removed in 3.5.2
+        $pkgname-$pkgver-KDE-BUG_121087.patch fw-default-dejavu-font.patch $pkgname-$pkgver-misc_fixes.patch)
+## NOTE: if someone change fw-default-dejavu-font.patch its _NEED_ be in sync with
+## fw-default-dejavu-font.patch from kdelibs and both pkgs _NEED_ be recompiled!
+
hunk ./source/kde/kdebase/FrugalBuild 38
-          '1f1fa84af91aed5e580ee3d4e19a956ccee04ae5')
-
-## NOTE : grr now really the last one with the config stuff :)
-
+          '1f1fa84af91aed5e580ee3d4e19a956ccee04ae5' \
+          '08e455621a86486a091e15ddcdcaa34150d25eea' \
+          '08fbbf8bbd4efd83a78028e2ff4a6bd95d67c869')
addfile ./source/kde/kdebase/fw-default-dejavu-font.patch
hunk ./source/kde/kdebase/fw-default-dejavu-font.patch 1
+diff -Naur kdebase-3.5.1/kcontrol/fonts/fonts.cpp kdebase-3.5.1-dejavu/kcontrol/fonts/fonts.cpp
+--- kdebase-3.5.1/kcontrol/fonts/fonts.cpp	2005-10-10 17:03:43.000000000 +0200
++++ kdebase-3.5.1-dejavu/kcontrol/fonts/fonts.cpp	2006-03-10 16:13:05.000000000 +0100
+@@ -508,11 +508,11 @@
+ 
+   // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
+ 
+-  QFont f0("Sans Serif", 10);
+-  QFont f1("Monospace", 10);
+-  QFont f2("Sans Serif", 10);
+-  QFont f3("Sans Serif", 9, QFont::Bold);
+-  QFont f4("Sans Serif", 10);
++  QFont f0("DejaVu Sans", 13);
++  QFont f1("DejaVu Sans Mono", 13);
++  QFont f2("DejaVu Sans", 13);
++  QFont f3("DejaVu Serif Condensed", 12, QFont::Bold);
++  QFont f4("DejaVu Sans", 13);
+ 
+   f0.setPointSize(10);
+   f1.setPointSize(10);
addfile ./source/kde/kdebase/kdebase-3.5.1-misc_fixes.patch
hunk ./source/kde/kdebase/kdebase-3.5.1-misc_fixes.patch 1
+diff -Naur kdebase-3.5.1/kcontrol/konq/desktopbehavior_impl.cpp kdebase-3.5.1-misc/kcontrol/konq/desktopbehavior_impl.cpp
+--- kdebase-3.5.1/kcontrol/konq/desktopbehavior_impl.cpp	2006-01-19 18:00:48.000000000 +0100
++++ kdebase-3.5.1-misc/kcontrol/konq/desktopbehavior_impl.cpp	2006-03-10 17:07:11.000000000 +0100
+@@ -304,7 +304,7 @@
+     g_pConfig->setGroup( "General" );
+     vrootBox->setChecked( g_pConfig->readBoolEntry( "SetVRoot", false ) );
+     iconsEnabledBox->setChecked( g_pConfig->readBoolEntry( "Enabled", true ) );
+-    autoLineupIconsBox->setChecked( g_pConfig->readBoolEntry( "AutoLineUpIcons", false ) );
++    autoLineupIconsBox->setChecked( g_pConfig->readBoolEntry( "AutoLineUpIcons", true ) );
+ 
+     //
+     g_pConfig->setGroup( "Mouse Buttons" );
+diff -Naur kdebase-3.5.1/kdesktop/kdesktop.kcfg kdebase-3.5.1-misc/kdesktop/kdesktop.kcfg
+--- kdebase-3.5.1/kdesktop/kdesktop.kcfg	2006-01-19 18:02:00.000000000 +0100
++++ kdebase-3.5.1-misc/kdesktop/kdesktop.kcfg	2006-03-10 17:07:11.000000000 +0100
+@@ -51,7 +51,7 @@
+       <!--     if (!config->readBoolEntry("CopyDesktopLinks", true)) -->
+     </entry>
+     <entry key="AutoLineUpIcons" type="Bool">
+-      <default>false</default>
++      <default>true</default>
+       <label>Automatically line up icons</label>
+       <whatsthis>Check this option if you want to see your icons automatically aligned to the grid when you move them.</whatsthis>
+     </entry>
+diff -Naur kdebase-3.5.1/konsole/konsole/konsole.cpp kdebase-3.5.1-misc/konsole/konsole/konsole.cpp
+--- kdebase-3.5.1/konsole/konsole/konsole.cpp	2006-01-19 18:02:25.000000000 +0100
++++ kdebase-3.5.1-misc/konsole/konsole/konsole.cpp	2006-03-10 17:18:56.000000000 +0100
+@@ -1584,7 +1584,10 @@
+ 
+       // (1) set menu items and Konsole members
+ 
+-      QFont tmpFont = KGlobalSettings::fixedFont();
++      // KGlobalSettings::fixedFont() is nicer for a unified look, but for
++      // konsole, speed matters more than anything else - and nothing beats
++      // the speed of bitmap fonts
++      QFont tmpFont = QFont("Fixed [misc]", 14); //KGlobalSettings::fixedFont();
+       defaultFont = config->readFontEntry("defaultfont", &tmpFont);
+ 
+       //set the schema
+diff -Naur kdebase-3.5.1/konsole/konsole/konsole_part.cpp kdebase-3.5.1-misc/konsole/konsole/konsole_part.cpp
+--- kdebase-3.5.1/konsole/konsole/konsole_part.cpp	2005-10-10 17:04:22.000000000 +0200
++++ kdebase-3.5.1-misc/konsole/konsole/konsole_part.cpp	2006-03-10 17:18:56.000000000 +0100
+@@ -561,7 +561,10 @@
+ 
+   n_encoding = config->readNumEntry("encoding",0);
+ 
+-  QFont tmpFont = KGlobalSettings::fixedFont();
++  // KGlobalSettings::fixedFont() is nicer for a unified look, but for
++  // konsole, speed matters more than anything else - and nothing beats
++  // the speed of bitmap fonts
++  QFont tmpFont = QFont("Fixed [misc]", 14); //KGlobalSettings::fixedFont();
+   defaultFont = config->readFontEntry("defaultfont", &tmpFont);
+ 
+   QString schema = config->readEntry("Schema");
+diff -Naur kdebase-3.5.1/libkonq/konq_settings.cc kdebase-3.5.1-misc/libkonq/konq_settings.cc
+--- kdebase-3.5.1/libkonq/konq_settings.cc	2005-10-10 17:04:21.000000000 +0200
++++ kdebase-3.5.1-misc/libkonq/konq_settings.cc	2006-03-10 17:08:51.000000000 +0100
+@@ -90,7 +90,7 @@
+   
+   d->m_iconTextWidth = config->readNumEntry( "TextWidth", DEFAULT_TEXTWIDTH );
+   if ( d->m_iconTextWidth == DEFAULT_TEXTWIDTH )
+-    d->m_iconTextWidth = QFontMetrics(m_standardFont).width("0000000000");
++    d->m_iconTextWidth = QFontMetrics(m_standardFont).width("0000000000000");
+ 
+   m_iconTextHeight = config->readNumEntry( "TextHeight", 0 );
+   if ( m_iconTextHeight == 0 ) {
}


More information about the Frugalware-darcs mailing list