From 6f4db8bb89f1d25f0163b0abe8a10c581dc93f03 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sat, 26 Oct 2019 02:25:38 -0700 Subject: libxkbcommon: Switch to git submodule Upstream no longer provides generated parser.[ch], so there is no point in using the upstream tar archives. --- .gitmodules | 4 ++++ pkg/libxkbcommon/.gitignore | 2 -- pkg/libxkbcommon/gen.lua | 2 +- pkg/libxkbcommon/sha256 | 1 - pkg/libxkbcommon/src | 1 + pkg/libxkbcommon/url | 1 - pkg/libxkbcommon/ver | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 pkg/libxkbcommon/.gitignore delete mode 100644 pkg/libxkbcommon/sha256 create mode 160000 pkg/libxkbcommon/src delete mode 100644 pkg/libxkbcommon/url diff --git a/.gitmodules b/.gitmodules index 86838e18..f67215aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -126,6 +126,10 @@ [submodule "pkg/libutp/src"] path = pkg/libutp/src url = https://github.com/oasislinux/libutp.git +[submodule "pkg/libxkbcommon/src"] + path = pkg/libxkbcommon/src + url = https://github.com/xkbcommon/libxkbcommon.git + ignore = all [submodule "pkg/loksh/src"] path = pkg/loksh/src url = https://github.com/dimkr/loksh diff --git a/pkg/libxkbcommon/.gitignore b/pkg/libxkbcommon/.gitignore deleted file mode 100644 index 0d473e36..00000000 --- a/pkg/libxkbcommon/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/libxkbcommon-0.9.1.tar.xz -/src diff --git a/pkg/libxkbcommon/gen.lua b/pkg/libxkbcommon/gen.lua index 23c5f924..956babb0 100644 --- a/pkg/libxkbcommon/gen.lua +++ b/pkg/libxkbcommon/gen.lua @@ -38,4 +38,4 @@ lib('libxkbcommon.a', [[src/( utils.c )]]) -fetch 'curl' +fetch 'git' diff --git a/pkg/libxkbcommon/sha256 b/pkg/libxkbcommon/sha256 deleted file mode 100644 index 8b53701d..00000000 --- a/pkg/libxkbcommon/sha256 +++ /dev/null @@ -1 +0,0 @@ -d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0 libxkbcommon-0.9.1.tar.xz diff --git a/pkg/libxkbcommon/src b/pkg/libxkbcommon/src new file mode 160000 index 00000000..6d83838c --- /dev/null +++ b/pkg/libxkbcommon/src @@ -0,0 +1 @@ +Subproject commit 6d83838cc2e89a61d081e6f7f53aa9bccd0ddb34 diff --git a/pkg/libxkbcommon/url b/pkg/libxkbcommon/url deleted file mode 100644 index 350dcf1b..00000000 --- a/pkg/libxkbcommon/url +++ /dev/null @@ -1 +0,0 @@ -url = "https://xkbcommon.org/download/libxkbcommon-0.9.1.tar.xz" diff --git a/pkg/libxkbcommon/ver b/pkg/libxkbcommon/ver index b9651fc4..0b37c4f5 100644 --- a/pkg/libxkbcommon/ver +++ b/pkg/libxkbcommon/ver @@ -1 +1 @@ -0.9.1 r0 +0.9.1 r1 -- cgit v1.2.3