derive linux git

Commit Diff

Commit:: a6096b50e13d889da7ae7ea40d02c29f5c2d0a4f
From:: shrub <maybeshrub@gmail.com>
Date:: Thu May 28 14:28:28 2026 UTC
Message:: kbd patch fix
Actions:: Patch | Tree
commit - a2ebd7683c28a034c854e0dbae155343ab2fb22e
commit + a6096b50e13d889da7ae7ea40d02c29f5c2d0a4f
blob - 636db83b5bebeb9063bf19d3c1d024019ff25aaa
blob + ab84c6180497292ec928aad2b5ecd8ebe5ca47ad
--- utils/kbd/kbd-hell.patch
+++ utils/kbd/kbd-hell.patch
@@ -60,52 +60,6 @@ index 8cd3610..4f47af4 100644
  	rm -f $(DESTDIR)$(datadir)/$(KEYMAPDIR)/ppc
  	$(LN_S) mac $(DESTDIR)$(datadir)/$(KEYMAPDIR)/ppc
  	@if [ -f $(DESTDIR)$(datadir)/$(OLDKEYMAPDIR) ]; then \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8635299..c1dd1ac 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -39,7 +39,11 @@ spawn_console_CFLAGS = -DSPAWN_CONSOLE
- spawn_login_CFLAGS   = -DSPAWN_LOGIN
- 
- COMMON_LIBS = \
--	libcommon/libcommon.a \
-+	$(top_builddir)/src/libcommon/libcommon.a \
-+	$(ZLIB_LIBS) \
-+	$(BZIP2_LIBS) \
-+	$(LZMA_LIBS) \
-+	$(ZSTD_LIBS) \
- 	@INTLLIBS@
- 
- chvt_LDADD            = $(COMMON_LIBS)
-@@ -63,18 +67,18 @@ spawn_console_LDADD   = $(COMMON_LIBS)
- spawn_login_LDADD     = $(COMMON_LIBS)
- outpsfheader_LDADD    = $(COMMON_LIBS)
- 
--resizecons_LDADD      = libkbdfile/libkbdfile.la $(COMMON_LIBS)
-+resizecons_LDADD      = $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
--clrunimap_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--getunimap_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--loadunimap_LDADD      = libkfont/libkfont.la $(COMMON_LIBS)
--mapscrn_LDADD         = libkfont/libkfont.la $(COMMON_LIBS)
--psfxtable_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--setfont_LDADD         = libkfont/libkfont.la $(COMMON_LIBS)
--showconsolefont_LDADD = libkfont/libkfont.la $(COMMON_LIBS)
-+clrunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+getunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+loadunimap_LDADD      = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+mapscrn_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+psfxtable_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+setfont_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+showconsolefont_LDADD = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
--dumpkeys_LDADD        = libkeymap/libkeymap.la libkbdfile/libkbdfile.la $(COMMON_LIBS)
--loadkeys_LDADD        = libkeymap/libkeymap.la libkbdfile/libkbdfile.la $(COMMON_LIBS)
-+dumpkeys_LDADD        = $(top_builddir)/src/libkeymap/libkeymap.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+loadkeys_LDADD        = $(top_builddir)/src/libkeymap/libkeymap.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
- install-exec-hook:
- 	for i in psfaddtable psfgettable psfstriptable; do \
 diff --git a/src/libkbdfile/Makefile.am b/src/libkbdfile/Makefile.am
 index 2511064..ef15113 100644
 --- a/src/libkbdfile/Makefile.am
@@ -122,7 +76,7 @@ index 2511064..ef15113 100644
 +	kbdfile-zstd.c
  
  libkbdfile_la_LIBADD =
- libkbdfile_la_CFLAGS =
+ libkbdfile_la_CFLAGS = $(AM_CFLAGS)
  
 -if USE_ZLIB
 -libkbdfile_la_SOURCES += kbdfile-zlib.c
blob - /dev/null
blob + d618c43a7750895b935a290f98b428ec47c5e7dc (mode 644)
--- /dev/null
+++ utils/kbd/info
@@ -0,0 +1,6 @@
+name: kbd
+description: keyboard utils
+license: 
+upstream: 
+version: git
+maintainer: shrub900
blob - f60530a906c9cf13da0afd44c029d598aed16ded
blob + cc8a93a4c2561aac9284014fd257596d94a5bbf2
--- utils/kbd/ndmake.sh
+++ utils/kbd/ndmake.sh
@@ -9,4 +9,46 @@ BUILD_OPT="-DCHECK_PKG= -DEXTRA_PKG= -DCHECK_LIB= \
 	-DPAM_LIBS= -DPAM_MISC_LIBS= -DCOND_VLOCK=0 \
 	-DLDFLAGS=\"$LDFLAGS\""
 
+prebuild() {
+	sed -i \
+		-e 's#libcommon/libcommon\.a#$(top_builddir)/src/libcommon/libcommon.a#g' \
+		-e '/^COMMON_LIBS[[:space:]]*=[[:space:]]*\\/,/^\$(CODE_COVERAGE_LIBS)[[:space:]]*$/ { /^\t@INTLLIBS@[[:space:]]*\\$/i\
+\t$(ZLIB_LIBS) \\
+\t$(BZIP2_LIBS) \\
+\t$(LZMA_LIBS) \\
+\t$(ZSTD_LIBS) \\
+}' \
+		-e 's#^resizecons_LDADD[[:space:]]*=.*#resizecons_LDADD      = $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^clrunimap_LDADD[[:space:]]*=.*#clrunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^getunimap_LDADD[[:space:]]*=.*#getunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^loadunimap_LDADD[[:space:]]*=.*#loadunimap_LDADD      = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^mapscrn_LDADD[[:space:]]*=.*#mapscrn_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^psfxtable_LDADD[[:space:]]*=.*#psfxtable_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^setfont_LDADD[[:space:]]*=.*#setfont_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)#' \
+		-e 's#^showconsolefont_LDADD[[:space:]]*=.*#showconsolefont_LDADD = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)