From 9e1d7a09fbe5ba368b4088bea40eae7b548d0ab3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 1 Mar 2011 09:46:49 -0700 Subject: avahi: Drop older versions We drop a number of un-pinned older versions and clean up slightly the files directory. Signed-off-by: Tom Rini --- .../avahi/avahi-python/configure-check-pymod.patch | 27 ++++++++++++++ .../avahi-python/dbus-pre-1.1.1-support.patch | 17 +++++++++ recipes/avahi/avahi-ui_0.6.21.bb | 23 ------------ recipes/avahi/avahi_0.6.19.bb | 5 --- recipes/avahi/avahi_0.6.21.bb | 9 ----- recipes/avahi/avahi_0.6.22.bb | 9 ----- recipes/avahi/avahi_0.6.23.bb | 9 ----- recipes/avahi/avahi_0.6.24.bb | 10 ------ recipes/avahi/files/avr32-ipv6-fix.patch | 42 ---------------------- recipes/avahi/files/configure-check-pymod.patch | 27 -------------- recipes/avahi/files/dbus-pre-1.1.1-support.patch | 17 --------- 11 files changed, 44 insertions(+), 151 deletions(-) create mode 100644 recipes/avahi/avahi-python/configure-check-pymod.patch create mode 100644 recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch delete mode 100644 recipes/avahi/avahi-ui_0.6.21.bb delete mode 100644 recipes/avahi/avahi_0.6.19.bb delete mode 100644 recipes/avahi/avahi_0.6.21.bb delete mode 100644 recipes/avahi/avahi_0.6.22.bb delete mode 100644 recipes/avahi/avahi_0.6.23.bb delete mode 100644 recipes/avahi/avahi_0.6.24.bb delete mode 100644 recipes/avahi/files/avr32-ipv6-fix.patch delete mode 100644 recipes/avahi/files/configure-check-pymod.patch delete mode 100644 recipes/avahi/files/dbus-pre-1.1.1-support.patch (limited to 'recipes') diff --git a/recipes/avahi/avahi-python/configure-check-pymod.patch b/recipes/avahi/avahi-python/configure-check-pymod.patch new file mode 100644 index 0000000000..e2df5d6fc0 --- /dev/null +++ b/recipes/avahi/avahi-python/configure-check-pymod.patch @@ -0,0 +1,27 @@ +Index: avahi-0.6.21/configure.ac +=================================================================== +--- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200 ++++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200 +@@ -700,10 +700,6 @@ + esac], + [HAVE_PYGTK=yes]) + +- if test "x$HAVE_PYGTK" = "xyes" ; then +- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)]) +- fi +- + + if test "x$HAVE_DBUS" = "xyes" ; then + AC_ARG_ENABLE(python-dbus, +@@ -715,11 +711,6 @@ + esac], + [HAVE_PYTHON_DBUS=yes]) + +- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then +- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) +- fi +- +- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) + if test "x$HAVE_GDBM" = "xyes"; then + AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) + fi diff --git a/recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch b/recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch new file mode 100644 index 0000000000..a92fb82710 --- /dev/null +++ b/recipes/avahi/avahi-python/dbus-pre-1.1.1-support.patch @@ -0,0 +1,17 @@ +http://avahi.org/changeset/1518 + +Index: trunk/avahi-common/dbus-watch-glue.c +=================================================================== +--- trunk/avahi-common/dbus-watch-glue.c (revision 1507) ++++ trunk/avahi-common/dbus-watch-glue.c (revision 1518) +@@ -135,5 +135,9 @@ + if (!(avahi_watch = poll_api->watch_new( + poll_api, ++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) + dbus_watch_get_unix_fd(dbus_watch), ++#else ++ dbus_watch_get_fd(dbus_watch), ++#endif + translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)), + watch_callback, + diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb deleted file mode 100644 index e3e5e5be99..0000000000 --- a/recipes/avahi/avahi-ui_0.6.21.bb +++ /dev/null @@ -1,23 +0,0 @@ -require avahi.inc -PR = "${INC_PR}.0" - -DEPENDS += "avahi gtk+" - -SRC_URI += "file://dbus-pre-1.1.1-support.patch" -AVAHI_GTK = "--enable-gtk" - -S = "${WORKDIR}/avahi-${PV}" - -do_stage() { - install -d ${STAGING_INCDIR}/avahi-ui - cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/ - oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR} -} - -PACKAGES = "${PN} ${PN}-dbg" - -FILES_${PN} = "${libdir}/libavahi-ui*.so.*" -FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" - -SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9" -SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561" diff --git a/recipes/avahi/avahi_0.6.19.bb b/recipes/avahi/avahi_0.6.19.bb deleted file mode 100644 index 6a6825c4e3..0000000000 --- a/recipes/avahi/avahi_0.6.19.bb +++ /dev/null @@ -1,5 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" -SRC_URI[md5sum] = "a06782435d1c994ecd00a66e95a5d9d4" -SRC_URI[sha256sum] = "a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a" diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb deleted file mode 100644 index 5372334336..0000000000 --- a/recipes/avahi/avahi_0.6.21.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://dbus-pre-1.1.1-support.patch" -SRC_URI += "file://avr32-ipv6-fix.patch" - -SRC_URI[md5sum] = "9cc68f79c50c9dd9e419990c3c9b05b9" -SRC_URI[sha256sum] = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561" diff --git a/recipes/avahi/avahi_0.6.22.bb b/recipes/avahi/avahi_0.6.22.bb deleted file mode 100644 index 6e9608ae19..0000000000 --- a/recipes/avahi/avahi_0.6.22.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -DEPENDS += "intltool-native" -PR = "${INC_PR}.0" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "c84b1a8a23126e188426728710414dc8" -SRC_URI[sha256sum] = "9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52" diff --git a/recipes/avahi/avahi_0.6.23.bb b/recipes/avahi/avahi_0.6.23.bb deleted file mode 100644 index abf0fbf3d9..0000000000 --- a/recipes/avahi/avahi_0.6.23.bb +++ /dev/null @@ -1,9 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "aab1a304851d8145ea5f6a85c10af9e9" -SRC_URI[sha256sum] = "dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb deleted file mode 100644 index 786f58ffdc..0000000000 --- a/recipes/avahi/avahi_0.6.24.bb +++ /dev/null @@ -1,10 +0,0 @@ -require avahi.inc - -PR = "${INC_PR}.0" - -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "068c1d220b07037e64caf87d4a7a0504" -SRC_URI[sha256sum] = "260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950" diff --git a/recipes/avahi/files/avr32-ipv6-fix.patch b/recipes/avahi/files/avr32-ipv6-fix.patch deleted file mode 100644 index f0710a1002..0000000000 --- a/recipes/avahi/files/avr32-ipv6-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- /tmp/socket.c 2007-09-14 14:03:01.395330465 +0200 -+++ avahi-0.6.21/avahi-core/socket.c 2007-09-14 14:08:42.081140297 +0200 -@@ -66,6 +66,39 @@ - #endif - #endif - -+#define IPV6_ADDRFORM 1 -+#define IPV6_2292PKTINFO 2 -+#define IPV6_2292HOPOPTS 3 -+#define IPV6_2292DSTOPTS 4 -+#define IPV6_2292RTHDR 5 -+#define IPV6_2292PKTOPTIONS 6 -+#define IPV6_CHECKSUM 7 -+#define IPV6_2292HOPLIMIT 8 -+#define IPV6_NEXTHOP 9 -+#define IPV6_AUTHHDR 10 /* obsolete */ -+#define IPV6_FLOWINFO 11 -+ -+#define IPV6_UNICAST_HOPS 16 -+#define IPV6_MULTICAST_IF 17 -+#define IPV6_MULTICAST_HOPS 18 -+#define IPV6_MULTICAST_LOOP 19 -+#define IPV6_ADD_MEMBERSHIP 20 -+#define IPV6_DROP_MEMBERSHIP 21 -+#define IPV6_ROUTER_ALERT 22 -+#define IPV6_MTU_DISCOVER 23 -+#define IPV6_MTU 24 -+#define IPV6_RECVERR 25 -+#define IPV6_V6ONLY 26 -+#define IPV6_JOIN_ANYCAST 27 -+#define IPV6_LEAVE_ANYCAST 28 -+ -+/* IPV6_MTU_DISCOVER values */ -+#define IPV6_PMTUDISC_DONT 0 -+#define IPV6_PMTUDISC_WANT 1 -+#define IPV6_PMTUDISC_DO 2 -+#define IPV6_PMTUDISC_PROBE 3 -+ -+ - static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) { - assert(ret_sa); - diff --git a/recipes/avahi/files/configure-check-pymod.patch b/recipes/avahi/files/configure-check-pymod.patch deleted file mode 100644 index e2df5d6fc0..0000000000 --- a/recipes/avahi/files/configure-check-pymod.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: avahi-0.6.21/configure.ac -=================================================================== ---- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200 -+++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200 -@@ -700,10 +700,6 @@ - esac], - [HAVE_PYGTK=yes]) - -- if test "x$HAVE_PYGTK" = "xyes" ; then -- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)]) -- fi -- - - if test "x$HAVE_DBUS" = "xyes" ; then - AC_ARG_ENABLE(python-dbus, -@@ -715,11 +711,6 @@ - esac], - [HAVE_PYTHON_DBUS=yes]) - -- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then -- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) -- fi -- -- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) - if test "x$HAVE_GDBM" = "xyes"; then - AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) - fi diff --git a/recipes/avahi/files/dbus-pre-1.1.1-support.patch b/recipes/avahi/files/dbus-pre-1.1.1-support.patch deleted file mode 100644 index a92fb82710..0000000000 --- a/recipes/avahi/files/dbus-pre-1.1.1-support.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://avahi.org/changeset/1518 - -Index: trunk/avahi-common/dbus-watch-glue.c -=================================================================== ---- trunk/avahi-common/dbus-watch-glue.c (revision 1507) -+++ trunk/avahi-common/dbus-watch-glue.c (revision 1518) -@@ -135,5 +135,9 @@ - if (!(avahi_watch = poll_api->watch_new( - poll_api, -+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) - dbus_watch_get_unix_fd(dbus_watch), -+#else -+ dbus_watch_get_fd(dbus_watch), -+#endif - translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)), - watch_callback, - -- cgit 1.2.3-korg