Split architectures for syncthingctl and dependencies

Author: Eeems

package/libcpp-utilities/package

@@ -2,17 +2,24 @@
 # Copyright (c) 2021 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
+archs=(
+    rm1os2
+    rm1os3
+    rm2os2
+    rm2os3
+)
 pkgnames=(libcpp-utilities libcpp-utilities-dev)
 pkgdesc="Common C++ classes and routines used by Martchus' applications"
 url=https://github.com/Martchus/cpp-utilities
-pkgver=5.31.0-1
+_srcver=5.31.0
+pkgver=$_srcver-2
 timestamp=2025-09-20T23:53Z
 section="devel"
 maintainer="Tom Parker-Shemilt <palfrey@tevps.net>"
 license=GPL-2.0-or-later
 image=base:v3.3
 source=(
-    https://github.com/Martchus/cpp-utilities/archive/refs/tags/v5.31.0.zip
+    "https://github.com/Martchus/cpp-utilities/archive/refs/tags/v$_srcver.zip"
     targets.cmake.patch
 )
 sha256sums=(
@@ -49,7 +56,7 @@ libcpp-utilities-dev() {
         install -d "$pkgdir"/opt/lib
         cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib
         cp -r "$srcdir"/install/opt/share "$pkgdir"/opt
-        (cd $pkgdir/opt/share/c++utilities/cmake && patch -p0 < $srcdir/targets.cmake.patch)
+        (cd "$pkgdir/opt/share/c++utilities/cmake" && patch -p0 < "$srcdir/targets.cmake.patch")
         cp -r "$srcdir"/install/opt/include "$pkgdir"/opt
     }
 }

package/qtforkawesome/package

@@ -2,17 +2,24 @@
 # Copyright (c) 2021 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
+archs=(
+    rm1os2
+    rm1os3
+    rm2os2
+    rm2os3
+)
 pkgnames=(libqtforkawesome libqtforkawesome-dev)
 pkgdesc="Library that bundles ForkAwesome for use within Qt applications"
 url=https://github.com/Martchus/qtforkawesome
-pkgver=0.3.2-1
+_srcver=0.3.2
+pkgver=$_srcver-2
 timestamp=2025-11-04T20:54Z
 section="devel"
 maintainer="Tom Parker-Shemilt <palfrey@tevps.net>"
 license=GPL-2.0-or-later
 image=qt:v3.3
 source=(
-    "https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.zip"
+    "https://github.com/Martchus/qtforkawesome/archive/refs/tags/v$_srcver.zip"
     "https://raw.githubusercontent.com/ForkAwesome/Fork-Awesome/1e3849530d0266ece3a883649e1398414b92241d/fonts/forkawesome-webfont.ttf"
     "https://raw.githubusercontent.com/ForkAwesome/Fork-Awesome/0237ab8eafeeacb896e008f744be6d9d717f44b0/src/icons/icons.yml"
 )
@@ -29,10 +36,10 @@ build() {
         -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \
         -DCMAKE_INSTALL_PREFIX="/opt" \
         -DBUILD_SHARED_LIBS=ON \
-        -DFORK_AWESOME_ICON_DEFINITIONS=$(realpath $srcdir/icons.yml)
+        -DFORK_AWESOME_ICON_DEFINITIONS="$(realpath "$srcdir/icons.yml")"
     cmake --build build
     rm -f build/qtforkawesome/forkawesome-webfont.ttf
-    cp $(realpath $srcdir/forkawesome-webfont.ttf) build/qtforkawesome/forkawesome-webfont.ttf
+    cp "$(realpath "$srcdir/forkawesome-webfont.ttf")" build/qtforkawesome/forkawesome-webfont.ttf
     cmake --build build --target install -- DESTDIR=../install
 }
 

package/qtutilities/package

@@ -2,17 +2,24 @@
 # Copyright (c) 2021 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
+archs=(
+    rm1os2
+    rm1os3
+    rm2os2
+    rm2os3
+)
 pkgnames=(libqtutilities libqtutilities-dev)
 pkgdesc="Common Qt related C++ classes and routines used by Martchus' applications"
 url=https://github.com/Martchus/qtutilities
-pkgver=6.18.2-1
+_srcver=6.18.2
+pkgver=$_srcver-2
 timestamp=2025-09-24T09:03Z
 section="devel"
 maintainer="Tom Parker-Shemilt <palfrey@tevps.net>"
 license=GPL-2.0-or-later
 image=qt:v3.3
 source=(
-    https://github.com/Martchus/qtutilities/archive/refs/tags/v6.18.2.zip
+    "https://github.com/Martchus/qtutilities/archive/refs/tags/v$_srcver.zip"
     targets.cmake.patch
 )
 sha256sums=(
@@ -52,7 +59,7 @@ libqtutilities-dev() {
         install -d "$pkgdir"/opt/lib
         cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib
         cp -r "$srcdir"/install/opt/share "$pkgdir"/opt
-        (cd $pkgdir/opt/share/qtutilities/cmake && patch -p0 < $srcdir/targets.cmake.patch)
+        (cd "$pkgdir/opt/share/qtutilities/cmake" && patch -p0 < "$srcdir/targets.cmake.patch")
         cp -r "$srcdir"/install/opt/include "$pkgdir"/opt
     }
 }

package/syncthingctl/package

@@ -2,10 +2,17 @@
 # Copyright (c) 2025 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
+archs=(
+    rm1os2
+    rm1os3
+    rm2os2
+    rm2os3
+)
 pkgnames=(syncthingctl)
 pkgdesc="CLI that orchestrates syncthing"
 url="https://martchus.github.io/syncthingtray/"
-pkgver=2.0.3-1
+_srcver=2.0.3
+pkgver=$_srcver-2
 timestamp=2025-11-04T22:54:13Z
 section=utils
 maintainer="Tom Parker-Shemilt <palfrey@tevps.net>"
@@ -14,7 +21,7 @@ image=qt:v3.3
 makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities host:libqtutilities host:libqtutilities-dev)
 installdepends=(libcpp-utilities libqtutilities syncthing)
 source=(
-    https://github.com/Martchus/syncthingtray/archive/refs/tags/v2.0.3.zip
+    "https://github.com/Martchus/syncthingtray/archive/refs/tags/v$_srcver.zip"
     syncthingctl
 )
 sha256sums=(

package/syncthingctl/syncthingctl

@@ -2,4 +2,4 @@
 
 export XDG_RUNTIME_DIR=/tmp/runtime-root
 
-exec /opt/libexec/syncthingctl $@
+exec /opt/libexec/syncthingctl "$@"