diff --git a/pkg.info b/pkg.info index 04e33da..7e4f3c7 100644 --- a/pkg.info +++ b/pkg.info @@ -1,8 +1,16 @@ name: xkeyboard-config description: X Keyboard Extension -version: 2.45 +version: "2.46" +revision: 1 url: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config license: LicenseRef-xkeyboard-config architecture: any -make_depends: ["meson","python3"] type: source +make_depends: + - meson + - python3 +downloads: + - url: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-2.46/xkeyboard-config-xkeyboard-config-2.46.tar.gz?ref_type=tags + extract_to_bpm_source: true + extract_strip_components: 1 + checksum: 81107e12f71087b3f1d7dea43c186805d46abaffead0cafca9bdd24b94c2007e diff --git a/source.sh b/source.sh index 4507410..8a6ae60 100644 --- a/source.sh +++ b/source.sh @@ -2,38 +2,24 @@ # 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://www.x.org/pub/individual/data/xkeyboard-config/xkeyboard-config-${BPM_PKG_VERSION}.tar.xz" -FILENAME="${DOWNLOAD##*/}" - -# The prepare function is executed in the root of the temp directory -# This function is used for downloading files and putting them into the correct location -prepare() { - wget "$DOWNLOAD" - tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" -} - # 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 --buildtype=release .. - ninja + meson setup --prefix=/usr --buildtype=release 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"/COPYING "$BPM_OUTPUT"/usr/share/licenses/xkeyboard-config/COPYING }