From 00a98d2aa7f24a14f2b336a3184bc8b83de6fd76 Mon Sep 17 00:00:00 2001 From: Emir Beganovic Date: Thu, 8 Oct 2026 03:06:40 +0200 Subject: [PATCH] T3 Code: accept the AppImage's compatibility libraries under their new names The 2026-10-07 nightly ships the same six compatibility libraries with their full versioned file names beside the short ones (libXss.so.1.0.0), and two under their GTK 3 names (libappindicator3, libindicator3). The guard in package() listed the short names only, so it stopped the build on both architectures and with it the bundled upstream sync (#837). Accept an optional 3 and trailing version numbers. Anything else in usr/ still stops the build. t3code-bin carries the same guard and gets the same pattern before the change reaches a stable release. --- pkgbuilds/t3code-bin/PKGBUILD | 6 ++++-- pkgbuilds/t3code-nightly-bin/PKGBUILD | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgbuilds/t3code-bin/PKGBUILD b/pkgbuilds/t3code-bin/PKGBUILD index 9f62947..73e1ad2 100644 --- a/pkgbuilds/t3code-bin/PKGBUILD +++ b/pkgbuilds/t3code-bin/PKGBUILD @@ -85,10 +85,12 @@ package() { # The AppImage's usr/ tree is compatibility libraries for distributions that # lack them, and Arch is not one; its icons are the only part worth keeping. # A release that starts shipping something else there stops the build rather - # than having it deleted quietly on the way past. + # than having it deleted quietly on the way past. The same six libraries + # under their full versioned names (libXss.so.1.0.0) or their GTK 3 names + # (libappindicator3, libindicator3) are not something else. local unexpected unexpected=$(find usr \( -type f -o -type l \) | grep -vE \ - '^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator\.so\.1|gconf-2\.so\.4|indicator\.so\.7|notify\.so\.4)$' || true) + '^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator3?\.so\.1|gconf-2\.so\.4|indicator3?\.so\.7|notify\.so\.4)(\.[0-9]+)*$' || true) if [[ -n "${unexpected}" ]]; then echo "Unexpected files in the AppImage's usr/ tree:" >&2 echo "${unexpected}" >&2 diff --git a/pkgbuilds/t3code-nightly-bin/PKGBUILD b/pkgbuilds/t3code-nightly-bin/PKGBUILD index 51fe1d6..ad659b9 100644 --- a/pkgbuilds/t3code-nightly-bin/PKGBUILD +++ b/pkgbuilds/t3code-nightly-bin/PKGBUILD @@ -86,10 +86,12 @@ package() { # The AppImage's usr/ tree is compatibility libraries for distributions that # lack them, and Arch is not one; its icons are the only part worth keeping. # A release that starts shipping something else there stops the build rather - # than having it deleted quietly on the way past. + # than having it deleted quietly on the way past. The same six libraries + # under their full versioned names (libXss.so.1.0.0) or their GTK 3 names + # (libappindicator3, libindicator3) are not something else. local unexpected unexpected=$(find usr \( -type f -o -type l \) | grep -vE \ - '^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator\.so\.1|gconf-2\.so\.4|indicator\.so\.7|notify\.so\.4)$' || true) + '^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator3?\.so\.1|gconf-2\.so\.4|indicator3?\.so\.7|notify\.so\.4)(\.[0-9]+)*$' || true) if [[ -n "${unexpected}" ]]; then echo "Unexpected files in the AppImage's usr/ tree:" >&2 echo "${unexpected}" >&2