From: Wulf Krueger Date: Fri, 13 Apr 2007 18:18:12 +0000 (+0000) Subject: Added a patch as per bug 171328. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=108bdf4ed80c310c7b33fb031b3c8b2fe5919b8a;p=gentoo.git Added a patch as per bug 171328. Package-Manager: portage-2.1.2.3 --- diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog index b3cfe18f79bd..9e45ce74b47e 100644 --- a/kde-base/umbrello/ChangeLog +++ b/kde-base/umbrello/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/umbrello # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.63 2007/02/05 12:31:07 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.64 2007/04/13 18:18:12 philantrop Exp $ + +*umbrello-3.5.6-r1 (13 Apr 2007) +*umbrello-3.5.5-r1 (13 Apr 2007) + + 13 Apr 2007; philantrop@gentoo.org +files/umbrello-diagram-fix.diff, + +umbrello-3.5.5-r1.ebuild, +umbrello-3.5.6-r1.ebuild: + Added a patch to fix erratic application behaviour as per bug + 171328. Thanks to David Grant for supplying the patch. 05 Feb 2007; Diego Pettenò -files/umbrello-3.5.1-fork.patch, diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest index 14de39af99e5..dd9ff1502fd1 100644 --- a/kde-base/umbrello/Manifest +++ b/kde-base/umbrello/Manifest @@ -1,20 +1,29 @@ ------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 umbrello-3.5.5-r1.ebuild 557 RMD160 8ce8cbbaac1475b2f3bfd3476595cb44d9f78c01 SHA1 153f3fe748f623f3f380b0f3bb1db08b2ba11bb7 SHA256 9a290c2000175aaebda1adc143d77e0134f37eb0e41727f43744f4d03b151e93 +MD5 dc7dce8c08e03e05e174aa97c172a27e umbrello-3.5.5-r1.ebuild 557 +RMD160 8ce8cbbaac1475b2f3bfd3476595cb44d9f78c01 umbrello-3.5.5-r1.ebuild 557 +SHA256 9a290c2000175aaebda1adc143d77e0134f37eb0e41727f43744f4d03b151e93 umbrello-3.5.5-r1.ebuild 557 EBUILD umbrello-3.5.5.ebuild 430 RMD160 c6e7b220fe177542a467561d69adff5f8b5005fe SHA1 c430f450bdad4634ed19007a00f869ad6e6f2ee3 SHA256 a9c7b3da158cda4d0100c4eb69bf136d1c5cc739a567a50c145feff9656120d3 MD5 7f23db4e3aee7ec22643bf5748204d22 umbrello-3.5.5.ebuild 430 RMD160 c6e7b220fe177542a467561d69adff5f8b5005fe umbrello-3.5.5.ebuild 430 SHA256 a9c7b3da158cda4d0100c4eb69bf136d1c5cc739a567a50c145feff9656120d3 umbrello-3.5.5.ebuild 430 +EBUILD umbrello-3.5.6-r1.ebuild 557 RMD160 ead617e32704ecf86268e4a11d9f9c076816ff57 SHA1 2370861677f321e47b564fa3b1e9762a6e43bb02 SHA256 d9217d8915c41460afd4d599ada4982c5af9025470f2382c826ab3e6bc920edd +MD5 1e5f04f7673a5518626251444f19a92a umbrello-3.5.6-r1.ebuild 557 +RMD160 ead617e32704ecf86268e4a11d9f9c076816ff57 umbrello-3.5.6-r1.ebuild 557 +SHA256 d9217d8915c41460afd4d599ada4982c5af9025470f2382c826ab3e6bc920edd umbrello-3.5.6-r1.ebuild 557 EBUILD umbrello-3.5.6.ebuild 440 RMD160 553087ca9af576655ccce9656121ab0cc3277675 SHA1 9dc180bff132aa02cc71cae6df10d9c4e47af228 SHA256 898982144ecfbbd0facb97451b1c84b920a4959bee611791d712b434279ca03b MD5 8e56b55950a32c9e12272522f5daaae2 umbrello-3.5.6.ebuild 440 RMD160 553087ca9af576655ccce9656121ab0cc3277675 umbrello-3.5.6.ebuild 440 SHA256 898982144ecfbbd0facb97451b1c84b920a4959bee611791d712b434279ca03b umbrello-3.5.6.ebuild 440 -MISC ChangeLog 8382 RMD160 8b3cf110fa88b5e920aae7dca8b67d3c2841c894 SHA1 4c21fe28426504708a63121b332cebd348cbb675 SHA256 a460ef0e0a0b7eea452e06a879f776e872ad230d610aefcd2d9f371f1266fc0c -MD5 e48e49f174bd2608ac6096bd63e4e15e ChangeLog 8382 -RMD160 8b3cf110fa88b5e920aae7dca8b67d3c2841c894 ChangeLog 8382 -SHA256 a460ef0e0a0b7eea452e06a879f776e872ad230d610aefcd2d9f371f1266fc0c ChangeLog 8382 +MISC ChangeLog 8700 RMD160 9caea98582189b9f0debbee19e6c2d833a29db65 SHA1 9c8b7185414dbde10637df60b18dab0cafb7f5d5 SHA256 a2b73b7e365a2bca4408a71e31890b5fa9932ec24ec0b5be5e3f51351d4898ab +MD5 f98294a4696c2751ce1f7238496a53c1 ChangeLog 8700 +RMD160 9caea98582189b9f0debbee19e6c2d833a29db65 ChangeLog 8700 +SHA256 a2b73b7e365a2bca4408a71e31890b5fa9932ec24ec0b5be5e3f51351d4898ab ChangeLog 8700 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -22,13 +31,12 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata MD5 a144103dcef6a1909e8ae60fc6ec782a files/digest-umbrello-3.5.5 244 RMD160 b6e6682c30ba3dc4ec805cdd8dc08913c693a0da files/digest-umbrello-3.5.5 244 SHA256 c3589de6f3695aa67f01c94883d3e032fa317a84e263e44ac72754fce964cffb files/digest-umbrello-3.5.5 244 +MD5 a144103dcef6a1909e8ae60fc6ec782a files/digest-umbrello-3.5.5-r1 244 +RMD160 b6e6682c30ba3dc4ec805cdd8dc08913c693a0da files/digest-umbrello-3.5.5-r1 244 +SHA256 c3589de6f3695aa67f01c94883d3e032fa317a84e263e44ac72754fce964cffb files/digest-umbrello-3.5.5-r1 244 MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-umbrello-3.5.6 244 RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-umbrello-3.5.6 244 SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-umbrello-3.5.6 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFxyOSAiZjviIA2XgRAtGOAKCONNFoUtCUTCxCkJzDDAinfQrXtwCfXa/W -22elQt6DZ//70R7U49o4yq0= -=u4Ja ------END PGP SIGNATURE----- +MD5 03dee6283bcdfcb198808ac3bca4e6ac files/digest-umbrello-3.5.6-r1 244 +RMD160 205bed8e8f34fea07c7af6ae4026b2c252109d56 files/digest-umbrello-3.5.6-r1 244 +SHA256 9130a817dd6d3b5c8d5ae8f926b4e65d8a35cfe930a1b613c06ce36aaeb17854 files/digest-umbrello-3.5.6-r1 244 diff --git a/kde-base/umbrello/files/digest-umbrello-3.5.5-r1 b/kde-base/umbrello/files/digest-umbrello-3.5.5-r1 new file mode 100644 index 000000000000..b70229887c86 --- /dev/null +++ b/kde-base/umbrello/files/digest-umbrello-3.5.5-r1 @@ -0,0 +1,3 @@ +MD5 d226bf07bf8106f37b4e9e31a7d451f0 kdesdk-3.5.5.tar.bz2 5043560 +RMD160 6151d938607bdd31f69ab1ca78ec7aec7bb14187 kdesdk-3.5.5.tar.bz2 5043560 +SHA256 fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd kdesdk-3.5.5.tar.bz2 5043560 diff --git a/kde-base/umbrello/files/digest-umbrello-3.5.6-r1 b/kde-base/umbrello/files/digest-umbrello-3.5.6-r1 new file mode 100644 index 000000000000..e3795607e98a --- /dev/null +++ b/kde-base/umbrello/files/digest-umbrello-3.5.6-r1 @@ -0,0 +1,3 @@ +MD5 1462e1a884fdaa070ed493c10a336728 kdesdk-3.5.6.tar.bz2 5046602 +RMD160 96e96a0ca87aadf8940ceb1dfead385503096a4f kdesdk-3.5.6.tar.bz2 5046602 +SHA256 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 kdesdk-3.5.6.tar.bz2 5046602 diff --git a/kde-base/umbrello/files/umbrello-diagram-fix.diff b/kde-base/umbrello/files/umbrello-diagram-fix.diff new file mode 100644 index 000000000000..5aff562c03fd --- /dev/null +++ b/kde-base/umbrello/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/umbrello/umbrello-3.5.5-r1.ebuild b/kde-base/umbrello/umbrello-3.5.5-r1.ebuild new file mode 100644 index 000000000000..7407c03c04ad --- /dev/null +++ b/kde-base/umbrello/umbrello-3.5.5-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.5-r1.ebuild,v 1.1 2007/04/13 18:18:12 philantrop Exp $ + +KMNAME=kdesdk +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE: Umbrello UML Modeller" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="kdehiddenvisibility" + +src_unpack() { + kde-meta_src_unpack + + # Patch to fix bug 171328 + epatch ${FILESDIR}/umbrello-diagram-fix.diff +} diff --git a/kde-base/umbrello/umbrello-3.5.6-r1.ebuild b/kde-base/umbrello/umbrello-3.5.6-r1.ebuild new file mode 100644 index 000000000000..fac5f7e0ecd5 --- /dev/null +++ b/kde-base/umbrello/umbrello-3.5.6-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.6-r1.ebuild,v 1.1 2007/04/13 18:18:12 philantrop Exp $ + +KMNAME=kdesdk +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE: Umbrello UML Modeller" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="kdehiddenvisibility" + +src_unpack() { + kde-meta_src_unpack + + # Patch to fix bug 171328 + epatch ${FILESDIR}/umbrello-diagram-fix.diff +}