Skip to content

signal-7.28.0 cleanup #303

Merged
merged 1 commit into from
Oct 16, 2024
Merged
Changes from all commits
Commits
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
20 changes: 6 additions & 14 deletions signal-desktop-7.28.0-0.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ PATH=/bin:/usr/bin:/usr/sbin:/usr/local/bin
export PATH

PREFIX=/pkg/${PKG}-${VERSION}-${BUILD}
mkdir -p ${PREFIX}

mkdir -vp ${PREFIX}
cat >${PREFIX}/profile <<EOF
PATH=$PREFIX/bin:\$PATH
EOF

BUILDDIR=/scratch/local2/${USER}/signal-build/${VERSION}
mkdir -p ${BUILDDIR}

# test -d ${BUILD_TMPDIR} && chmod -c -R u+rwx ${BUILD_TMPDIR} && rm -rf ${BUILD_TMPDIR}

TMPDIR=${BUILDDIR}/tmp
mkdir -p ${TMPDIR}
export TMPDIR
Expand Down Expand Up @@ -80,7 +82,6 @@ exec </dev/null

NODEPREFIX=/scratch/local2/${USER}/signal-build/node-${NODEVERSION}

# SRCURL="https://beehive.molgen.mpg.de/44001df7f3be296a2a305769bc156b94/node-v3.0.0-29893-g7fe67b7078.tar"
SRCURL="https://beehive.molgen.mpg.de/8996b90d5544c80c6ddc91efbcacc72f/node-v3.0.0-30761-g019efe1453.tar"

PKGARC=${SRCURL##*/}
Expand Down Expand Up @@ -164,23 +165,14 @@ cd Signal-Desktop

git-lfs install

# git checkout tags/v${VERSION}
# git checkout tags/v${VERSION}-beta.1

git clean -d --force
git checkout tags/v${VERSION}
# git checkout tags/v7.29.0-beta.1

# allow higher node versions
#sed 's#"node": "#&>=#' -i package.json

#nope# sed 's#"socks-proxy-agent": "^8.0.1"#"socks-proxy-agent": "=8.0.1"#' -i package-lock.json
grep socks-proxy-agent package-lock.json

#nope#mv -v patches/socks-proxy-agent+8.0.1.patch patches/socks-proxy-agent+8.0.4.patch

# dirty...
rm -v patches/socks-proxy-agent+8.0.1.patch

mv -v patches/@types+express+4.17.18.patch patches/@types+express+4.17.21.patch

# workaround https://github.com/yarnpkg/yarn/issues/7584
Expand Down