diff --git a/.SRCINFO b/.SRCINFO index b1c19f1d2f50..696d6638cc2a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = goose-desktop pkgdesc = Goose Desktop (built from source) - an open source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM - pkgver = 1.22.2 + pkgver = 1.23.0 pkgrel = 1 url = https://github.com/block/goose arch = x86_64 @@ -13,7 +13,9 @@ pkgbase = goose-desktop conflicts = goose-desktop-bin options = !lto options = !debug - source = git+https://github.com/block/goose.git#tag=v1.22.2 - b2sums = SKIP + source = goose-desktop-1.23.0.tar.gz::https://github.com/block/goose/archive/refs/tags/v1.23.0.tar.gz + source = tailwind-fix.patch + b2sums = 855b3463006b17e2343dae4f50220a7689beeead488c70ad46646533e16910f023e17ec6d49687c480ce89ade2746c9f3420aff636132b169374a03fd4b442b9 + b2sums = 46d01b3c652405ccdbb79889c07e2efe5b50dca4bc930abbe192be2e0f7feb6eeb69b813905524507b7d6227d0da697c15d00cd54fcdee14d837a95de2d4d13b pkgname = goose-desktop diff --git a/PKGBUILD b/PKGBUILD index 8865d73f1948..0673616a6f31 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sheikh Limon pkgname=goose-desktop -pkgver=1.22.2 +pkgver=1.23.0 pkgrel=1 pkgdesc="Goose Desktop (built from source) - an open source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM" arch=("x86_64") @@ -16,23 +16,30 @@ makedepends=( "oniguruma" ) # LTO is broken for dependency ring https://github.com/briansmith/ring/issues/1444 +# TODO: Remove tailwind-fix.patch when upstream releases include PR #6917 options=("!lto" "!debug") source=( - "git+https://github.com/block/goose.git#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::https://github.com/block/goose/archive/refs/tags/v${pkgver}.tar.gz" + "tailwind-fix.patch" ) -b2sums=('SKIP') +b2sums=('855b3463006b17e2343dae4f50220a7689beeead488c70ad46646533e16910f023e17ec6d49687c480ce89ade2746c9f3420aff636132b169374a03fd4b442b9' + '46d01b3c652405ccdbb79889c07e2efe5b50dca4bc930abbe192be2e0f7feb6eeb69b813905524507b7d6227d0da697c15d00cd54fcdee14d837a95de2d4d13b') conflicts=("goose-desktop-bin") provides=("goose-desktop") prepare() { - cd goose + cd "goose-${pkgver}" + # Fix Tailwind scan in tarball releases + patch -p1 < "../tailwind-fix.patch" + + # Hide menu bar on Linux sed -i '/useContentSize: true/a\ autoHideMenuBar: process.platform === '\''linux'\'',' \ ui/desktop/src/main.ts } build() { - cd goose + cd "goose-${pkgver}" # Use the prebuilt oniguruma for now # https://github.com/block/goose/issues/2572 @@ -52,7 +59,7 @@ build() { } package() { - cd goose + cd "goose-${pkgver}" install -Dm755 "target/release/goose" "$pkgdir/usr/bin/goose" diff --git a/tailwind-fix.patch b/tailwind-fix.patch new file mode 100644 index 000000000000..a3d55e21f554 --- /dev/null +++ b/tailwind-fix.patch @@ -0,0 +1,24 @@ +From 578dc5a88d27a8757bc9a7ebab219f7c89bf3349 Mon Sep 17 00:00:00 2001 +From: Sheikh Limon +Date: Tue, 3 Feb 2026 22:11:12 +0600 +Subject: [PATCH] fix: broken Tailwind scan in tarball releases (#6917) + +Signed-off-by: sheikhlimon +--- + ui/desktop/src/styles/main.css | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ui/desktop/src/styles/main.css b/ui/desktop/src/styles/main.css +index eeb6d3392911..6829376dc02b 100644 +--- a/ui/desktop/src/styles/main.css ++++ b/ui/desktop/src/styles/main.css +@@ -2,6 +2,9 @@ + @import 'tw-animate-css'; + @plugin '@tailwindcss/typography'; + ++@source '../../index.html'; ++@source '../**/*.{js,ts,jsx,tsx}'; ++ + @theme { + --breakpoint-md: 930px; + } diff --git a/update-goose-pkgbuild.sh b/update-goose-pkgbuild.sh index bfb0f711e3d1..ef3339a7071a 100755 --- a/update-goose-pkgbuild.sh +++ b/update-goose-pkgbuild.sh @@ -1,61 +1,46 @@ #!/usr/bin/env bash set -euo pipefail -# Colors -RED='\033[0;31m' GREEN='\033[0;32m' YELLOW='\033[1;33m' NC='\033[0m' REPO="block/goose" -PKGBUILD_FILE="PKGBUILD" -echo -e "${GREEN}Fetching latest release from GitHub API...${NC}" - -# Fetch latest release +echo -e "${GREEN}Fetching latest release...${NC}" RELEASE_DATA=$(curl -s "https://api.github.com/repos/${REPO}/releases/latest") - -# Extract version LATEST_VERSION=$(echo "$RELEASE_DATA" | jq -r '.tag_name' | sed 's/^v//') if [[ -z "$LATEST_VERSION" || "$LATEST_VERSION" == "null" ]]; then - echo -e "${RED}Error: Could not fetch latest version${NC}" + echo "Error: Could not fetch latest version" exit 1 fi -echo -e "${GREEN}Latest version: ${YELLOW}${LATEST_VERSION}${NC}" +echo -e "${GREEN}Latest: ${YELLOW}${LATEST_VERSION}${NC}" -# Get current version -CURRENT_VERSION=$(grep '^pkgver=' "$PKGBUILD_FILE" | cut -d'=' -f2) - -echo -e "${GREEN}Current version: ${YELLOW}${CURRENT_VERSION}${NC}" +CURRENT_VERSION=$(grep '^pkgver=' PKGBUILD | cut -d'=' -f2) +echo -e "${GREEN}Current: ${YELLOW}${CURRENT_VERSION}${NC}" if [[ "$LATEST_VERSION" == "$CURRENT_VERSION" ]]; then - echo -e "${YELLOW}Already up to date!${NC}" + echo "Already up to date!" exit 0 fi -# Update PKGBUILD -echo -e "${GREEN}Updating PKGBUILD...${NC}" +sed -i "s/^pkgver=.*/pkgver=${LATEST_VERSION}/" PKGBUILD +sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD -# Update pkgver -sed -i "s/^pkgver=.*/pkgver=${LATEST_VERSION}/" "$PKGBUILD_FILE" +echo -e "${GREEN}Downloading tarball for b2sum...${NC}" +TARBALL_URL="https://github.com/${REPO}/archive/refs/tags/v${LATEST_VERSION}.tar.gz" +B2SUM=$(curl -L "$TARBALL_URL" | b2sum | awk '{print $1}') +sed -i "s|^b2sums=.*|b2sums=('${B2SUM}')|" PKGBUILD -# Reset pkgrel to 1 -sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD_FILE" +makepkg --printsrcinfo > .SRCINFO -# Generate .SRCINFO -echo -e "${GREEN}Generating .SRCINFO...${NC}" -makepkg --printsrcinfo | tee .SRCINFO +echo -e "${GREEN}Verifying tarball download...${NC}" +makepkg -od -echo -e "${GREEN}✓ PKGBUILD updated successfully!${NC}" -echo -e "${GREEN}✓ .SRCINFO generated successfully!${NC}" +echo -e "${GREEN}✓ Updated to ${LATEST_VERSION}${NC}" echo "" -echo -e "${YELLOW}Changes:${NC}" -echo -e " Version: ${CURRENT_VERSION} → ${LATEST_VERSION}" -echo "" -echo -e "${YELLOW}Next steps:${NC}" -echo " 1. Review changes: git diff PKGBUILD .SRCINFO" -echo " 2. Test build: makepkg -si" -echo " 3. Commit: git add PKGBUILD .SRCINFO && git commit -m 'upgpkg: ${LATEST_VERSION}'" -echo " 4. Push: git push" +echo "Next:" +echo " git diff PKGBUILD .SRCINFO" +echo " makepkg -si"