From 300bb44794f0964d7280aa722116b32ecd6fb072 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 7 Mar 2026 19:16:16 +0200 Subject: [PATCH] Switch to new download format and update check-version.sh script --- check-version.sh | 2 +- pkg.info | 9 ++++++++- source.sh | 20 +++----------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/check-version.sh b/check-version.sh index 96cf21c..75cf146 100644 --- a/check-version.sh +++ b/check-version.sh @@ -7,7 +7,7 @@ REPO="GNOME/adwaita-icon-theme" REPO=$(echo "$REPO" | sed 's|/|%2F|g') # Get tag name using Gitlab Rest API -TAG_NAME=$(curl -s -L https://gitlab.gnome.org/api/v4/projects/"$REPO"/releases | jq -r '.[].tag_name' | grep -v -E 'alpha|beta' | head -n1) +TAG_NAME=$(curl -s -L https://gitlab.gnome.org/api/v4/projects/"$REPO"/releases | jq -r '.[].tag_name' | grep -v -E 'alpha|beta|rc' | head -n1) # Trim 'v' character in TAG_NAME variable VERSION=$(echo "$TAG_NAME" | tr -d 'v') diff --git a/pkg.info b/pkg.info index b6a619f..9d60e0e 100644 --- a/pkg.info +++ b/pkg.info @@ -1,9 +1,11 @@ name: adwaita-icon-theme description: UI icon set for GNOME core apps version: "49.0" -revision: 1 +revision: 2 url: https://gitlab.gnome.org/GNOME/adwaita-icon-theme license: CC-BY-SA-3.0 or LGPL3-only +maintainers: + - enumdev@enumerated.dev architecture: any output_architecture: any type: source @@ -11,3 +13,8 @@ depends: - gtk3 make_depends: - meson +downloads: + - url: https://download.gnome.org/sources/adwaita-icon-theme/${BPM_PKG_VERSION%.*}/adwaita-icon-theme-${BPM_PKG_VERSION}.tar.xz + extract_to: ${BPM_SOURCE} + extract_strip_components: 1 + checksum: 65166461d1b278aa942f59aa8d0fccf1108d71c65f372c6266e172449791755c diff --git a/source.sh b/source.sh index d618510..9d709ce 100644 --- a/source.sh +++ b/source.sh @@ -2,29 +2,15 @@ # 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://download.gnome.org/sources/adwaita-icon-theme/${BPM_PKG_VERSION%.*}/adwaita-icon-theme-${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 .. - ninja + meson setup build --prefix=/usr + meson compile -C build } # 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" }