Added patch to fix umbrello crash on starting.

(Portage version: 2.0.52-r1)

6 files changed, 52 insertions, 8 deletions

diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index b82b6a4f16bf..cb3d579d02f1 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.16 2005/09/26 10:19:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.17 2005/09/28 14:19:24 flameeyes Exp $
+
+*umbrello-3.5_beta1-r1 (28 Sep 2005)
+
+  28 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/umbrello-qt-3.3.5.patch, +files/kdesdk-3.5_beta1-crash.patch,
+  -umbrello-3.5_beta1.ebuild, +umbrello-3.5_beta1-r1.ebuild:
+  Added patch to fix umbrello crash on starting.
 
   26 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
   +files/kdesdk-3.5_beta1-compile.patch, umbrello-3.5_beta1.ebuild:
diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest
index feb4b17e887e..931653842b44 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-base/umbrello/Manifest
@@ -1,9 +1,11 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b4ee85af48c02e02fa4425daccbd799f ChangeLog 2538
 MD5 15c59514c459c17d1785f7a7eaf3efea umbrello-3.4.1.ebuild 390
-MD5 4857e930c7870c29742d0d438b1abeb1 umbrello-3.5_beta1.ebuild 466
+MD5 b4ee85af48c02e02fa4425daccbd799f ChangeLog 2538
+MD5 dad1b67b754392079d2fbe1101bec57e umbrello-3.5_beta1-r1.ebuild 544
 MD5 d90d841849894a72dda6b8329d44183b umbrello-3.4.2.ebuild 398
-MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-umbrello-3.5_beta1 67
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-umbrello-3.5_beta1-r1 67
+MD5 0f4007b5db8e59debdab22a1e984546f files/umbrello-qt-3.3.5.patch 788
 MD5 9b4e9e38740207531ab771519519d01e files/digest-umbrello-3.4.1 206
-MD5 0a38813829924b012d8b632f47abb45d files/digest-umbrello-3.4.2 280
 MD5 e909850d57bdca22b0b476f1acf0fd5d files/kdesdk-3.5_beta1-compile.patch 1406
+MD5 0a38813829924b012d8b632f47abb45d files/digest-umbrello-3.4.2 280
+MD5 bb0014fd062d56a11c42435a49d483cb files/kdesdk-3.5_beta1-crash.patch 729
diff --git a/kde-base/umbrello/files/digest-umbrello-3.5_beta1 b/kde-base/umbrello/files/digest-umbrello-3.5_beta1-r1
index 055cfa281fa8..055cfa281fa8 100644
--- a/kde-base/umbrello/files/digest-umbrello-3.5_beta1
+++ b/kde-base/umbrello/files/digest-umbrello-3.5_beta1-r1
diff --git a/kde-base/umbrello/files/kdesdk-3.5_beta1-crash.patch b/kde-base/umbrello/files/kdesdk-3.5_beta1-crash.patch
new file mode 100644
index 000000000000..9fda43ef1b6c
--- /dev/null
+++ b/kde-base/umbrello/files/kdesdk-3.5_beta1-crash.patch
@@ -0,0 +1,14 @@
+Index: umbrello/umbrello/worktoolbar.cpp
+===================================================================
+--- umbrello/umbrello/worktoolbar.cpp	(revision 462433)
++++ umbrello/umbrello/worktoolbar.cpp	(revision 462434)
+@@ -288,8 +288,7 @@
+     KStandardDirs * dirs = KGlobal::dirs();
+     QString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
+     dataDir += "/umbrello/pics/";
+-    const size_t n_buttonInfos = sizeof(buttonInfo) /
+-                                 (sizeof(ToolBar_Buttons) + sizeof(QString) + sizeof(char*));
++    const size_t n_buttonInfos = sizeof(buttonInfo) / sizeof(ButtonInfo);
+ 
+     m_ToolButtons.insert(tbb_Undefined,
+                          ToolButton(i18n("UNDEFINED"),
diff --git a/kde-base/umbrello/files/umbrello-qt-3.3.5.patch b/kde-base/umbrello/files/umbrello-qt-3.3.5.patch
new file mode 100644
index 000000000000..28bad3616bbe
--- /dev/null
+++ b/kde-base/umbrello/files/umbrello-qt-3.3.5.patch
@@ -0,0 +1,19 @@
+Index: kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+===================================================================
+--- kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui.orig
++++ kdesdk-3.4.91/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+@@ -363,14 +363,4 @@
+     </image>
+ </images>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>kfontchooser.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-    <includehint>kcolorbutton.h</includehint>
+-</includehints>
+ </UI>
diff --git a/kde-base/umbrello/umbrello-3.5_beta1.ebuild b/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild
index d91bad9dd99e..d632427fff84 100644
--- a/kde-base/umbrello/umbrello-3.5_beta1.ebuild
+++ b/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5_beta1.ebuild,v 1.2 2005/09/26 10:19:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild,v 1.1 2005/09/28 14:19:24 flameeyes Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -12,4 +12,6 @@ KEYWORDS="~amd64"
 IUSE=""
 
 # Fix compilation. Applied for rc1.
-PATCHES1="${FILESDIR}/kdesdk-3.5_beta1-compile.patch"
+PATCHES="${FILESDIR}/kdesdk-3.5_beta1-compile.patch
+	${FILESDIR}/kdesdk-3.5_beta1-crash.patch
+	${FILESDIR}/umbrello-qt-3.3.5.patch"