From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QY5U7-0000s0-TZ for garchives@archives.gentoo.org; Sun, 19 Jun 2011 00:03:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 865611C033; Sun, 19 Jun 2011 00:03:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 441631C033 for ; Sun, 19 Jun 2011 00:03:20 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 698DE1B400C for ; Sun, 19 Jun 2011 00:03:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 928268003E for ; Sun, 19 Jun 2011 00:03:18 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <70f8d57d959e187fef5e1237cd74d87161002557.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/konsole/, kde-base/konsole/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/konsole/files/konsole-4.6.4-imagesize.patch kde-base/konsole/konsole-4.6.49.9999.ebuild kde-base/konsole/konsole-9999.ebuild X-VCS-Directories: kde-base/konsole/ kde-base/konsole/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 70f8d57d959e187fef5e1237cd74d87161002557 Date: Sun, 19 Jun 2011 00:03:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: dc2ec53f3faf331abd2863bd8e2f512d commit: 70f8d57d959e187fef5e1237cd74d87161002557 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Jun 19 00:02:28 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jun 19 00:03:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D70f8d57d [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) --- .../konsole/files/konsole-4.6.4-imagesize.patch | 70 ++++++++++++++= ++++++ kde-base/konsole/konsole-4.6.49.9999.ebuild | 3 + kde-base/konsole/konsole-9999.ebuild | 2 + 3 files changed, 75 insertions(+), 0 deletions(-) diff --git a/kde-base/konsole/files/konsole-4.6.4-imagesize.patch b/kde-b= ase/konsole/files/konsole-4.6.4-imagesize.patch new file mode 100644 index 0000000..03fb8c9 --- /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.= =20 +One could either choose 24x80 as the default screen size, as this is wha= t +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 structure= s +seems expensive enough to discourage this approach. + +https://bugs.kde.org/show_bug.cgi?id=3D176902 +https://bugs.gentoo.org/show_bug.cgi?id=3D357945 +https://bugzilla.redhat.com/show_bug.cgi?id=3D477359 + +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 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- 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] =3D new Screen(40,80); +@@ -344,12 +345,20 @@ void Emulation::setImageSize(int lines, + QSize newSize(columns,lines); +=20 + if (newSize =3D=3D screenSize[0] && newSize =3D=3D screenSize[1]) +- return; =20 ++ { ++ if (!_imageSizeSet) ++ { ++ emit imageSizeChanged(lines,columns); ++ _imageSizeSet =3D true; ++ } ++ return; ++ } +=20 + _screen[0]->resizeImage(lines,columns); + _screen[1]->resizeImage(lines,columns); +=20 + emit imageSizeChanged(lines,columns); ++ _imageSizeSet =3D true; +=20 + bufferedUpdate(); + } +Index: konsole-4.6.1/konsole/src/Emulation.h +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- 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; + =20 + }; +=20 diff --git a/kde-base/konsole/konsole-4.6.49.9999.ebuild b/kde-base/konso= le/konsole-4.6.49.9999.ebuild index bb4a2b8..68bdc20 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=3D"${COMMONDEPEND} ) " RDEPEND=3D"${COMMONDEPEND}" + +PATCHES=3D( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" ) + diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/kons= ole-9999.ebuild index c23bdb7..9395f59 100644 --- a/kde-base/konsole/konsole-9999.ebuild +++ b/kde-base/konsole/konsole-9999.ebuild @@ -37,3 +37,5 @@ DEPEND=3D"${COMMONDEPEND} ) " RDEPEND=3D"${COMMONDEPEND}" + +PATCHES=3D( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )