From b3495a1e78751ba4c51c86efa8f580483f7b392c Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Sun, 3 Apr 2022 12:44:29 +0300 Subject: [PATCH] Don't use libglib2.0 while building appimage and exclude it from the recipe. Closes: #1941 --- packages/AppImage/PyBitmessage.yml | 2 ++ packages/docker/Dockerfile.bionic | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/AppImage/PyBitmessage.yml b/packages/AppImage/PyBitmessage.yml index 4f0c7e3d..3156df90 100644 --- a/packages/AppImage/PyBitmessage.yml +++ b/packages/AppImage/PyBitmessage.yml @@ -16,6 +16,7 @@ ingredients: - python-six - sni-qt exclude: + - libglib2.0-0 - libmng2 - libncursesw5 - libqt4-declarative @@ -31,5 +32,6 @@ ingredients: - ../deb_dist/pybitmessage_*_amd64.deb script: + - rm -rf usr/share/glib-2.0/schemas - cp usr/share/icons/hicolor/scalable/apps/pybitmessage.svg . - mv usr/bin/python2.7 usr/bin/python2 diff --git a/packages/docker/Dockerfile.bionic b/packages/docker/Dockerfile.bionic index e2b7288c..fbb352f9 100644 --- a/packages/docker/Dockerfile.bionic +++ b/packages/docker/Dockerfile.bionic @@ -27,7 +27,6 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \ dh-apparmor debhelper dh-python python-msgpack python-qt4 git python-stdeb \ python-all-dev python-crypto python-psutil \ fakeroot python-pytest python3-wheel \ - libglib2.0-dev \ # Code quality pylint python-pycodestyle python3-pycodestyle pycodestyle python-flake8 \ python3-flake8 flake8 python-pyflakes python3-pyflakes pyflakes pyflakes3 \