diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:31:07 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:31:07 +0000 |
| commit | 74bb63beda486eff09b43606378bf0bab24d4478 (patch) | |
| tree | e63f1cfa30634154fbbcdfc90536534714d3bc17 /kde-base/umbrello | |
| parent | Remove unneeded patches. (diff) | |
| download | gentoo-2-74bb63beda486eff09b43606378bf0bab24d4478.tar.gz gentoo-2-74bb63beda486eff09b43606378bf0bab24d4478.tar.bz2 gentoo-2-74bb63beda486eff09b43606378bf0bab24d4478.zip | |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/umbrello')
| -rw-r--r-- | kde-base/umbrello/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch | 13 | ||||
| -rw-r--r-- | kde-base/umbrello/files/umbrello-3.5.1-fork.patch | 30 |
3 files changed, 6 insertions, 44 deletions
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog index c6d879fc318b..b3cfe18f79bd 100644 --- a/kde-base/umbrello/ChangeLog +++ b/kde-base/umbrello/ChangeLog @@ -1,6 +1,11 @@ # 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.62 2007/02/04 03:19:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.63 2007/02/05 12:31:07 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/umbrello-3.5.1-fork.patch, + -files/umbrello-3.5.1-fork-rectangle.patch: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -umbrello-3.5.1-r1.ebuild, -umbrello-3.5.2.ebuild: diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch deleted file mode 100644 index 5ce4c8e1672a..000000000000 --- a/kde-base/umbrello/files/umbrello-3.5.1-fork-rectangle.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: umbrello/umbrello/umlwidget.cpp -=================================================================== ---- umbrello/umbrello/umlwidget.cpp (revision 516637) -+++ umbrello/umbrello/umlwidget.cpp (revision 516638) -@@ -1063,7 +1063,7 @@ - const QSize minSize = calculateSize(); - const int w = minSize.width(); - const int h = minSize.height(); -- if (getWidth() >= w && getHeight() >= h) -+ if (m_Type != Uml::wt_ForkJoin && getWidth() >= w && getHeight() >= h) - return; - setSize(w, h); - adjustAssocs( getX(), getY() ); // adjust assoc lines diff --git a/kde-base/umbrello/files/umbrello-3.5.1-fork.patch b/kde-base/umbrello/files/umbrello-3.5.1-fork.patch deleted file mode 100644 index 87888e5ee392..000000000000 --- a/kde-base/umbrello/files/umbrello-3.5.1-fork.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp -=================================================================== ---- kdesdk-3.5.1.orig/umbrello/umbrello/assocrules.cpp -+++ kdesdk-3.5.1/umbrello/umbrello/assocrules.cpp -@@ -21,6 +21,7 @@ - #include "associationwidget.h" - #include "statewidget.h" - #include "activitywidget.h" -+#include "forkjoinwidget.h" - - using namespace Uml; - -@@ -197,13 +198,15 @@ bool AssocRules::allowAssociation( Assoc - static_cast<ActivityWidget*>(widgetA)->getActivityType() != - ActivityWidget::Branch && - static_cast<ActivityWidget*>(widgetA)->getActivityType() != -- ActivityWidget::Fork_DEPRECATED ) { -+ ActivityWidget::Fork_DEPRECATED && -+ dynamic_cast<ForkJoinWidget*>(widgetA) == NULL ) { - return false; - } - // only Forks and Branches can have more than one "outgoing" transition - if( static_cast<ActivityWidget*>(widgetA)->getActivityType() != - ActivityWidget::Fork_DEPRECATED && -- static_cast<ActivityWidget*>(widgetA)->getActivityType() != -+ dynamic_cast<ForkJoinWidget*>(widgetA) == NULL && -+ static_cast<ActivityWidget*>(widgetA)->getActivityType() != - ActivityWidget::Branch ) { - AssociationWidgetList list = widgetA->getAssocList(); - for (AssociationWidget* assoc = list.first(); assoc; assoc = list.next()) { |