-
Notifications
You must be signed in to change notification settings - Fork 71
Add syncthingctl #957
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
palfrey
wants to merge
9
commits into
toltec-dev:testing
Choose a base branch
from
palfrey:package/syncthingctl
base: testing
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+255
−0
Open
Add syncthingctl #957
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b1daf42
Initial attempt at syncthingctl
palfrey 1f437ca
Unfudge libcpp-utilities paths
palfrey 89fe03e
Fix qtutilities build
palfrey 2069e3d
Fix qtforkawesome
palfrey 4fc3c17
Partial syncthingctl build
palfrey d06ba59
Remove qtforkawesome patch
palfrey c519696
syncthingctl now builds
palfrey 0760a33
Timestamp fixes
palfrey 5fcc72d
Use released versions for syncthingctl and qtforkawesome
palfrey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright (c) 2021 The Toltec Contributors | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| 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 | ||
| 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 | ||
| targets.cmake.patch | ||
| ) | ||
| sha256sums=( | ||
| cbdf3ef53c47fc3c1d8ee20bb1f65290db878408530afe46a285b401af2839a2 | ||
| SKIP | ||
| ) | ||
|
|
||
| build() { | ||
| cmake -B build \ | ||
| -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ | ||
| -DCMAKE_INSTALL_PREFIX="/opt" \ | ||
| -DBUILD_SHARED_LIBS=ON | ||
| cmake --build build | ||
| cmake --build build --target install -- DESTDIR=../install | ||
| } | ||
|
|
||
| libcpp-utilities() { | ||
| package() { | ||
| install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib | ||
| cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib | ||
|
|
||
| for file in "$pkgdir"/opt/lib/lib*.so*; do | ||
| base="${file#"$pkgdir"}" | ||
| ln -s "$base" "${file/\/opt/\/usr}" | ||
| done | ||
| } | ||
| } | ||
|
|
||
| libcpp-utilities-dev() { | ||
| pkgdesc="$pkgdesc - development files" | ||
| installdepends=("libcpp-utilities=$pkgver") | ||
|
|
||
| package() { | ||
| 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) | ||
| cp -r "$srcdir"/install/opt/include "$pkgdir"/opt | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- c++utilitiesTargets.cmake.orig 2025-11-03 20:33:08.016186953 +0000 | ||
| +++ c++utilitiesTargets.cmake 2025-11-03 20:33:55.701608765 +0000 | ||
| @@ -55,7 +55,7 @@ | ||
|
|
||
| set_target_properties(c++utilities PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "CPP_UTILITIES_USE_NATIVE_FILE_BUFFER" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "/opt/include" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" | ||
| ) | ||
|
|
||
| # Create imported target c++utilities-headers | ||
| @@ -63,7 +63,7 @@ | ||
|
|
||
| set_target_properties(c++utilities-headers PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "CPP_UTILITIES_USE_NATIVE_FILE_BUFFER" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "/opt/include" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" | ||
| ) | ||
|
|
||
| if(CMAKE_VERSION VERSION_LESS 3.0.0) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright (c) 2021 The Toltec Contributors | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| pkgnames=(libqtforkawesome libqtforkawesome-dev) | ||
| pkgdesc="Library that bundles ForkAwesome for use within Qt applications" | ||
| url=https://github.com/Martchus/qtforkawesome | ||
| pkgver=0.3.1-1 | ||
| timestamp=2025-11-04T20:30Z | ||
| section="devel" | ||
| maintainer="Tom Parker-Shemilt <palfrey@tevps.net>" | ||
| license=GPL-2.0-or-later | ||
| image=qt:v3.3 | ||
| # We need the commit version for https://github.com/Martchus/qtforkawesome/commit/bebb422f4c7bd605a335f40f88e289588757ceef which fixes the Qt compatibility | ||
| source=( | ||
| "https://github.com/Martchus/qtforkawesome/archive/42fe0be74ad6ee075d91f2b96d9bc3eb7717c9d5.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" | ||
| ) | ||
| noextract=(icons.yml forkawesome-webfont.ttf) | ||
| sha256sums=( | ||
| 0f7a2fdcbefb7d9b7528128ad83be85da1cfff6d84d627539dd827a36012fc7f | ||
| 4f319287827e35f841069eb471c092eccf97d2f7830aa4d8bd7301ded418bf49 | ||
| 1e588fc6c93737add8443a98d2bbd6b75537d173da6b613e37aaff3fc1f80c92 | ||
| ) | ||
| makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities host:libqtutilities host:libqtutilities-dev build:libyaml-libyaml-perl) | ||
|
|
||
| build() { | ||
| cmake -B 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) | ||
| cmake --build build | ||
| rm -f build/qtforkawesome/forkawesome-webfont.ttf | ||
| cp $(realpath $srcdir/forkawesome-webfont.ttf) build/qtforkawesome/forkawesome-webfont.ttf | ||
| cmake --build build --target install -- DESTDIR=../install | ||
| } | ||
|
|
||
| libqtforkawesome() { | ||
| package() { | ||
| install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib | ||
| cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib | ||
|
|
||
| for file in "$pkgdir"/opt/lib/lib*.so*; do | ||
| base="${file#"$pkgdir"}" | ||
| ln -s "$base" "${file/\/opt/\/usr}" | ||
| done | ||
| } | ||
| } | ||
|
|
||
| libqtforkawesome-dev() { | ||
| pkgdesc="$pkgdesc - development files" | ||
| installdepends=("libqtforkawesome=$pkgver") | ||
|
|
||
| package() { | ||
| install -d "$pkgdir"/opt/lib | ||
| cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib | ||
| cp -r "$srcdir"/install/opt/share "$pkgdir"/opt | ||
| cp -r "$srcdir"/install/opt/include "$pkgdir"/opt | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright (c) 2021 The Toltec Contributors | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| 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 | ||
| 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 | ||
| targets.cmake.patch | ||
| ) | ||
| sha256sums=( | ||
| 7a1047622c1a92760aaf448eee7c4a1b3c30c65bffdce7de1322c402ca0e9e1a | ||
| SKIP | ||
| ) | ||
| makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities) | ||
|
|
||
| build() { | ||
| cmake -B build \ | ||
| -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ | ||
| -DCMAKE_INSTALL_PREFIX="/opt" \ | ||
| -DBUILD_SHARED_LIBS=ON \ | ||
| -DENABLE_QT_TRANSLATIONS=OFF \ | ||
| -DWIDGETS_GUI=OFF | ||
| cmake --build build | ||
| cmake --build build --target install -- DESTDIR=../install | ||
| } | ||
|
|
||
| libqtutilities() { | ||
| package() { | ||
| install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib | ||
| cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib | ||
|
|
||
| for file in "$pkgdir"/opt/lib/lib*.so*; do | ||
| base="${file#"$pkgdir"}" | ||
| ln -s "$base" "${file/\/opt/\/usr}" | ||
| done | ||
| } | ||
| } | ||
|
|
||
| libqtutilities-dev() { | ||
| pkgdesc="$pkgdesc - development files" | ||
| installdepends=("libqtutilities=$pkgver") | ||
|
|
||
| package() { | ||
| 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) | ||
| cp -r "$srcdir"/install/opt/include "$pkgdir"/opt | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- qtutilitiesTargets.cmake.orig 2025-11-03 22:15:18.324436027 +0000 | ||
| +++ qtutilitiesTargets.cmake 2025-11-03 22:15:38.028569434 +0000 | ||
| @@ -55,7 +55,7 @@ | ||
|
|
||
| set_target_properties(qtutilities PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "/opt/include" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" | ||
| INTERFACE_LINK_LIBRARIES "Qt5::Gui;Qt5::Core" | ||
| ) | ||
|
|
||
| @@ -64,7 +64,7 @@ | ||
|
|
||
| set_target_properties(qtutilities-headers PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS" | ||
| - INTERFACE_INCLUDE_DIRECTORIES "/opt/include" | ||
| + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" | ||
| ) | ||
|
|
||
| if(CMAKE_VERSION VERSION_LESS 3.0.0) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright (c) 2025 The Toltec Contributors | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| pkgnames=(syncthingctl) | ||
| pkgdesc="CLI that orchestrates syncthing" | ||
| url="https://martchus.github.io/syncthingtray/" | ||
| pkgver=2.0.2-1 | ||
| timestamp=2025-11-04T08:50Z | ||
| section=utils | ||
| maintainer="Tom Parker-Shemilt <palfrey@tevps.net>" | ||
| license=GPL-2.0-or-later | ||
| image=qt:v3.3 | ||
| makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities host:libqtutilities host:libqtutilities-dev) | ||
| installdepends=(libcpp-utilities libqtutilities syncthing) | ||
| # We need commit version for Qt version and qtforkawesome removal patches | ||
palfrey marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| source=( | ||
| https://github.com/Martchus/syncthingtray/archive/67a4ced74d79b5152e438464f60b7da6f40f9a4a.zip | ||
| ) | ||
| sha256sums=( | ||
| 9c51b2c0e4e3671e75cb9bde2b0cbb2b4db5794ddfe2a05ea42bfb1ca476f400 | ||
| ) | ||
|
|
||
| build() { | ||
| cmake -B build \ | ||
| -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ | ||
| -DCMAKE_INSTALL_PREFIX="/opt" \ | ||
| -DENABLE_QT_TRANSLATIONS=OFF \ | ||
| -DUSE_BOOST_PROCESS=OFF \ | ||
| -DNO_MODEL=ON \ | ||
| -DNO_FILE_ITEM_ACTION_PLUGIN=ON \ | ||
| -DNO_PLASMOID=ON \ | ||
| -DNO_WIDGETS=ON \ | ||
| -DNO_TRAY=ON | ||
| cmake --build build | ||
| cmake --build build --target install -- DESTDIR=../install | ||
| } | ||
|
|
||
| package() { | ||
| install -D -m 755 -t "$pkgdir"/opt/bin \ | ||
| "$srcdir"/install/opt/bin/syncthingctl | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.