diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/multilib.conf | 1 | ||||
-rw-r--r-- | meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch | 34 | ||||
-rw-r--r-- | meta/recipes-core/eggdbus/eggdbus/marshal.patch | 28 | ||||
-rw-r--r-- | meta/recipes-core/eggdbus/eggdbus_0.6.bb | 31 |
4 files changed, 0 insertions, 94 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index bb21815d0f..2ee4ab2794 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
@@ -127,7 +127,6 @@ BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}" | |||
127 | BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}" | 127 | BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}" |
128 | BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}" | 128 | BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}" |
129 | BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}" | 129 | BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}" |
130 | BBCLASSEXTEND_append_pn-eggdbus = " ${MULTILIBS}" | ||
131 | BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}" | 130 | BBCLASSEXTEND_append_pn-eglibc-initial = " ${MULTILIBS}" |
132 | BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}" | 131 | BBCLASSEXTEND_append_pn-eglibc-locale = " ${MULTILIBS}" |
133 | BBCLASSEXTEND_append_pn-eglibc = " ${MULTILIBS}" | 132 | BBCLASSEXTEND_append_pn-eglibc = " ${MULTILIBS}" |
diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch deleted file mode 100644 index abd7ff4166..0000000000 --- a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: eggdbus-0.6/docs/eggdbus/Makefile.am | ||
4 | =================================================================== | ||
5 | --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am | ||
6 | +++ eggdbus-0.6/docs/eggdbus/Makefile.am | ||
7 | @@ -87,11 +87,7 @@ HTML_IMAGES = \ | ||
8 | # Extra options to supply to gtkdoc-fixref | ||
9 | FIXXREF_OPTIONS= | ||
10 | |||
11 | -if ENABLE_GTK_DOC | ||
12 | -include $(top_srcdir)/gtk-doc.make | ||
13 | -else | ||
14 | CLEANFILES = | ||
15 | -endif | ||
16 | |||
17 | CLEANFILES += *~ \ | ||
18 | eggdbus-scan.* \ | ||
19 | Index: eggdbus-0.6/docs/tests/Makefile.am | ||
20 | =================================================================== | ||
21 | --- eggdbus-0.6.orig/docs/tests/Makefile.am | ||
22 | +++ eggdbus-0.6/docs/tests/Makefile.am | ||
23 | @@ -65,11 +65,7 @@ HTML_IMAGES = \ | ||
24 | # Extra options to supply to gtkdoc-fixref | ||
25 | FIXXREF_OPTIONS= | ||
26 | |||
27 | -if ENABLE_GTK_DOC | ||
28 | -include $(top_srcdir)/gtk-doc.make | ||
29 | -else | ||
30 | CLEANFILES = | ||
31 | -endif | ||
32 | |||
33 | CLEANFILES += *~ \ | ||
34 | tests-scan.* \ | ||
diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch deleted file mode 100644 index a605a34c8e..0000000000 --- a/meta/recipes-core/eggdbus/eggdbus/marshal.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: eggdbus-0.6/src/eggdbus/Makefile.am | ||
4 | =================================================================== | ||
5 | --- eggdbus-0.6.orig/src/eggdbus/Makefile.am | ||
6 | +++ eggdbus-0.6/src/eggdbus/Makefile.am | ||
7 | @@ -130,7 +130,7 @@ BUILT_SOURCES = \ | ||
8 | $(NULL) | ||
9 | |||
10 | 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 | ||
11 | - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ | ||
12 | + EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ | ||
13 | --namespace EggDBus \ | ||
14 | --dbus-namespace org.freedesktop.DBus \ | ||
15 | --interfaces-only \ | ||
16 | Index: eggdbus-0.6/src/tests/Makefile.am | ||
17 | =================================================================== | ||
18 | --- eggdbus-0.6.orig/src/tests/Makefile.am | ||
19 | +++ eggdbus-0.6/src/tests/Makefile.am | ||
20 | @@ -25,7 +25,7 @@ BUILT_SOURCES = \ | ||
21 | $(NULL) | ||
22 | |||
23 | 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 | ||
24 | - EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ | ||
25 | + EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ | ||
26 | --namespace "Test" \ | ||
27 | --dbus-namespace "com.example" \ | ||
28 | --include-header testtypes.h \ | ||
diff --git a/meta/recipes-core/eggdbus/eggdbus_0.6.bb b/meta/recipes-core/eggdbus/eggdbus_0.6.bb deleted file mode 100644 index 75f56def4c..0000000000 --- a/meta/recipes-core/eggdbus/eggdbus_0.6.bb +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | SUMMARY = "An alternative to dbug-glib." | ||
2 | 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" | ||
3 | HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus" | ||
4 | LICENSE = "LGPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ | ||
6 | file://src/eggdbus/eggdbus.h;md5=6b312aef57ed8d738b3f131ad037d6c2" | ||
7 | PR = "r3" | ||
8 | |||
9 | DEPENDS = "dbus glib-2.0 dbus-glib eggdbus-native" | ||
10 | DEPENDS_virtclass-native = "dbus-native glib-2.0-native dbus-glib-native" | ||
11 | |||
12 | BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \ | ||
13 | file://gtk-doc.patch;apply=yes \ | ||
14 | " | ||
15 | |||
16 | SRC_URI = "${BASE_SRC_URI} \ | ||
17 | file://marshal.patch;apply=yes \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[md5sum] = "0a111faa54dfba2cf432c2c8e8a76e06" | ||
21 | SRC_URI[sha256sum] = "3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1" | ||
22 | |||
23 | SRC_URI_virtclass-native = "${BASE_SRC_URI}" | ||
24 | |||
25 | inherit autotools | ||
26 | |||
27 | EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html " | ||
28 | |||
29 | BBCLASSEXTEND = "native" | ||
30 | |||
31 | PARALLEL_MAKE = "" | ||