Skip to content

Commit

Permalink
Don't upgrade xz to 5.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jralls committed Mar 30, 2024
1 parent 77fd260 commit a04f759
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions gtk-osx-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ envvar ()
_var=$2
fi
if test ! -d "$_var"; then
echo "Creating $_var"
mkdir -p "$_var"
fi
}
Expand Down Expand Up @@ -79,7 +80,6 @@ if test ! -x /usr/bin/groff -a ! -x "$DEVPREFIX/bin/groff"; then
ln -s /usr/bin/true "$DEVPREFIX/bin/groff"
fi

# Setup pyenv
if test ! -x "$PYENV_INSTALL_ROOT/libexec/pyenv"; then
if test -d "$PYENV_INSTALL_ROOT"; then
rm -rf "$PYENV_INSTALL_ROOT";
Expand All @@ -106,9 +106,11 @@ export PYTHON_CONFIGURE_OPTS="--enable-shared"
#This really means pyenv's *python* version. It's poorly named but
#it's defined by pyenv so it can't be changed.
export PYENV_VERSION=$PYTHON_VERSION
$PYENV install -v $PYENV_VERSION
$PYENV install $PYENV_VERSION
PIP="$PYENV_ROOT/shims/pip3"

echo PyEnv installed to $PYENV_ROOT

$PIP install --upgrade --user pip

# Install pipenv
Expand Down Expand Up @@ -255,7 +257,9 @@ if test -d "$SDKROOT"; then
export CFLAGS="-isysroot $SDKROOT -I$SDKROOT/usr/include"
fi

$PIPENV install
echo "Running $PIPENV install"
$PIPENV install -v
exit

BASEURL="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master"

Expand Down
1 change: 1 addition & 0 deletions modulesets-stable/bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
href="https://github.com"
type="tarball" />
<!---->
<!-- NOTE: DO NOT UPGRADE TO 5.6.x! See https://nvd.nist.gov/vuln/detail/CVE-2024-3094 -->
<autotools id="xz"
autogen-sh="configure"
bootstrap="true">
Expand Down

0 comments on commit a04f759

Please sign in to comment.