commit: 826f0634056864f68df22ab8e2d50cf9a13e7eb7 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Tue Jan 28 21:41:15 2025 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Tue Jan 28 21:41:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826f0634
media-libs/hamlib: Drop broken LUA support Closes: https://bugs.gentoo.org/941718 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> media-libs/hamlib/files/hamlib-drop-lua.patch | 88 ++++++++++++++++++++++ ...mlib-4.5.5-r3.ebuild => hamlib-4.5.5-r4.ebuild} | 3 +- media-libs/hamlib/hamlib-4.6.1.ebuild | 2 + 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/media-libs/hamlib/files/hamlib-drop-lua.patch b/media-libs/hamlib/files/hamlib-drop-lua.patch new file mode 100644 index 000000000000..aae145c0ddeb --- /dev/null +++ b/media-libs/hamlib/files/hamlib-drop-lua.patch @@ -0,0 +1,88 @@ +diff --git a/configure.ac b/configure.ac +index 609db45..fe0ad42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -666,34 +666,6 @@ AC_SUBST([TCL_LIBS]) + AC_SUBST([TCL_CFLAGS]) + + +-dnl Check for lua availability, so we can enable HamlibLua +-# Lua bindings +-AC_MSG_CHECKING([whether to build lua binding]) +-AC_ARG_WITH([lua-binding], +- [AS_HELP_STRING([--with-lua-binding], +- [build lua binding @<:@default=no@:>@])], +- [cf_with_lua_binding=$withval], +- [cf_with_lua_binding=no]) +-AC_MSG_RESULT([$cf_with_lua_binding]) +- +-dnl AX_LUA_DEVEL from macros/ax_lua_devel.m4 +-AS_IF([test x"${cf_with_lua_binding}" = "xyes"],[ +- +- AX_PROG_LUA([5.2], [5.5]) +- AX_LUA_HEADERS +- AX_LUA_LIBS +- +- BINDING_LIST="${BINDING_LIST} lua" +- BINDING_ALL="${BINDING_ALL} all-lua" +- BINDING_CHECK="${BINDING_CHECK} check-lua" +- BINDING_CLEAN="${BINDING_CLEAN} clean-lua" +- BINDING_DISTCLEAN="${BINDING_DISTCLEAN} distclean-lua" +- BINDING_INSTALL_EXEC="${BINDING_INSTALL_EXEC} install-lua" +- BINDING_UNINSTALL="${BINDING_UNINSTALL} uninstall-lua" +- BINDING_LIB_TARGETS="${BINDING_LIB_TARGETS} \$(lua_ltlib)"]) +- +-AM_CONDITIONAL([ENABLE_LUA], [test x"${cf_with_lua_binding}" = "xyes"]) +- + + dnl Only search for Swig if one or more bindings are enabled. + AS_IF([test "x${BINDING_ALL}" != "x"], +diff --git a/bindings/Makefile.am b/bindings/Makefile.am +index fa75abc..75319ff 100644 +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -191,44 +191,7 @@ uninstall-tcl: + endif + # TCL + +-if ENABLE_LUA +-########################################## +-# Lua binding +- +-luaexec_ltlib = Hamliblua.la +- +-MOSTLYCLEANFILES += hamliblua_wrap.c +-BUILT_SOURCES += hamliblua_wrap.c +-example_DATA += luatest.lua +- +-nodist_luaexec_LUA = Hamlib.lua +-nodist_Hamliblua_la_SOURCES = hamliblua_wrap.c +- +-Hamliblua_la_CPPFLAGS = $(LUA_INCLUDE) -I$(top_srcdir)/include -I$(top_srcdir)/src +-Hamliblua_la_LDFLAGS = -no-undefined -module -avoid-version +-Hamliblua_la_LIBADD = $(top_builddir)/src/libhamlib.la +-Hamliblua_ladir = $(luaexecdir) +-Hamliblua_la_LTLIBRARIES = $(luaexec_ltlib) +- +-all-lua: $(luaexec_ltlib) + +-check-lua: all-lua +- $(AM_V_at)LUA_CPATH="$(abs_builddir)/.libs/?.so" $(LUA) $(srcdir)/luatest.lua \ +- || echo "Lua test failed" 1>&2 +- +-Hamlib.lua: hamliblua_wrap.c +- +-hamliblua_wrap.c: hamlib.swg $(SWGDEP) +- $(AM_V_GEN)$(SWIG) -lua $(AM_CPPFLAGS) -I$(top_srcdir)/bindings \ +- -o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg +- +-install-lua: +-clean-lua: +-distclean-lua: +-uninstall-lua: +- +-endif +-# Lua + + + all-local: @BINDING_ALL@ diff --git a/media-libs/hamlib/hamlib-4.5.5-r3.ebuild b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild similarity index 96% rename from media-libs/hamlib/hamlib-4.5.5-r3.ebuild rename to media-libs/hamlib/hamlib-4.5.5-r4.ebuild index daa89b08622c..460369f15605 100644 --- a/media-libs/hamlib/hamlib-4.5.5-r3.ebuild +++ b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,6 +42,7 @@ DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer) PATCHES=( "${FILESDIR}/${PN}-4.5.5-gcc14-fix.patch" + "$FILESDIR/hamlib-drop-lua.patch" ) pkg_setup() { diff --git a/media-libs/hamlib/hamlib-4.6.1.ebuild b/media-libs/hamlib/hamlib-4.6.1.ebuild index 0aa7bcf6e296..6b606145abd6 100644 --- a/media-libs/hamlib/hamlib-4.6.1.ebuild +++ b/media-libs/hamlib/hamlib-4.6.1.ebuild @@ -40,6 +40,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer) +PATCHES=( "$FILESDIR/hamlib-drop-lua.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup }
