diff --git a/.checkpackageignore b/.checkpackageignore index 760ae29cfb..bd93f87dfb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -562,9 +562,6 @@ package/ftop/0001-overflow.patch lib_patch.Upstream package/fwts/0001-build-do-not-use-Werror.patch lib_patch.Upstream package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch lib_patch.Upstream package/fxload/0001-fix-static-build.patch lib_patch.Upstream -package/gamin/0001-no-abstract-sockets.patch lib_patch.Upstream -package/gamin/0002-no-const-return.patch lib_patch.Sob lib_patch.Upstream -package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch lib_patch.Upstream package/gcc/12.4.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream package/gcc/14.1.0/0001-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 414a14944e..94ac60b668 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_GAMIN + bool "gamin package removed" + select BR2_LEGACY + help + The gamin package was removed as it is not maintained + anymore (no commit since 2016). + config BR2_PACKAGE_CAIRO_SVG bool "cairo svg support" select BR2_LEGACY diff --git a/package/gamin/0001-no-abstract-sockets.patch b/package/gamin/0001-no-abstract-sockets.patch deleted file mode 100644 index 3d659015ec..0000000000 --- a/package/gamin/0001-no-abstract-sockets.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH]: Remove abstract socket namespace check breaking cross compilation - -Taken from openembedded: - -http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/gamin/files/no-abstract-sockets.patch - -Signed-off-by: Peter Korsgaard ---- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 -+++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 -@@ -354,51 +354,6 @@ - AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) - fi - --#### Abstract sockets -- --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include --#include --#include --#include --#include --#include --#include --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) --AC_MSG_RESULT($have_abstract_sockets) -- - if test x$enable_abstract_sockets = xyes; then - if test x$have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) diff --git a/package/gamin/0002-no-const-return.patch b/package/gamin/0002-no-const-return.patch deleted file mode 100644 index 3e6e905214..0000000000 --- a/package/gamin/0002-no-const-return.patch +++ /dev/null @@ -1,57 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -Upstream-Status: Pending - -Index: gamin-0.1.10/server/gam_node.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 -+++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 -@@ -122,7 +122,7 @@ - * it has finished with the string. If it must keep it longer, it - * should makes its own copy. The returned string must not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_node_get_path(GamNode * node) - { - g_assert(node); -Index: gamin-0.1.10/server/gam_node.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 -+++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 -@@ -58,7 +58,7 @@ - void gam_node_set_is_dir (GamNode *node, - gboolean is_dir); - --G_CONST_RETURN char *gam_node_get_path (GamNode *node); -+const char *gam_node_get_path (GamNode *node); - - GList *gam_node_get_subscriptions (GamNode *node); - -Index: gamin-0.1.10/server/gam_subscription.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 -+++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 -@@ -141,7 +141,7 @@ - * @param sub the GamSubscription - * @returns The path being monitored. It should not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_subscription_get_path(GamSubscription * sub) - { - if (sub == NULL) -Index: gamin-0.1.10/server/gam_subscription.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 -+++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 -@@ -21,7 +21,7 @@ - - int gam_subscription_get_reqno (GamSubscription *sub); - --G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); -+const char *gam_subscription_get_path (GamSubscription *sub); - - GamListener *gam_subscription_get_listener (GamSubscription *sub); - diff --git a/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch b/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch deleted file mode 100644 index b5f2e6c521..0000000000 --- a/package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix missing PTHREAD_MUTEX_RECURSIVE_NP - -The musl C library does not provide the non portable -PTHREAD_MUTEX_RECURSIVE_NP. In addition, uClibc does not define it as -a #define, but as an enum value, so doing a #if defined() check -doesn't work properly. Instead, add a AC_CHECK_DECL() autoconf check. - -Signed-off-by: Baruch Siach -[Thomas: switch to an autoconf check.] -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -294,6 +294,10 @@ - AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)]) - AC_DEFINE([HAVE_PTHREAD_H], [], [Define if is there]) - WITH_THREADS="1"])) -+ -+ AC_CHECK_DECL([PTHREAD_MUTEX_RECURSIVE_NP], -+ [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], [], [whether HAVE_PTHREAD_MUTEX_RECURSIVE_NP is defined])], -+ [], [#include ]) - fi - - dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps -Index: b/libgamin/gam_data.c -=================================================================== ---- a/libgamin/gam_data.c -+++ b/libgamin/gam_data.c -@@ -470,7 +470,7 @@ - } - if (is_threaded > 0) { - pthread_mutexattr_init(&attr); --#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) -+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - #else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package/gamin/Config.in b/package/gamin/Config.in deleted file mode 100644 index 55e037a4a4..0000000000 --- a/package/gamin/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_GAMIN - bool "gamin" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - the File Alteration Monitor - - http://www.gnome.org/~veillard/gamin/sources - -comment "gamin needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gamin/gamin.hash b/package/gamin/gamin.hash deleted file mode 100644 index e28660dded..0000000000 --- a/package/gamin/gamin.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 gamin-0.1.10.tar.gz -sha256 7f9ffc38883325f011f331a9d6074ffd0175fbcecd57f69c577fb3845f333876 COPYING diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk deleted file mode 100644 index 4621b1646f..0000000000 --- a/package/gamin/gamin.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# gamin -# -################################################################################ - -GAMIN_VERSION = 0.1.10 -GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources -GAMIN_AUTORECONF = YES -GAMIN_INSTALL_STAGING = YES -GAMIN_LICENSE = LGPL-2.0+ -GAMIN_LICENSE_FILES = COPYING - -# python support broken -GAMIN_CONF_OPTS += --without-python - -GAMIN_CONF_ENV = have_abstract_sockets=no - -GAMIN_DEPENDENCIES = libglib2 - -$(eval $(autotools-package)) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 5536b6b121..ec0ffd70bf 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -79,13 +79,6 @@ else SAMBA4_CONF_OPTS += --disable-avahi endif -ifeq ($(BR2_PACKAGE_GAMIN),y) -SAMBA4_CONF_OPTS += --with-fam -SAMBA4_DEPENDENCIES += gamin -else -SAMBA4_CONF_OPTS += --without-fam -endif - ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) SAMBA4_CONF_OPTS += --with-libarchive SAMBA4_DEPENDENCIES += libarchive @@ -139,6 +132,7 @@ define SAMBA4_CONFIGURE_CMDS --disable-rpath \ --disable-rpath-install \ --disable-iprint \ + --without-fam \ --without-pam \ --without-dmapi \ --without-gpgme \