From 5ff249cb2019e6b6574a3bacf60694475a6cc925 Mon Sep 17 00:00:00 2001 From: Alfredo Monclus Date: Sat, 4 Dec 2021 14:29:35 -0300 Subject: [PATCH] Switch from vext.gi to PyGObject (#348) --- scripts/KlipperScreen-install.sh | 5 +++-- scripts/KlipperScreen-requirements.txt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/KlipperScreen-install.sh b/scripts/KlipperScreen-install.sh index c7f3797e..f05f83c4 100755 --- a/scripts/KlipperScreen-install.sh +++ b/scripts/KlipperScreen-install.sh @@ -4,9 +4,10 @@ SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" KSPATH=$(sed 's/\/scripts//g' <<< $SCRIPTPATH) KSENV="${HOME}/.KlipperScreen-env" -PKGLIST="xserver-xorg-video-fbturbo xdotool xinit xinput x11-xserver-utils libopenjp2-7 python3-distutils python3-gi" -PKGLIST="${PKGLIST} python3-gi-cairo python3-virtualenv gir1.2-gtk-3.0 virtualenv matchbox-keyboard wireless-tools" +PKGLIST="xserver-xorg-video-fbturbo xdotool xinit xinput x11-xserver-utils libopenjp2-7 python3-distutils" +PKGLIST="${PKGLIST} python3-virtualenv virtualenv matchbox-keyboard wireless-tools" PKGLIST="${PKGLIST} libatlas-base-dev fonts-freefont-ttf" +PKGLIST="${PKGLIST} libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0" Red='\033[0;31m' Green='\033[0;32m' diff --git a/scripts/KlipperScreen-requirements.txt b/scripts/KlipperScreen-requirements.txt index f164c04c..393f372c 100644 --- a/scripts/KlipperScreen-requirements.txt +++ b/scripts/KlipperScreen-requirements.txt @@ -3,6 +3,6 @@ jinja2==3.0.3 matplotlib==3.5.0 netifaces==0.11.0 requests==2.26.0 -vext==0.7.6 websocket-client==1.2.1 -vext.gi==0.7.4 --prefer-binary +pycairo==1.20.1 +PyGObject==3.42.0