diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-08-02 07:42:44 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-08-02 07:42:44 +0000 |
| commit | b2e9d2ab368d10ccc1aee5540ec812d821eb130b (patch) | |
| tree | 9a632242a6f751fe10b9b10948227f57b532bf6d | |
| parent | Stable on ppc64; bug #138552 (diff) | |
| download | gentoo-2-b2e9d2ab368d10ccc1aee5540ec812d821eb130b.tar.gz gentoo-2-b2e9d2ab368d10ccc1aee5540ec812d821eb130b.tar.bz2 gentoo-2-b2e9d2ab368d10ccc1aee5540ec812d821eb130b.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)
3 files changed, 27 insertions, 2 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index 490294dad700..5af65b407157 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.61 2006/08/01 11:07:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.62 2006/08/02 07:42:44 flameeyes Exp $ + + 02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kdebase-kioslaves-3.5.4-dbuscrash.patch, + kdebase-kioslaves-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-kioslaves-3.5.4.ebuild: diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch new file mode 100644 index 000000000000..bb0746cd58f0 --- /dev/null +++ b/kde-base/kdebase-kioslaves/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-kioslaves/kdebase-kioslaves-3.5.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild index 947e5a729e24..9a8ccd37b184 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-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-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.2 2006/08/01 11:07:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.3 2006/08/02 07:42:44 flameeyes Exp $ KMNAME=kdebase KMMODULE=kioslave @@ -21,6 +21,8 @@ DEPEND="ldap? ( net-nds/openldap ) RDEPEND="${DEPEND} $(deprange $PV $MAXKDEVER kde-base/kdialog)" # for the kdeeject script used by the devices/mounthelper ioslave +PATCHES="${FILESDIR}/${P}-dbuscrash.patch" + pkg_setup() { kde_pkg_setup if use hal && ! built_with_use sys-apps/dbus qt3; then |