diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-08-02 07:47:53 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-08-02 07:47:53 +0000 |
| commit | 9fd5985d3f715c4fc48817cec9bb8cd9b590d92b (patch) | |
| tree | 431a2c193adcb5b2226e13867336fa534e761042 /kde-base | |
| parent | Add a patch to fix crashes when D-Bus is not started, thanks to Tobias Powalo... (diff) | |
| download | gentoo-2-9fd5985d3f715c4fc48817cec9bb8cd9b590d92b.tar.gz gentoo-2-9fd5985d3f715c4fc48817cec9bb8cd9b590d92b.tar.bz2 gentoo-2-9fd5985d3f715c4fc48817cec9bb8cd9b590d92b.zip | |
Add a patch to fix crashes when D-Bus is not started, thanks to Tobias Powalowski from Archlinux.
(Portage version: 2.1.1_pre4-r1)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kdebase-kioslaves-3.5.4-dbuscrash.patch | 17 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.4.ebuild | 5 |
3 files changed, 26 insertions, 3 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 80bbe846a7b6..6e0cbacdaffe 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.305 2006/08/01 11:04:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.306 2006/08/02 07:47:53 flameeyes Exp $ + + 02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kdebase-kioslaves-3.5.4-dbuscrash.patch, kdebase-3.5.4.ebuild: + Add a patch to fix crashes when D-Bus is not started, thanks to Tobias + Powalowski from Archlinux. 01 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.5.4.ebuild: Require a newer eject version, or use unieject, because of changes in KDE diff --git a/kde-base/kdebase/files/kdebase-kioslaves-3.5.4-dbuscrash.patch b/kde-base/kdebase/files/kdebase-kioslaves-3.5.4-dbuscrash.patch new file mode 100644 index 000000000000..bb0746cd58f0 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-kioslaves-3.5.4-dbuscrash.patch @@ -0,0 +1,17 @@ +--- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp 2006/06/21 08:56:19 553501 ++++ branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp 2006/07/26 08:18:37 566466 +@@ -112,6 +112,14 @@ + DBusError error; + dbus_error_init(&error); + dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); ++ ++ if (!dbus_connection || dbus_error_is_set(&error)) { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ return false; ++ } ++ + dbus_bus_register(dbus_connection, &error); + + if (dbus_error_is_set(&error)) { diff --git a/kde-base/kdebase/kdebase-3.5.4.ebuild b/kde-base/kdebase/kdebase-3.5.4.ebuild index ded5632256ab..ef3f7cfa4243 100644 --- a/kde-base/kdebase/kdebase-3.5.4.ebuild +++ b/kde-base/kdebase/kdebase-3.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.4.ebuild,v 1.3 2006/08/01 11:04:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.4.ebuild,v 1.4 2006/08/02 07:47:53 flameeyes Exp $ inherit kde-dist eutils flag-o-matic @@ -77,7 +77,8 @@ DEPEND="${DEPEND} dev-util/pkgconfig" PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch - ${FILESDIR}/nsplugins-3.5.3-applet-redirects.patch" + ${FILESDIR}/nsplugins-3.5.3-applet-redirects.patch + ${FILESDIR}/kdebase-kioslaves-3.5.4-dbuscrash.patch" pkg_setup() { kde_pkg_setup |