From 29ab7e9a79036fcd3065d66e03533451498a4758 Mon Sep 17 00:00:00 2001 From: Wulf Krueger Date: Sat, 21 Apr 2007 14:21:56 +0000 Subject: [PATCH] Added a patch to fix erratic application behaviour as per bug 171328. Thanks to David Grant for supplying the patch. Package-Manager: portage-2.1.2.4 --- kde-base/kdesdk/ChangeLog | 7 ++++- kde-base/kdesdk/Manifest | 28 +++++++++++-------- .../kdesdk/files/umbrello-diagram-fix.diff | 21 ++++++++++++++ kde-base/kdesdk/kdesdk-3.5.6.ebuild | 9 +++++- 4 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 kde-base/kdesdk/files/umbrello-diagram-fix.diff diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog index 77705d7cf4e4..1474c004e215 100644 --- a/kde-base/kdesdk/ChangeLog +++ b/kde-base/kdesdk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdesdk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.142 2007/02/16 21:56:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.143 2007/04/21 14:21:56 philantrop Exp $ + + 21 Apr 2007; Wulf C. Krueger + +files/umbrello-diagram-fix.diff, kdesdk-3.5.6.ebuild: + Added a patch to fix erratic application behaviour as per bug 171328. Thanks + to David Grant for supplying the patch. 16 Feb 2007; Diego Pettenò kdesdk-3.5.5.ebuild, kdesdk-3.5.6.ebuild: diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest index abe009e8a95c..bf6162216b63 100644 --- a/kde-base/kdesdk/Manifest +++ b/kde-base/kdesdk/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX umbrello-diagram-fix.diff 873 RMD160 f64da9cc5a5cd20af701d3bf8729cbaa4dea832a SHA1 2710bb0b84879473d2704b5333abcdf228bf7e56 SHA256 6ccab3cc1f14b0beb04a7fc8d45b007e7ce6bfbe115547dc7e724e8ddfbceb37 +MD5 2a2cb2148d8765029fa6d5cbf163a1a3 files/umbrello-diagram-fix.diff 873 +RMD160 f64da9cc5a5cd20af701d3bf8729cbaa4dea832a files/umbrello-diagram-fix.diff 873 +SHA256 6ccab3cc1f14b0beb04a7fc8d45b007e7ce6bfbe115547dc7e724e8ddfbceb37 files/umbrello-diagram-fix.diff 873 DIST kdesdk-3.5.5.tar.bz2 5043560 RMD160 6151d938607bdd31f69ab1ca78ec7aec7bb14187 SHA1 0994e8eef41ab4e0237a78f1c761d7133998a712 SHA256 fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd DIST kdesdk-3.5.6.tar.bz2 5046602 RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f SHA1 5c1f3478b72fde8b117d9458072d471eb8be5cbe SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 EBUILD kdesdk-3.5.5.ebuild 882 RMD160 f76887f0fe2398b45a9f98223a20793bd6eaf82a SHA1 0d91887e194543a3eeddc30d85cb4d6830de9c5e SHA256 6a57dc10b93a3dfa71edb29584d838974355eb9a4d5d1687d4a1e7278cd30276 MD5 af827f17bc1862edf003b4ccadab80c8 kdesdk-3.5.5.ebuild 882 RMD160 f76887f0fe2398b45a9f98223a20793bd6eaf82a kdesdk-3.5.5.ebuild 882 SHA256 6a57dc10b93a3dfa71edb29584d838974355eb9a4d5d1687d4a1e7278cd30276 kdesdk-3.5.5.ebuild 882 -EBUILD kdesdk-3.5.6.ebuild 882 RMD160 85f786e714f16feca0f85fe41ecaa5a123b8c90a SHA1 d324700280b47aeafd354b0ecb77f330d540ca88 SHA256 32611c7cfd35227059e42d8e0448b6d425f10d3550508b9736138cf03305de3a -MD5 a433855a50bada2d065c4c9517a0958f kdesdk-3.5.6.ebuild 882 -RMD160 85f786e714f16feca0f85fe41ecaa5a123b8c90a kdesdk-3.5.6.ebuild 882 -SHA256 32611c7cfd35227059e42d8e0448b6d425f10d3550508b9736138cf03305de3a kdesdk-3.5.6.ebuild 882 -MISC ChangeLog 18323 RMD160 463ea77dd2d62409c198bd13fa7da7c97a770673 SHA1 20407ee2d8b38a256f027dc59c7254626d7f5f97 SHA256 a835a316b0b47eebb22ee5d524b46184766005c3005ddb0ca544257b850acdcf -MD5 300889f516f9786d1741747fed679f19 ChangeLog 18323 -RMD160 463ea77dd2d62409c198bd13fa7da7c97a770673 ChangeLog 18323 -SHA256 a835a316b0b47eebb22ee5d524b46184766005c3005ddb0ca544257b850acdcf ChangeLog 18323 +EBUILD kdesdk-3.5.6.ebuild 991 RMD160 a8b147378a97be3078043441a1b5947feea03e1f SHA1 3d99bf013d1fdfe42bb2e30714bdf39b865e7697 SHA256 ed115b2ede8363e643eea15d2994d2d3f64c65836bff10f2b0673aad34a302d7 +MD5 95450474bd570571ed75c6cf5bbb990d kdesdk-3.5.6.ebuild 991 +RMD160 a8b147378a97be3078043441a1b5947feea03e1f kdesdk-3.5.6.ebuild 991 +SHA256 ed115b2ede8363e643eea15d2994d2d3f64c65836bff10f2b0673aad34a302d7 kdesdk-3.5.6.ebuild 991 +MISC ChangeLog 18558 RMD160 4f94fcc1e318fc9df9b7557f39756a13281b9c19 SHA1 072361e2d4b1790517e4dee72a9fe1d2ffa43af9 SHA256 09dd23c2e2aa10c796eb805a737432ecaf1b94d79f75bc01523607344ee70c9a +MD5 3d4af4225b64e785a6a0c6bd1abafe78 ChangeLog 18558 +RMD160 4f94fcc1e318fc9df9b7557f39756a13281b9c19 ChangeLog 18558 +SHA256 09dd23c2e2aa10c796eb805a737432ecaf1b94d79f75bc01523607344ee70c9a ChangeLog 18558 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -26,9 +30,9 @@ MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-kdesdk-3.5.6 244 RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-kdesdk-3.5.6 244 SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-kdesdk-3.5.6 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF1iiZAiZjviIA2XgRAv+lAKCgSr9vGtzeNdFYBRYJhja7A5ELPgCgp3Zg -VSCa/FLQDBB01gAFUlwJHm8= -=3ujf +iD8DBQFGKh4QCkvF58q80IkRArjZAJsG9R+8LjSda7tnIJvN2eMcuDvHHgCggItB +dNw6xMacB8Z4ZUOaWhY3E6c= +=B/cZ -----END PGP SIGNATURE----- diff --git a/kde-base/kdesdk/files/umbrello-diagram-fix.diff b/kde-base/kdesdk/files/umbrello-diagram-fix.diff new file mode 100644 index 000000000000..5aff562c03fd --- /dev/null +++ b/kde-base/kdesdk/files/umbrello-diagram-fix.diff @@ -0,0 +1,21 @@ +diff -ru umbrello-3.5.6.orig/umbrello/umbrello/umldoc.cpp umbrello-3.5.6/umbrello/umbrello/umldoc.cpp +--- umbrello-3.5.6.orig/umbrello/umbrello/umldoc.cpp 2007-01-15 03:24:47.000000000 -0800 ++++ umbrello-3.5.6/umbrello/umbrello/umldoc.cpp 2007-03-18 03:21:32.000000000 -0700 +@@ -147,15 +147,10 @@ + if ( pApp->getListView() ) + connect(this, SIGNAL(sigObjectRemoved(UMLObject *)), view, SLOT(slotObjectRemoved(UMLObject *))); + +- UMLView * previousView = pApp->getCurrentView(); + pApp->setCurrentView(view); + if ( ! m_bLoading ) { +- if (previousView == NULL) { +- view -> show(); +- emit sigDiagramChanged(view ->getType()); +- } else { +- view -> hide(); +- } ++ view->show(); ++ emit sigDiagramChanged(view ->getType()); + } + + Settings::OptionState optionState = Settings::getOptionState(); diff --git a/kde-base/kdesdk/kdesdk-3.5.6.ebuild b/kde-base/kdesdk/kdesdk-3.5.6.ebuild index 94052f8a4c93..0a8b2273fa3c 100644 --- a/kde-base/kdesdk/kdesdk-3.5.6.ebuild +++ b/kde-base/kdesdk/kdesdk-3.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.6.ebuild,v 1.4 2007/02/16 21:56:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.6.ebuild,v 1.5 2007/04/21 14:21:56 philantrop Exp $ inherit db-use kde-dist @@ -20,6 +20,13 @@ RDEPEND="${DEPEND} DEPEND="${RDEPEND} sys-devel/flex" +src_unpack() { + kde_src_unpack + + # Patch to fix bug 171328 + epatch ${FILESDIR}/umbrello-diagram-fix.diff +} + src_compile() { local myconf="$(use_with subversion)" -- 2.26.2