Backport crash patch from upstream.

Package-Manager: portage-2.1.12.5/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 98 insertions, 16 deletions

diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog
index e039f28eb842..716d370de2d5 100644
--- a/kde-base/katepart/ChangeLog
+++ b/kde-base/katepart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/katepart
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.82 2013/06/08 17:33:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.83 2013/06/22 15:02:40 kensington Exp $
+
+*katepart-4.10.4-r1 (22 Jun 2013)
+
+  22 Jun 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/katepart-4.10.4-crash.patch, +katepart-4.10.4-r1.ebuild:
+  Backport crash patch from upstream.
 
   08 Jun 2013; Agostino Sarubbo <ago@gentoo.org> -katepart-4.10.2.ebuild:
   Remove old
diff --git a/kde-base/katepart/Manifest b/kde-base/katepart/Manifest
index 9720b5478a08..912e046da957 100644
--- a/kde-base/katepart/Manifest
+++ b/kde-base/katepart/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX katepart-4.10.4-crash.patch 1656 SHA256 c189b1d3d71cf8e148cacfa4c7e501c76cd876a682ffd64f3441d1e360071eb7 SHA512 621f4d05a46185f8abd372b6ea0a3c070c44764b015a75747e7a330efd04ea1188062e336e3b101225d0b9410470bc212ddf250903ea7d12b51d7ffadb6aa3c3 WHIRLPOOL c82d1ef15f368f9eaf442f20f119a161a18d54497f6e79e4b0ab3f41e55ad7d5fd0ffca272595f66031624cc3a1ee9ccf89ef7172e97c065124f0c4d2dc8f66a
 DIST kate-4.10.3.tar.xz 2579668 SHA256 82a92153688018fb28db86d5d80ce80dddc345928c52b638cfc0a0912a85cc1e SHA512 a49d06ba2499325741abb6a09d558af24e63a1c0650f2f7b1961e53cb6f90f7487d3fdab8fb8cb9919c6f7e2d71864e4bda1e38e154fd17e5ed769aee0032a31 WHIRLPOOL c3cdd97fb4b0a978c8b44f46f78b715b15739688d0e769612414c8f42cd65421489d97f7b7553652e6a2feaf0eb238ea64286702e93b4c0c6deb8639eee6bf7f
 DIST kate-4.10.4.tar.xz 2519916 SHA256 bd63bf6cfbe7d1009c2b5af2b42c8b9be7133dd71bc2d318fc6dfe2d883a3255 SHA512 c7a7a701d6cfc2ef1cf1cc0316266049d6688b9b6c4ff77c15ad044c3e117a1df099a147704cc48b96a57546acb2694a1e225171307ab7b535b49a8f9bbda193 WHIRLPOOL 59d8877659e268e7aacd3b0a6f892a00bbd3a57029b7ed1d5ed1e26ba7961de2001df02321d944377803b624f85d31144a2edd9bf2be36e025b3d6f12de49ce0
 EBUILD katepart-4.10.3.ebuild 583 SHA256 ad523fefead25163e197185e4597670115a0ad8dc759c4a456d9c27df286798e SHA512 1ec058042011ae26ba06cb7a7e9ddd4fc7b3958a08b260012948c81394f85f0facb72292069bc80953de6317cc5e3560b14474501dd27b7334a1de7ac14408c5 WHIRLPOOL c8aa8fd19b214d979ee22f66b60a00504092aee3aed6a4662f3b5fd3173e4f594d2f232bf977fa0df22fc2959fd8acddfb9326a8416d69d3ce01ecc38bff0181
