From 447e3e662ebfcdec01c7bacbc3627439c2ea8d09 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 Jul 2022 20:58:53 +1000 Subject: [PATCH] Ladybird: bump git revision * add haiku icons for toolbar * fix resource dir * fix typo in recipe --- .../ladybird/additional-files/icons.zip | Bin 0 -> 3230 bytes ...725.recipe => ladybird-pre20220728.recipe} | 41 +++++++++------ ...patchset => ladybird-pre20220728.patchset} | 47 +++++++++++++++++- ...patchset => serenity-pre20220728.patchset} | 10 ++-- 4 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 www-client/ladybird/additional-files/icons.zip rename www-client/ladybird/{ladybird-pre20220725.recipe => ladybird-pre20220728.recipe} (61%) rename www-client/ladybird/patches/{ladybird-pre20220725.patchset => ladybird-pre20220728.patchset} (58%) rename www-client/ladybird/patches/{serenity-pre20220725.patchset => serenity-pre20220728.patchset} (98%) diff --git a/www-client/ladybird/additional-files/icons.zip b/www-client/ladybird/additional-files/icons.zip new file mode 100644 index 0000000000000000000000000000000000000000..368db6c51746ed5e60cc7070a9dea91e3d9eaa2f GIT binary patch literal 3230 zcmcJScTiL58pcmTLI(qaNHuf?M4I$!f*2wYAc*v4=-tp1B=oKbs6a%d$Wj;SO{FAC zL_wO3Cdj3Vh=8zCmT=iGw=E4%$)PgnQwm2`#uMQrh_m8v=x)LgT+|O z1!aK%fL1I(8sO%4)Y-|!OV;1l%>v5=(79T_bzY=aP$&xkg3#XjdO3mf0a9ppjDYNI zh24~6M|xfyqdY}Fx$+E!V+>^7=R^RQ;!6!s@JCkM&{E8G7CJw zY|MPL4`)N2LYh%`7_AuTsn9rRH<3QT`4QU-$bHV+EQ8JVS&=GPr~7P1jRD zti^18UhU8+G(bL-U8~%Ew8X`9)mW?88rec0-^yfn#?M**CV9gd<#D=p$O;y%T?6ks zp;6F$k!F7q+9QCvTl)f?Y=M#?6nBPeXqmneI7im{RrHEGSzmnwY7Z~Cc zcFG*cW>G?Wtq{Rm8maO8Z-l>-_x=$TFML!H<0!7i*OtTxRxn5vuA zv0xXCu-eJux|4Y$jhQMFhBnEf`id{z4B5}J9E!Iv%8zWq-43t1Cx2flqW+3KrRSU? zeD_v)^^4J|-MfWTLmTwG+tapVmdAX%#m4n7KTgR+1Zu}uI2n;fh2S2N)&X8k@8-+! zKZ{*^;31=OIjPc3_zTBqs>&X7dbp92w$elrb^(lc7mwj5^Vj%`hrh2OhCb&P-Z~I* zWSAvki_?H|=;@w%nAX6((eSAv`7sHtZTSNOP>`>@pG~+wYOIZv? zJ=`JV*5ixMnSJihbzd}QK(TUW%_@n%ZcD7nDo6RWr&yDeRhlEQ4=ZOlxV0lRNF5 z*R+e`qNvXWhuD7FuD-#;wc>?~>lo(p&`o=ZzE0{~e=9OxR8;NYIZ~!NPb7$9?0-7! z;$~=A%dVOiZg?lVx@-y`p#@%VYB1GQip|LD-JHQ~k({PIG?)3KJb>jcB-TQ_q^CpT#2|_W&(X)O943NT!{k| zI(I0mvQP9?of%{7SV?KZBfejzW*Y*Ud+KdcRm3spiwh*hs(sY9GZ^LzkSo^!S(D z8e)WqtC--5?@c+6T}HVb{yn?3tHK78EPw5lVyai_g|qV$ zsXn0h$0 zH≊fcJqk%{6CUhb@?JpYE}tLB$MclN(NkEYY@T|i&n+VG9=I8r^X9q*6|30zHK z6USXwI{y$c3d zWKmqtMP_--&bl+fTP)xa1`1-?kzqN6QKrWh+;%D5SGCOVIu-4b)1qE%G`iU2basIE zZ7n+>FHEfQe;noxOh)saP9S3C8o6BE$#uy}IiDnJM=r?R(&dz1%w2glP5j7C7;8%_ zs3X?ow==0%jp!j!3es8F0U;LSmks9mUN_Mhe)TNktL%e{N0izsXM(z29AXkb7RXNy zY@s#7Bt6P~^mBL-US*=vZ_+tas$rJOH+LHoWx}R>{3M-s>_N)6EOgoAX2y7JlO0}B;;D0sL6 zoS+6@Z|eMFz5|Xb9W9MtfQNqT9uQcF?(g!kFzwN=t3HaheUp}j_fY8@2_HWV<`gH&R literal 0 HcmV?d00001 diff --git a/www-client/ladybird/ladybird-pre20220725.recipe b/www-client/ladybird/ladybird-pre20220728.recipe similarity index 61% rename from www-client/ladybird/ladybird-pre20220725.recipe rename to www-client/ladybird/ladybird-pre20220728.recipe index b423e6cfa..239d466fc 100644 --- a/www-client/ladybird/ladybird-pre20220725.recipe +++ b/www-client/ladybird/ladybird-pre20220728.recipe @@ -4,20 +4,23 @@ HOMEPAGE="https://github.com/awesomekling/ladybird/" COPYRIGHT="2022 Andreas Kling" LICENSE="BSD (2-clause)" REVISION="1" -srvGitRev="9e3a1f47d484cee6f23c4dae6c51750af155a8fc" +srvGitRev="75d7d82daa06c9db90e62a6a7250e57dcc4951b7" SOURCE_URI="https://github.com/awesomekling/ladybird/archive/$srvGitRev.tar.gz" -CHECKSUM_SHA256="65aa7fda09cbee902a4d8d59557f2d76d5fae047049328210a174cc846f49288" +CHECKSUM_SHA256="0dec3606fa3ccc136d7aa48d694d267f48747e8fef5a3a671bd973175429648d" SOURCE_DIR="ladybird-$srvGitRev" -srvGitRev2="c2a1817c704a2e7109c823c8b847731e12f647e9" +srvGitRev2="ef2d4b9ed6b7e69e51a8038cf8a881c88e32b83b" SOURCE_URI_2="https://github.com/SerenityOS/serenity/archive/$srvGitRev2.tar.gz" -CHECKSUM_SHA256_2="399f2c904fc8eb9e02658a9b82ecbe80cb0a5d772688dc550c76e84db4894fc6" +CHECKSUM_SHA256_2="3187176935f1f74f298d7e955ce3e5972af8c60fe4ada2db5b26562ebbc35cdb" SOURCE_DIR_2="serenity-$srvGitRev2" PATCHES="ladybird-$portVersion.patchset" PATCHES_2="serenity-$portVersion.patchset" -ADDITIONAL_FILES="ladybird.rdef" +ADDITIONAL_FILES=" + ladybird.rdef + icons.zip + " -ARCHITECTURES="!x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" ladybird$secondaryArchSuffix = $portVersion @@ -42,28 +45,34 @@ BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix cmd:ninja cmd:pkg_config$secondaryArchSuffix + cmd:unzip " +PATCH() +{ + unzip -o $sourceDir/../../additional-files/icons.zip -d $sourceDir2/Base/res/icons/16x16 +} + BUILD() { cmake -GNinja -B Build \ -DCMAKE_BUILD_TYPE=Release \ -DSERENITY_SOURCE_DIR=$sourceDir2 - ninja -C Build + ninja -v -C Build } INSTALL() { - mkdir -p $appsDir/Ladibird/lib + mkdir -p $appsDir/Ladybird/lib - cp -r Build/ladybird $appsDir/Ladibird/Ladibird - cp -r Build/_deps/lagom-build/*.so* $appsDir/Ladibird/lib - cp -r $sourceDir2/Base/res $appsDir/Ladibird + cp -r Build/ladybird $appsDir/Ladybird/Ladybird + cp -r Build/_deps/lagom-build/*.so* $appsDir/Ladybird/lib + cp -r $sourceDir2/Base/res $appsDir/Ladybird - strip $appsDir/Ladibird/Ladibird - strip $appsDir/Ladibird/lib/*.so* + strip $appsDir/Ladybird/Ladybird + strip $appsDir/Ladybird/lib/*.so* - addResourcesToBinaries $portDir/additional-files/ladybird.rdef $appsDir/Ladibird/Ladibird - addAppDeskbarSymlink $appsDir/Ladibird/Ladibird + addResourcesToBinaries $portDir/additional-files/ladybird.rdef $appsDir/Ladybird/Ladybird + addAppDeskbarSymlink $appsDir/Ladybird/Ladybird } diff --git a/www-client/ladybird/patches/ladybird-pre20220725.patchset b/www-client/ladybird/patches/ladybird-pre20220728.patchset similarity index 58% rename from www-client/ladybird/patches/ladybird-pre20220725.patchset rename to www-client/ladybird/patches/ladybird-pre20220728.patchset index ef173adba..397538eea 100644 --- a/www-client/ladybird/patches/ladybird-pre20220725.patchset +++ b/www-client/ladybird/patches/ladybird-pre20220728.patchset @@ -1,4 +1,4 @@ -From c895179ca2f9d9d8a87059cc5b70085dd7384681 Mon Sep 17 00:00:00 2001 +From 731d6ec7c75908c775253abc800ea80d69e48414 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 22 Jul 2022 21:34:16 +1000 Subject: Fix build for Haiku @@ -29,7 +29,7 @@ index ce0f107..60ba806 100644 2.36.1 -From 40e9da08790693d75bc4b1ee2c0e098e3e1b487b Mon Sep 17 00:00:00 2001 +From 105c8702dcd2ca877915b117661ffa3752ba45c0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 22 Jul 2022 21:34:38 +1000 Subject: Disable tooltips @@ -58,3 +58,46 @@ index 8f0d8cc..1b02266 100644 -- 2.36.1 + +From 83c5d9f1391ad89e972a101e288c88549b0061cb Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 28 Jul 2022 20:11:13 +1000 +Subject: Use application dir for resources + + +diff --git a/WebView.cpp b/WebView.cpp +index c7a20fe..cf4f71f 100644 +--- a/WebView.cpp ++++ b/WebView.cpp +@@ -62,6 +62,12 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#include ++#include ++#endif ++ + AK::String akstring_from_qstring(QString const& qstring) + { + return AK::String(qstring.toUtf8().data()); +@@ -77,6 +83,15 @@ String s_serenity_resource_root = [] { + if (source_dir) { + return String::formatted("{}/Base", source_dir); + } ++#ifdef __HAIKU__ ++ int32 cookie = 0; ++ image_info info; ++ while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) { ++ if (info.type != B_APP_IMAGE) ++ continue; ++ return String::formatted("{}", dirname(realpath(info.name, nullptr))); ++ } ++#endif + auto* home = getenv("XDG_CONFIG_HOME") ?: getenv("HOME"); + VERIFY(home); + return String::formatted("{}/.lagom", home); +-- +2.36.1 + diff --git a/www-client/ladybird/patches/serenity-pre20220725.patchset b/www-client/ladybird/patches/serenity-pre20220728.patchset similarity index 98% rename from www-client/ladybird/patches/serenity-pre20220725.patchset rename to www-client/ladybird/patches/serenity-pre20220728.patchset index 8a9145f93..4fbb3e0ec 100644 --- a/www-client/ladybird/patches/serenity-pre20220725.patchset +++ b/www-client/ladybird/patches/serenity-pre20220728.patchset @@ -1,4 +1,4 @@ -From b63ad85468c426e836d14b3cba93f55817321214 Mon Sep 17 00:00:00 2001 +From 3839532509696be7cf4f1c44e92eea5983ebda5d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 22 Jul 2022 21:35:26 +1000 Subject: Fix build for Haiku @@ -208,7 +208,7 @@ index 6430fd6..dd99908 100644 #else int accepted_fd = ::accept(m_fd, (sockaddr*)&un, &un_size); diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp -index 459ac94..070cb99 100644 +index 70a3a7b..7eaf14f 100644 --- a/Userland/Libraries/LibCore/System.cpp +++ b/Userland/Libraries/LibCore/System.cpp @@ -19,7 +19,9 @@ @@ -282,7 +282,7 @@ index 459ac94..070cb99 100644 return Error::from_syscall("ioctl"sv, -errno); return {}; } -@@ -918,7 +947,7 @@ ErrorOr uname() +@@ -936,7 +965,7 @@ ErrorOr uname() return uts; } @@ -292,7 +292,7 @@ index 459ac94..070cb99 100644 { # ifdef __serenity__ diff --git a/Userland/Libraries/LibCore/System.h b/Userland/Libraries/LibCore/System.h -index d183682..a109681 100644 +index 7875d87..c652eac 100644 --- a/Userland/Libraries/LibCore/System.h +++ b/Userland/Libraries/LibCore/System.h @@ -87,6 +87,10 @@ ErrorOr> getspnam(StringView name); @@ -306,7 +306,7 @@ index d183682..a109681 100644 ErrorOr sigaction(int signal, struct sigaction const* action, struct sigaction* old_action); #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) ErrorOr signal(int signal, sig_t handler); -@@ -157,7 +161,7 @@ ErrorOr unlink(StringView path); +@@ -158,7 +162,7 @@ ErrorOr unlink(StringView path); ErrorOr utime(StringView path, Optional); ErrorOr uname(); ErrorOr> pipe2(int flags);