Remove eggdbus

PATCH Applied Ross Burton 2 participants 5 messages Jul 19, 2012 – Jul 20, 2012

lore

Share & tools

lore

Ross Burton

author

2012-07-19 12:16 UTC #0 lore raw

cover Remove eggdbus

eggdbus isn't actually used anything anymore, so remove the dependencies and delete the package.

The following changes since commit 09d11c2794f445a4311f6cba3fdd79bfc216abc5:

package_ipk.bbclass: Fix python whitespace (2012-07-19 12:24:50 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/eggdbus

for you to fetch changes up to c45181c5fcaee663c5ade1c81c78efd81fbd9875:

eggdbus: remove, nothing uses it (2012-07-19 13:01:51 +0100)

----------------------------------------------------------------
Ross Burton (3):
libgnome-keyring: remove eggdbus dependency, it has an in-tree copy
polkit: remove dbus-glib and eggdbus dependencies, polkit uses gio for DBus
eggdbus: remove, nothing uses it

 meta/conf/multilib.conf                            |    1 -
 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch    |   34 --------------------
 meta/recipes-core/eggdbus/eggdbus/marshal.patch    |   28 ----------------
 meta/recipes-core/eggdbus/eggdbus_0.6.bb           |   31 ------------------
 meta/recipes-extended/polkit/polkit_0.104.bb       |    4 +--
 .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 +--
 6 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/marshal.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus_0.6.bb

Ross Burton (3):
libgnome-keyring: remove eggdbus dependency, it has an in-tree copy
polkit: remove dbus-glib and eggdbus dependencies, polkit uses gio
for DBus
eggdbus: remove, nothing uses it

 meta/conf/multilib.conf                            |    1 -
 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch    |   34 --------------------
 meta/recipes-core/eggdbus/eggdbus/marshal.patch    |   28 ----------------
 meta/recipes-core/eggdbus/eggdbus_0.6.bb           |   31 ------------------
 meta/recipes-extended/polkit/polkit_0.104.bb       |    4 +--
 .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 +--
 6 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/marshal.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus_0.6.bb

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-19 12:16 UTC #1 lore raw

PATCH 1/3 libgnome-keyring: remove eggdbus dependency, it has an in-tree copy

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb +2 -2

index 53e583e..a6576db 100644
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
                     file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
 
 SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 
-DEPENDS = "dbus eggdbus libgcrypt"
+DEPENDS = "dbus libgcrypt"
 
 EXTRA_OECONF = "--disable-gtk-doc"

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-19 12:16 UTC #2 lore raw

PATCH 2/3 polkit: remove dbus-glib and eggdbus dependencies, polkit uses gio for DBus

In reply to Ross Burton

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-extended/polkit/polkit_0.104.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-extended/polkit/polkit_0.104.bb +2 -2

index 6a8fdd6..2462741 100644
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
                     file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
 
-DEPENDS = "expat dbus-glib eggdbus intltool-native"
+DEPENDS = "expat glib-2.0 intltool-native"
 
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
 
-PR = "r5"
+PR = "r6"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-19 12:16 UTC #3 lore raw

PATCH 3/3 eggdbus: remove, nothing uses it

In reply to Ross Burton

Signed-off-by Ross Burton <[email protected]>

---
 meta/conf/multilib.conf                         |    1 -
 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch |   34 -----------------------
 meta/recipes-core/eggdbus/eggdbus/marshal.patch |   28 -------------------
 meta/recipes-core/eggdbus/eggdbus_0.6.bb        |   31 ---------------------
 4 files changed, 94 deletions(-)
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus/marshal.patch
 delete mode 100644 meta/recipes-core/eggdbus/eggdbus_0.6.bb

meta/conf/multilib.conf +0 -1

index bb21815..2ee4ab2 100644
@@ -127,7 +127,6 @@ BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-eggdbus = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eglibc = " ${MULTILIBS}"

meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch deleted +0 ~~-34~~

deleted file mode 100644
index abd7ff4..0000000
@@ -1,34 +0,0 @@
-Upstream-Status: Inappropriate [configuration] 
-
-Index: eggdbus-0.6/docs/eggdbus/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/docs/eggdbus/Makefile.am
-+++ eggdbus-0.6/docs/eggdbus/Makefile.am
-@@ -87,11 +87,7 @@ HTML_IMAGES = 				\
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=
- 
--if ENABLE_GTK_DOC
--include $(top_srcdir)/gtk-doc.make
--else
- CLEANFILES =
--endif
- 
- CLEANFILES +=   *~				\
- 		eggdbus-scan.*			\
-Index: eggdbus-0.6/docs/tests/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/docs/tests/Makefile.am
-+++ eggdbus-0.6/docs/tests/Makefile.am
-@@ -65,11 +65,7 @@ HTML_IMAGES = 				\
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=
- 
--if ENABLE_GTK_DOC
--include $(top_srcdir)/gtk-doc.make
--else
- CLEANFILES =
--endif
- 
- CLEANFILES +=   *~				\
- 		tests-scan.*			\

meta/recipes-core/eggdbus/eggdbus/marshal.patch deleted +0 ~~-28~~

deleted file mode 100644
index a605a34..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: eggdbus-0.6/src/eggdbus/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/src/eggdbus/Makefile.am
-+++ eggdbus-0.6/src/eggdbus/Makefile.am
-@@ -130,7 +130,7 @@ BUILT_SOURCES =								\
- 	$(NULL)
- 
- eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
--	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool							\
-+	EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool							\
- 		--namespace EggDBus									\
- 		--dbus-namespace org.freedesktop.DBus							\
- 		--interfaces-only									\
-Index: eggdbus-0.6/src/tests/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/src/tests/Makefile.am
-+++ eggdbus-0.6/src/tests/Makefile.am
-@@ -25,7 +25,7 @@ BUILT_SOURCES = 							\
- 	$(NULL)
- 
- test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml
--	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool									\
-+	EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool									\
- 	  --namespace       "Test"										\
- 	  --dbus-namespace  "com.example"									\
- 	  --include-header  testtypes.h										\

meta/recipes-core/eggdbus/eggdbus_0.6.bb deleted +0 ~~-31~~

deleted file mode 100644
index 75f56de..0000000
@@ -1,31 +0,0 @@
-SUMMARY = "An alternative to dbug-glib."
-DESCRIPTION = "An alternative to dbus-glib. It is designed specifically to make it comfortable to work with very large and potentially complex D-Bus services like e.g. DeviceKit-disks"
-HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
-                    file://src/eggdbus/eggdbus.h;md5=6b312aef57ed8d738b3f131ad037d6c2"
-PR = "r3"
-
-DEPENDS = "dbus glib-2.0 dbus-glib eggdbus-native"
-DEPENDS_virtclass-native = "dbus-native glib-2.0-native dbus-glib-native"
-
-BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \
-          file://gtk-doc.patch;apply=yes \
-          "
-
-SRC_URI = "${BASE_SRC_URI} \
-           file://marshal.patch;apply=yes \
-          "
-
-SRC_URI[md5sum] = "0a111faa54dfba2cf432c2c8e8a76e06"
-SRC_URI[sha256sum] = "3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1"
-
-SRC_URI_virtclass-native = "${BASE_SRC_URI}"
-
-inherit autotools
-
-EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html "
-
-BBCLASSEXTEND = "native"
-
-PARALLEL_MAKE = ""

Signature · 1 line

1.7.10

Saul Wold

Applied

2012-07-20 04:15 UTC #4 lore raw

In reply to Ross Burton

Quoted 45 lines · Ross Burton

eggdbus isn't actually used anything anymore, so remove the dependencies and delete the package.
The following changes since commit 09d11c2794f445a4311f6cba3fdd79bfc216abc5:
   package_ipk.bbclass: Fix python whitespace (2012-07-19 12:24:50 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/eggdbus
for you to fetch changes up to c45181c5fcaee663c5ade1c81c78efd81fbd9875:
eggdbus: remove, nothing uses it (2012-07-19 13:01:51 +0100)
----------------------------------------------------------------
Ross Burton (3):
libgnome-keyring: remove eggdbus dependency, it has an in-tree copy
polkit: remove dbus-glib and eggdbus dependencies, polkit uses gio for DBus
eggdbus: remove, nothing uses it
  meta/conf/multilib.conf                            |    1 -
  meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch    |   34 --------------------
  meta/recipes-core/eggdbus/eggdbus/marshal.patch    |   28 ----------------
  meta/recipes-core/eggdbus/eggdbus_0.6.bb           |   31 ------------------
  meta/recipes-extended/polkit/polkit_0.104.bb       |    4 +--
  .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 +--
  6 files changed, 4 insertions(+), 98 deletions(-)
delete mode 100644 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch delete mode 100644 meta/recipes-core/eggdbus/eggdbus/marshal.patch delete mode 100644 meta/recipes-core/eggdbus/eggdbus_0.6.bb
Ross Burton (3):
libgnome-keyring: remove eggdbus dependency, it has an in-tree copy
polkit: remove dbus-glib and eggdbus dependencies, polkit uses gio
for DBus
eggdbus: remove, nothing uses it
  meta/conf/multilib.conf                            |    1 -
  meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch    |   34 --------------------
  meta/recipes-core/eggdbus/eggdbus/marshal.patch    |   28 ----------------
  meta/recipes-core/eggdbus/eggdbus_0.6.bb           |   31 ------------------
  meta/recipes-extended/polkit/polkit_0.104.bb       |    4 +--
  .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb |    4 +--
  6 files changed, 4 insertions(+), 98 deletions(-)

Quoted 4 lines

delete mode 100644 meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch delete mode 100644 meta/recipes-core/eggdbus/eggdbus/marshal.patch delete mode 100644 meta/recipes-core/eggdbus/eggdbus_0.6.bb

Merged into OE-Core

Nice cleanup!

Thanks
Sau!