diff --git a/check-version.sh b/check-version.sh new file mode 100644 index 0000000..f9374d5 --- /dev/null +++ b/check-version.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Github repository +REPO="xkbcommon/libxkbcommon" + +# Get tag name using Github Rest API +TAG_NAME=$(curl -s -L -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/"$REPO"/releases/latest | jq -r '.tag_name') + +# Trim prefix +VERSION=${TAG_NAME//xkbcommon-/} + +echo "$VERSION" diff --git a/pkg.info b/pkg.info index 709f354..7ff1685 100644 --- a/pkg.info +++ b/pkg.info @@ -1,9 +1,10 @@ name: libxkbcommon description: Keymap handling library for toolkits and window systems -version: 1.7.0 +version: 1.11.0 url: https://xkbcommon.org/ license: MIT architecture: any depends: ["glibc","libxml2","xkeyboard-config"] -make_depends: ["libxcb","libxml2","meson","xkeyboard-config","xorgproto"] +optional_depends: ["wayland"] +make_depends: ["graphviz","libxcb","libxml2","meson","wayland","wayland-protocols","xkeyboard-config","xorgproto"] type: source diff --git a/source.sh b/source.sh index 37c1fef..9164bb0 100644 --- a/source.sh +++ b/source.sh @@ -2,7 +2,7 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-${BPM_PKG_VERSION}.tar.xz" +DOWNLOAD="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-${BPM_PKG_VERSION}.tar.gz" FILENAME="${DOWNLOAD##*/}" # The prepare function is executed in the root of the temp directory @@ -15,25 +15,21 @@ prepare() { # The build function is executed in the source directory # This function is used to compile the source code build() { - mkdir build - cd build - - meson setup --prefix=/usr --libdir=/usr/lib --buildtype=release -Denable-wayland=false -Denable-docs=false .. - ninja + meson setup --prefix=/usr --libdir=/usr/lib --buildtype=release -Denable-docs=false build + meson compile -C build } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - cd build - ninja test + meson test -C build --print-errorlogs } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - cd build - DESTDIR="$BPM_OUTPUT" ninja install + meson install -C build --destdir="$BPM_OUTPUT" + # Install package license install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/libxkbcommon/LICENSE }