From 84aae7bcddeb45da3b52e8c8fe61a3544bff9152 Mon Sep 17 00:00:00 2001 From: Cagebreak Signing Key 7 Date: Wed, 30 Jun 2021 13:00:40 +0200 Subject: [PATCH] Release 1.7.3 - Adjust to wlroots 0.14.0 - Update build dependencies --- README.md | 22 ++++++++++++++++++++++ man/cagebreak-config.5.md | 2 +- man/cagebreak.1.md | 2 +- meson.build | 14 +++++++------- message.c | 10 ++++++++-- signatures/1.7.1-cagebreak-config.5.sig | Bin 0 -> 566 bytes signatures/1.7.1-cagebreak.1.sig | Bin 0 -> 566 bytes signatures/1.7.1.sig | Bin 0 -> 566 bytes signatures/1.7.2-cagebreak-config.5.sig | Bin 0 -> 566 bytes signatures/1.7.2-cagebreak.1.sig | Bin 0 -> 566 bytes signatures/1.7.2.sig | Bin 0 -> 566 bytes signatures/cagebreak-config.5.sig | Bin 566 -> 566 bytes signatures/cagebreak.1.sig | Bin 566 -> 566 bytes signatures/cagebreak.sig | Bin 566 -> 566 bytes view.c | 8 +++++++- 15 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 signatures/1.7.1-cagebreak-config.5.sig create mode 100644 signatures/1.7.1-cagebreak.1.sig create mode 100644 signatures/1.7.1.sig create mode 100644 signatures/1.7.2-cagebreak-config.5.sig create mode 100644 signatures/1.7.2-cagebreak.1.sig create mode 100644 signatures/1.7.2.sig diff --git a/README.md b/README.md index 7b722f4..169431b 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,21 @@ For every release after 1.0.5, hashes will be provided. For every release after 1.7.0, hashes will be provided for man pages too. +1.7.3 cagebreak + + * sha 256: 8adb4911d9603fec5b8eb4f67a09be95b8f0b37e50d4ab579191da78df18f70b + * sha 512: eddaecd7b577b9fe77b1ed4d341074f7f860967568392d0479543ea8860b4289df3eb5645885e18e35260b14843663ae50f98103f8016e857237a397632322a6 + +1.7.3 cagebreak.1 + + * sha 256: bcc623e42c86ab65bc2f8cb7e4377ca0d816ddc281527b7caeded62753e943b8 + * sha 512: b4290e1040bd6a299d478ad6b695de75cf030d0d274340b43d3ed4382cf6877f824cd4ed9d7020bfb55afe276c62de7fc07c3fbee6f6485c6440a024115afe12 + +1.7.3 cagebreak-config.5 + + * sha 256: b9789b6abd473e9afb33d4e2c7822f7d8f3c10e9eb3fb70c47b713f6331c626a + * sha 512: c49e01cfc4a4ed272f054bea8f2845f0e3f1609cf85d1a0ce14c1b67dc207df153b11bc20ceef09c855d467f0e013e54623ce9f70c217c4278607fc54d0e3206 + 1.7.2 cagebreak * sha 256: 40f4642e8e8caee338055079b046f6e0b790c87226ee307b27a64fcb2a6c6472 @@ -331,6 +346,13 @@ For every release after 1.0.5, a GPG signature will be provided in `signatures`. The current signature is called `cagebreak.sig`, whereas all older signatures will be named after their release version. +Due to errors in the release process, the releases 1.7.1 and 1.7.2 did not include the release +signatures in the appropriate folder of the git repository. However, signatures were provided +as release-artefacts at the time of release. The signatures were introduced into the +repository with 1.7.3. The integrity of cagebreak is still the same because the signatures were +provided as release-artefacts (which were themselves signed) and the hashes in README.md +are part of a signed release tag. + #### Signing Keys All releases are signed by at least one of the following collection of diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index 557cbac..c3447fd 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -cagebreak-config(1) "Version 1.7.2" "Cagebreak Manual" +cagebreak-config(1) "Version 1.7.3" "Cagebreak Manual" # NAME diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index d0e67db..2b4514f 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -cagebreak(1) "Version 1.7.2" "Cagebreak Manual" +cagebreak(1) "Version 1.7.3" "Cagebreak Manual" # NAME diff --git a/meson.build b/meson.build index 2e5c248..9e73902 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.7.2', + version: '1.7.3', license: 'MIT', default_options: [ 'c_std=c11', @@ -53,7 +53,7 @@ if is_freebsd ) endif -wlroots = dependency('wlroots', version: ['>=0.13.0', '< 0.14.0']) +wlroots = dependency('wlroots', version: ['>=0.14.0', '< 0.15.0']) wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') wayland_cursor = dependency('wayland-cursor') @@ -198,13 +198,13 @@ reproducible_build_versions = { 'wayland_server': '1.19.0', 'wayland_client': '1.19.0', 'wayland_cursor': '1.19.0', - 'wlroots': '0.13.0', + 'wlroots': '0.14.0', 'xkbcommon': '1.3.0', 'fontconfig': '2.13.93', 'pixman': '0.40.0', - 'pango': '1.48.4', + 'pango': '1.48.5', 'cairo': '1.17.4', - 'pangocairo': '1.48.4', + 'pangocairo': '1.48.5', 'math': '-1' } @@ -257,7 +257,7 @@ if get_option('man-pages') output : 'cagebreak.1', input : 'man/cagebreak.1.md', capture : true, - command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1621324686 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1624989203 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir1 ) @@ -266,7 +266,7 @@ if get_option('man-pages') output : 'cagebreak-config.5', input : 'man/cagebreak-config.5.md', capture : true, - command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1621324686 ; @0@ < @INPUT@'.format(scdoc.path())], + command : [sh, '-c', 'export SOURCE_DATE_EPOCH=1624989203 ; @0@ < @INPUT@'.format(scdoc.path())], install: true, install_dir: mandir5 ) diff --git a/message.c b/message.c index acf1ffc..2ff2075 100644 --- a/message.c +++ b/message.c @@ -108,11 +108,17 @@ message_set_output(struct cg_output *output, const char *string, return; } message->message = create_message_texture(string, output); + if(!message->message) { + wlr_log(WLR_ERROR, "Could not create message texture"); + free(box); + free(message); + return; + } message->position = box; wl_list_insert(&output->messages, &message->link); - int width, height; - wlr_texture_get_size(message->message, &width, &height); + int width = message->message->width; + int height = message->message->height; message->position->width = width; message->position->height = height; switch(align) { diff --git a/signatures/1.7.1-cagebreak-config.5.sig b/signatures/1.7.1-cagebreak-config.5.sig new file mode 100644 index 0000000000000000000000000000000000000000..048473eac0b262e824d8812c1ca7fa06c0184947 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0$`Kfg8&K%5b{@R z(`FTGx&0px|9>xu{GD6iVTW~8P}kb-3=HX+F>p!hKhFT!))}4xau~K zT4#YLj}p1#D_6m2=IPtYIg)=hpY7D7xVvX3`&b><{U46v=4a4!biL@jlMtsfUQiTc z_?bfpxdQHcPHJgR=C_wsx)V9{!nh>)d1v_ZgNgcQBFvz=mwB-c`fon$Rt6Z!X*8uQ zk(Mz*S575beXXj$DB;i*CDcDFCB|;Dsw;-&{8ZZbMDH@EW6J0T_D3u9=6KPtM_svzoY#;Dl$kf=`U_7w^Uhj`f^Z;x z4#=u9k}uPLN|hb`ZH=p`pl(($A=WiHo9FO5YBfx>h>;SN@W&v{wYB{vikZiLbFpUC zwYM)&N;~Dt6pVE{jn<99T48fc|C?%kU5W;E-()!@6N6&O(KNJ*-c{Dxdml7&6PuC~ z%%LAx8(=i97k+_qwzc7>d=Mq$dK|<-XD8=;xHvCjHZs&mCR)gH!6zG6ta0Z0fa6$| zX;9IS2{!Vo4AdRvexpx(3x*;3U2`ykvKA)f`LdZ{@mOvAyihx6ZqQ2=((Wn2dqUf* Ekg-4*JOBUy literal 0 HcmV?d00001 diff --git a/signatures/1.7.1-cagebreak.1.sig b/signatures/1.7.1-cagebreak.1.sig new file mode 100644 index 0000000000000000000000000000000000000000..35c9e1fff161db252d357169221ca1efb27a12fb GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0$`KffB*^!5b{@R z(`FTGxzhI!|6I&i))J**1ZIN%ZT$C`Pe^XB>9;7-8;jFX;e_Lgogk%{BEu%Q4Eddxm-XfW+ zUBYl-ZM)m5J41j*57;YPIu_+r<_1IeEJc{Va5cX6RV`qB(DK$B2%f-S2a zOY&9eNicETY&M38E?(T+I%Z@|XGL4E-$C)}KLq5D@rNr_&qE#-9G)9iFqiSjzcCU2`JZpQc;c|m6;-uJXi@dKV)Ya_ zf5*;o$ru<~#T9==&E{}M8OtM({rcF80@WaCq$Gay6x|o E1;scJBme*a literal 0 HcmV?d00001 diff --git a/signatures/1.7.1.sig b/signatures/1.7.1.sig new file mode 100644 index 0000000000000000000000000000000000000000..e54765f6c6c28bb2ed7051dae7aa3969664c8233 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0$`KfY5)oe5b{@R z(`FTGxeCD#|4k*{A>dJ^GyMV&@)`PVzMF((5;{)zxmH|Mk-jQkg!M5f#|GIF55dwnY9$2(~}XIG>sxz z#5Zy8t>xiRR!JYD_}J>Nv3P_R}I^?#FiXb&ApO$1@g3HjuMI zv&{N3ckF)SoN!86Z-3Ti#cyzTcs5S@0qMci_m_OlK^qR-Ykxf`uN{NUVHv;l^V1>i zNB+V=6AhDE%d5~qCkmv%s4^8sd%hU+a}El^dIP(!*6YnJN#*UpiY@JLVDsDB7SgYD znBo&Tb~nW1iQ_Q@aU4iRa$2^!vVqc#Nq0BtY1(OUGFVz8&9AZ|H=dJ<|N1QbyV%gl z7sLGt)QkG&JJ?C Ey)k$iFaQ7m literal 0 HcmV?d00001 diff --git a/signatures/1.7.2-cagebreak-config.5.sig b/signatures/1.7.2-cagebreak-config.5.sig new file mode 100644 index 0000000000000000000000000000000000000000..a6facb1580b1819d97dd3764826ac1821d2886ea GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0$`(gq5ujB5b{@R z(`FTGxlm&e0Ezk^P>5zd!hf!r@yeS>jieWac0Cpb-e<~&!YgQ{AI?`Cxg*T7SamE( zz=7VpF$v=?t$}oh4>7A?y2WYhYIL91sR6gggb4t|cDvVmUo_YB^fIgCky6KtC;l{W zeJZ?)Qc0H%$C&F;23Wd|X^}+KxHFJ_B^kwhZ4|#GDiJ>UzLZx+ZG>Qu zuyxXEsl!t@NLVWhMT~7XP?$N0G-rW{a6e&;ysNtFY6?+HedUnl zQWS?63ER;{6IFN2AmeSmYH`^l4&(f>9mCHWUg38vLRo)CY(b^`+eht4UbKbeuMAeS za)BVfo-rgu-nh=+8bB%DSKWy&sNRHIk|}BnbM~y>H8^jEbQb1UO^nO#@EHmx7CJoo z!XP1{tdOtB{tG{irLN%Wf?47gm~}bOE#@8}Ec{d8cdr=SO3U-4YviD!i`X%dXjF(OTWxqo5S8LN|6>GT#0$`(goB#?55b{@R z(`FTGxvZZM0G`i<*@2H29JpiDa!$T^9&?k!H^);7OCy066oXxO`fv<|0-=!!@L8qi zeLi)AJd#_1)1!bd+Tnwwu?qi**Ah(V_dEv!WFOW0e+RYF0X+qg^I~jZTc{SIg7l~k zHfypOXIMD|{!$96w*tjwySsy-7uuJMSLeIW@6_ zT;b&7NdXgwRb?f%z>N``JQ_vHjlsy~2L|%IF9fw>DlPEc_yCuxD_vfUIN4Z8`t)Fz zI$dt`1F+Y8nh7tv1_zjQ%>SGY$deoJom6Cl9@Y!T6oX#mUn8Wt8{~|YrC-=dzy)k$ zJkro^)_zT`tRpu3MnqO+W{Z`Ea>GMc_8k+7%lSc_hk?VQkJixK@M|E)sD+`pyJ`74 zOvPmb{_}g4ao9qe=`<|uM{p7m$X0uo9Kj-Yxl61F<1K+aOeBoV+`^C z^t=vAHkU_P2#8n3*bk|{gG@TqaQ~2@2A(8MnBGNtT^!ho@~;C2lKp7BobEu~5FXkL E`MM7eg#Z8m literal 0 HcmV?d00001 diff --git a/signatures/1.7.2.sig b/signatures/1.7.2.sig new file mode 100644 index 0000000000000000000000000000000000000000..5fd3ee9f60a885a1a5422ca86c7945f77100e011 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+QYm%>XjF(OTWxqo5S8LN|6>GT#0$`(gm;ee15b{@R z(`FTGxpxW={yodLLp2tJkG}*QcXVHQU?pSP#N@hP(M_C(waaF}hk4>#h&O>`Du)l) zOPkaqvom1YM4_yW;uvV+t>I9&KOU+CeYW)C(`i?UVF3$yKNkkrel|6yo2z^B%Kve_ z`!99pAjXuJ*!rh8zqikuzjko3W~gjzoiRZ{;To78K$Y4P^A3!h+}{iuz$Uy~BKqrK zya!2(gCaG8*(OIw8({X-YAA_Ieay-PF^_6GPJw~az@>d40bG{?#H(rltYrSsZ9{2bBD&LVtycZRPAYP7TmN8KOMvoS&;miVwfN*Tl z3hQrl z&kaPdq7u={qyatc>B&BhFGfd1AErIrkc!6Sgpks@A5wd2`~MYS{Rlr$J+$T1yK0KP~j$ zUGDT35`DJ7s@Rq%2x6I5Gd&taKauLKVCWC=&W`odo>gC4FS%@;2l-1`hkf~1Wq>ut E4Bc!HX8-^I literal 0 HcmV?d00001 diff --git a/signatures/cagebreak-config.5.sig b/signatures/cagebreak-config.5.sig index a6facb1580b1819d97dd3764826ac1821d2886ea..7461360a82d12acd110d6d03098aac099701a629 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY)gY<^T!_5b{@R(`FTGxkif*|8cRnxlLWoTBuYIvXLKuJ`Xb2 z)%D9#d}?NDFgUNM5`PaO`LIV_Bt}EvB+6A@qBCQ(WJ`tuw2nD0apV0URS@Qs*~7Tb z<(CzOOtj(g6r~&lX-&;b^~y87)%kDx*xSrkcn&^Y=>Y)Cz<>XamlCKamD3x^To2K` zK;+A>BKKNznWSdR$NyOth{<(qX$a~DLfVHW3sTE*QHEiP>%ltJ#!{>FoloRFV2~7V z>#n~CDzt43>@Dj*O07Jm+|im_L!_Xodz?n}gJ!=Y^(j^fM3uteGm992En$0kk1?Cx zf*Ey5KKym&<9~M_m;M1MQc}T6K4Rdl)CIuog^Hc}L4Sml>yRAUq6PvZo^HuUczUoK zdiT<(w(vQrmoepf&l*N)XpZ5jsx1ONh_Hk4bS0&5eVP=K$e`zr1rscP{4Fbpoa2iK z3S;2)RwiLQ5A2TAUgJRc$n7&m6~V(_JK3Mlq9j*c z81bb{N8YGAFPW}?T>4Op3Sgx#Fuvp*5S<-34K)6_p$Bb#1h=X8A3gNZ5zd!hf!r@yeS>jieWa zc0Cpb-e<~&!YgQ{AI?`Cxg*T7SamE(z=7VpF$v=?t$}oh4>7A?y2WYhYIL91sR6gg zgb4t|cDvVmUo_YB^fIgCky6KtC;l{WeJZ?)QcqYN^9hH%M433Pp@4h%{$`iE^`~ zSOYIEzkLrk3y`Bf*C592JRJ z^->cF(CT;>htKJkn1j5ly6b8RQA>U0kmXVohZqUl(M1zgcg!H;ZN6%8*(46*{IMOw z&l+CgcPv6#e@1LUrTp7R?MPmhI$bve*2 z<{lv|{8Qj}uNd4)%k!jb_hiL~|X}bvo89oyq9)G+5pmky=?L09D{<(>P zxxYs@s(6DAJkW3)Y&m9_GGd`g$gv=`mXTuOFXJwC{Iky3Ai8sRthY553fn0SgZgfP zuw-VHSvUrgE=3w1VuLqjY}#1E{P$Ean%#mc;fx(;f|W7BBM^Q6TYAPLvmzBg$cZK6 z93Na8G`bAMqJJUU0b8=l*fFth4{Tfb2CebqMO-z2D>4bS>ch4dzH~`UyBW*xXn%CY z=Q8VKSGHQ;89}+$L=FvOGYQREDsX{!opqu8Dd9cSfPkVmVe?dRe^Lo2hj^nXT7;Erz3$a zIEa0F+uNVpX!;)H)ao8rvL8H2YtMgJj}T33w6$q=nsmtriu6$lma#3ioXrdY8_4PJ zGQr>_j&D4~8RjaSxjuCYswzdmM_l&8C+9b8@~M<-{CUjbYo@!aRN-b(8ZQtXO5J`y g3uGysD;KCA6dhOYmOJkr-Z?d~gk0g|<4FM%hgD@Iw!n=Mn>-pt%8kLu<_8Ay zye|Z`Vk#~0-S_~Psw-Vyj5yg?Nc!|(mpWZ;^aHThe3}U_y9NiCbj<&p4#<-m@SRj- zgC5ok#}tEJ1 zDU<@2NL8E}uRYf5i16?+SNj)m=lk7b4DtW;ybek>mq%F$h*!nf52?R{OghwX|B#^u go+M3}-WNrBT^!ho@~;C2lKp7BobEu~5FXkL`FO+#kN^Mx diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig index 5fd3ee9f60a885a1a5422ca86c7945f77100e011..c0e34973f2a7c6665db0a15fb578d8fa37356ac2 100644 GIT binary patch delta 542 zcmV+(0^$9(1hxc_BY)gY;Q$H=5b{@R(`FTGx#c_${0PT^F-8b3g<0mOdZRIjg9K|t zDqfG?knfmy80O3&MD{o&rQ2Tt^In&nzEu4ePNT~VFve;cWJ8Y84b!2Tf{O3}Fm7$1 zjFWkQ%mCaS4EPICsEeo-vki<69JCmnUy@=iQ0o#XAPpw}1b-#ar+}z+jh9fUG2I9+ zxAT}4%4JtS#6TqNQa@IQ{b3>m-ro;gevq=+MgtFz)voM+Oz{UotiHdRA+OSLE6+t; z3OcL!_Kg0Z3n3*lzR5z+Ox!>I3(7XLD>a`jkpW{0HY?pT0V|cs^rPnuCD;PZZ9{B{ z%)A+<7~W*9C4XYNVbqrAp3|f+e&8nFr+}#wyECVN1$zsSYLb4;?H@hA_Siv=<{SQ7 zHNArT{4;o@_~n#H`lahzM1$yo)H2e=y&K?c0@8@MLv76~!w*S5;b79q)Qw7bd%vu# zYQmNplt0o&97Vtsd)UnPSnfN*{LEEKE2XEnxH#h&O>`Du)l)OPkaqvom1YM4_yW;uvV+t>I9&KOU+CeYW)C z(`i?UVF3$yKNkkrel|6yo2z^B%Kve_`!99pAjXuJ*!rh8zkj#So4WPbH`Jlc0X

gC4FS%@;2l-1`hkf~1Wq>ut45xqzasU7T diff --git a/view.c b/view.c index 410a746..19ae2ad 100644 --- a/view.c +++ b/view.c @@ -337,7 +337,13 @@ view_map(struct cg_view *view, struct wlr_surface *surface, view->wlr_surface = surface; struct wlr_subsurface *subsurface; - wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces, parent_link) { + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_above, + parent_link) { + subsurface_create(NULL, view, subsurface); + } + + wl_list_for_each(subsurface, &view->wlr_surface->subsurfaces_below, + parent_link) { subsurface_create(NULL, view, subsurface); }