+EBUILD katepart-4.10.4-r1.ebuild 642 SHA256 a77b3ea999589a0e673d29859b0cc86aa7abf69675f8f4b246b85562381d6f00 SHA512 89a3de69df7b14757a31f0ee9b4b0360ca32124adba4c265a8b6aa44add8c2e6f7642fd87e1dff6f1fdc2676613abd7425186d64e0f81761a7f4ab44c2e5b4ae WHIRLPOOL 440d614c7f668f074d972723634cf52109c8f3b83e1dd26cb2b99efa6e8eae1dad705926b40713d49a2bdcfc7de26374c8758f7607e52300b5b4d8d877728a1d
 EBUILD katepart-4.10.4.ebuild 589 SHA256 51adbc9c9c2e39dc42df82d25d6c076085cbb7cfa71d372681525ae35af62a51 SHA512 7ff5385b0b7e12d3e897fb5fef3984e3f12cf1a811f3c9d0a1df184d95aed41ede4ae0245193d7dcfc8303ab6e1fe1abbff6444adca9871c9e72acdefe0ace52 WHIRLPOOL fe982648d283ccab5c8dee4e94062313c5a53a6b5b1ad529208c86a5c5ce1d0b7e1e566be4d00e36528249ff952f1a4050cbc58db7bdd09c4cb1eba9c91031f7
-MISC ChangeLog 9663 SHA256 7b418cbb10c412a889cbf883bf96b369398dbf1078da3cc7e7326743b236b0c2 SHA512 5446588b092e5027aa029e10e33884dd92f566d3b672e7859baca79eaedf172c0cff28acfc09fc250d6f52d99cf1a682efd21faadf9fd97ef60e2ea051fb00bb WHIRLPOOL 35d22b02399ff720feb14fab3a09ab4e2ff4d5b077b658d0ab84bfeb3d145b5fc36c77cc8a9b9de02b6d823397230e84d7f5dba84084b45137600962f5f8f08f
+MISC ChangeLog 9866 SHA256 795941973243745a11cba0fbc22465da37e323ea41156d77c7f86eb600ad3d75 SHA512 0ed3de61e770744be80715a4d8a17c51035f1361a21d422a27ed2b6a34fbfce56a32acd8e5c54da009bc15248acc5f074771410e7ca420c861b4a8c4089396e0 WHIRLPOOL dcce2a5b321d74a6a24bd946f9c1ba0ea061dd1aebccd62cc17d3f979c157ba33cae073ea05cf410a7e534a8cc85ee3d2084109f943fe8ff614d2cbdf5d7d05a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRs2sFAAoJELp701BxlEWfeF0P/3Uv9lmvM/xQV8YDB8ffpMiF
-vvLV+kHD0IOYHg6aiOx50EG6Re/EDpwSjFzgXzu1N6BUsNP/Qk53S7sGMSNZ/C+3
-usd2/18/u3DVbLFcz3LmZ948iSEeO7Jmevwpx0Map+hQkiNInLrLM3CQYmynnAMS
-AkYD4t0MAnk4NnIppXiC7AFyG9nSTmBra+oXdHdX1iVG1q0Sx91njbFASLk1RbUA
-x5QQw+e583PzK8bkqHPqR3rNvzRdnXJYSZxGtpkNjgLvc/iOuPktL0nin0nDjYAA
-nfs0Cn38W6/EQRGrmmExcXI/mcehqN99xo/dJGg8X/JT+siLbJLbTqnrso2BaOlE
-mbGQ1Sgck9zdwjUEmUDilPQEEiRuTOwTftb9o3QOqzFpjN984TlqN6KDfm2wH1AA
-Zz27H2VP0Y6ndr6dhYWd5+Oj+LvlLWBtM3Znk0zWeEXzg50pqoOkf2fBM/waws9v
-eOUs0H5hZN+2veifshuDxREDhUl17sEcr4n2K6iI/LBB05MdKb0dS6Tng/600Mwo
-aOCr2+JB7bQPP4CxgrxmZoisKY8vkvgvUZfY+Qp/ghcTMF8TZQdAwI6jbo4nKrYY
-8J9cwogfMOTjZbvDWOV54peMBCyma95OGwD/ppeWMxaMHV6mm7rRDc0zJrDIuRse
-YOOXCcdkEbr731UvFpTv
-=+Led
+iQEbBAEBCAAGBQJRxbw3AAoJEMbwO6tnXQ0sbCIH+OfqzWVXEKEqGhmp7KK7fyta
+ni/fnfPAtJEqdiq7mc0OQAbo6T3IQDvLFogD4Mdtjq+4S6pXWztN2re95GxEfq9/
+SdWVTt5OWE86nytSRPQgctiaF3LRPLnUoCPt0DyQfsBpJFkyOXhd8n5PZqA9yWLC
+7TXmtiGVuOC7+j5c111LwQX8R5iis2hpTWiwYGThSRNwYaM4NDlTAVphmRg7LXBO
++8jSDELnIJEUmnrqVHWD0hGeGzmhloEDXC2SW535puYThj0fmW0bYRKYpVOP4hEa
+ELd9pN2UXS6PEmRqUxCeAXwVbPAyR9TILs0bvIKu45IA3AyJoGdviy5s8UPYAQ==
+=g8YB
 -----END PGP SIGNATURE-----
