From 77730bae29a009049e587ccbe37f80ac5cbf56af Mon Sep 17 00:00:00 2001 From: aunetx Date: Wed, 13 Oct 2021 00:14:07 +0200 Subject: [PATCH] Update makefile --- .gitignore | 5 ++--- Makefile | 17 +++++++---------- extra/linux/systray.png | Bin 0 -> 1545 bytes quit.patch => patches/quit.patch | 0 .../start-hidden-in-tray.patch | 0 5 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 extra/linux/systray.png rename quit.patch => patches/quit.patch (100%) rename start-hidden-in-tray.patch => patches/start-hidden-in-tray.patch (100%) diff --git a/.gitignore b/.gitignore index 55f9996..16328e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,13 @@ node_modules .flatpak-builder build -/dist +repo +generated-sources.json source app -extra app-32.7z deezer-*.exe package-lock.json package.json app.7z -repo *.AppImage \ No newline at end of file diff --git a/Makefile b/Makefile index 275c9ee..9a7b1d1 100644 --- a/Makefile +++ b/Makefile @@ -61,17 +61,14 @@ prepare: install_build_deps cd source && 7z x -y -bsp0 -bso0 app-32.7z # Extract app sources from the app asar extract source/resources/app.asar app - - # Add extra resources to be used at runtime - mkdir -p extra/linux - cp source/resources/win/systray.png extra/linux/ - + # Prettier the sources to patch successfully prettier --write "app/build/*.js" - # Patch hide to tray (https://github.com/SibrenVasse/deezer/issues/4) - patch -p1 -dapp < quit.patch - # Add start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12) - patch -p1 -dapp < start-hidden-in-tray.patch + + # Apply patches from ./patches, default ones: + # Hide to tray when closing (https://github.com/SibrenVasse/deezer/issues/4) + # Start in tray cli option (https://github.com/SibrenVasse/deezer/pull/12) + $(foreach p, $(wildcard ./patches/*), patch -p1 -dapp < $(p);) # Append `pkg_json_append` to the `package.json` of the app # Adds electron, elecron-builder dependencies, and build directives @@ -110,4 +107,4 @@ run_flatpak: flatpak run dev.aunetx.deezer clean: - rm -rf app extra flatpak/{.flatpak-builder,build} node_modules source app-32.7z app.7z deezer-*.exe package-lock.json \ No newline at end of file + rm -rf app flatpak/{.flatpak-builder,build} node_modules source app-32.7z app.7z deezer-*.exe package-lock.json \ No newline at end of file diff --git a/extra/linux/systray.png b/extra/linux/systray.png new file mode 100644 index 0000000000000000000000000000000000000000..4e97125454660928a725fd7c69fe18b9831016f6 GIT binary patch literal 1545 zcmV+k2KM=hP)_IX=H z@om(VSqx^!KMD(y4~md z>eQ)I_riz~BSwrEF=E7s5f3Hg&;|^FXI}aG$L7o9pI-Yx*I&mE!Jhv+?k-LzGiknb z-RE3K0}hRcUVx9pHu&ksk1yVPfA!_-KbhYh-kK2)7H*sh z`|tUrHF`#huo5gQq=>B}B*9aJb?r+6>xiX@tmV$hH{LlPf&@SM?h!}-{=TAM`-kYB zaOdW~yLk*)@R(RQ^CWlXKKn@ugMu3yWOp~4g$fY^$+PZ6JtYMt2m)}%79R>zvtT`h)Zn?(%$ph<1)Z5uwsYgRm5BJo)q%1 z8<3iAX1FEo9rZ2JrAJT(5MZ^MqDDuYdk`lno@?KFI1e}l8jI}Ca+Rd5JGA7*WgriL z-puY2@5h6_R}8uY?n0Qxp1b$GfDK^;b?wN@5FWs43d#2nZ{vXOT@IvhOOBhZ zaIIJ>?NS#chc^b`4ZxG9%f)}*fAp+Ks%UO&0SrRT0o1w?00h%N4rRlL2NgF@h2Q4X z{yX_fo=>nvB+qBqV#0bp!4@-YJ|VYdcQ3+x`rFT(zw$c3kDvP97na1&E;XJ3j)nVX;fJ z$e(W>1eZMNNnYM$gNmh4;z3e82RxNCf?GW+SRh+`33weqO~0x^UQ`hxP6E_H-3TfK z6BJN20)o1u4r`zN0$42Wo*v6lep!@~lVrygL?OlO#UEV{)1k53qn{GfBP)Cfe9}}noVMDwTT1~gf z?U3Iuh}mZK1-EVTIDu03uRvcQ2QD^tv?Q&Nlni3^%9VI;j8uVco(jVz#oZzr?kPw= z57;5<+eCN0qqHCCMKH;LUegQ0ARfSd&iu9@mi8}!eMB#NL)-2{jO%+r9()PhD-M+W zzpeK@K+LXod9L<^EmT5c(h=T>BAwfBL=i{>y%oNC=C2mSddK02-IvP;-xjFDU63r@ zY~RZZr0)ejKq|b>{!g)R%aURi%4@J(-ui6F3aqOjZE5nG_BRx{qp%EaMAtg=5HJ)i z#07#_J=i$G;Uq5R0QT|NNLt_8Y=3my9}1qzwnrQJlVbuBb+B}N#DfaCxXm+eJPtsr zy}6dDH!^Pu&)6rv$*TbWxWyy0CVoCOGiYYy<&4zK$n(-pwXdt^8C)E(UQPb;xwn4u z4!|#;_|DVI7(UeyXoxg1a6v37FOdrZO^h_X@*+e|GIxIdhZk1QKKrZqx0IiY5eTU) z>;TLt^#~!<`mElI5XJu*6@K9GMR&@{z`<*Y)^_in7?k+Q1mL*gscdpCCYY76;viCX z9g(sYt*%E|Lly`0CE(itD*i2TUPJ^}Fqg7^y|h)z`#UMQEUtpO@GqG@0lfF_2kB&b z veciW1vp4V4