Added patch to fix umbrello crash on starting.

Package-Manager: portage-2.0.52-r1

diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 1a76f958f3d9b1ad63d712f63a19c6734b0c0a13..e7e635f06c63bc45f92059d7ed9c1b2aab047b01 100644 (file)
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.96 2005/09/21 17:28:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.97 2005/09/28 14:26:24 flameeyes Exp $
+
+*kdesdk-3.5_beta1-r1 (28 Sep 2005)
+
+  28 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdesdk-3.5_beta1-crash.patch, -kdesdk-3.5_beta1.ebuild,
+  +kdesdk-3.5_beta1-r1.ebuild:
+  Added patch to fix umbrello crash on starting.
 
 *kdesdk-3.5_beta1 (21 Sep 2005)
 

diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index a3dc703d17323c43e8d5c8231ace3f8de59d68ad..0dc68066596bd710204334a0aa16d549696a3f03 100644 (file)
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -1,15 +1,26 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b4802bd82fc3d12e6f743beb36b8acda kdesdk-3.3.2.ebuild 503
-MD5 5e0cc8faaf27dcdcc64b297cc2fc1c71 kdesdk-3.4.2.ebuild 1259
-MD5 53b70b46435cbcf30026aa9a84b17562 ChangeLog 12520
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 27813b6ec7aceda1c7af98816ddefc95 kdesdk-3.4.1.ebuild 513
+MD5 acfd388f00070fdf58eb37ccf6674731 ChangeLog 12758
+MD5 5e0cc8faaf27dcdcc64b297cc2fc1c71 kdesdk-3.4.2.ebuild 1259
+MD5 b4802bd82fc3d12e6f743beb36b8acda kdesdk-3.3.2.ebuild 503
+MD5 bb37c4f64262b36746a2a90378716bda kdesdk-3.5_beta1-r1.ebuild 1404
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 616ebbb6468ed653c5370bd042239ad0 kdesdk-3.2.3.ebuild 419
-MD5 32931a6639d048433b3ec112ad773cf5 kdesdk-3.5_beta1.ebuild 1328
+MD5 5d548fa64f7fd6d2883d96488a8615c2 files/digest-kdesdk-3.2.3 66
+MD5 72d5f7e9416a5e70c188be7159797367 files/kdesdk-3.4-configure.patch 2511
 MD5 05b78a43919e346c710b79326bac8ad5 files/digest-kdesdk-3.3.2 66
-MD5 e9178add9702e87b7fe025e8f7a2f8db files/digest-kdesdk-3.4.1 66
 MD5 ad23546d0ec5bf0193c3135d739a332b files/kdesdk-3.5-configure-db.patch 1736
+MD5 e9178add9702e87b7fe025e8f7a2f8db files/digest-kdesdk-3.4.1 66
 MD5 e909850d57bdca22b0b476f1acf0fd5d files/kdesdk-3.5_beta1-compile.patch 1406
-MD5 5d548fa64f7fd6d2883d96488a8615c2 files/digest-kdesdk-3.2.3 66
 MD5 086313a32c0a92f42f8050236d4494ab files/digest-kdesdk-3.4.2 66
-MD5 72d5f7e9416a5e70c188be7159797367 files/kdesdk-3.4-configure.patch 2511
-MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-3.5_beta1 67
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-3.5_beta1-r1 67
+MD5 bb0014fd062d56a11c42435a49d483cb files/kdesdk-3.5_beta1-crash.patch 729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOqgxj5H05b2HAEkRAvfsAKCVm2Ml0NqSk+aq3tdp9buWHyNTugCfYTKB
+u+P7pNIM11BNhQa9EcRzIjQ=
+=kWNe
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 b/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1
similarity index 100%
rename from kde-base/kdesdk/files/digest-kdesdk-3.5_beta1
rename to kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1

diff --git a/kde-base/kdesdk/files/kdesdk-3.5_beta1-crash.patch b/kde-base/kdesdk/files/kdesdk-3.5_beta1-crash.patch
new file mode 100644 (file)
index 0000000..9fda43e
--- /dev/null
+++ b/kde-base/kdesdk/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/kdesdk/kdesdk-3.5_beta1.ebuild b/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild
similarity index 91%
rename from kde-base/kdesdk/kdesdk-3.5_beta1.ebuild
rename to kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild
index 3c0127dc3fdc1f6b4b04ce98c9631afbae1a51ff..598f1e1de388a27eea049acad3e31076a7352048 100644 (file)
--- a/kde-base/kdesdk/kdesdk-3.5_beta1.ebuild
+++ b/kde-base/kdesdk/kdesdk-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/kdesdk/kdesdk-3.5_beta1.ebuild,v 1.1 2005/09/21 17:28:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild,v 1.1 2005/09/28 14:26:24 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -27,6 +27,8 @@ src_unpack() {
 
        # Fix compilation. Applied for rc1.
        epatch "${FILESDIR}/${P}-compile.patch"
+       # Fix crash. Applied for rc1.
+       epatch "${FILESDIR}/${P}-crash.patch"
 
        # For the configure patch.
        make -f admin/Makefile.common