diff --git a/CHANGELOG.md b/CHANGELOG.md index 37eb11ba..184e705d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,11 +42,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Web - search not working for some typed addresses (e.g: those returning 403) + ### Contributions - German translations by [Mape6](https://github.com/Mape6) - Russian translations by [KoromeloDev](https://github.com/KoromeloDev) - Fix [#329](https://github.com/vinifmor/bauh/issues/329) by [w568w](https://github.com/w568w) + +### Distribution +- bauh's AppImage is now based on Debian bullseye and had a small size reduction + ## [0.10.5] 2022-12-17 ### Fixes diff --git a/linux_dist/appimage/AppImageBuilder.yml b/linux_dist/appimage/AppImageBuilder.yml index fa7e0725..f0b5ad5c 100755 --- a/linux_dist/appimage/AppImageBuilder.yml +++ b/linux_dist/appimage/AppImageBuilder.yml @@ -28,8 +28,8 @@ AppDir: apt: arch: amd64 sources: - - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse' - key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32' + - sourceline: 'deb http://deb.debian.org/debian/ bullseye main contrib non-free' + key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa4285295fc7b1a81600062a9605c66f00d6c9793' include: - python3 @@ -41,8 +41,6 @@ AppDir: - python3-bs4 - sqlite3 - xdg-utils - # - libfreetype6 - # - libfontconfig1 exclude: - dpkg - apt @@ -52,20 +50,27 @@ AppDir: - python3-distutils after_bundle: - - pip3 install pyqt5==5.15.7 --prefix=/usr --root=AppDir || exit 1 - - cd AppDir/usr/lib/python3.8/site-packages/PyQt5/Qt5/plugins || exit 1 - - rm -rf audio gamepad gamepads geoservices printsupport sceneparsers sensorgestures sensors sqldrivers texttospeech webview || exit 1 + - pip3 install pyqt5==5.15.10 --prefix=/usr --root=AppDir || exit 1 + - rm -rf AppDir/usr/share/doc || exit 1 + - cd AppDir/usr/lib/python3.9/site-packages/PyQt5/Qt5/plugins || exit 1 + - rm -rf audio gamepad gamepads geoservices printsupport sceneparsers sensorgestures sensors sqldrivers texttospeech webview mediaservice playlistformats || exit 1 - cd ../lib/ || exit 1 - rm libQt5Bluetooth.so.5 libQt5Designer.so.5 libQt5Multimedia.so.5 libQt5MultimediaGstTools.so.5 libQt5MultimediaWidgets.so.5 || exit 1 - rm libQt5Quick3D.so.5 libQt5Quick3DAssetImport.so.5 libQt5Quick3DRender.so.5 libQt5Quick3DRuntimeRender.so.5 libQt5QuickTest.so.5 || exit 1 - rm libQt5Quick3DUtils.so.5 libQt5PrintSupport.so.5 libQt5SerialPort.so.5 libQt5Sql.so.5 libQt5Sensors.so.5 libQt5Test.so.5 libQt5WebView.so.5 || exit 1 - rm libQt5Quick.so.5 libQt5Location.so.5 libQt5QuickTemplates2.so.5 || exit 1 - + - cd ../qml || exit 1 + - rm -rf QtBluetooth QtMultimedia QtQuick QtQuick.2 QtQuick3D QtRemoteObjects QtSensors QtTest + - cd ../../ || exit 1 + - rm QtBluetooth.abi3.so QtMultimedia.abi3.so QtMultimediaWidgets.abi3.so QtPrintSupport.abi3.so QtQuick.abi3.so QtQuick3D.abi3.so QtQuickWidgets.abi3.so QtRemoteObjects.abi3.so QtSensors.abi3.so QtSerialPort.abi3.so QtSql.abi3.so QtTest.abi3.so QtTextToSpeech.abi3.so QtWebSockets.abi3.so|| exit 1 + - rm QtBluetooth.pyi QtMultimedia.pyi QtMultimediaWidgets.pyi QtPrintSupport.pyi QtQuick3D.pyi QtQuickWidgets.pyi QtSensors.pyi QtSerialPort.pyi QtSql.pyi + - cd bindings || exit 1 + - rm -rf QtBluetooth QtMultimedia QtMultimediaWidgets QtPrintSupport QtSensors QtSerialPort QtTextToSpeech QtQuick QtQuick3D QtQuickWidgets QtSql QtTest || exit 1 runtime: version: "v1.2.5" env: PYTHONHOME: '${APPDIR}/usr' - PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages' + PYTHONPATH: '${APPDIR}/usr/lib/python3.9/site-packages' test: fedora: diff --git a/linux_dist/appimage/Dockerfile b/linux_dist/appimage/Dockerfile index d2289ca5..8c77f71b 100644 --- a/linux_dist/appimage/Dockerfile +++ b/linux_dist/appimage/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive diff --git a/linux_dist/appimage/build.sh b/linux_dist/appimage/build.sh index feadf42e..ffe65632 100755 --- a/linux_dist/appimage/build.sh +++ b/linux_dist/appimage/build.sh @@ -3,3 +3,4 @@ set -Ceufox pipefail docker build -t bauh-appimage . docker run -e BAUH_VERSION=$BAUH_VERSION -v ./AppImageBuilder.yml:/build/AppImageBuilder.yml --rm --cap-add=SYS_ADMIN --device /dev/fuse --mount type=bind,source="$(pwd)",target=/build bauh-appimage +# volume required to run tests: -v /var/run/docker.sock:/var/run/docker.sock