Linux + iPhone Continuity / iMessage / SMS
feat: aarch64 support
Zack Bartel0f1b9181a270
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex d0a04dd..b9bba40 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -17,13 +17,25 @@ jobs:- image: ubuntu:24.04generator: DEBname: deb+ runner: ubuntu-latest+ - image: ubuntu:24.04+ generator: DEB+ name: deb-arm64+ runner: ubuntu-24.04-arm- image: fedora:latestgenerator: RPMname: rpm+ runner: ubuntu-latest+ - image: fedora:latest+ generator: RPM+ name: rpm-arm64+ runner: ubuntu-24.04-arm+ # archlinux has no arm64 image.- image: archlinux:base-develgenerator: TGZname: tgz- runs-on: ubuntu-latest+ runner: ubuntu-latest+ runs-on: ${{ matrix.runner }}container: ${{ matrix.image }}steps:- name: bootstrap git@@ -65,7 +77,11 @@ jobs:if-no-files-found: errorappimage:- runs-on: ubuntu-latest+ strategy:+ fail-fast: false+ matrix:+ runner: [ubuntu-latest, ubuntu-24.04-arm]+ runs-on: ${{ matrix.runner }}# oldest glibc tether supportscontainer: ubuntu:24.04steps:@@ -90,12 +106,16 @@ jobs:- uses: actions/upload-artifact@v4with:- name: appimage+ name: appimage-${{ matrix.runner }}path: build/appimage/*.AppImageif-no-files-found: errorflatpak:- runs-on: ubuntu-latest+ strategy:+ fail-fast: false+ matrix:+ runner: [ubuntu-latest, ubuntu-24.04-arm]+ runs-on: ${{ matrix.runner }}steps:- uses: actions/checkout@v4with:@@ -111,7 +131,7 @@ jobs:- uses: actions/upload-artifact@v4with:- name: flatpak+ name: flatpak-${{ matrix.runner }}path: build/flatpak/*.flatpakif-no-files-found: errordiff --git a/CMakeLists.txt b/CMakeLists.txtindex f43b534..d7d9a91 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -233,6 +233,7 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")# DEBset(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]")+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)# alternates cover Ubuntu 24.04's t64 renamesset(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 | libgtk-3-0t64, libgtk-layer-shell0, libnotify4, libssl3 | libssl3t64, libwayland-client0, libavahi-client3, libglib2.0-0 | libglib2.0-0t64, bluez, bluez-obexd")set(CPACK_DEBIAN_PACKAGE_SECTION "utils")@@ -241,6 +242,7 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/zackb/tether")# RPMset(CPACK_RPM_PACKAGE_REQUIRES "gtk3, gtk-layer-shell, libnotify, openssl-libs, libwayland-client, avahi-libs, glib2, bluez, bluez-obexd")set(CPACK_RPM_PACKAGE_LICENSE "MIT")+set(CPACK_RPM_FILE_NAME RPM-DEFAULT)set(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)# Generatorsdiff --git a/PKGBUILD b/PKGBUILDindex aececf3..37d4d8f 100644--- a/PKGBUILD+++ b/PKGBUILD@@ -2,7 +2,7 @@ pkgname=tether-gitpkgver=r1.1234pkgrel=1pkgdesc="Bridge an iPhone to the Linux desktop: clipboard, files, messages, and notifications"-arch=('x86_64')+arch=('x86_64' 'aarch64')url="https://github.com/zackb/tether"license=('MIT')depends=('gtk3' 'gtk-layer-shell' 'libnotify' 'openssl' 'wayland' 'avahi' 'glib2' 'libsecret' 'bluez' 'bluez-utils' 'bluez-obex')diff --git a/README.md b/README.mdindex 885e54c..df0c293 100644--- a/README.md+++ b/README.md@@ -92,14 +92,14 @@ yay -S tether### AppImageOne file, no install, for distros without a package and for immutable systems.-Download `tether-<version>-x86_64.AppImage` from the+Download `tether-<version>-<arch>.AppImage` from the[releases page](https://github.com/zackb/tether/releases), then:```bash-chmod +x tether-*-x86_64.AppImage-./tether-*-x86_64.AppImage # the GTK app-./tether-*-x86_64.AppImage --bt-setup # the CLI, same binary-./tether-*-x86_64.AppImage --install-extension-host # if you use the browser or mail extension+chmod +x tether-*.AppImage+./tether-*.AppImage # the GTK app+./tether-*.AppImage --bt-setup # the CLI, same binary+./tether-*.AppImage --install-extension-host # if you use the browser or mail extension```The iPhone Bluetooth features need one-time system setup the AppImage cannot do for you.@@ -109,7 +109,7 @@ Requires glibc 2.38 and libstdc++ from GCC 13 (Fedora 39+, Ubuntu 23.10+, Debian### Flatpak-Download `tether-<version>.flatpak` from the+Download `tether-<version>-<arch>.flatpak` from the[releases page](https://github.com/zackb/tether/releases) if you're into that, then:```bash@@ -311,6 +311,7 @@ See [docs/HEADLESS.md](docs/HEADLESS.md).### Linux- Wayland compositor with `wlr-data-control` protocol (Hyprland, Sway, [Fenriz](https://github.com/zackb/fenriz) etc.)- Build tools: cmake, ninja, pkg-config+- x86_64 or aarch64 (Asahi, Raspberry Pi OS Trixie+). 32-bit ARM is not supported.### Dependencies- `wayland-client`diff --git a/packaging/flatpak/build.sh b/packaging/flatpak/build.shindex 24ee6b9..447a336 100755--- a/packaging/flatpak/build.sh+++ b/packaging/flatpak/build.sh@@ -38,7 +38,7 @@ mkdir -p "$BUILD_DIR"VERSION=$(git -C "$ROOT" describe --tags --always --dirty 2>/dev/null | sed 's/^v//')VERSION=${VERSION:-unknown}-OUTPUT=$BUILD_DIR/tether-$VERSION.flatpak+OUTPUT=$BUILD_DIR/tether-$VERSION-$(uname -m).flatpakflatpak build-bundle "$BUILD_DIR/repo" "$OUTPUT" "$APP_ID" --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo