From 6d89b28b1141f472fe21aee98bab85c8c00343d8 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 28 Sep 2005 14:26:25 +0000 Subject: Added patch to fix umbrello crash on starting. (Portage version: 2.0.52-r1) --- kde-base/kdesdk/ChangeLog | 9 +++- kde-base/kdesdk/Manifest | 18 ++++---- kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 | 1 - kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1 | 1 + kde-base/kdesdk/files/kdesdk-3.5_beta1-crash.patch | 14 ++++++ kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild | 53 ++++++++++++++++++++++ kde-base/kdesdk/kdesdk-3.5_beta1.ebuild | 51 --------------------- 7 files changed, 85 insertions(+), 62 deletions(-) delete mode 100644 kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 create mode 100644 kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1 create mode 100644 kde-base/kdesdk/files/kdesdk-3.5_beta1-crash.patch create mode 100644 kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild delete mode 100644 kde-base/kdesdk/kdesdk-3.5_beta1.ebuild (limited to 'kde-base/kdesdk') diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog index 1a76f958f3d9..e7e635f06c63 100644 --- 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ò + +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 a3dc703d1732..68b7ee455af1 100644 --- a/kde-base/kdesdk/Manifest +++ b/kde-base/kdesdk/Manifest @@ -1,15 +1,15 @@ -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 MD5 27813b6ec7aceda1c7af98816ddefc95 kdesdk-3.4.1.ebuild 513 +MD5 53b70b46435cbcf30026aa9a84b17562 ChangeLog 12520 +MD5 5e0cc8faaf27dcdcc64b297cc2fc1c71 kdesdk-3.4.2.ebuild 1259 +MD5 b4802bd82fc3d12e6f743beb36b8acda kdesdk-3.3.2.ebuild 503 +MD5 32931a6639d048433b3ec112ad773cf5 kdesdk-3.5_beta1-r1.ebuild 1328 +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 diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 b/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 deleted file mode 100644 index 055cfa281fa8..000000000000 --- a/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1 +++ /dev/null @@ -1 +0,0 @@ -MD5 350ad64c530e3660d3872dacab8f7914 kdesdk-3.4.91.tar.bz2 4826641 diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1 b/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1 new file mode 100644 index 000000000000..055cfa281fa8 --- /dev/null +++ b/kde-base/kdesdk/files/digest-kdesdk-3.5_beta1-r1 @@ -0,0 +1 @@ +MD5 350ad64c530e3660d3872dacab8f7914 kdesdk-3.4.91.tar.bz2 4826641 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 index 000000000000..9fda43ef1b6c --- /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-r1.ebuild b/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild new file mode 100644 index 000000000000..598f1e1de388 --- /dev/null +++ b/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild @@ -0,0 +1,53 @@ +# 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-r1.ebuild,v 1.1 2005/09/28 14:26:24 flameeyes Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..." + +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa" +IUSE="berkdb subversion" + +DEPEND="x86? ( dev-util/callgrind ) + sys-devel/flex + subversion? ( dev-util/subversion ) + berkdb? ( || ( =sys-libs/db-4.3* + =sys-libs/db-4.2* ) )" + +RDEPEND="${DEPEND} + dev-util/cvs + media-gfx/graphviz" + +src_unpack() { + kde_src_unpack + + # Configure patch. + epatch "${FILESDIR}/kdesdk-3.5-configure-db.patch" + + # 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 +} + +src_compile() { + local myconf="$(use_with subversion)" + + if use berkdb; then + if has_version "=sys-libs/db-4.3*"; then + myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3 + --with-db-include-dir=/usr/include/db4.3" + elif has_version "=sys-libs/db-4.2*"; then + myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2 + --with-db-include-dir=/usr/include/db4.2" + fi + else + myconf="${myconf} --without-berkeley-db" + fi + + kde_src_compile +} diff --git a/kde-base/kdesdk/kdesdk-3.5_beta1.ebuild b/kde-base/kdesdk/kdesdk-3.5_beta1.ebuild deleted file mode 100644 index 3c0127dc3fdc..000000000000 --- a/kde-base/kdesdk/kdesdk-3.5_beta1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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 $ - -inherit kde-dist eutils - -DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..." - -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa" -IUSE="berkdb subversion" - -DEPEND="x86? ( dev-util/callgrind ) - sys-devel/flex - subversion? ( dev-util/subversion ) - berkdb? ( || ( =sys-libs/db-4.3* - =sys-libs/db-4.2* ) )" - -RDEPEND="${DEPEND} - dev-util/cvs - media-gfx/graphviz" - -src_unpack() { - kde_src_unpack - - # Configure patch. - epatch "${FILESDIR}/kdesdk-3.5-configure-db.patch" - - # Fix compilation. Applied for rc1. - epatch "${FILESDIR}/${P}-compile.patch" - - # For the configure patch. - make -f admin/Makefile.common -} - -src_compile() { - local myconf="$(use_with subversion)" - - if use berkdb; then - if has_version "=sys-libs/db-4.3*"; then - myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3 - --with-db-include-dir=/usr/include/db4.3" - elif has_version "=sys-libs/db-4.2*"; then - myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2 - --with-db-include-dir=/usr/include/db4.2" - fi - else - myconf="${myconf} --without-berkeley-db" - fi - - kde_src_compile -} -- cgit v1.2.3-65-gdbad