[kde-base/konsole] Added patch by Martin von Gagern, fixes bug 357945

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 91 insertions, 15 deletions

diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index 31c5b6e42f1..6ff9e258d12 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX konsole-4.6.4-imagesize.patch 2373 RMD160 f35549577157ccc9a596dae80ed6cf520ccff5f2 SHA1 b54d9b0515201df553d2386dd2b53e15e2502fcc SHA256 cbebc132ff781fa02cb6e2db9c1f7c55ea0aa98e8506dbd2325a672f437de978
 DIST konsole-4.6.80.tar.bz2 448071 RMD160 f55b0903ce5407e1011f6368bd0aa3ae7da68beb SHA1 7e7b5a0b37ae4d22e51a61f70afccbba86a93921 SHA256 929633bf676b7697eca754b609fd4bad6d7630f525d9b4b12b5845315bad2dca
-EBUILD konsole-4.6.49.9999.ebuild 634 RMD160 3bab1883a062ea6b8f5a884ae470d86abdeee29d SHA1 9c744084560c56b541476141a83a211924e58499 SHA256 23dbd1ab85009bd3beda16824c4b30fab2feaed1dc7cba120a73ac77b985986b
+EBUILD konsole-4.6.49.9999.ebuild 690 RMD160 ad81ab575d539fb06d0ffe7e5547caa351388432 SHA1 1b6cd27f58e799b4a4525aa8d9dfdb2108e19691 SHA256 d12e6bfa9096be44c96b6790a68226c76c9bae645a38333a5f6f3779278af267
 EBUILD konsole-4.6.80.ebuild 583 RMD160 97696831094ed7419bccf1cc3017e634245301aa SHA1 2a605244760a00d3b206b5d1abb9133aba5dab61 SHA256 5e6abf205caf1ce50c5ff5ed9363ae1975daf55f096d5fc817d3862306a96c20
-EBUILD konsole-9999.ebuild 661 RMD160 28ab86bead8d48afe74e7968bdacecd44a68922c SHA1 0829e256eae64a4f8a84a2267c47f5f15f31de3b SHA256 2d72fd7d4cd7edd75bc988a75b7d087ff27b57f388ab632f4bed99970065f312
+EBUILD konsole-9999.ebuild 716 RMD160 e275cf12cea641ff2a452491d4386c4d510d85d7 SHA1 0db838636bd475cb236fa3d15342b8b2ec047f31 SHA256 aa20179a2f27394b3e7e8cc16c9386626b231441d35faa9c72b229046a3641a1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN9HZ1AAoJELHSF2kinlg4iFcP/RVJsVRDGBAtdII2Fu89Pb/0
-kbGiGkH1EGSQ7RDUXl3BelNtiMA+3HSp0buk/AdQWwc2Nl0F2ZquXoC4OcPATxJ7
-VegvLMoiCxWc73NHgdlGq0ecB1QP089vcX9L8Sx7XOwUJsUlvVlohWXPdv2ecCDd
-cxFzX11aEmfc7C6bRjrIQxT2fMR2zIAszA4XKbFlE5StdOOYNSGacfE17dQuKCPO
-OhuY0Y0JT1WMB8aRbPI5HS+SEgOVkwjQ0mY69BgJ3zpQYjHYi6Edh8FU6b5DSpZy
-vbDgWHf4mfndDPky0JiTw9s+/I2nfdjxiXdXO/juiSmT6uNud8RJLzj2IOk7JLcm
-VfAAcnx4q5IvBjETA8ym57Cuu3tSxD31HE+SK++icy+KJ8o1qO+OsXjdJ7Ywttnk
-96cWfJNJr7wB25/69dnFk6vIKLuxFKQyU1EdecZWmkfl/ZvyWCXCnirJY/Wdtt39
-Fea2l7YRVMg3EJmw8SNuEPXKVbB6uQa7luQne6icS4AD7ZGPPVdOc/v0Sx3QlY0W
-QlcBBfAtgXgVL56wXo/L7DxO7ctDb55H72skwjsiIFwtFl5JNyZEtzBg59Uk3n8X
-jRzZN+vdSQlHiJBMAgDI4bGWUWlbcNMz97A3SpyDL4enVEfD0ZmC1IixW8V6tJiy
-MIhZGWxQj6njGoQXWvXg
-=k2b3
+iQIcBAEBCgAGBQJN/TyUAAoJENwGBM22xffexvMP/1szbBa1EJHpwhGbF5KV41S5
+x7FsqHT6DJeiz7pn5D8v+QE0S9Me7GfouHmCIOq0IxgNgOZ3uK4jw5L4U7dP+iMh
+FiD4rf71YQaK09hhkNAw0JVjHh6wBKKzf2W5oVRQjfo8oTZH1ddZp7JN9LRQKThz
+DzgUIt5XyRElodbExjLuPHzacIBBhBbecLjls8wb5D4WIYQWyCYCZnjHeMT2t1fy
+C2oUBXblULmg8c6VrxpUW55g/FklzgcnjyuFrst6I7jv1zjGzS/5wGAytViAPr7l
+Sn6bU7GcQ0vi4ZvgPfa/sq8rlbDDbq33VxHK3RGxKkC15I6DFhTq7zh2fmuzvkN/
+jT9XhHpsbr2L+M/QpOThNZglyWMq5s1beC8A8fApsyHOeCLrbJjWS9Qs4/KXCLNi
+WpZfgRLND5cP0YrL9jpsYKFAFbCiDEscaMdU//YJ/+I87R5Nc/Ko5tyI0ixWfOLw
+2vZ+K2cuQGAFYV4ZVVPku1R1jzrJfK9G6T+q7XwUfNjj3pfnDhEJMXnGdDWo9/z5
+7fOSeE1PmAzcYg21WrCcih+5qT/SS5WzZshQ6sUpy+l2igb37CHcX3Wy+1DFPXQ8
+bAbny/qafFoIVkBmT++p85zy1bz3bErEc0zmpReCsM0tW9mHxG1C4W1sX8IkPlMD
+JwvhcAdnWvTjG2xeUNPR
+=Kw/y
 -----END PGP SIGNATURE-----
diff --git a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch b/kde-base/konsole/files/konsole-4.6.4-imagesize.patch
new file mode 100644
index 00000000000..03fb8c97913
--- /dev/null
+++ b/kde-base/konsole/files/konsole-4.6.4-imagesize.patch
@@ -0,0 +1,70 @@
+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/konsole-4.6.49.9999.ebuild b/kde-base/konsole/konsole-4.6.49.9999.ebuild
index bb4a2b8d8c2..68bdc20dda7 100644
--- a/kde-base/konsole/konsole-4.6.49.9999.ebuild
+++ b/kde-base/konsole/konsole-4.6.49.9999.ebuild
@@ -36,3 +36,6 @@ DEPEND="${COMMONDEPEND}
 	)
 "
 RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )
+
diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild
index c23bdb72f3d..9395f59a60b 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-9999.ebuild
@@ -37,3 +37,5 @@ DEPEND="${COMMONDEPEND}
 	)
 "
 RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )