[packages/kde4-konsole] - rel 1; didn't notice 188528 anymore, so likely fixed

arekm arekm at pld-linux.org
Sat Aug 25 17:32:08 CEST 2012


commit 19b695b0cbf73baab4061cfc62f80522463ff196
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Aug 25 17:32:05 2012 +0200

    - rel 1; didn't notice 188528 anymore, so likely fixed

 kde4-konsole.spec        |  5 +----
 konsole-bug-188528.patch | 22 ----------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
---
diff --git a/kde4-konsole.spec b/kde4-konsole.spec
index cb4db54..6286f97 100644
--- a/kde4-konsole.spec
+++ b/kde4-konsole.spec
@@ -9,13 +9,12 @@ Summary:	K Desktop Environment - KDE Terminal Emulator
 Summary(pl.UTF-8):	K Desktop Environment - Emulator terminala dla KDE
 Name:		kde4-konsole
 Version:	4.9.0
-Release:	0.1
+Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	0999ac1ebe7c8c863c117fa3169555b4
 Patch0:		konsole-wordchars.patch
-Patch1:		konsole-bug-188528.patch
 URL:		http://www.kde.org/
 BuildRequires:	kde4-kdebase-devel >= %{version}
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
@@ -37,8 +36,6 @@ Emulator terminala dla KDE.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
-# CHECK IF IT STILL NEEDED, most likely it is since kde team is worse than bad in fixing this bug
-#%patch1 -p2
 
 %build
 install -d build
diff --git a/konsole-bug-188528.patch b/konsole-bug-188528.patch
deleted file mode 100644
index 40667f4..0000000
--- a/konsole-bug-188528.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdebase-4.5.1/konsole/src/Screen.cpp~	2010-04-28 10:01:02.000000000 +0200
-+++ kdebase-4.5.1/konsole/src/Screen.cpp	2010-09-27 09:23:48.658050544 +0200
-@@ -1223,6 +1223,19 @@
-         Character* data = screenLines[screenLine].data();
-         int length = screenLines[screenLine].count();
- 
-+	// Don't remove end spaces in lines that wrap
-+	if (!(lineProperties[screenLine] & LINE_WRAPPED))
-+	{
-+		 // ignore trailing white space at the end of the line
-+		 for (int i = length-1; i >= 0; i--)
-+		 {
-+			 if (data[i].character == ' ')
-+				 length--;
-+			 else
-+				 break;
-+		 }
-+	}
-+
-         //retrieve line from screen image
-         for (int i=start;i < qMin(start+count,length);i++)
-         {


More information about the pld-cvs-commit mailing list