From 87797ec47f6e53a76bf23d4fe2b432feed77a6dc Mon Sep 17 00:00:00 2001 From: josselinonduty Date: Mon, 1 Dec 2025 17:30:25 +0100 Subject: [PATCH] chore: reorder patches and improve build logs --- Makefile | 25 +++++------------- README.md | 26 +++++++++---------- ...tray.patch => 02-start-without-tray.patch} | 0 ...er.patch => 03-disable-auto-updater.patch} | 0 ...n.patch => 04-remove-os-information.patch} | 0 ....patch => 05-provide-metadata-mpris.patch} | 0 ...level.patch => 06-control-log-level.patch} | 0 ....patch => 07-improve-responsiveness.patch} | 0 ...ner.patch => 08-hide-offline-banner.patch} | 0 ...ions.patch => 09-disable-animations.patch} | 0 ...s.patch => 10-disable-notifications.patch} | 0 ...ons.patch => 11-fix-thumbar-actions.patch} | 0 12 files changed, 19 insertions(+), 32 deletions(-) rename patches/{03-start-without-tray.patch => 02-start-without-tray.patch} (100%) rename patches/{04-disable-auto-updater.patch => 03-disable-auto-updater.patch} (100%) rename patches/{05-remove-os-information.patch => 04-remove-os-information.patch} (100%) rename patches/{06-provide-metadata-mpris.patch => 05-provide-metadata-mpris.patch} (100%) rename patches/{07-control-log-level.patch => 06-control-log-level.patch} (100%) rename patches/{10-improve-responsiveness.patch => 07-improve-responsiveness.patch} (100%) rename patches/{11-hide-offline-banner.patch => 08-hide-offline-banner.patch} (100%) rename patches/{12-disable-animations.patch => 09-disable-animations.patch} (100%) rename patches/{13-disable-notifications.patch => 10-disable-notifications.patch} (100%) rename patches/{14-fix-thumbar-actions.patch => 11-fix-thumbar-actions.patch} (100%) diff --git a/Makefile b/Makefile index 90e7449..ea564ad 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ -# Maintainer: Aurélien Hamy +# Maintainers: +# - Aurélien Hamy +# - Josselin Dulongcourty APPNAME = dev.aunetx.deezer BASE_URL = $(shell jq ".modules[0].sources[0].url" dev.aunetx.deezer.json) @@ -37,25 +39,10 @@ prepare: clean install_build_deps @cp .prettierrc.json $(APP_DIR)/ @npm run prettier -- --write "$(APP_DIR)/build/*.{js,html}" --config .prettierrc.json --ignore-path /dev/null - @echo "Apply patches from ./patches:" - @echo "01 - Hide to tray when closing (https://github.com/SibrenVasse/deezer/issues/4)" - @echo "02 - Start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12)" - @echo "03 - Avoid to set the text/html mime type (https://github.com/aunetx/deezer-linux/issues/13)" - @echo "04 - Disable auto updater (https://github.com/aunetx/deezer-linux/pull/95)" - @echo "05 - Remove OS information (https://github.com/aunetx/deezer-linux/pull/95)" - @echo "06 - Add a better management of MPRIS (https://github.com/aunetx/deezer-linux/pull/61)" - @echo "07 - Add environment variable to change log level (https://github.com/aunetx/deezer-linux/pull/95)" - @echo "08 - Provide additional metadata (https://github.com/aunetx/deezer-linux/pull/95)" - @echo "09 - Add Discord Rich Presence (https://github.com/aunetx/deezer-linux/pull/82)" - @echo "10 - Improve responsiveness on small devices (https://github.com/aunetx/deezer-linux/pull/122)" - @echo "11 - Hide Application is offline banner (https://github.com/aunetx/deezer-linux/pull/124)" - @echo "12 - Disable animations (https://github.com/aunetx/deezer-linux/pull/133)" - @echo "13 - Disable notifications (https://github.com/aunetx/deezer-linux/pull/151)" - @echo "14 - Make thumbar actions work (https://github.com/aunetx/deezer-linux/pull/153)" + @echo "--------------------------------" + @$(foreach p,$(wildcard ./patches/*), echo "Applying $(p)"; patch -p 1 -d $(APP_DIR) < $(p) && echo "Applied $(p)\n";) - @$(foreach p, $(wildcard ./patches/*), patch -p 1 -d $(APP_DIR) < $(p);) - - @echo "Append `package-append.json` to the `package.json` of the app" + @echo "Append package-append.json to the package.json of the app" @echo "Adds electron, elecron-builder dependencies, prod and build directives" @jq -s '.[0] * .[1]' $(APP_DIR)/package.json package-append.json > $(APP_DIR)/tmp.json && mv $(APP_DIR)/tmp.json $(APP_DIR)/package.json diff --git a/README.md b/README.md index 5dd4e18..e7c6062 100644 --- a/README.md +++ b/README.md @@ -40,24 +40,24 @@ Other packages can be installed from you package manager, either by clicking on | Option | Description | | ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------- | | `--start-in-tray` | Start the app in the tray (see [patch](./patches/01-start-in-tray.patch)) | -| `--disable-systray` | Quit the app when the window is closed (see [patch](./patches/03-start-without-tray.patch)) | -| `--keep-kernel` | Use the exact kernel version (see [patch](./patches/05-remove-os-information.patch))
_This feature impacts privacy._ | -| `--disable-features` | Disable some features (see [patch](./patches/06-provide-metadata-mpris.patch)) | -| `--hide-offline-banner` | Hide the "Application is offline" banner that appears when using a VPN or DNS blocker (see [patch](./patches/11-hide-offline-banner.patch)) | -| `--disable-animations` | Disable animations (see [patch](./patches/12-disable-animations.patch)) | -| `--disable-notifications` | Disable notifications (see [patch](./patches/13-disable-notifications.patch)) | -| `--log-level` | Set the log level (`silly`,`debug`,`verbose`,`info`,`warn`,`error`) (see [patch](./patches/07-control-log-level.patch)) | +| `--disable-systray` | Quit the app when the window is closed (see [patch](./patches/02-start-without-tray.patch)) | +| `--keep-kernel` | Use the exact kernel version (see [patch](./patches/04-remove-os-information.patch))
_This feature impacts privacy._ | +| `--disable-features` | Disable some features (see [patch](./patches/05-provide-metadata-mpris.patch)) | +| `--hide-offline-banner` | Hide the "Application is offline" banner that appears when using a VPN or DNS blocker (see [patch](./patches/08-hide-offline-banner.patch)) | +| `--disable-animations` | Disable animations (see [patch](./patches/09-disable-animations.patch)) | +| `--disable-notifications` | Disable notifications (see [patch](./patches/10-disable-notifications.patch)) | +| `--log-level` | Set the log level (`silly`,`debug`,`verbose`,`info`,`warn`,`error`) (see [patch](./patches/06-control-log-level.patch)) | | `--enable-wayland-ime` `--ozone-platform-hint=auto` `--wayland-text-input-version=3` | Enable IME keyboard support on Wayland | | Environment variable | Options | Description | | -------------------------- | ----------------------------------------------- | ---------------------------------------------------------------------------------------------- | | `DZ_START_IN_TRAY` | `yes`,`no` | Start the app in the tray (see [patch](./patches/01-start-in-tray.patch)) | -| `DZ_DISABLE_SYSTRAY` | `yes`,`no` | Quit the app when the window is closed (see [patch](./patches/03-start-without-tray.patch)) | -| `DZ_KEEP_KERNEL` | `yes`,`no` | Use the exact kernel version (see [patch](./patches/05-remove-os-information.patch)) | -| `DZ_LOG_LEVEL` | `silly`,`debug`,`verbose`,`info`,`warn`,`error` | Set the log level (see [patch](./patches/07-control-log-level.patch)) | -| `DZ_HIDE_OFFLINE_BANNER` | `yes`,`no` | Hide the "Application is offline" banner (see [patch](./patches/11-hide-offline-banner.patch)) | -| `DZ_DISABLE_ANIMATIONS` | `yes`,`no` | Disable animations (see [patch](./patches/12-disable-animations.patch)) | -| `DZ_DISABLE_NOTIFICATIONS` | `yes`,`no` | Disable notifications (see [patch](./patches/13-disable-notifications.patch)) | +| `DZ_DISABLE_SYSTRAY` | `yes`,`no` | Quit the app when the window is closed (see [patch](./patches/02-start-without-tray.patch)) | +| `DZ_KEEP_KERNEL` | `yes`,`no` | Use the exact kernel version (see [patch](./patches/04-remove-os-information.patch)) | +| `DZ_LOG_LEVEL` | `silly`,`debug`,`verbose`,`info`,`warn`,`error` | Set the log level (see [patch](./patches/06-control-log-level.patch)) | +| `DZ_HIDE_OFFLINE_BANNER` | `yes`,`no` | Hide the "Application is offline" banner (see [patch](./patches/08-hide-offline-banner.patch)) | +| `DZ_DISABLE_ANIMATIONS` | `yes`,`no` | Disable animations (see [patch](./patches/09-disable-animations.patch)) | +| `DZ_DISABLE_NOTIFICATIONS` | `yes`,`no` | Disable notifications (see [patch](./patches/10-disable-notifications.patch)) | | `DZ_DEVTOOLS` | `yes`,`no` | Enable the developer console (ctrl+shift+i) | ## Building from source diff --git a/patches/03-start-without-tray.patch b/patches/02-start-without-tray.patch similarity index 100% rename from patches/03-start-without-tray.patch rename to patches/02-start-without-tray.patch diff --git a/patches/04-disable-auto-updater.patch b/patches/03-disable-auto-updater.patch similarity index 100% rename from patches/04-disable-auto-updater.patch rename to patches/03-disable-auto-updater.patch diff --git a/patches/05-remove-os-information.patch b/patches/04-remove-os-information.patch similarity index 100% rename from patches/05-remove-os-information.patch rename to patches/04-remove-os-information.patch diff --git a/patches/06-provide-metadata-mpris.patch b/patches/05-provide-metadata-mpris.patch similarity index 100% rename from patches/06-provide-metadata-mpris.patch rename to patches/05-provide-metadata-mpris.patch diff --git a/patches/07-control-log-level.patch b/patches/06-control-log-level.patch similarity index 100% rename from patches/07-control-log-level.patch rename to patches/06-control-log-level.patch diff --git a/patches/10-improve-responsiveness.patch b/patches/07-improve-responsiveness.patch similarity index 100% rename from patches/10-improve-responsiveness.patch rename to patches/07-improve-responsiveness.patch diff --git a/patches/11-hide-offline-banner.patch b/patches/08-hide-offline-banner.patch similarity index 100% rename from patches/11-hide-offline-banner.patch rename to patches/08-hide-offline-banner.patch diff --git a/patches/12-disable-animations.patch b/patches/09-disable-animations.patch similarity index 100% rename from patches/12-disable-animations.patch rename to patches/09-disable-animations.patch diff --git a/patches/13-disable-notifications.patch b/patches/10-disable-notifications.patch similarity index 100% rename from patches/13-disable-notifications.patch rename to patches/10-disable-notifications.patch diff --git a/patches/14-fix-thumbar-actions.patch b/patches/11-fix-thumbar-actions.patch similarity index 100% rename from patches/14-fix-thumbar-actions.patch rename to patches/11-fix-thumbar-actions.patch