rpms/kdebase/FC-5 kdebase-3.5.4-kde#124116.patch, NONE, 1.1 kdebase-3.5.4-konsole-bz#203221.patch, NONE, 1.1 kdebase.spec, 1.179, 1.180
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 21 15:12:23 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3089
Modified Files:
kdebase.spec
Added Files:
kdebase-3.5.4-kde#124116.patch
kdebase-3.5.4-konsole-bz#203221.patch
Log Message:
- fix #203221, konsole does not display bold characters
- fix #203083, correct htdig settings
- apply upstream patch to fix argument quoting
kdebase-3.5.4-kde#124116.patch:
main.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE kdebase-3.5.4-kde#124116.patch ---
Index: ksystraycmd/main.cpp
===================================================================
--- ksystraycmd/main.cpp (Revision 572102)
+++ ksystraycmd/main.cpp (Revision 572103)
@@ -5,6 +5,7 @@
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
+#include <kprocess.h>
#include "ksystraycmd.h"
@@ -94,7 +95,7 @@
// Read the command
QString command;
for ( int i = 0; i < args->count(); i++ )
- command += QCString( args->arg(i) ) + " ";
+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " ";
if ( !command.isEmpty() )
cmd.setCommand( command );
kdebase-3.5.4-konsole-bz#203221.patch:
TEScreen.cpp | 2 +-
TEWidget.cpp | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
--- NEW FILE kdebase-3.5.4-konsole-bz#203221.patch ---
Index: konsole/konsole/TEScreen.cpp
===================================================================
--- konsole/konsole/TEScreen.cpp (Revision 570193)
+++ konsole/konsole/TEScreen.cpp (Revision 570194)
@@ -501,7 +501,7 @@
void TEScreen::effectiveRendition()
// calculate rendition
{
- ef_re = cu_re & (RE_UNDERLINE | RE_BLINK);
+ ef_re = cu_re & (RE_UNDERLINE | RE_BLINK | RE_BOLD);
if (cu_re & RE_REVERSE)
{
ef_fg = cu_bg;
Index: konsole/konsole/TEWidget.cpp
===================================================================
--- konsole/konsole/TEWidget.cpp (Revision 570193)
+++ konsole/konsole/TEWidget.cpp (Revision 570194)
@@ -677,6 +677,18 @@
}
// Paint text
+ if (attr->r & RE_BOLD)
+ {
+ QFont currentFont = paint.font();
+ currentFont.setBold(true);
+ paint.setFont( currentFont );
+ } else {
+ QFont currentFont = paint.font();
+ currentFont.setBold(false);
+ paint.setFont( currentFont );
+ }
+
+
if (!(blinking && (attr->r & RE_BLINK)))
{
// ### Disabled for now, since it causes problems with characters
Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- kdebase.spec 11 Aug 2006 18:48:31 -0000 1.179
+++ kdebase.spec 21 Aug 2006 15:12:20 -0000 1.180
@@ -53,6 +53,8 @@
# upstream patches
Patch100: kdebase-3.5.4-halbackend-dbus.patch
Patch101: kdebase-3.5.4-kde#128552.patch
+Patch102: kdebase-3.5.4-kde#124116.patch
+Patch103: kdebase-3.5.4-konsole-bz#203221.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -160,6 +162,8 @@
# upstream patches
%patch100 -p0 -b .halbackend-dbus
%patch101 -p0 -b .kde#128552
+%patch102 -p0 -b .kde#124116
+%patch103 -p0 -b .bz#203221
%if %{rhel}
rm -rf kdeprint/kdeprintfax
@@ -522,6 +526,11 @@
%changelog
+* Mon Aug 21 2006 Than Ngo <than at redhat.com> 3.5.4-0.2.fc5
+- fix #203221, konsole does not display bold characters
+- fix #203083, correct htdig settings
+- apply upstream patch to fix argument quoting
+
* Fri Aug 11 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.2.fc5
- fix BR
More information about the fedora-cvs-commits
mailing list