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

chore: Update pkgsrc to 2024Q4. #237

Merged
merged 1 commit into from
Jan 24, 2025
Merged

chore: Update pkgsrc to 2024Q4. #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions pkgsrc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19.0
FROM alpine:3.21.0

RUN ["apk", "add", "--no-cache", \
"bash", \
Expand All @@ -8,9 +8,10 @@ RUN ["apk", "add", "--no-cache", \
"git", \
"linux-headers", \
"musl-dev", \
"nawk"]
"nawk", \
"patch"]

RUN ["git", "clone", "--branch=pkgsrc-2023Q4", "--depth=1", "https://github.com/NetBSD/pkgsrc", "/work/pkgsrc"]
RUN ["git", "clone", "--branch=pkgsrc-2024Q4", "--depth=1", "https://github.com/NetBSD/pkgsrc", "/work/pkgsrc"]
WORKDIR /work/pkgsrc/bootstrap
ENV TOOLS_PLATFORM.awk=/usr/bin/nawk
RUN ["./bootstrap"]
Expand Down
5 changes: 1 addition & 4 deletions qtox/download/version_qt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ "$MACOS_MINIMUM_SUPPORTED_VERSION" = "10.15" ]; then
QTSVG_HASH=4acb1e576eca55e955cf2b0d15c914a200df290e737accd7c1901fa1e33a25c7
QTTOOLS_HASH=aa6d4c822d8cb74066ef30ab42283ac24e5cc702f33e6d78a9ebef5b0df91bc0
QTWAYLAND_HASH="???"
elif [ "$MACOS_MINIMUM_SUPPORTED_VERSION" = "12.0" ]; then
else
QT_MINOR=8
QT_PATCH=1

Expand All @@ -27,9 +27,6 @@ elif [ "$MACOS_MINIMUM_SUPPORTED_VERSION" = "12.0" ]; then
QTSVG_HASH=3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0
QTTOOLS_HASH=9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d
QTWAYLAND_HASH=2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203
else
echo "Unsupported macOS version: $MACOS_MINIMUM_SUPPORTED_VERSION"
exit 1
fi

QT_VERSION="$QT_MAJOR.$QT_MINOR.$QT_PATCH"
Loading