From 5f9e4063b7f1ede3eec81dab6a50d83c0954dea7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 31 Mar 2024 14:39:16 +1000 Subject: [PATCH] Tokodon: rebuild with new MPV, theme fixes --- .../tokodon/additional-files/tokodon.rdef.in | 166 +++--- .../tokodon/patches/tokodon-23.08.5.patchset | 497 +++++++++++++++++- net-im/tokodon/tokodon-23.08.5.recipe | 4 +- 3 files changed, 584 insertions(+), 83 deletions(-) diff --git a/net-im/tokodon/additional-files/tokodon.rdef.in b/net-im/tokodon/additional-files/tokodon.rdef.in index f0b9dcc26..d469b3ad8 100644 --- a/net-im/tokodon/additional-files/tokodon.rdef.in +++ b/net-im/tokodon/additional-files/tokodon.rdef.in @@ -15,84 +15,90 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; resource vector_icon { - $"6E6369661102000603BDDF4BA7031C27031CBDDF4B4A01EF4A0FB8003DAEE983" - $"3498DBFF3DAEE9033DAEE70193CEE9F904003F04002B02001202376AAC386362" - $"386362B76AAC4ADB624A2B4D0000FFFF000002001202395EA6394A94B94A9439" - $"5EA64728EB4A5A4D0000FFFF000002001202B76AAC386362B86362B76AAC47AD" - $"2B4A41B90000FFFF000003F6FFD5020012023C368C395973B959733C368C4A96" - $"A54C01320000FFFFB300020012022CB150352A48B52A482CB1504A3ABA49B008" - $"0000FFFF00000200120234CEDE342394B4239434CEDE48D1C349CA950000FFFF" - $"000004004C054D0200120236A24C36A292B6A29236A24C4A40FC492DC50000FF" - $"FF000001F6FFD5F90200120236D79F36CDDCB6CDDC36D79F493ECE493DE90000" - $"FFFF00001B0606FF07BFBDCC7ABFBDCC7AB8F4CC7AB374C031B374C6FAB374B9" - $"69BFBDB3E9B8F4B3E951B3E9CC06C031CC06B969CC06C6FABFBDCC7A51CC7ABF" - $"BDCC7ACC7A0206BEDDE7A9BEDDE7A9BEA9E8CFBE01E8DDBDD4E8B6BE2BE902BF" - $"86E805BEEEE918BF82E80ABF12E7B2BF2BE7D7BEEBE79DBEDDE7A9BEDDE7A9BE" - $"DDE7A9BEDDE7A9BEDDE7A9BEDDE7A90606FF07B8C2E6F8B8C2E6F8B8C2E71BB8" - $"87E737B8A8E737B867E737B84DE6F8B84DE71BB84DE6D5B887E6B9B867E6B9B8" - $"A8E6B9B8C2E6F8B8C2E6D5B8C2E6F8E6F80606FF07C788E6F8C788E6F8C788E7" - $"1BC74DE737C76EE737C72DE737C713E6F8C713E71BC713E6D5C74DE6B9C72DE6" - $"B9C76EE6B9C788E6F8C788E6D5C788E6F8E6F80606FF07BFBDCB91BFBDCB91B8" - $"F4CB91B374BF48B374C611B374B87FBFBD1FB8F41F511FCC06BF48CC06B87FCC" - $"06C611BFBDCB9151CB91BFBDCB91CB910605BF01C598C728C598C728C64FC787" - $"C743C72AC6F3C6D3C793C781C750C842C7BAC7FDC6E7C888C598C728C7280605" - $"BF01C598C728C598C728C64FC787C743C72AC6F3C6D3C793C781C750C842C7BA" - $"C7FDC6E7C888C598C728C728020AB8FEBD79B8FEBD79BA00BE7BBC5F3EBAA9BE" - $"E0BDCCBEF7C4C4C755BED4C767C3B5C6B2C260C29BC2A2C602C260C29BC285BE" - $"FAC27FBF78C3D0BEC9C63CBEBFC619BED5C726BDFCC734BCCFC734BE0BC734BB" - $"93C6F0BA19C760BA97C680B99AC514B8A7C514B8A7C10DBA43B8FEBD79BD05BB" - $"DEB8FEBD79020AB8FEBD79B8FEBD79BA00BE7BBC5F3EBAA9BEE0BDCCBEF7C4C4" - $"C755BED4C767C3B5C6B2C260C29BC2A2C602C260C29BC285BEFAC27FBF78C3D0" - $"BEC9C63CBEBFC619BED5C726BDFCC734BCCFC734BE0BC734BB93C6F0BA19C760" - $"BA97C680B99AC514B8A7C514B8A7C10DBA43B8FEBD79BD05BBDEB8FEBD790208" - $"C255BFAEC255BFAEC2DFC0F1C41EC2FCC347C23EC4CEC398C5F7C465C5FFC44F" - $"C5CEC4B2C2B6C381C3DEC43EC2B6C381C163C212C191C2B8C117C25DC163C212" - $"C16EC206C116C268C140C099C140C099C19CC04AC255BFAEC1F8BFFCC255BFAE" - $"0206BBEEC09CBBEEC09CBAC5BF77B873BD2EB99CBE52B84ABC31B7F6BA37B820" - $"BB34B8F2BA6DBAE9BADBB9EEBAA4BC96BBEEBFEEBE14BE42BD01BE99BEECBBEE" - $"C09CBD44BFC4BBEEC09C0208BC58BFA1BC58BFA1BBCEC0E4B9F4C38BBACAC2CD" - $"B944C427B81BC4F4B813C4DEB844C541BB48C3F2BA82C4D6BC40C2FABD5FC197" - $"BD22C1E63BC1FDBDE4C2BBBDDAC2AEBE31C311BD6D42BD6D42BD11C03EBC58BF" - $"A1BCB5BFF0BC58BFA10205BC12BD1EBC12BD1EBAEBC278B862C2B1B869C278B8" - $"5BC2E6BCB5C04EBA48C3A3BEB0BD95BDC7BD3BBDC7BD3BBD35BD31BC12BD1EBC" - $"A4BD28BC12BD1E0205C2EBBD1EC2EBBD1EC411C278C64DC2B1C646C278C654C2" - $"E6C1FAC04EC467C3A3BFFFBD95C0E7BD3BC0E7BD3BC193BD31C2EBBD1EC23FBD" - $"28C2EBBD1E0609FFFF01C381CAF8C381CAF8C25ECA08BF7CC788C148C902BF69" - $"C32ABF43BA6DBF56BECBC0FEB9CBC476B887C2BAB929C505B89EC623B8CCC594" - $"B8B5C793BA8BCC02BFA7CABFBE0FCBBBBF98C85EC820CD0CC33EC58ECB0FC381" - $"CAF8C514CA65C381CAF8CAF80205C1ADBF14C1ADBF14C1D3BE89C353BEA0C339" - $"BE99C346BE74C32ABE1DC338BE49C29CBE12C180BDFBC20EBE07C18FBE59C1AD" - $"BF14C19EBEB6C1ADBF140606FF07BB87BEFFBB87BEFFBBA6BEADBBDBBDF4BBCB" - $"BE40BC54BDE4BD46BDC4BCCDBDD4BD1FBE21BCD1BEDABCF8BE7EBCAFBECDBB87" - $"BEFFBBBFBEAEBB87BEFFBEFF0205BF13C761BF13C761C0D2C8AAC3F7C8BFC238" - $"C953C5B6C82CC5D8C700C5F7C771C30AC6E2BDDDC588BDDDC588BE45C626BF13" - $"C761BEACC6C3BF13C7610205BF13C761BF13C761C0D2C8AAC3F7C8BFC238C953" - $"C5B6C82CC5D8C700C5F7C771C30AC6E2BDDDC588BDDDC588BE45C626BF13C761" - $"BEACC6C3BF13C7610605BF01C50BC6D6C50BC6D6C5CEC690C62FC59DC5B9C59D" - $"C6A5C59DC706C652C71BC5D5C6F1C6CFC50BC6D6C6D60605BF01C50BC6D6C50B" - $"C6D6C5CEC690C62FC59DC5B9C59DC6A5C59DC706C652C71BC5D5C6F1C6CFC50B" - $"C6D6C6D60217B89FB7B3B89FB7B3BC6EB7B3C40EB7B3C03EB7B3C5D3B7B3C6C8" - $"BAECC6CAB994C6C8BC8BC6CABCE3C6CABC6BC6CABD82C588BE22C5F3BE22C4E0" - $"BE22C1D5BE23C1D5BE23C1D4BE60C1D4C0CCC1D3BE75C1D4C251C251C4D4C1E2" - $"C3C9C2A1C596C420C687C32DC66BC499C696C579C632C557C65AC5B6C5EBC609" - $"C540C4FAC512C68EC556C623C670C649C632C6D6C692C6EFC75CC71DC70DC6A6" - $"C7D9C5E1C74CC5FEC745C3BFC7D7C165C85BC327C89EC01FC82BBD6DC4DBBE4F" - $"C71BBD02C3C9BCA7C0D0BCB0C25DBC94BDA8BCA4BE24BCA4BE24BBE8BE23BA6F" - $"BE21BB2BBE22B936BE20B79DBB55B79DBCC4B79DBAA4B79CB8E3B79CB92FB79C" - $"B896B8E3B7B3B836B7B3B8CCB7B3B89FB7B3B8B5B7B3B89FB7B30205C0C6BBEF" - $"C0C6BBEFC127BB54C1E9BA1EC188BAB9C2B6BACFC451BC2FC383BB7FC3EFBCA6" - $"C32DBD94C38EBD1DC260BD07C0C6BBEFC193BC7BC0C6BBEF0606FF07C1E2BA1E" - $"C1E2BA1EC242BA55C206BB70C252BAEDC1BABBF4C0CFBBFAC12FBC31C070BBC3" - $"C0ACBAA8C060BB2CC0F8BA25C1E2BA1EC183B9E7C1E2BA1EBA1E0205BCECBBEF" - $"BCECBBEFBD2EBB62BDB2BA49BD70BAD6BE99BB0CC066BC93BF7FBBD0C014BCF0" - $"BF72BDA9BFC3BD4CBE9BBD16BCECBBEFBDC3BC82BCECBBEF0606FF07BCC2BA2A" - $"BCC2BA2ABC5EBA63BC9DBB8CBC4DBB02BCEDBC16BDE3BC1DBD7EBC57BE47BBE3" - $"BE08BABBBE57BB45BDB8BA31BCC2BA2ABD26B9F0BCC2BA2ABA2A0206C0E8E7B5" - $"C0E8E7B5C11CE8DBC1C4E8E9C1F0E8C2C19AE90EC03FE811C0D7E924C043E816" - $"C0B3E7BEC09AE7E3C0D9E7A9C0E8E7B5C0E8E7B5C0E8E7B5C0E8E7B5C0E8E7B5" - $"C0E8E7B51B0A000100000A010101000A010102000A010103000A020104000A03" - $"0105000A0301061001178000040A040107000A0401081001178000040A050109" - $"000A06010A000A07010B000A08010C000A08010D000A09010E000A0A010F000A" - $"0B0110000A0C0111000A0C01121001178000040A030113000A03011410011780" - $"00040A0D0115000A0E0116000A0F0117000A100118000A0F0119000A01011A00" + $"6E63696611040198020102033E50000000000000003E300048000046400000B3" + $"E6FFF9469DD7F2F9FF38A0D1F904003F04002B02001202376AAC386362386362" + $"B76AAC4ADB624A2B4D0000FFFF000002001202395EA6394A94B94A94395EA647" + $"28EB4A5A4D0000FFFF000002001202B76AAC386362B86362B76AAC47AD2B4A41" + $"B90000FFFF000003F6FFD5020012023C368C395973B959733C368C4A96A54C01" + $"320000FFFFB300020012022CB150352A48B52A482CB1504A3ABA49B0080000FF" + $"FF00000200120234CEDE342394B4239434CEDE48D1C349CA950000FFFF000004" + $"004C020016023C659B3DBA80BE644C3D133D4AF0BF4772410092FF6102001202" + $"36A24C36A292B6A29236A24C4A40FC492DC50000FFFF000001F5FFD5F9020012" + $"0236D79F36CDDCB6CDDC36D79F493ECE493DE90000FFFF00000501170606FF07" + $"BFBDCC7ABFBDCC7AB8F4CC7AB374C031B374C6FAB374B969BFBDB3E9B8F4B3E9" + $"51B3E9CC06C031CC06B969CC06C6FABFBDCC7A51CC7ABFBDCC7ACC7A0606FF07" + $"BFBDCB91BFBDCB91B8F4CB91B374BF48B374C611B374B87FBFBD1FB8F41F511F" + $"CC06BF48CC06B87FCC06C611BFBDCB9151CB91BFBDCB91CB910605BF01C598C7" + $"28C598C728C64FC787C743C72AC6F3C6D3C793C781C750C842C7BAC7FDC6E7C8" + $"88C598C728C7280605BF01C598C728C598C728C64FC787C743C72AC6F3C6D3C7" + $"93C781C750C842C7BAC7FDC6E7C888C598C728C728020AB8FEBD79B8FEBD79BA" + $"00BE7BBC5F3EBAA9BEE0BDCCBEF7C4C4C755BED4C767C3B5C6B2C260C29BC2A2" + $"C602C260C29BC285BEFAC27FBF78C3D0BEC9C63CBEBFC619BED5C726BDFCC734" + $"BCCFC734BE0BC734BB93C6F0BA19C760BA97C680B99AC514B8A7C514B8A7C10D" + $"BA43B8FEBD79BD05BBDEB8FEBD79020AB8FEBD79B8FEBD79BA00BE7BBC5F3EBA" + $"A9BEE0BDCCBEF7C4C4C755BED4C767C3B5C6B2C260C29BC2A2C602C260C29BC2" + $"85BEFAC27FBF78C3D0BEC9C63CBEBFC619BED5C726BDFCC734BCCFC734BE0BC7" + $"34BB93C6F0BA19C760BA97C680B99AC514B8A7C514B8A7C10DBA43B8FEBD79BD" + $"05BBDEB8FEBD790208C255BFAEC255BFAEC2DFC0F1C41EC2FCC347C23EC4CEC3" + $"98C5F7C465C5FFC44FC5CEC4B2C2B6C381C3DEC43EC2B6C381C163C212C191C2" + $"B8C117C25DC163C212C16EC206C116C268C140C099C140C099C19CC04AC255BF" + $"AEC1F8BFFCC255BFAE0206BBEEC09CBBEEC09CBAC5BF77B873BD2EB99CBE52B8" + $"4ABC31B7F6BA37B820BB34B8F2BA6DBAE9BADBB9EEBAA4BC96BBEEBFEEBE14BE" + $"42BD01BE99BEECBBEEC09CBD44BFC4BBEEC09C0208BC58BFA1BC58BFA1BBCEC0" + $"E4B9F4C38BBACAC2CDB944C427B81BC4F4B813C4DEB844C541BB48C3F2BA82C4" + $"D6BC40C2FABD5FC197BD22C1E63BC1FDBDE4C2BBBDDAC2AEBE31C311BD6D42BD" + $"6D42BD11C03EBC58BFA1BCB5BFF0BC58BFA10205BC12BD1EBC12BD1EBAEBC278" + $"B862C2B1B869C278B85BC2E6BCB5C04EBA48C3A3BEB0BD95BDC7BD3BBDC7BD3B" + $"BD35BD31BC12BD1EBCA4BD28BC12BD1E0205C2EBBD1EC2EBBD1EC411C278C64D" + $"C2B1C646C278C654C2E6C1FAC04EC467C3A3BFFFBD95C0E7BD3BC0E7BD3BC193" + $"BD31C2EBBD1EC23FBD28C2EBBD1E0609FFFF01C381CAF8C381CAF8C25ECA08BF" + $"7CC788C148C902BF69C32ABF43BA6DBF56BECBC0FEB9CBC476B887C2BAB929C5" + $"05B89EC623B8CCC594B8B5C793BA8BCC02BFA7CABFBE0FCBBBBF98C85EC820CD" + $"0CC33EC58ECB0FC381CAF8C514CA65C381CAF8CAF80205C1ADBF14C1ADBF14C1" + $"D3BE89C353BEA0C339BE99C346BE74C32ABE1DC338BE49C29CBE12C180BDFBC2" + $"0EBE07C18FBE59C1ADBF14C19EBEB6C1ADBF140606FF07BB87BEFFBB87BEFFBB" + $"A6BEADBBDBBDF4BBCBBE40BC54BDE4BD46BDC4BCCDBDD4BD1FBE21BCD1BEDABC" + $"F8BE7EBCAFBECDBB87BEFFBBBFBEAEBB87BEFFBEFF0205BF13C761BF13C761C0" + $"D2C8AAC3F7C8BFC238C953C5B6C82CC5D8C700C5F7C771C30AC6E2BDDDC588BD" + $"DDC588BE45C626BF13C761BEACC6C3BF13C7610205BF13C761BF13C761C0D2C8" + $"AAC3F7C8BFC238C953C5B6C82CC5D8C700C5F7C771C30AC6E2BDDDC588BDDDC5" + $"88BE45C626BF13C761BEACC6C3BF13C7610605BF01C50BC6D6C50BC6D6C5CEC6" + $"90C62FC59DC5B9C59DC6A5C59DC706C652C71BC5D5C6F1C6CFC50BC6D6C6D606" + $"05BF01C50BC6D6C50BC6D6C5CEC690C62FC59DC5B9C59DC6A5C59DC706C652C7" + $"1BC5D5C6F1C6CFC50BC6D6C6D60215C40EB7B3C03EB7B3C5D3B7B3C6C8BAECC6" + $"CAB994C6C8BC8BC6CABCE3C6CABC6BC6CABD82C588BE22C5F3BE22C4E0BE22C1" + $"D5BE23C1D5BE23C1D4BE60C1D4C0CCC1D3BE75C1D4C251C251C4D4C1E2C3C9C2" + $"A1C596C420C687C32DC66BC499C696C579C632C557C65AC5B6C5EBC609C540C4" + $"FAC512C68EC556C623C670C649C632C6D6C692C6EFC75CC71DC70DC6A6C7D9C5" + $"E1C74CC5FEC745C3BFC7D7C165C85BC327C89EC01FC82BBD6DC4DBBE4FC71BBD" + $"02C3C9BCA7C0D0BCB0C25DBC94BDA8BCA4BE24BCA4BE24BBE8BE23BA6FBE21BB" + $"2BBE22B936BE20B79DBB55B79DBCC4B79DBAA4B79CB8E3B79CB92FB79CB896B8" + $"E3B7B3B836B7B3B8CCB7B30205C0C6BBEFC0C6BBEFC127BB54C1E9BA1EC188BA" + $"B9C2B6BACFC451BC2FC383BB7FC3EFBCA6C32DBD94C38EBD1DC260BD07C0C6BB" + $"EFC193BC7BC0C6BBEF0606FF07C1E2BA1EC1E2BA1EC242BA55C206BB70C252BA" + $"EDC1BABBF4C0CFBBFAC12FBC31C070BBC3C0ACBAA8C060BB2CC0F8BA25C1E2BA" + $"1EC183B9E7C1E2BA1EBA1E0205BCECBBEFBCECBBEFBD2EBB62BDB2BA49BD70BA" + $"D6BE99BB0CC066BC93BF7FBBD0C014BCF0BF72BDA9BFC3BD4CBE9BBD16BCECBB" + $"EFBDC3BC82BCECBBEF0606FF07BCC2BA2ABCC2BA2ABC5EBA63BC9DBB8CBC4DBB" + $"02BCEDBC16BDE3BC1DBD7EBC57BE47BBE3BE08BABBBE57BB45BDB8BA31BCC2BA" + $"2ABD26B9F0BCC2BA2ABA2A190A000100023F16140000000000003CC30C475A20" + $"4A8DF00A100101123FC19F0000000000003FC1E441E54242E0F101178422040A" + $"010101023FC19F0000000000003FC1E441E54242E0F10A020102023FC19F0000" + $"000000003FC1E441E54242E0F10A020103123FC19F0000000000003FC1E441E5" + $"4242E0F101178000040A030104023FC19F0000000000003FC1E441E54242E0F1" + $"0A030105123FC19F0000000000003FC1E441E54242E0F101178000040A040106" + $"023FC19F0000000000003FC1E441E54242E0F10A050107023FC19F0000000000" + $"003FC1E441E54242E0F10A060108023FC19F0000000000003FC1E441E54242E0" + $"F10A070109023FC19F0000000000003FC1E441E54242E0F10A07010A023FC19F" + $"0000000000003FC1E441E54242E0F10A08010B023FC19F0000000000003FC1E4" + $"41E54242E0F10A09010C023FC19F0000000000003FC1E441E54242E0F10A0A01" + $"0D023FC19F0000000000003FC1E441E54242E0F10A0B010E023FC19F00000000" + $"00003FC1E441E54242E0F10A0B010F123FC19F0000000000003FC1E441E54242" + $"E0F101178000040A020110023FC19F0000000000003FC1E441E54242E0F10A02" + $"0111123FC19F0000000000003FC1E441E54242E0F101178000040A100112123F" + $"C19F0000000000003FC1E441E54242E0F101178422040A0C0112023FC19F0000" + $"000000003FC1E441E54242E0F10A0D0113023FC19F0000000000003FC1E441E5" + $"4242E0F10A0E0114023FC19F0000000000003FC1E441E54242E0F10A0F011502" + $"3FC19F0000000000003FC1E441E54242E0F10A0E0116023FC19F000000000000" + $"3FC1E441E54242E0F1" }; diff --git a/net-im/tokodon/patches/tokodon-23.08.5.patchset b/net-im/tokodon/patches/tokodon-23.08.5.patchset index 0d222ff66..173f585a5 100644 --- a/net-im/tokodon/patches/tokodon-23.08.5.patchset +++ b/net-im/tokodon/patches/tokodon-23.08.5.patchset @@ -1,4 +1,4 @@ -From 758238050753a17fef2887040c0307331dc16a08 Mon Sep 17 00:00:00 2001 +From bf6bfd71a72fe964a70364e2d631270b77dee8e8 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 1 Mar 2024 15:03:22 +0100 Subject: undef HAVE_KDBUSADDONS @@ -22,3 +22,498 @@ index a48773d..7438cc8 100644 -- 2.43.2 + +From 27f557a92d71b19ce0d5624d9aa9ba52b3e85892 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 31 Mar 2024 11:36:18 +1000 +Subject: Style fixes for Haiku + + +diff --git a/src/content/ui/StatusDelegate/InteractionButton.qml b/src/content/ui/StatusDelegate/InteractionButton.qml +index b0b8010..d8c3730 100644 +--- a/src/content/ui/StatusDelegate/InteractionButton.qml ++++ b/src/content/ui/StatusDelegate/InteractionButton.qml +@@ -44,7 +44,7 @@ QQC2.AbstractButton { + + source: control.interacted ? control.interactedIconName : control.iconName + +- isMask: true ++ isMask: false + color: (interactable && (control.hovered || parent.activeFocus)) ? Kirigami.Theme.focusColor : (control.interacted ? control.interactionColor : Kirigami.Theme.textColor) + } + +diff --git a/src/content/ui/StatusDelegate/StatusDelegate.qml b/src/content/ui/StatusDelegate/StatusDelegate.qml +index c5143f4..ae95e7e 100644 +--- a/src/content/ui/StatusDelegate/StatusDelegate.qml ++++ b/src/content/ui/StatusDelegate/StatusDelegate.qml +@@ -230,7 +230,7 @@ QQC2.ItemDelegate { + + return '' + } +- isMask: true ++ isMask: false + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + color: root.type === Notification.Repeat ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor + Layout.preferredHeight: Kirigami.Units.largeSpacing * 2 +@@ -289,7 +289,7 @@ QQC2.ItemDelegate { + Layout.alignment: Qt.AlignTop + iconName: switch(root.visibility) { + case Post.Public: +- return "kstars_xplanet"; ++ return "globe"; + case Post.Unlisted: + return "unlock"; + case Post.Private: +@@ -297,7 +297,7 @@ QQC2.ItemDelegate { + case Post.Direct: + return "mail-message"; + default: +- return "kstars_xplanet"; ++ return "globe"; + } + tooltip: switch(root.visibility) { + case Post.Public: +@@ -508,7 +508,7 @@ QQC2.ItemDelegate { + interacted: root.bookmarked + interactionColor: "red" + +- iconName: 'bookmarks' ++ iconName: 'post-bookmark' + interactedIconName: 'post-bookmarked' + + tooltip: root.bookmarked ? i18n("Remove bookmark") : i18nc("Bookmark a post", "Bookmark") +diff --git a/src/content/ui/main.qml b/src/content/ui/main.qml +index 3864401..f1e23b0 100644 +--- a/src/content/ui/main.qml ++++ b/src/content/ui/main.qml +@@ -292,7 +292,7 @@ Kirigami.ApplicationWindow { + } + } + property Kirigami.Action globalTimelineAction: Kirigami.Action { +- icon.name: "kstars_xplanet" ++ icon.name: "globe" + text: i18n("Global") + checkable: true + onTriggered: { +@@ -308,7 +308,7 @@ Kirigami.ApplicationWindow { + } + + property Kirigami.Action conversationAction: Kirigami.Action { +- icon.name: "tokodon-chat-reply" ++ icon.name: "dialog-messages" + text: i18n("Conversation") + checkable: true + onTriggered: { +@@ -338,7 +338,7 @@ Kirigami.ApplicationWindow { + } + + property Kirigami.Action bookmarksAction: Kirigami.Action { +- icon.name: "bookmarks" ++ icon.name: "bookmarks-organize" + text: i18n("Bookmarks") + checkable: true + onTriggered: { +@@ -354,7 +354,7 @@ Kirigami.ApplicationWindow { + } + + property Kirigami.Action exploreAction: Kirigami.Action { +- icon.name: "kstars_planets" ++ icon.name: "view-process-system" + text: i18n("Explore") + checkable: true + onTriggered: { +diff --git a/src/icons/tokodon/scalable/post-bookmark.svg b/src/icons/tokodon/scalable/post-bookmark.svg +new file mode 100644 +index 0000000..e4d9bfc +--- /dev/null ++++ b/src/icons/tokodon/scalable/post-bookmark.svg +@@ -0,0 +1,51 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/src/icons/tokodon/scalable/post-bookmarked.svg b/src/icons/tokodon/scalable/post-bookmarked.svg +index 05d9343..d39f89f 100644 +--- a/src/icons/tokodon/scalable/post-bookmarked.svg ++++ b/src/icons/tokodon/scalable/post-bookmarked.svg +@@ -1,4 +1,47 @@ +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/src/icons/tokodon/scalable/post-boost.svg b/src/icons/tokodon/scalable/post-boost.svg +index 9e84006..8492fa7 100644 +--- a/src/icons/tokodon/scalable/post-boost.svg ++++ b/src/icons/tokodon/scalable/post-boost.svg +@@ -1,9 +1,37 @@ +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/icons/tokodon/scalable/post-boosted.svg b/src/icons/tokodon/scalable/post-boosted.svg +index 50c4c12..c8e895d 100644 +--- a/src/icons/tokodon/scalable/post-boosted.svg ++++ b/src/icons/tokodon/scalable/post-boosted.svg +@@ -1,11 +1,37 @@ +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/icons/tokodon/scalable/post-favorite.svg b/src/icons/tokodon/scalable/post-favorite.svg +index 704963d..e771e1f 100644 +--- a/src/icons/tokodon/scalable/post-favorite.svg ++++ b/src/icons/tokodon/scalable/post-favorite.svg +@@ -1,5 +1,22 @@ +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/src/icons/tokodon/scalable/post-favorited.svg b/src/icons/tokodon/scalable/post-favorited.svg +index 9759a38..66104d1 100644 +--- a/src/icons/tokodon/scalable/post-favorited.svg ++++ b/src/icons/tokodon/scalable/post-favorited.svg +@@ -1,5 +1,22 @@ +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/src/icons/tokodon/scalable/post-reply-filled.svg b/src/icons/tokodon/scalable/post-reply-filled.svg +index f25dc9e..ca51602 100644 +--- a/src/icons/tokodon/scalable/post-reply-filled.svg ++++ b/src/icons/tokodon/scalable/post-reply-filled.svg +@@ -1,6 +1,19 @@ +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/icons/tokodon/scalable/post-reply.svg b/src/icons/tokodon/scalable/post-reply.svg +index c2930a7..52329b4 100644 +--- a/src/icons/tokodon/scalable/post-reply.svg ++++ b/src/icons/tokodon/scalable/post-reply.svg +@@ -1,6 +1,19 @@ +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/src/icons/tokodon/scalable/tokodon-chat-reply.svg b/src/icons/tokodon/scalable/tokodon-chat-reply.svg +index 24a65c5..52329b4 100644 +--- a/src/icons/tokodon/scalable/tokodon-chat-reply.svg ++++ b/src/icons/tokodon/scalable/tokodon-chat-reply.svg +@@ -1,11 +1,19 @@ +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +diff --git a/src/main.cpp b/src/main.cpp +index 7438cc8..8388bcb 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -88,6 +88,11 @@ int main(int argc, char *argv[]) + QGuiApplication app(argc, argv); + QQuickStyle::setStyle(QStringLiteral("org.kde.breeze")); + QIcon::setThemeName("tokodon"); ++#elif defined(Q_OS_HAIKU) ++ QGuiApplication app(argc, argv); ++ QQuickStyle::setStyle(QStringLiteral("org.kde.desktop")); ++ QIcon::setFallbackThemeName("tokodon"); ++ QIcon::setThemeName("haiku"); + #else + QApplication app(argc, argv); + // Default to org.kde.desktop style unless the user forces another style +diff --git a/src/resources.qrc b/src/resources.qrc +index 907795a..7ff3931 100644 +--- a/src/resources.qrc ++++ b/src/resources.qrc +@@ -48,6 +48,7 @@ SPDX-License-Identifier: GPL-3.0-or-later + content/ui/Settings/SonnetCard.qml + content/ui/Settings/PreferencesCard.qml + content/elephant.svg ++ icons/tokodon/scalable/post-bookmark.svg + icons/tokodon/scalable/post-bookmarked.svg + icons/tokodon/scalable/post-boost.svg + icons/tokodon/scalable/post-boosted.svg +-- +2.43.2 + diff --git a/net-im/tokodon/tokodon-23.08.5.recipe b/net-im/tokodon/tokodon-23.08.5.recipe index c27b5d5c9..aeb3af8c5 100644 --- a/net-im/tokodon/tokodon-23.08.5.recipe +++ b/net-im/tokodon/tokodon-23.08.5.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://invent.kde.org/network/tokodon" COPYRIGHT="2021-2023 Carl Schlwan 2002-2023 KDE Organisation" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/tokodon-v$portVersion.tar.bz2" CHECKSUM_SHA256="66052291bae51b2c6396343aec309e77660829b66b8d5b0013a17443e778b84f" SOURCE_DIR="tokodon-v$portVersion" @@ -58,7 +58,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libmpv$secondaryArchSuffix # KF5 - extra_cmake_modules$secondaryArchSuffix >= 5.93.0 + extra_cmake_modules$secondaryArchSuffix kirigami_addons$secondaryArchSuffix qqc2_desktop_style${secondaryArchSuffix}_devel devel:libKF5Auth$secondaryArchSuffix