summaryrefslogtreecommitdiff
path: root/package/xkeyboard-config/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/xkeyboard-config/Makefile')
-rw-r--r--package/xkeyboard-config/Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 182812e57..5724468e0 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -4,12 +4,12 @@
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 meson-host
+PKG_BUILDDEP:= util-macros-host xkbcomp-host xkbcomp meson-host
PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/
include $(ADK_TOPDIR)/mk/package.mk
@@ -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