Added patch by Martin von Gagern, fixes bug 357945

(Portage version: 2.1.10.3/cvs/Linux x86_64)

4 files changed, 118 insertions, 158 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index d66720e55efa..d04a02c056a9 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.194 2011/06/10 17:59:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.195 2011/06/19 00:00:29 dilfridge Exp $
+
+*konsole-4.6.4-r1 (19 Jun 2011)
+
+  19 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/konsole-4.4.2-remember-size.patch, +konsole-4.6.4-r1.ebuild,
+  +files/konsole-4.6.4-imagesize.patch:
+  Added patch by Martin von Gagern, fixes bug 357945
 
 *konsole-4.6.4 (10 Jun 2011)
 
diff --git a/kde-base/konsole/files/konsole-4.4.2-remember-size.patch b/kde-base/konsole/files/konsole-4.4.2-remember-size.patch
deleted file mode 100644
index 516af28f08f5..000000000000
--- a/kde-base/konsole/files/konsole-4.4.2-remember-size.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.cpp konsole-4.2.4/konsole/src/EditProfileDialog.cpp
---- konsole-4.2.4_orig/konsole/src/EditProfileDialog.cpp	2008-12-10 17:13:08.000000000 +0100
-+++ konsole-4.2.4/konsole/src/EditProfileDialog.cpp	2009-08-02 01:50:04.000000000 +0200
-@@ -255,6 +255,7 @@
- 
-     // window options
-     _ui->showMenuBarButton->setChecked( info->property<bool>(Profile::ShowMenuBar) );
-+    _ui->saveGeometryOnExitButton->setChecked( info->property<bool>(Profile::SaveGeometryOnExit) );
- 
-     // signals and slots
-     connect( _ui->dirSelectButton , SIGNAL(clicked()) , this , SLOT(selectInitialDir()) );
-@@ -270,6 +271,8 @@
-     
-     connect(_ui->showMenuBarButton , SIGNAL(toggled(bool)) , this , 
-             SLOT(showMenuBar(bool)) );
-+    connect(_ui->saveGeometryOnExitButton , SIGNAL(toggled(bool)) , this ,
-+	    SLOT(saveGeometryOnExit(bool)) );
- 
-     connect(_ui->environmentEditButton , SIGNAL(clicked()) , this , 
-             SLOT(showEnvironmentEditor()) );
-@@ -371,6 +374,10 @@
- {
-     _tempProfile->setProperty(Profile::ShowMenuBar,show);
- }
-+void EditProfileDialog::saveGeometryOnExit(bool save)
-+{
-+    _tempProfile->setProperty(Profile::SaveGeometryOnExit,save);
-+}
- void EditProfileDialog::tabTitleFormatChanged(const QString& format)
- {
-     _tempProfile->setProperty(Profile::LocalTabTitleFormat,format);
-diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.h konsole-4.2.4/konsole/src/EditProfileDialog.h
---- konsole-4.2.4_orig/konsole/src/EditProfileDialog.h	2008-09-26 16:55:51.000000000 +0200
-+++ konsole-4.2.4/konsole/src/EditProfileDialog.h	2009-08-02 01:53:03.000000000 +0200
-@@ -120,6 +120,7 @@
-     void insertRemoteTabTitleText(const QString& text);
- 
-     void showMenuBar(bool);
-+    void saveGeometryOnExit(bool);
-     void showEnvironmentEditor();
-     void tabBarVisibilityChanged(int);
-     void tabBarPositionChanged(int);
-diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.ui konsole-4.2.4/konsole/src/EditProfileDialog.ui
---- konsole-4.2.4_orig/konsole/src/EditProfileDialog.ui	2008-10-09 11:46:34.000000000 +0200
-+++ konsole-4.2.4/konsole/src/EditProfileDialog.ui	2009-08-02 02:02:59.000000000 +0200
-@@ -228,6 +228,22 @@
-             </property>
-            </widget>
-           </item>
-+	  <item>
-+	   <widget class="QCheckBox" name="saveGeometryOnExitButton">
-+	    <property name="sizePolicy">
-+	     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-+	      <horstretch>0</horstretch>
-+	      <verstretch>0</verstretch>
-+	     </sizepolicy>
-+	    </property>
-+	    <property name="toolTip">
-+	     <string>Set the window size and position for this profile when exiting</string>
-+	    </property>
-+	    <property name="text">
-+	     <string>Save window size and position on exit</string>
-+	    </property>
-+	   </widget>
-+	  </item>
-          </layout>
-         </widget>
-        </item>
-diff -ur konsole-4.2.4_orig/konsole/src/MainWindow.cpp konsole-4.2.4/konsole/src/MainWindow.cpp
---- konsole-4.2.4_orig/konsole/src/MainWindow.cpp	2008-12-10 17:13:08.000000000 +0100
-+++ konsole-4.2.4/konsole/src/MainWindow.cpp	2009-08-02 01:57:31.000000000 +0200
-@@ -79,6 +79,8 @@
- 
-     connect( _viewManager , SIGNAL(setMenuBarVisibleRequest(bool)) , this ,
-             SLOT(setMenuBarVisibleOnce(bool)) );
-+    connect( _viewManager , SIGNAL(setSaveGeometryOnExitRequest(bool)) , this ,
-+	    SLOT(setSaveGeometryOnExit(bool)) );
-     connect( _viewManager , SIGNAL(newViewRequest(Profile::Ptr)) , 
-         this , SLOT(newFromProfile(Profile::Ptr)) );
-     connect( _viewManager , SIGNAL(newViewRequest()) , 
-@@ -129,6 +131,11 @@
-     _menuBarVisibilitySet = true;
- }
- 
-+void MainWindow::setSaveGeometryOnExit(bool save)
-+{
-+    setAutoSaveSettings("MainWindow",save);
-+}
-+
- void MainWindow::correctShortcuts()
- {
-     // replace F1 shortcut for help contents
-diff -ur konsole-4.2.4_orig/konsole/src/MainWindow.h konsole-4.2.4/konsole/src/MainWindow.h
---- konsole-4.2.4_orig/konsole/src/MainWindow.h	2008-10-09 11:46:34.000000000 +0200
-+++ konsole-4.2.4/konsole/src/MainWindow.h	2009-08-02 01:46:59.000000000 +0200
-@@ -155,6 +155,8 @@
-         // effect if the menu bar is a MacOS-style top-level menu
-         void setMenuBarVisibleOnce(bool visible);
- 
-+	void setSaveGeometryOnExit(bool visible);
-+
-         void openUrls(const QList<KUrl>& urls);
- 
-     private:
-diff -ur konsole-4.2.4_orig/konsole/src/Profile.cpp konsole-4.2.4/konsole/src/Profile.cpp
---- konsole-4.2.4_orig/konsole/src/Profile.cpp	2008-09-26 16:55:51.000000000 +0200
-+++ konsole-4.2.4/konsole/src/Profile.cpp	2009-08-02 01:45:01.000000000 +0200
-@@ -76,6 +76,7 @@
-     , { LocalTabTitleFormat , "tabtitle" , 0 , QVariant::String }
-     , { RemoteTabTitleFormat , "RemoteTabTitleFormat" , GENERAL_GROUP , QVariant::String }
-     , { ShowMenuBar , "ShowMenuBar" , GENERAL_GROUP , QVariant::Bool }
-+    , { SaveGeometryOnExit , "SaveGeometryOnExit" , GENERAL_GROUP , QVariant::Bool }
-     , { TabBarMode , "TabBarMode" , GENERAL_GROUP , QVariant::Int }
-     , { TabBarPosition , "TabBarPosition" , GENERAL_GROUP , QVariant::Int }
-     , { StartInCurrentSessionDir , "StartInCurrentSessionDir" , GENERAL_GROUP , QVariant::Bool }
-@@ -153,6 +154,7 @@
-     setProperty(TabBarMode,AlwaysShowTabBar);
-     setProperty(TabBarPosition,TabBarBottom);
-     setProperty(ShowMenuBar,true);
-+    setProperty(SaveGeometryOnExit,true);
-     setProperty(StartInCurrentSessionDir,true);
-     setProperty(ShowNewAndCloseTabButtons,false);
- 
-diff -ur konsole-4.2.4_orig/konsole/src/Profile.h konsole-4.2.4/konsole/src/Profile.h
---- konsole-4.2.4_orig/konsole/src/Profile.h	2008-09-26 16:55:51.000000000 +0200
-+++ konsole-4.2.4/konsole/src/Profile.h	2009-08-02 01:52:38.000000000 +0200
-@@ -113,6 +113,7 @@
-         RemoteTabTitleFormat,   
-         /** (bool) Specifies whether the menu bar should be shown in the main application window. */
-         ShowMenuBar,    
-+	SaveGeometryOnExit,
-         /** (TabBarModeEnum) Specifies when the tab bar should be shown in
-          * the main application window. */ 
-         TabBarMode,    
-diff -ur konsole-4.2.4_orig/konsole/src/ViewManager.cpp konsole-4.2.4/konsole/src/ViewManager.cpp
---- konsole-4.2.4_orig/konsole/src/ViewManager.cpp	2009-03-26 15:42:41.000000000 +0100
-+++ konsole-4.2.4/konsole/src/ViewManager.cpp	2009-08-02 01:51:24.000000000 +0200
-@@ -738,6 +738,8 @@
-     // menu bar visibility
-     emit setMenuBarVisibleRequest( info->property<bool>(Profile::ShowMenuBar) );
- 
-+    emit setSaveGeometryOnExitRequest( info->property<bool>(Profile::SaveGeometryOnExit) );
-+
-     // tab bar visibility
-     if (applyContainerSettings)
-     {
-diff -ur konsole-4.2.4_orig/konsole/src/ViewManager.h konsole-4.2.4/konsole/src/ViewManager.h
---- konsole-4.2.4_orig/konsole/src/ViewManager.h	2008-10-09 11:46:34.000000000 +0200
-+++ konsole-4.2.4/konsole/src/ViewManager.h	2009-08-02 01:46:23.000000000 +0200
-@@ -195,6 +195,7 @@
-      * activated.
-      */
-     void setMenuBarVisibleRequest(bool);
-+    void setSaveGeometryOnExitRequest(bool);
- 
-     /** Requests creation of a new view with the default profile. */
-     void newViewRequest();
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 000000000000..03fb8c97913c
--- /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.4-r1.ebuild b/kde-base/konsole/konsole-4.6.4-r1.ebuild
new file mode 100644
index 000000000000..36d6a606ead4
--- /dev/null
+++ b/kde-base/konsole/konsole-4.6.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.6.4-r1.ebuild,v 1.1 2011/06/19 00:00:29 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+if [[ ${PV} = *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdebase-apps"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
+
+DESCRIPTION="X terminal for use with KDE."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+COMMONDEPEND="
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libxklavier-3.2
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)
+"
+DEPEND="${COMMONDEPEND}
+	!aqua? (
+		x11-apps/bdftopcf
+		x11-proto/kbproto
+		x11-proto/renderproto
+	)
+"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )