diff --git a/Makefile b/Makefile index de450c1..9aa5bbe 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,8 @@ build: _build_init _apply_config $(DO) build $(PREFIX) $(DO) prepare-install $(PREFIX) -build_dev: install - $(MAYBE_SUDO_DO) install-dev +build_dev: build + $(call colorecho, Built for dev) clean: $(DO) clean diff --git a/README.md b/README.md index cba8596..bd02eef 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,18 @@ Gruvbox and Dracula themes! ## Dependencies | | arch | ubuntu | fedora | openSUSE | |-----------------------|---------------|----------------------|---------------------|-----------------------| -|**[whither][whither]** | \*install it from source\* |**liblightdm-gobject** |lightdm |liblightdm-gobject-dev|lightdm-gobject-devel|liblightdm-gobject-1-0 | |**pygobject** |python-gobject |python3-gi |pygobject3 |python3-gobject | - -> ***NOTE*** Be sure to have [whither][whither] installed from this source +|**pyqt5** |python-pyqt5 |python3-pyqt5 |python3-qt5 |python3-qt5 | +|**qt5-webengine** |qt5-webengine |libqt5webengine5 |qt5-qtwebengine |libqt5-qtwebengine | ### PIP -Above dependencies can be installed with pip as well. +- PyGObject +- PyQt5 +- PyQtWebEngine +- ruamel.yaml + +Install PIP dependencies with: ```sh pip install -r requirements.txt ``` @@ -80,7 +84,6 @@ web-greeter --debug > ***Note:*** Do not use `lightdm --test-mode` as it is not supported. [antergos]: https://github.com/Antergos "Antergos" -[whither]: https://github.com/JezerM/whither "Whither" [nody-greeter]: https://github.com/JezerM/nody-greeter "Nody Greeter" [acpilight]: https://gitlab.com/wavexx/acpilight "acpilight" [WebArchive]: https://web.archive.org/web/20190524032923/https://doclets.io/Antergos/web-greeter/stable "Web Archive" diff --git a/build/utils.sh b/build/utils.sh index c226561..e6d4910 100755 --- a/build/utils.sh +++ b/build/utils.sh @@ -41,10 +41,6 @@ do_install() { cp -R "${INSTALL_ROOT}"/* "${DESTDIR}" } -do_install_dev() { - cp -RH "${REPO_DIR}/whither/whither" /usr/lib/python3.6/site-packages -} - # Not used generate_pot_file() { REPO_ROOT="$(dirname "${REPO_DIR}")" @@ -114,7 +110,6 @@ set_config() { [[ -z "$1" || -z "$2" ]] && return 1 sed -i "s|'@$1@'|$2|g" \ - "${BUILD_DIR}/web-greeter/whither.yml" \ "${BUILD_DIR}/dist/web-greeter.yml" } @@ -151,10 +146,6 @@ case "$1" in clean_build_dir ;; - install-dev) - do_install_dev - ;; - prepare-install) PREFIX="$2" prepare_install diff --git a/requirements.txt b/requirements.txt index 18b4b84..636bc57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ PyGObject -whither @ https://github.com/JezerM/whither/tarball/master +PyQt5 +PyQtWebEngine +ruamel.yaml