Skip to content
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.

Sign up for GitHub

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

Remove zsync #933

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Remove zsync #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
047e5db
Remove zsync
DeinAlptraum Dec 31, 2024
26e0873
Inform about useless warning
DeinAlptraum Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dists/linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ run: build/$(ARCH)/usr/bin/ultrastardx
compress: UltraStarDeluxe-$(ARCH).AppImage
UltraStarDeluxe-$(ARCH).AppImage: build/$(ARCH)/usr/bin/ultrastardx build/$(ARCH)/usr/bin/VERSION
rm -f "./UltraStarDeluxe-$(ARCH).AppImage"
echo "INFO: Any warnings about zsync and binary delta updates can be ignored, since we don't use them."
PATH="prefix/$(ARCH)/bin:$$PATH" prefix/$(ARCH)/bin/appimagetool --comp xz build/$(ARCH) $@

upload: UltraStarDeluxe-$(ARCH).AppImage
Expand Down
4 changes: 0 additions & 4 deletions dists/linux/dl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ deps+=('projectm,https://github.com/projectM-visualizer/projectm/releases/downlo
# deps+=('fpc-i686,https://sourceforge.net/projects/freepascal/files/Linux/3.0.4/fpc-3.0.4.i386-linux.tar,0a51364bd1a37f1e776df5357ab5bfca8cc7ddeb')
# fi

if ! true | zsyncmake -V >/dev/null ; then
deps+=('zsync,http://zsync.moria.org.uk/download/zsync-0.6.2.tar.bz2,5e69f084c8adaad6a677b68f7388ae0f9507617a')
fi

if ! desktop-file-validate -h >/dev/null ; then
deps+=('desktop-file-utils,https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz,9fd94cb7de302163015fcbc0e157c61323b1205d')
fi
Expand Down
10 changes: 0 additions & 10 deletions dists/linux/tasks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,6 @@ task_projectm() {
hide make distclean
}

task_zsync() {
start_build zsync || return 0
./configure --prefix="$PREFIX" CC="$CC" CXX="$CXX"
hide make $makearg
hide make install
hide make distclean
}

task_desktop_file_utils() {
start_build desktop-file-utils || return 0
CC="$CC" CXX="$CXX" meson setup --prefix "$PREFIX" --libdir=lib build
Expand Down Expand Up @@ -587,8 +579,6 @@ if [ "$1" == "all_deps" ]; then
echo
task_meson
echo
task_zsync
echo
task_desktop_file_utils
echo
task_AppImageKit
Expand Down
Loading