summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-10-06 19:54:31 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-10-06 19:54:31 +0000
commit43843c9a0c3cb386665fdbebdeff8d89ec00bd0c (patch)
tree11ac8e85ab5242d50d1d6a6278d6a5261abf6639 /dev-util/d-feet
parentx86 stable, bug #338349 (diff)
downloadhistorical-43843c9a0c3cb386665fdbebdeff8d89ec00bd0c.tar.gz
historical-43843c9a0c3cb386665fdbebdeff8d89ec00bd0c.tar.bz2
historical-43843c9a0c3cb386665fdbebdeff8d89ec00bd0c.zip
Version bump. Project moved to gnome.org. Fix some UI bugs.
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'dev-util/d-feet')
-rw-r--r--dev-util/d-feet/ChangeLog9
-rw-r--r--dev-util/d-feet/Manifest21
-rw-r--r--dev-util/d-feet/d-feet-0.1.12.ebuild (renamed from dev-util/d-feet/d-feet-0.1.6.ebuild)14
-rw-r--r--dev-util/d-feet/d-feet-0.1.4.ebuild36
-rw-r--r--dev-util/d-feet/d-feet-0.1.8.ebuild29
-rw-r--r--dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch158
6 files changed, 29 insertions, 238 deletions
diff --git a/dev-util/d-feet/ChangeLog b/dev-util/d-feet/ChangeLog
index cbad5b3e716c..ec7945623b11 100644
--- a/dev-util/d-feet/ChangeLog
+++ b/dev-util/d-feet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/d-feet
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/ChangeLog,v 1.8 2010/02/08 08:55:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/ChangeLog,v 1.9 2010/10/06 19:54:31 eva Exp $
+
+*d-feet-0.1.12 (06 Oct 2010)
+
+ 06 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> -d-feet-0.1.4.ebuild,
+ -files/d-feet-0.1.4-show-properties.patch, -d-feet-0.1.6.ebuild,
+ -d-feet-0.1.8.ebuild, +d-feet-0.1.12.ebuild:
+ Version bump. Project moved to gnome.org. Fix some UI bugs.
08 Feb 2010; Peter Volkov <pva@gentoo.org> d-feet-0.1.4.ebuild:
Add inherit eutils for epatch.
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index a61e30602276..9abcac5f6c51 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,11 +1,16 @@
-AUX d-feet-0.1.4-show-properties.patch 6064 RMD160 8d6e6191030a2f7d7b76b3cb432d4064da4de761 SHA1 0501ebe8764ceee8df7569dc5b99cb98dabf2086 SHA256 490c3d58d6325f4ee1c7b2abb49eef6b03f823864da599c5e8739d6996413755
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST d-feet-0.1.10.tar.gz 37794 RMD160 4cb81b5c0dfad116f2fe45bff20bfdd11c470945 SHA1 950e91e713114d20c2b449669f778b70eb4352ad SHA256 ca40b7bb5d8eda04482d588c29514f0edc831f5aed8aa662e7e76024b6361ac5
-DIST d-feet-0.1.4.tar.gz 26881 RMD160 c223b6652cb7b8d588e8d73c02c0c8a20ba3af65 SHA1 9f29b28062ced165eb5d264ea0db7fef9f80cbfb SHA256 69dc91e50996d698572d951d82d3608fba2768f904c86753d89a28e806691436
-DIST d-feet-0.1.6.tar.gz 31070 RMD160 8fb5afffc0f60f67ba463348c499d26c4a4cdb5e SHA1 5b0e58bd265bfb708ca974a108b6989f96ceaf0e SHA256 bb66af87c53b056cafe0719af5c7de09544df15d23f5d0d0dcc27f365fb06e66
-DIST d-feet-0.1.8.tar.gz 38226 RMD160 6bffe6e77ffa09e0a7b5559b2b21a01eb2c56daa SHA1 ea4e22eafc7a405542bc7d25ff2b0f6a352de487 SHA256 d394bd65899435c6dfc8c921b746888da6a8bfc153d3b91ed4c35394e4ab3acf
+DIST d-feet-0.1.12.tar.bz2 34701 RMD160 7b37685b76b51fa934ba8c4f1aadc295d9bbf358 SHA1 6d9e2bc6aa06ba30e4cf36e0c8cf2522fb376c23 SHA256 11b247e39fd0b0077df8f5dffd9dadbe2becef2c0dfa0df50688d41bdcba5307
EBUILD d-feet-0.1.10.ebuild 725 RMD160 fe15e47ae854411ebed3255a45f4eed55db45386 SHA1 39bf66b5d12c8efd4c209704401b4156e48f2740 SHA256 10628fde2773576dfc95b109a7cdedd593562bc48b1b75276abec720e1afccc9
-EBUILD d-feet-0.1.4.ebuild 775 RMD160 fb6cd922815e9310e5313dc2a085edb7e417f8f6 SHA1 a1b8a09bf2ad3b5a8d79d106904efdf36ed539a4 SHA256 5c70e5bd49695c7a3221ba14ff0a1753ea1da702a8e3cc6189a492b218b6f320
-EBUILD d-feet-0.1.6.ebuild 678 RMD160 3fbc1fabfba5a79af0de15a51367d42af16cbd2f SHA1 4bf0060f59b1b8c5a682877e088f8334244292d3 SHA256 f61236af9538189e9fb66d9f938ad997c4b0e2aa824a021dfcbe492290ea60ec
-EBUILD d-feet-0.1.8.ebuild 678 RMD160 97d1e6bf89d5d4fc42f46dbbf081c25c74bf4342 SHA1 999003c10130e8ad9a964d52c2f22b5b3c508081 SHA256 b4b78dea28b2890e2c910943686572a4dc8fa5410259b9105bcbc1056ffea875
-MISC ChangeLog 1884 RMD160 e0880f92afc860a62d5450ffe8c36f5210d39433 SHA1 6f7b460148f7a270be04f15f167c34369e68e34e SHA256 20ec79e06641ea4630fcd078976af137a58509eee50f3beda03a55459c1f3fc1
+EBUILD d-feet-0.1.12.ebuild 667 RMD160 4dcee9310e717edcdf8d69391bfab6ed6c5326f6 SHA1 efc3dcf8d666aef8b1b1d1e0e41b7ee89f6873e7 SHA256 cea9fec9d1b47dda74ba7ee6edc0780b963a8e8230659833568929f8cf36c3d3
+MISC ChangeLog 2167 RMD160 7fdca45b2c5e5fecacfc28badff7fd1cafa87e5c SHA1 2be632b50889cd4d1ab66cba995368ede0661ee9 SHA256 4921c4ee46f2426dc0f2404c33274a48c3ad68a51a1ef428749b44e38cd370bf
MISC metadata.xml 222 RMD160 d1a3fdf35754f259a53541e6f3fdf4685c621b4c SHA1 2669a0aa4051cb9d7eca5b8e5719f5039bf850b9 SHA256 2744b911fd4a893fc26fd4fbfcf4bad6189fbbd14a6b525c84c95d012e8c06da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkys1AAACgkQ1fmVwcYIWAYdnACeMLqq6BPnnIMs11tOigmYdFM6
+EScAoKA1FScIqxwFgi8P80ufQiLMju0p
+=dt4r
+-----END PGP SIGNATURE-----
diff --git a/dev-util/d-feet/d-feet-0.1.6.ebuild b/dev-util/d-feet/d-feet-0.1.12.ebuild
index 99e359ff87aa..e1e87bbd7e67 100644
--- a/dev-util/d-feet/d-feet-0.1.6.ebuild
+++ b/dev-util/d-feet/d-feet-0.1.12.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.6.ebuild,v 1.3 2009/03/10 13:57:09 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.12.ebuild,v 1.1 2010/10/06 19:54:31 eva Exp $
+
+GCONF_DEBUG="no"
inherit gnome2 distutils
DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
+HOMEPAGE="http://live.gnome.org/d-feet/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gnome"
RDEPEND=">=sys-apps/dbus-1.0
>=dev-python/dbus-python-0.82.3
dev-python/pygtk
- >=dev-lang/python-2.5"
+ >=dev-lang/python-2.5
+ gnome? ( dev-python/libwnck-python )"
pkg_setup() {
PYTHON_MODNAME="dfeet"
diff --git a/dev-util/d-feet/d-feet-0.1.4.ebuild b/dev-util/d-feet/d-feet-0.1.4.ebuild
deleted file mode 100644
index 02e379ff031d..000000000000
--- a/dev-util/d-feet/d-feet-0.1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.4.ebuild,v 1.3 2010/02/08 08:55:38 pva Exp $
-
-inherit eutils gnome2 distutils
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.0
- >=dev-python/dbus-python-0.82.3
- dev-python/pygtk
- >=dev-lang/python-2.5"
-
-pkg_setup() {
- PYTHON_MODNAME="dfeet"
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-show-properties.patch
-}
-
-pkg_postinst()
-{
- distutils_pkg_postinst
- gnome2_icon_cache_update
-}
diff --git a/dev-util/d-feet/d-feet-0.1.8.ebuild b/dev-util/d-feet/d-feet-0.1.8.ebuild
deleted file mode 100644
index 6e4acaf6ea84..000000000000
--- a/dev-util/d-feet/d-feet-0.1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.8.ebuild,v 1.2 2009/03/10 13:57:09 steev Exp $
-
-inherit gnome2 distutils
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.0
- >=dev-python/dbus-python-0.82.3
- dev-python/pygtk
- >=dev-lang/python-2.5"
-
-pkg_setup() {
- PYTHON_MODNAME="dfeet"
-}
-
-pkg_postinst()
-{
- distutils_pkg_postinst
- gnome2_icon_cache_update
-}
diff --git a/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch b/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch
deleted file mode 100644
index 6c394c09a832..000000000000
--- a/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/dfeet/_introspect_parser.py b/dfeet/_introspect_parser.py
-index 370d9e7..656f672 100644
---- a/dfeet/_introspect_parser.py
-+++ b/dfeet/_introspect_parser.py
-@@ -26,6 +26,8 @@ class _Parser(object):
- __slots__ = ('map',
- 'in_iface',
- 'in_method',
-+ 'in_signal',
-+ 'in_property',
- 'in_sig',
- 'out_sig',
- 'node_level',
-@@ -35,6 +37,7 @@ class _Parser(object):
- self.in_iface = ''
- self.in_method = ''
- self.in_signal = ''
-+ self.in_property = ''
- self.in_sig = ''
- self.out_sig = ''
- self.node_level = 0
-@@ -68,6 +71,10 @@ class _Parser(object):
- elif (self.in_signal and name == 'arg'):
- if attributes.get('direction', 'in') == 'in':
- self.in_sig += attributes['type']
-+ elif (not self.in_property and name == 'property'):
-+ self.in_property = attributes['name']
-+ self.in_sig = attributes['type']
-+ self.out_sig = attributes['access']
-
-
- def EndElementHandler(self, name):
-@@ -78,7 +85,7 @@ class _Parser(object):
- self.in_iface = ''
- elif (self.in_method and name == 'method'):
- if not self.map['interfaces'].has_key(self.in_iface):
-- self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}}
-+ self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
-
- if self.map['interfaces'][self.in_iface]['methods'].has_key(self.in_method):
- print "ERROR: Some clever service is trying to be cute and has the same method name in the same interface"
-@@ -90,16 +97,28 @@ class _Parser(object):
- self.out_sig = ''
- elif (self.in_signal and name == 'signal'):
- if not self.map['interfaces'].has_key(self.in_iface):
-- self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}}
-+ self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
-
- if self.map['interfaces'][self.in_iface]['signals'].has_key(self.in_signal):
- print "ERROR: Some clever service is trying to be cute and has the same signal name in the same interface"
- else:
- self.map['interfaces'][self.in_iface]['signals'][self.in_signal] = (self.in_sig, self.out_sig)
-
--
- self.in_signal = ''
- self.in_sig = ''
-+ self.out_sig = ''
-+ elif (self.in_property and name == 'property'):
-+ if not self.map['interfaces'].has_key(self.in_iface):
-+ self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
-+
-+ if self.map['interfaces'][self.in_iface]['properties'].has_key(self.in_property):
-+ print "ERROR: Some clever service is trying to be cute and has the same property name in the same interface"
-+ else:
-+ self.map['interfaces'][self.in_iface]['properties'][self.in_property] = (self.in_sig, self.out_sig)
-+
-+ self.in_property = ''
-+ self.in_sig = ''
-+ self.out_sig = ''
-
-
- def process_introspection_data(data):
-diff --git a/dfeet/introspect_data.py b/dfeet/introspect_data.py
-index 5540b9a..e4dac89 100644
---- a/dfeet/introspect_data.py
-+++ b/dfeet/introspect_data.py
-@@ -234,6 +234,25 @@ class Signal(Node):
-
- return result
-
-+class Property(Node):
-+ # tree path = (0,x,0,y,2,z)
-+ def __init__(self, model, parent, property, insig):
-+ self.property = property
-+ self.insig = insig
-+
-+ Node.__init__(self, model, parent)
-+
-+ def dbus_call(self, bus, name, *args):
-+ # for testing out properties
-+ # this is not implemented yet
-+ pass
-+
-+ def __str__(self):
-+ result = self.property + '('
-+ result += dbus_utils.sig_to_string(self.insig) + ')'
-+
-+ return result
-+
- class MethodLabel(Node):
- # tree path = (0,x,0,y,0)
- def __init__(self, model, parent):
-@@ -274,6 +293,26 @@ class SignalLabel(Node):
- def __str__(self):
- return self._label
-
-+class PropertyLabel(Node):
-+ # tree path = (0,x,0,y,2)
-+ def __init__(self, model, parent):
-+ Node.__init__(self, model, parent)
-+ self.set_expanded(True)
-+ self._label = 'Properties'
-+
-+ def add(self, data):
-+ property_list = data.keys()
-+ property_list.sort()
-+ for property_name in property_list:
-+ property = Property(self.model, self, property_name, data[property_name])
-+ self._add_child(property, None)
-+
-+ def to_markup_str(self):
-+ return '<b>' + gobject.markup_escape_text(self._label) + '</b>'
-+
-+ def __str__(self):
-+ return self._label
-+
- class Interface(Node):
- # tree path = (0,x,0,y)
- def __init__(self, model, parent, interface):
-@@ -283,6 +322,7 @@ class Interface(Node):
- def add(self, data):
- method_data = data['methods']
- signal_data = data['signals']
-+ property_data = data['properties']
-
- methods = MethodLabel(self.model, self)
- self._add_child(methods, method_data)
-@@ -290,6 +330,9 @@ class Interface(Node):
- signals = SignalLabel(self.model, self)
- self._add_child(signals, signal_data)
-
-+ properties = PropertyLabel(self.model, self)
-+ self._add_child(properties, property_data)
-+
- def __str__(self):
- return self.iface
-
-@@ -367,8 +410,10 @@ class IntrospectData(gtk.GenericTreeModel):
- (0,x,0,y) - interface
- (0,x,0,y,0) - "Methods"
- (0,x,0,y,1) - "Signals"
-+ (0,x,0,y,2) - "Properties"
- (0,x,0,y,0,z) - method signature
- (0,x,0,y,1,z) - signal signature
-+ (0,x,0,y,1,z) - property signature
-
- """
-