From 39ce5d16af48d6a5f1d15027fada04e245d68124 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:28:41 -0500 Subject: [PATCH] Fix Macos Dock showing icon (#4095) --- cmake/modules/MacOSXBundleInfo.plist.in | 46 ------------------------ packaging/macos/Info.plist.in | 32 +++++++++++++++++ packaging/macos/flameshot.icns | Bin 0 -> 8507 bytes src/CMakeLists.txt | 3 ++ 4 files changed, 35 insertions(+), 46 deletions(-) delete mode 100644 cmake/modules/MacOSXBundleInfo.plist.in create mode 100644 packaging/macos/Info.plist.in create mode 100644 packaging/macos/flameshot.icns diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in deleted file mode 100644 index 4100a011..00000000 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ /dev/null @@ -1,46 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - flameshot - CFBundleGetInfoString - - CFBundleIconFile - flameshot - CFBundleIdentifier - @MACOSX_BUNDLE_IDENTIFIER@ - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Flameshot - CFBundlePackageType - APPL - CFBundleShortVersionString - - CFBundleSignature - ???? - CFBundleVersion - @PROJECT_VERSION@ - CFBundleLongVersionString - @PROJECT_VERSION@ - CSResourcesFileMapped - - NSHumanReadableCopyright - - LSMinimumSystemVersion - 10.15 - NSPrincipalClass - NSApplication - NSHighResolutionCapable - True - LSUIElement - 1 - NSPhotoLibraryAddUsageDescription - Application requires access to save screenshots to your gallery - NSSupportsAutomaticGraphicsSwitching - - - diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in new file mode 100644 index 00000000..c1f165f7 --- /dev/null +++ b/packaging/macos/Info.plist.in @@ -0,0 +1,32 @@ + + + + + CFBundleExecutable + ${MACOSX_BUNDLE_EXECUTABLE_NAME} + CFBundleIconFile + flameshot + CFBundleIdentifier + ${MACOSX_BUNDLE_GUI_IDENTIFIER} + CFBundleName + ${MACOSX_BUNDLE_BUNDLE_NAME} + CFBundleDisplayName + ${MACOSX_BUNDLE_BUNDLE_NAME} + CFBundleVersion + ${MACOSX_BUNDLE_BUNDLE_VERSION} + CFBundleShortVersionString + ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleInfoDictionaryVersion + 6.0 + LSMinimumSystemVersion + ${CMAKE_OSX_DEPLOYMENT_TARGET} + NSHighResolutionCapable + + LSUIElement + + + \ No newline at end of file diff --git a/packaging/macos/flameshot.icns b/packaging/macos/flameshot.icns new file mode 100644 index 0000000000000000000000000000000000000000..b8db080fc200fc45e55c3ff6c92b6165af6dbbc1 GIT binary patch literal 8507 zcmeHtS5y>B+iuScLl_1SBnLssC`eENksuNTC8GpI1Vlh34s1aMX2>cML{X3^Nf9N? zkTXaS5JW(NWRM&tkzx98_P5V}{)=;S);bsGV)t6zRqs=8yi39cOEU zyGBNU3{+R zKWyyXu;=IiS6gjtIj`DtBN3H|I66TQEqIt5;Unke*SXnT+4oLzU3;Hzc`IOI*S;gS4TgdD8|ZLbHe94?reuf~GEXWUymsT95oeI&)r^{scjaQ*X@ z^?$}OJ*rzN>+1Dt#%8^;mp@wOXV=!&o`}Cph>3|AuS=FmEXXCo@3bYqd$;V}P#!D}8!I@I1V| z2US5YcT2XVqqB1`F)?xc`M#{UxcG~}z`#%E>|Gf$EV&-|Cw@shnwy*Zsvf!X@T!T4 zr#1erkvQ5Lm`*YPP*RUr24Ai}t_{`q(`S8%at^()-!8{La`+&@_gdg=jLlo|(O+{M-?k z^gssz#QUvG{DEq#p~cn((|3(to|Mc-{1Tb<-j?3}q;m15)Z1y2zic~bhYnH^jb7GE z=`}PQy{hl>l}C4&UdTz~Zi5%YAlS;p^eXkcA!~s5!LA?9L*2*Lbr}<3AP&C@sY)nfSG1A~JJ}o%UG1L_!pnWu%;J z`Mu>ij}c;C`fYxGzN43)6hlVX<9bwSL(JK5x+c%&JO?56XK^;?RaC4)do?Bch4Vh& z6v+siFYf5*m`hGhrdyXgl{)sJg%~m>sXG-!jS?0>-DdT z-^)gnV_xFYllG`ifj>Ubh4;u+QANA}E#!79EaH#y zRG`;YgexLG@ZuIX=Z^F#qI<^o_U|1CEKxY^VQ#dzEK#TdW{joXPpQL8t`L;r2IHm~h?Z$o=o_#YK;j z0wPI%CcF$oR-zd8^Gc=N-hKrf6QOVXw5+VGxIP3)8Z!D` zc3#PEKcvVMvNqhG-DO7)8w%X{(>Jr|dE8X*(@`ri?K(#vpOTc%7OCqlZvwESkOI~& z?1PXfe%2+R^VX&In|6zzu9{+|`-teHZ}3a}`+}LS?GtSnQ5ks!`rps(!otrso#2~O zi|}k2PV6}idoUo;vOP%m{kB(G(itv%3_0C z0{i9Z(>3;h%83@gvn6OJk7jnKo5eP&E_X-*o;B@cbpm8_fStU&-6uQN zbJH$X+v5h3uTX0?JL&@;mJshar@LmNBxRb`i#KNQN-edy3&5m6a&<#>3~m7_X+)hcIdjZVLT zoBY^0?qB(&Lrv3gE|6zRS7E1)KIc=>aEMe$6g9I+1W^coRdy6*GYedJu$^pS(zpi3 zN6BBAqWhWyJM|LHAPpot5Ae6|gzp7NRjPbpuz7PiXR0}pO;V_)9d_a9)iX5aq81ae zCVx$bEZKp5zV8Dni~ZW;{JWHihzcjOahH7tCnu-ABnQf-1m|CW#wctJFNo%>)1+s! z^PgN0W^FE#A}ceZqN0KAGHqDx69D^1Jkjlr?S~xcW#HDr$fFA6IGX^Ine+jvX);6* zYy3V~khmf*sZoX@?-x9_+&27Sr)v(`2E!J`BKZelyXVWru5xgFy z&IW?Ru;|o3YSSF7Qg=7h1H0``d0gscWPS36{ZeJ?$>Rvi>yOgnZPvzF^d%(tfr3*? zMv_@FsHyt?Gnv822JP8`U8Hm~&-ZXatH)7{+dLC!QD(J;feoU@w!YUmMs*x{B04>6 z%t>@TnD;_gnR5TwSRfCp{L2$ZBdRw7bZZ)vD>Wi2e zbj0qJ=MdXG;WV{!+vbd*6#Hi!D}w@Y*DmvaZ2NsRn7lKe9-C!yZc9mK5nz+=0zXV8 z$2*VPpS|gJ?L4Qeg5I4p_{L7lk{(BPT1(Qg0v+9;7wO{g@mAtyPPCP`5RuC|PCD#r zzryt{Ckf{WIV+}}bFFP^YHEW%vP*@{SZ!3gcXWN2TrizZ;jEIev-;dK!Mjp!UmiEa z=`7kx_|SYrG{F`cCG#{0*ah`d6Dvghs|3*jS63VKMW$v)lqCr0q^&G2N;|fc zE0po^$#^6Q@T<&QemmDS(?iwwCu&d#&Ki$Ogt%`m0GeoRH6Wbjr26Xm<`>#azw_(a z?C6c>9`x9gZC=6LC!4(Ld2W)-U*$@_9SvfL_eFTwslM)%R4-(>%}EiK{4JAmH>{Qy$r;tkfkdJfN@_mtcdCE|C^k%QUlQ4$+P zy8#ppwP(ztlk|eyoovk#Z|`t^nLeLdUI}MfHuHaWB%P0+UncAG-2q*{dF>u?gt(Q? z&@zll44cPvE10eOgNT&3a-(#E~poqsu>)lbYQzM z^NoCu{a!XL#^Sd;ji*OrZ-sa8d4BC5i9wiWV`Ae;p7Al=p4ps_Mq$q zksjsZT6ewUIE8YPT+c>XJ^QaeJ`vZC{3V#W8!M=)7=sAm5>e&T%U{aY#tv-T z^a@?cnYiUMK7HNOamTL*p&2-fcWDkzLLFRWJKWH#ooQhm8%IgkT4TVcc{KQ|A6r$; zH=bKfAWfGeMi1!^l|}bPR3*Rrh|3vz_EB zmkukKI;bFD`63XY&ZyRjKQFi<6YscS*a9f~8 zXdL0f)ZB*FKjuHA3g?dYvc+=|%30sKT%aH6X^vD@s0yVC`vk|3vO1=gyZX|e#On>3 zB>rU8vcZ^}dS5G1O*0FB=!gw`CNG7X$_fJ?3C2sijRh$xUf|qdE_mUx-YA@+;yvBb z)O{q}-)= z(#Jk?)+5B5W5G=`#4QEO{KNrLnf5~=U@V5O_ za>)ayqxEvMtXs1sALKH9lF(x;L`}-oWo<8RmA!gfErLWFak|*onJ=7YzNa5IlPhRb zzT$j~fp=2}x3MdH8)P(#qZWQTuX(z)T85IZB0S5%O6)9(aqrR8h$it21~% z0PMD0B!D=3fQ7vP-~kn=2mlcYmNP=ev%N>*0G;9*xNJSPb^1&gYPyoqP4ubni z5OymBKr*(2peq~)z~~aNAnf2;H~_Qy0O9frAlS!;1>p3dyEqW=4FllDtItCK*ex0s zL>fVgH-0w+1VTdqIwp@b&<={g`WXiz(gB6qFc65w0`y43Y7pF$hFWwsaUgsKw-62@ zaR8@d*&cMOZVoJT)6XFwY_~5Qq&s*X*}nxDiS!Vx3x$Slw}peS{km`vu!11oj?jM~ z%AYV0HYW{X;Rg`5`vY?8+6e=ZrAPoczXCN97s5a|<=0*)h}?Yu036kjM<*>5gzx_( zhJkc_0ss&c4#F4aXdxhccXSErLc50rfKjO1&cGH98qG@g3=M*t(Ga`~_1x=UhLW3} z=-q^3Eok5XU^NtE9GeG0+EULPDFTFV-+)2rw-AtlI0Ax{p`qsh**S22a1RQ3r&mvp^z2)B!<=I;0H}_yWL!5OK&f^2A{kqRj@G zN}h!%k{=4-K!`ISX^TuDLI6Gl2nBHfJxHQZ$Ydf!7yRE47C?ZcO)8EI5v91S6+5COstF*vD$5Q2x7;|YI5 zRB9+0wlx)or>n+y0YD_=L=7P$s2j~CA$U3hq4;lXj}!t0+ZrQ4UFpj3c;GM^?LUrl zrD1p&q2w?cYU?oPtqtOEDIpXO|7R$uUCIWTvOyecC_Y5Xpb37Im>)-K^8kz$5$Q^?GP-D)D$|K8ozI4S;4UVUR+Vd~2O7vMWS;;7&fk`AO$%bnO!L@W>x5U@JM-PuW(*)U~r5c|iEMY4V(7?zpW z<$7y|4r37{+oy(pbJw#eUT9v}$459Xu~tUnSf`m^mNFX}?f)r1zfRBPx_N>A&jS|z z#-jx{c!Q>NvwCfpXiR!?4qqicS{Z~mfY_?RZgb3nyT5Sejq=)Bbz5$L{yxlC(Xh~* z=YnQTIz2@-<`!q0?R-0z_H}9mb#rrsUqGNIA&IS_T=Css(D7~ja|ux7l}Iw|w(Rx1 ze~P<08Y8?l*7C_p%u=~Mhh5p(Bz4*5@lbN#gZTC(02*6I`&Z<|Mc$4;wHl% zC9^tYhyd5Sk^9@n_WHO4zbP#rY1Y#TxVpT&oRD2L&L|1f3a%Ji!=8Et0Ge$hd26~E zmu^goU8xdF{k}MpY1+{PMn$VsIfDxhp{lxB-D7`Qg>S z-0JKr*(dHPIGWz#%<7(KX%vH1sJN*=vLItZdrHr)r{qFg8uhC6YPxr5{s$_TS#LCLb zKC46T*_RycesS~VQBmh2C};3Lce=b&BJy%`XQ{FH!o-u}I6gCt)$+!mg87?NG3;{m zPhd71%osXVn(NWoc-t!=D2T@B?gi8>B&PBw-7)Y8J25ji3g1H-Jv1`=u@iqR&Sc#v z!cLT}ZN{6qn~kz@Ly(WpMp7VlszIjvntsW3hANH$87EX_jn82G!Dw%9annd#KL;A; ze>S!w?z%6Y;RA`hu&{vYHgW7fAo8miSwe2MW>WqGMwj+P{9>r$}$mm>HBC(TxI|{ueq`l|ax+QG|MQ zhCYjH#>TC{OXWf(f#9qC2-`O%lJQAJSRyA}Ux#x&@fFan4X?L%TtVNLWX-~0Fp^W^ zOmh~7B(C)Cp|SIQeO5{$r9w?pXXnbVTUmW_trJ11udc3!K6i>|OXP|G75{HsA0+L;*Z~$O~ zWS_eXwAA;Pg#;l}zb#ZP{RmYbgCRJ8#}@kdIKC|b+}{B+0Dvwe4FHU3U}QWNWX_?} zuLaEjL@fv|;lLwptu$~=5U`^`<_;u6SFs?v3?}ghTBI&R*ct^3!mWW;NE)qEz`f-a zC_+0E0C{dM@2@OuKr7ufWdQgLX|B!1ZOE6_qlE>S&+Tq5t$}MbPn|SSkTQW4l9xt2 zgdu4oH=N4%41irc@)Uqlp+dR_0HIVU6lnY)2#tS+O8s9|3P`~LaA@U^1DOHR);<{k z>Isku4dH-9rS4Me38hu|!`59gg}gmk2w7#2iP|HP$(tRegi1WLK1Xds`d|rC5EX<& zR~mV9bH1+RP_!JH8=G_Ogc3q!Y3X5Hrd{$6e0gO_f1G+5nJj%gJ$V`! zbXX*o-qORt-P!&KH`L_p>*V0;@W9hW*2np-vyZcfle49plc&dFOaVdej0`OOPhpYc zCv5){>9C{qf2z)yo5mJ8Zce^XA`U(Q?~jXG8(WzCod6>{znHY5vcXj|iyIEEUXMe< oBcDdc#Jzk|R9aJ8*U<7~c<%7$2Iznt{>pH8i2bMd?<@Jg0Q3~fH2?qr literal 0 HcmV?d00001 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 98ec9220..6d109772 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -238,6 +238,9 @@ if (APPLE) MACOSX_BUNDLE_IDENTIFIER "org.flameshot.Flameshot" MACOSX_BUNDLE_GUI_IDENTIFIER "org.flameshot.Flameshot" ) + set_property(TARGET flameshot PROPERTY + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/packaging/macos/Info.plist.in + ) target_link_libraries( flameshot qhotkey