Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=393e31719f6ddc7b450e35672bed1c13485c6859
commit 393e31719f6ddc7b450e35672bed1c13485c6859
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Tue Jan 12 01:29:09 2010 +0100
qt4-4.6.0-4-i686
- add kdbus to replaces() for qdbusviewer
diff --git a/source/kde-extra/kdbus/FrugalBuild
b/source/kde-extra/kdbus/FrugalBuild
deleted file mode 100644
index 4d24ef9..0000000
--- a/source/kde-extra/kdbus/FrugalBuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Compiling Time: 0.26 SBU
-# Maintainer: crazy <cr...@frugalware.org>
-
-pkgname=kdbus
-pkgver=0.8.6
-pkgrel=3
-pkgdesc="kdbus is a D-BUS service browser for KDE."
-depends=('kdelibs>=3.5.4-4' 'dbus>=0.93')
-groups=('kde-extra')
-archs=('i686' 'x86_64')
-_F_kde_id="34692"
-Finclude kde
-source=(http://www.kde-apps.org/CONTENT/content-files/34692-$pkgname-$pkgver.tar.gz
dont_segfault.patch)
-sha1sums=('f9365eb720ccfa98db6a6a3cd94e94a5ff937f7d' \
- '64f62d935275b6aee38a49d0b456fa4be49cc102')
-
-
-# optimization OK
diff --git a/source/kde-extra/kdbus/dont_segfault.patch
b/source/kde-extra/kdbus/dont_segfault.patch
deleted file mode 100644
index ca05209..0000000
--- a/source/kde-extra/kdbus/dont_segfault.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurp kdbus-0.8.6/src/dbusobject.cpp kdbus-0.8.6-p/src/dbusobject.cpp
---- kdbus-0.8.6/src/dbusobject.cpp 2006-02-18 06:23:48.000000000 +0100
-+++ kdbus-0.8.6-p/src/dbusobject.cpp 2006-11-17 23:25:27.000000000 +0100
-@@ -42,6 +42,7 @@ public:
-
- QString discoverPath( QDomElement const & elem );
-
-+ QDomDocument doc;
- QDBusProxy * proxy;
- DBusObject * p;
- };
-@@ -88,19 +89,19 @@ DBusObject::DBusObject(
-
- // Now iterate through self, enumerating interfaces, properties, and
- // other objects.
-- myElem = myElem.firstChild().toElement();
-+ QDomElement childElement = myElem.firstChild().toElement();
-
- try {
- do {
-- if ( myElem.tagName() == "node" )
-- new DBusObject( this, myElem, d->proxy );
-- else if ( myElem.tagName() == "interface" )
-- new DBusInterface( this, myElem );
-+ if ( childElement.tagName() == "node" )
-+ new DBusObject( this, childElement, d->proxy );
-+ else if ( childElement.tagName() == "interface" )
-+ new DBusInterface( this, childElement );
- else
- kdWarning() << "Unhandled node in introspect data: "
-- << myElem.tagName() << endl;
-- myElem = myElem.nextSibling().toElement();
-- } while ( !myElem.isNull() );
-+ << childElement.tagName() << endl;
-+ childElement = childElement.nextSibling().toElement();
-+ } while ( !childElement.isNull() );
- }
- catch ( std::runtime_error const & e ) {
- m_ok = false;
-@@ -128,7 +129,6 @@ throw ( QDBusSendError, QDBusXmlError )
- .arg( proxy->lastError().message() )
- );
-
-- QDomDocument doc;
- if ( !doc.setContent( reply[0].toString() ) )
- throw QDBusXmlError(
- i18n(
diff --git a/source/xlib-extra/qt4/FrugalBuild
b/source/xlib-extra/qt4/FrugalBuild
index 9b85e7c..dcc75ce 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -440,7 +440,7 @@ subrodepends=("${subrodepen...@]}" "$LIBQT3SUPPORTDEP
$LIBQTPHONONDEP")
subgroups=("${subgrou...@]}" 'xapps-extra')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
subconflicts=("${subconflic...@]}" '')
-subreplaces=("${subreplac...@]}" '')
+subreplaces=("${subreplac...@]}" 'kdbus')
subprovides=("${subprovid...@]}" '')
## this is here till I've fixed all reverse depends so we not break all apps
using qt4 by now
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
