xkeyboard-config: update to 2.45

package/xkeyboard-config/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xkeyboard-config
-PKG_VERSION:=		2.37
+PKG_VERSION:=		2.45
 PKG_RELEASE:=		1
-PKG_HASH:=		eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c
+PKG_HASH:=		169e075a92d957a57787c199e84e359df2931b7196c1c5b4a3d576ee6235a87c
 PKG_DESCR:=		keyboard config
 PKG_SECTION:=		x11/misc
 PKG_BUILDDEP:=		util-macros-host xkbcomp-host xkbcomp meson-host
@@ -23,9 +23,10 @@ BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
 xkeyboard-config-install:
-	${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
-	${CP} ${WRKINST}/usr/share/X11/xkb/* \
-		${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
-	rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr
+	${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11
+	${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2
+	${CP} ${WRKINST}/usr/share/xkeyboard-config-2/* \
+		${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2
+	(cd $(IDIR_XKEYBOARD_CONFIG)/usr/share/X11 && ln -sf ../xkeyboard-config-2 xkb)
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk