* [gentoo-commits] proj/kde:master commit in: kde-base/konsole/, kde-base/konsole/files/
@ 2011-06-19 0:03 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2011-06-19 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 70f8d57d959e187fef5e1237cd74d87161002557
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jun 19 00:02:28 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 00:03:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=70f8d57d
[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-base/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.
+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 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="${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 c23bdb7..9395f59 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" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/konsole/, kde-base/konsole/files/
@ 2011-08-03 21:09 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2011-08-03 21:09 UTC (permalink / raw
To: gentoo-commits
commit: cfae685416670db66ffdebc88e05205dd3d0a96d
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Aug 3 21:09:38 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 21:09:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cfae6854
[kde-base/konsole] Disable test requiring session dbus, bug 376935
(Portage version: 2.1.10.9/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/konsole/files/konsole-4.7.0-tests.patch | 12 ++++++++++++
kde-base/konsole/konsole-4.7.49.9999.ebuild | 7 +++++--
kde-base/konsole/konsole-9999.ebuild | 7 +++++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/kde-base/konsole/files/konsole-4.7.0-tests.patch b/kde-base/konsole/files/konsole-4.7.0-tests.patch
new file mode 100644
index 0000000..d548c35
--- /dev/null
+++ b/kde-base/konsole/files/konsole-4.7.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN konsole-4.7.0.orig/src/tests/CMakeLists.txt konsole-4.7.0/src/tests/CMakeLists.txt
+--- konsole-4.7.0.orig/src/tests/CMakeLists.txt 2011-05-21 01:08:13.000000000 +0200
++++ konsole-4.7.0/src/tests/CMakeLists.txt 2011-08-03 23:05:10.864318665 +0200
+@@ -12,6 +12,6 @@
+ kde4_add_unit_test(SessionManagerTest SessionManagerTest.cpp)
+ target_link_libraries(SessionManagerTest ${KONSOLE_TEST_LIBS})
+
+-kde4_add_unit_test(DBusTest DBusTest.cpp)
+-target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS})
++#kde4_add_unit_test(DBusTest DBusTest.cpp)
++#target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS})
+
diff --git a/kde-base/konsole/konsole-4.7.49.9999.ebuild b/kde-base/konsole/konsole-4.7.49.9999.ebuild
index 8d040b9..b1ffce3 100644
--- a/kde-base/konsole/konsole-4.7.49.9999.ebuild
+++ b/kde-base/konsole/konsole-4.7.49.9999.ebuild
@@ -11,7 +11,7 @@ KDE_DOC_DIRS="doc/manual"
inherit kde4-base
-DESCRIPTION="X terminal for use with KDE."
+DESCRIPTION="X terminal for use with KDE"
KEYWORDS=""
IUSE="debug"
@@ -33,4 +33,7 @@ DEPEND="${COMMONDEPEND}
"
RDEPEND="${COMMONDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6.4-imagesize.patch"
+ "${FILESDIR}/${PN}-4.7.0-tests.patch"
+)
diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild
index 1388bcd..af47240 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-9999.ebuild
@@ -10,7 +10,7 @@ KDE_SCM="git"
KDE_DOC_DIRS="doc/manual"
inherit kde4-base
-DESCRIPTION="X terminal for use with KDE."
+DESCRIPTION="X terminal for use with KDE"
KEYWORDS=""
IUSE="debug"
@@ -32,4 +32,7 @@ DEPEND="${COMMONDEPEND}
"
RDEPEND="${COMMONDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6.4-imagesize.patch"
+ "${FILESDIR}/${PN}-4.7.0-tests.patch"
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/konsole/, kde-base/konsole/files/
@ 2013-09-16 10:40 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2013-09-16 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 38898e151804a12836cbd2589781f81b3437f81f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 10:36:57 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 10:37:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38898e15
[kde-base/konsole] Fix failing tests patch wrt bug #485052.
Package-Manager: portage-2.2.5
---
kde-base/konsole/files/konsole-4.7.0-tests.patch | 12 ------------
kde-base/konsole/konsole-9999.ebuild | 5 +----
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/kde-base/konsole/files/konsole-4.7.0-tests.patch b/kde-base/konsole/files/konsole-4.7.0-tests.patch
deleted file mode 100644
index d548c35..0000000
--- a/kde-base/konsole/files/konsole-4.7.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN konsole-4.7.0.orig/src/tests/CMakeLists.txt konsole-4.7.0/src/tests/CMakeLists.txt
---- konsole-4.7.0.orig/src/tests/CMakeLists.txt 2011-05-21 01:08:13.000000000 +0200
-+++ konsole-4.7.0/src/tests/CMakeLists.txt 2011-08-03 23:05:10.864318665 +0200
-@@ -12,6 +12,6 @@
- kde4_add_unit_test(SessionManagerTest SessionManagerTest.cpp)
- target_link_libraries(SessionManagerTest ${KONSOLE_TEST_LIBS})
-
--kde4_add_unit_test(DBusTest DBusTest.cpp)
--target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS})
-+#kde4_add_unit_test(DBusTest DBusTest.cpp)
-+#target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS})
-
diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild
index d8184ae..3a67971 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-9999.ebuild
@@ -7,6 +7,7 @@ EAPI=5
KDE_HANDBOOK="optional"
KDE_DOC_DIRS="doc/manual"
VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
inherit kde4-base
DESCRIPTION="X terminal for use with KDE"
@@ -32,7 +33,3 @@ DEPEND="${COMMONDEPEND}
)
"
RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.7.0-tests.patch"
-)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-16 10:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-19 0:03 [gentoo-commits] proj/kde:master commit in: kde-base/konsole/, kde-base/konsole/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2011-08-03 21:09 Andreas Hüttel
2013-09-16 10:40 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox