diff options
6 files changed, 0 insertions, 176 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 531f7291c1..7d5a41adfc 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | |||
| @@ -118,7 +118,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ | |||
| 118 | diffutils \ | 118 | diffutils \ |
| 119 | elfutils \ | 119 | elfutils \ |
| 120 | expat \ | 120 | expat \ |
| 121 | gamin \ | ||
| 122 | gawk \ | 121 | gawk \ |
| 123 | gdbm \ | 122 | gdbm \ |
| 124 | gettext \ | 123 | gettext \ |
diff --git a/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch b/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch deleted file mode 100644 index c4300ca6a0..0000000000 --- a/meta/recipes-extended/gamin/gamin-0.1.10/obsolete_automake_macros.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=693449] | ||
| 2 | |||
| 3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
| 4 | diff -Nurd gamin-0.1.10/configure.in gamin-0.1.10/configure.in | ||
| 5 | --- gamin-0.1.10/configure.in 2008-11-24 17:23:06.000000000 +0200 | ||
| 6 | +++ gamin-0.1.10/configure.in 2013-02-08 23:11:59.656279992 +0200 | ||
| 7 | @@ -1,7 +1,7 @@ | ||
| 8 | dnl Process this file with autoconf to produce a configure script. | ||
| 9 | AC_PREREQ(2.52) | ||
| 10 | AC_INIT(libgamin) | ||
| 11 | -AM_CONFIG_HEADER(config.h) | ||
| 12 | +AC_CONFIG_HEADERS(config.h) | ||
| 13 | AC_CANONICAL_SYSTEM | ||
| 14 | |||
| 15 | # get any external flags setting before we start playing with the CFLAGS variable | ||
| 16 | @@ -31,7 +31,6 @@ | ||
| 17 | |||
| 18 | AC_USE_SYSTEM_EXTENSIONS | ||
| 19 | AC_PROG_CC | ||
| 20 | -AM_PROG_CC_STDC | ||
| 21 | AC_HEADER_STDC | ||
| 22 | AC_PROG_INSTALL | ||
| 23 | AC_PROG_MAKE_SET | ||
diff --git a/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch b/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch deleted file mode 100644 index cddf2dc93d..0000000000 --- a/meta/recipes-extended/gamin/gamin/no-abstract-sockets.patch +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | --- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 | ||
| 4 | +++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 | ||
| 5 | @@ -354,51 +354,6 @@ | ||
| 6 | AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) | ||
| 7 | fi | ||
| 8 | |||
| 9 | -#### Abstract sockets | ||
| 10 | - | ||
| 11 | -AC_MSG_CHECKING(abstract socket namespace) | ||
| 12 | -AC_LANG_PUSH(C) | ||
| 13 | -AC_RUN_IFELSE([AC_LANG_PROGRAM( | ||
| 14 | -[[ | ||
| 15 | -#include <sys/types.h> | ||
| 16 | -#include <stdlib.h> | ||
| 17 | -#include <string.h> | ||
| 18 | -#include <stdio.h> | ||
| 19 | -#include <sys/socket.h> | ||
| 20 | -#include <sys/un.h> | ||
| 21 | -#include <errno.h> | ||
| 22 | -]], | ||
| 23 | -[[ | ||
| 24 | - int listen_fd; | ||
| 25 | - struct sockaddr_un addr; | ||
| 26 | - | ||
| 27 | - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); | ||
| 28 | - | ||
| 29 | - if (listen_fd < 0) | ||
| 30 | - { | ||
| 31 | - fprintf (stderr, "socket() failed: %s\n", strerror (errno)); | ||
| 32 | - exit (1); | ||
| 33 | - } | ||
| 34 | - | ||
| 35 | - memset (&addr, '\0', sizeof (addr)); | ||
| 36 | - addr.sun_family = AF_UNIX; | ||
| 37 | - strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); | ||
| 38 | - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ | ||
| 39 | - | ||
| 40 | - if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) | ||
| 41 | - { | ||
| 42 | - fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", | ||
| 43 | - strerror (errno)); | ||
| 44 | - exit (1); | ||
| 45 | - } | ||
| 46 | - else | ||
| 47 | - exit (0); | ||
| 48 | -]])], | ||
| 49 | - [have_abstract_sockets=yes], | ||
| 50 | - [have_abstract_sockets=no]) | ||
| 51 | -AC_LANG_POP(C) | ||
| 52 | -AC_MSG_RESULT($have_abstract_sockets) | ||
| 53 | - | ||
| 54 | if test x$enable_abstract_sockets = xyes; then | ||
| 55 | if test x$have_abstract_sockets = xno; then | ||
| 56 | AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) | ||
diff --git a/meta/recipes-extended/gamin/gamin/noconst.patch b/meta/recipes-extended/gamin/gamin/noconst.patch deleted file mode 100644 index 7b2998c279..0000000000 --- a/meta/recipes-extended/gamin/gamin/noconst.patch +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid | ||
| 2 | build failures. | ||
| 3 | |||
| 4 | RP 2011/10/12 | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Index: gamin-0.1.10/server/gam_node.c | ||
| 9 | =================================================================== | ||
| 10 | --- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 | ||
| 11 | +++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 | ||
| 12 | @@ -122,7 +122,7 @@ | ||
| 13 | * it has finished with the string. If it must keep it longer, it | ||
| 14 | * should makes its own copy. The returned string must not be freed. | ||
| 15 | */ | ||
| 16 | -G_CONST_RETURN char * | ||
| 17 | +const char * | ||
| 18 | gam_node_get_path(GamNode * node) | ||
| 19 | { | ||
| 20 | g_assert(node); | ||
| 21 | Index: gamin-0.1.10/server/gam_node.h | ||
| 22 | =================================================================== | ||
| 23 | --- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 | ||
| 24 | +++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 | ||
| 25 | @@ -58,7 +58,7 @@ | ||
| 26 | void gam_node_set_is_dir (GamNode *node, | ||
| 27 | gboolean is_dir); | ||
| 28 | |||
| 29 | -G_CONST_RETURN char *gam_node_get_path (GamNode *node); | ||
| 30 | +const char *gam_node_get_path (GamNode *node); | ||
| 31 | |||
| 32 | GList *gam_node_get_subscriptions (GamNode *node); | ||
| 33 | |||
| 34 | Index: gamin-0.1.10/server/gam_subscription.c | ||
| 35 | =================================================================== | ||
| 36 | --- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 | ||
| 37 | +++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 | ||
| 38 | @@ -141,7 +141,7 @@ | ||
| 39 | * @param sub the GamSubscription | ||
| 40 | * @returns The path being monitored. It should not be freed. | ||
| 41 | */ | ||
| 42 | -G_CONST_RETURN char * | ||
| 43 | +const char * | ||
| 44 | gam_subscription_get_path(GamSubscription * sub) | ||
| 45 | { | ||
| 46 | if (sub == NULL) | ||
| 47 | Index: gamin-0.1.10/server/gam_subscription.h | ||
| 48 | =================================================================== | ||
| 49 | --- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 | ||
| 50 | +++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 | ||
| 51 | @@ -21,7 +21,7 @@ | ||
| 52 | |||
| 53 | int gam_subscription_get_reqno (GamSubscription *sub); | ||
| 54 | |||
| 55 | -G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); | ||
| 56 | +const char *gam_subscription_get_path (GamSubscription *sub); | ||
| 57 | |||
| 58 | GamListener *gam_subscription_get_listener (GamSubscription *sub); | ||
| 59 | |||
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb deleted file mode 100644 index 375d265f57..0000000000 --- a/meta/recipes-extended/gamin/gamin_0.1.10.bb +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | SUMMARY = "Gamin the File Alteration Monitor" | ||
| 2 | DESCRIPTION = "Gamin is a file and directory monitoring system defined to \ | ||
| 3 | be a subset of the FAM (File Alteration Monitor) system." | ||
| 4 | HOMEPAGE = "http://people.gnome.org/~veillard/gamin/" | ||
| 5 | |||
| 6 | LICENSE = "LGPLv2+" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62" | ||
| 8 | |||
| 9 | DEPENDS = "glib-2.0" | ||
| 10 | PROVIDES = "fam" | ||
| 11 | PR = "r5" | ||
| 12 | |||
| 13 | SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ | ||
| 14 | file://no-abstract-sockets.patch \ | ||
| 15 | file://noconst.patch \ | ||
| 16 | file://obsolete_automake_macros.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028" | ||
| 20 | SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1" | ||
| 21 | |||
| 22 | inherit autotools pkgconfig | ||
| 23 | |||
| 24 | EXTRA_OECONF = "--without-python" | ||
| 25 | |||
| 26 | PACKAGES += "lib${BPN} lib${BPN}-dev" | ||
| 27 | FILES_${PN} = "${libexecdir}" | ||
| 28 | FILES_${PN}-dbg += "${libexecdir}/.debug" | ||
| 29 | FILES_lib${BPN} = "${libdir}/lib*.so.*" | ||
| 30 | FILES_lib${BPN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ | ||
| 31 | ${libdir}/lib*.a ${libdir}/lib*.so" | ||
| 32 | |||
| 33 | RDEPENDS_lib${BPN} = "${PN}" | ||
| 34 | |||
| 35 | LEAD_SONAME = "libgamin-1.so" | ||
| 36 | |||
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 3cb23051f8..ce823858ce 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
| @@ -55,7 +55,6 @@ RDEPENDS_packagegroup-core-lsb = "\ | |||
| 55 | RDEPENDS_packagegroup-core-sys-extended = "\ | 55 | RDEPENDS_packagegroup-core-sys-extended = "\ |
| 56 | curl \ | 56 | curl \ |
| 57 | dhcp-client \ | 57 | dhcp-client \ |
| 58 | gamin \ | ||
| 59 | hdparm \ | 58 | hdparm \ |
| 60 | lighttpd \ | 59 | lighttpd \ |
| 61 | libaio \ | 60 | libaio \ |