diff --git a/kde-base/katepart/files/katepart-4.10.4-crash.patch b/kde-base/katepart/files/katepart-4.10.4-crash.patch
new file mode 100644
index 000000000000..b8c618be0c2c
--- /dev/null
+++ b/kde-base/katepart/files/katepart-4.10.4-crash.patch
@@ -0,0 +1,51 @@
+From d2e34218068432ba9c312591067e53eda67cb68a Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Wed, 12 Jun 2013 22:30:32 +0200
+Subject: [PATCH] fix crash in passive notification system
+
+@packagers / distributions: Better backport this to you 4.10.4 packages.
+
+FIXED-IN: 4.10.5
+BUG: 320302
+---
+ part/view/katemessagewidget.cpp | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/part/view/katemessagewidget.cpp b/part/view/katemessagewidget.cpp
+index d3c895f..6c227c0 100644
+--- a/part/view/katemessagewidget.cpp
++++ b/part/view/katemessagewidget.cpp
+@@ -225,11 +225,28 @@ void KateMessageWidget::startAutoHideTimer()
+     return;
+   }
+ 
++  // switching KateViews may result isVisible() == true and still m_messageList.size() == 0.
++  // The problem is that the hideEvent is never called for the KMessageWidget, if the
++  // parent widget is hidden. In that case, we 'miss' that the notification is gone...
++  if (m_messageList.size() == 0) {
++    m_hideAnimationRunning = false;
++    m_autoHideTimerRunning = false;
++    m_autoHideTime = -1;
++
++    if (isVisible()) {
++      m_hideAnimationRunning = true;
++      if (m_fadeEffect) {
++        m_fadeEffect->fadeOut();
++      } else {
++        m_messageWidget->animatedHide();
++      }
++    }
++    return;
++  }
++
+   // remember that auto hide timer is running
+   m_autoHideTimerRunning = true;
+ 
+-  // the message must still still be valid
+-  Q_ASSERT(m_messageList.size());
+   KTextEditor::Message* message = m_messageList[0];
+   QTimer::singleShot(m_autoHideTime == 0 ? (6*1000) : m_autoHideTime, message, SLOT(deleteLater()));
+ }
+-- 
+1.8.2.1
+
diff --git a/kde-base/katepart/katepart-4.10.4-r1.ebuild b/kde-base/katepart/katepart-4.10.4-r1.ebuild
new file mode 100644
index 000000000000..f6d6c36f86d4
--- /dev/null
+++ b/kde-base/katepart/katepart-4.10.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.10.4-r1.ebuild,v 1.1 2013/06/22 15:02:40 kensington Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kate"
+KMMODULE="part"
+inherit kde4-meta
+
+DESCRIPTION="KDE Editor KPart"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# bug 392993
+
+add_blocker kdelibs 4.6.50
+
+PATCHES=( "${FILESDIR}/${P}-crash.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DKDE4_BUILD_TESTS=OFF"
+	)
+
+	kde4-meta_src_configure
+}