Remove old.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

3 files changed, 5 insertions, 84 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 94bbddaa50c2..78149c6b9e70 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.242 2012/09/03 13:29:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.243 2012/09/03 14:14:01 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/konsole-4.6.4-imagesize.patch, -files/konsole-4.7.4-ypos.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -konsole-4.7.4-r1.ebuild:
   Remove KDE SC 4.7.4
@@ -960,4 +964,3 @@
   +konsole-3.4.0_beta1.ebuild:
   Adding the split ebuilds to portage. For KDE 3.4, we've created separate
   ebuilds for all the KDE apps.
-
diff --git a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch b/kde-base/konsole/files/konsole-4.6.4-imagesize.patch
deleted file mode 100644
index 03fb8c97913c..000000000000
--- a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Make sure the imageSizeChanged signal is emitted at least once.
-
-Without this patch, the shell or other app might have a wrong idea as to the
-size of the terminal, because the size has never explicitely been set.
-
-This patch uses a boolean flag, to make sure the signal gets emitted at
-least once.  An alternative would be to change the default screen sizes. 
-One could either choose 24x80 as the default screen size, as this is what
-most apps expect, or 1x1, as this is almost certainly different from any
-screen size actually used.  The first approach relies on defaults which need
-not be fixed, and should therefore be avoided.  Both approaches force a
-resize of the screens created in the constructor, which is some overhead I'd
-like to avoid.  Neither one bool of data nor the added control structures
-seems expensive enough to discourage this approach.
-
-https://bugs.kde.org/show_bug.cgi?id=176902
-https://bugs.gentoo.org/show_bug.cgi?id=357945
-https://bugzilla.redhat.com/show_bug.cgi?id=477359
-
-2011-04-06 Patch by Martin von Gagern
-based on ideas from Kurt V. Hindenburg and Jonathan Wakely
-
-Index: konsole-4.6.1/konsole/src/Emulation.cpp
-===================================================================
---- konsole-4.6.1.orig/konsole/src/Emulation.cpp
-+++ konsole-4.6.1/konsole/src/Emulation.cpp
-@@ -55,7 +55,8 @@ Emulation::Emulation() :
-   _codec(0),
-   _decoder(0),
-   _keyTranslator(0),
--  _usesMouse(false)
-+  _usesMouse(false),
-+  _imageSizeSet(false)
- {
-   // create screens with a default size
-   _screen[0] = new Screen(40,80);
-@@ -344,12 +345,20 @@ void Emulation::setImageSize(int lines,
-   QSize newSize(columns,lines);
- 
-   if (newSize == screenSize[0] && newSize == screenSize[1])
--    return;    
-+  {
-+    if (!_imageSizeSet)
-+    {
-+      emit imageSizeChanged(lines,columns);
-+      _imageSizeSet = true;
-+    }
-+    return;
-+  }
- 
-   _screen[0]->resizeImage(lines,columns);
-   _screen[1]->resizeImage(lines,columns);
- 
-   emit imageSizeChanged(lines,columns);
-+  _imageSizeSet = true;
- 
-   bufferedUpdate();
- }
-Index: konsole-4.6.1/konsole/src/Emulation.h
-===================================================================
---- konsole-4.6.1.orig/konsole/src/Emulation.h
-+++ konsole-4.6.1/konsole/src/Emulation.h
-@@ -462,6 +462,7 @@ private:
-   bool _usesMouse;
-   QTimer _bulkTimer1;
-   QTimer _bulkTimer2;
-+  bool _imageSizeSet;
-   
- };
- 
diff --git a/kde-base/konsole/files/konsole-4.7.4-ypos.patch b/kde-base/konsole/files/konsole-4.7.4-ypos.patch
deleted file mode 100644
index e9bdd4c71e5e..000000000000
--- a/kde-base/konsole/files/konsole-4.7.4-ypos.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
---- a/src/TerminalDisplay.cpp	2011-10-28 10:44:03.000000000 +0300
-+++ b/src/TerminalDisplay.cpp	2011-12-28 02:32:02.686667954 +0200
-@@ -718,7 +718,7 @@
-         if (_bidiEnabled)
-             painter.drawText(rect,0,text);
-         else
--            painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text);
-+            painter.drawText(rect,Qt::AlignBottom,LTR_OVERRIDE_CHAR+text);
-     }
- }
-