amule, new recipe (#9411)

This commit is contained in:
Schrijvers Luc
2023-09-13 16:21:02 +00:00
committed by GitHub
parent b01a0cfb67
commit 4d15faa19e
6 changed files with 1035 additions and 0 deletions

Binary file not shown.

View File

@@ -0,0 +1,376 @@
resource app_flags B_SINGLE_LAUNCH;
resource app_version {
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_FINAL,
internal = 0,
short_info = "@APP_NAME@",
long_info = "@LONG_INFO@"
};
resource app_signature "@APP_SIGNATURE@";
resource vector_icon {
$"6E6369661503858683031F1A1702010602377AD43BBF8BB8D05635076D48BB0C"
$"4A0E8400E1A56EFFA66A3302000602000000BAC6D93A94250000004A028F4A3E"
$"F900B0B2AFFFD4D6D3050005FF02000602000000B8054037C0B70000004930B5"
$"4AB07800625E5CFFA6A8A5035B585703A66A3302010602000000398CB9BA527A"
$"0000004917394B47B300E1A56EFFA66A33020106023454FD3747C0B5B54A330E"
$"8349A6AB4B043000EC7B74FFD63A4502000602B83A21000000000000B865EB4A"
$"159B4A97BD00E1A56EFFA66A3302000602B9BBF5000000000000BA02B14A27B3"
$"4B1EC900E1A56EFFA66A3302000602395B48000000000000399D48468FF94C04"
$"3600E1A56EFFA66A330200060238471A0000000000003873E446D4E94B3B9600"
$"E1A56EFFA66A3302010602B6D4B53A8B55B5951CB24F99492D4346C46000E1A5"
$"6EFFA66A3302010602B47D5E346AD1B90ACDB9A21A47147947F85800E1A56EFF"
$"A66A3302000602000000B884BF3856C20000004644F24B9CB400625E5CFFA6A8"
$"A502000602000000B8548D382A0000000046DD804AEFD200625E5CFFA6A8A502"
$"000602000000B87ED03851400000004AE5A54BA60100625E5CFFA6A8A5020006"
$"02000000B83796380F190000004A95824AEC3300625E5CFFA6A8A556022CB47A"
$"C6B1B47AC6B1B484C6FDB51AC7C9B4DAC7C6B490C7C8B37AC7C8B405C7C8B333"
$"C809B304C8BBB309C880B2FAC939B346C9AFB2FBC978B2EECA09B3B9CC4AB2F7"
$"CB79B5B6CBE3B9B1CB14B7B4CB7CBAF5CBB7BE0BCB55BCE0CBD4C01FCBB7C447"
$"CC7DC2335FC492CC2EC4D4C9EDC55BCB2BC51AC982C49BC7EDC521C886C31FC7"
$"EBC028C7E6C1A3C7E9C015C79CBFEFC708C00253C0B5C73CC242C7A4C17BC770"
$"C28EC764C2C3C523C398C624C349C491C2D4C388C35CC46CC1DEC383BFF1C379"
$"C0E7C37EC021C2D2BF9EC153C010C215BEABBFB8BDABBBE9BDB8BE0EBDD6BBE9"
$"BE2DBBE9BE01BBE9BE06BBB8BDB8BB55BDDFBB87BE07BB56BEA6BB56BE57BB56"
$"BE62BB30BDD9BAE5BE1DBB0BBE18BAB4BE97BA53BE58BA84BE37BA52BD79BA51"
$"BDD8BA52BE32B83FBE86B3FBBE4BB634BEB5B237BCD1B464BD81B321BC20B5A7"
$"BAC9B98BBAE4B734BA67B928B9A5B863BA06B8C6B9B5B8DCB9D6B9D031B956B8"
$"D7B872B5AEB643B79FB770B417B54DB5CDB922B54DB851B627B9B7B7ACBBA8B6"
$"F4BACEB78FBBE2B755BC56B772BC1CB76ABC53B796BC4EB780BC50B78CBC6CB7"
$"79BCA9B783BC8BB7A6BCB2B800BCC4B7D3BCBBB800BDF2B83EC01CB857BEE9B8"
$"20C192B773C3D5B747C297B691C3D3B4CDC3D0B5AFC3D2B445C46DB4C0C58FB4"
$"46C572B46DC5D0B47AC6B1B467C629B47AC6B1B47AC6B1B47AC6B1B47AC6B1B4"
$"7AC6B1B47AC6B1B47AC6B10605FF01B5CDC7C9B5CDC7C9B6A2C78EB84BC717B7"
$"76C753B83DC753B821C7CAB82FC78EB75AC7C9B5CDC7C9B694C7C9B5CDC7C9C7"
$"C90609FF7F01BD6FBC20BD6FBC20BD36B9B6B849BD3FB849B9D7B849BE56B882"
$"C049B899BF2DB85CC220B862C50EB6D5C312B92AC60FBC98C5A4BB94C5B4BE88"
$"C587BF51C167C098C38EBE70BFECBD6FBC20BD7CBE1BBD6FBC20BC20BC200608"
$"FF7FBC19BF6EBC19BF6EBC5BBFA8BD9DBF67BD9CBFEEBD9EBEE3BD8A3CBD9ABE"
$"73BD7ABDDEBD1BBD14BD5BBD51BCF3BCEEBC4FBCEBBC8ABCD8BC13BCFEBBB3BE"
$"86BBB3BE26BBB3BF05BC19BF6EBBD6BF35BC19BF6EBF6E0607FF17B9B0C06BB9"
$"B0C06BBA51C016BAB6BEB6BAD5BFB8BAAABE52B9E9BD73BA34BDA8B92BBCEBB8"
$"BCBE9BB8ACBDD7B8C8BF2DB9B0C06BB90EC0BFB9B0C06BC06BC06B0003BA04C5"
$"B9BA04C5B9BA3FC5CCBAB6C618BA60C5FEBB8FC65CBD01C604BC5BC641BD01C6"
$"040004BF16C606BF16C606BF65C699BEACCAA7C0C7C8F9BD4CCBC0B8A2C990B9"
$"22CB5CB813C790B953C59BB8B3C713B953C59B0004BCF7C599BCF7C59939C61D"
$"3AC6FABD24C687BDBCC7BCBF1EC6CABF03C7C4BF31C61BBE83C4ECBF06C57DBE"
$"83C4EC0004B9FDBAB4B9FDBAB4B911B929B5A6B691B787B7BFB45EB5C3B644B9"
$"6BB5DEB8BCB6ABBA1AB875BC38B7D2BB7FB875BC380005BB56BA7BBB56BA7BBB"
$"46B809BBD5B709BB4BB831BC5FB5E2BD64B421BCDDB4F7BDCDB37ABE38B452BE"
$"66B2B0BDFAB67FBCBFBAF0BDAAB945BCBFBAF00007BCE9BA9CBCE9BA9CBD22BA"
$"9BBD94BA9ABD5BBA9BBD79BAB8BD42BAF5BD5DBAD6BD70BAF9BDCDBB02BD9FBA"
$"FEBD99BB11BD31BB2DBD65BB1FBD48BB3CBD77BB5BBD5FBB4CBD5DBB5CBD2BBB"
$"5FBD44BB5DBD2BBB5F0007BAFEBA7CBAFEBA7CBAFCBA41BAFAB9CBBAFBBA06BA"
$"E7B9E8BAC3BA21BAD5BA04BA9CB9F5BA4DB99EBA74B9CABA50B9CEBA56BA2FBA"
$"53B9FFBA3332B9EFBA26BA11BA29BA0DBA4DBA4BBA9932BA73BA4BBA990005B8"
$"02BBB3B802BBB3B7EBBBD3B7BCBC15B7D3BBF4B7DDBC0FB81FBC03B7FEBC09B8"
$"08BC22B7D9BC62B7F1BC42B809BC62B867BC62B838BC62B867BC620003BA44C5"
$"BEBA44C5BEBA44C4D9BA0DC33EBA63C3F6B9B7C285B8DFC137B958C1E4B8DFC1"
$"370003BE14C533BE14C533BDB9C485BD80C2B1BD80C391BD80C203BE04C01FBD"
$"BAC0D1BE04C01F0005BA49C479BA49C479BA50C370B8A6C1EDB8A6C34CB8A6C0"
$"4BBCD3C002BB8CC002BDC5C002BE92C12ABE92BFF6BE92C1BCBD8AC35ABDC6C2"
$"92BD8AC35A0005BF71C3D8BF71C3D8C085C3DBC2AEC3E1C199C3DEC323C4A5C2"
$"57C542C2CCC4C4C34AC5F1C222C766C2BDC6CBC13AC727BF69C6ABC052C6E9BF"
$"69C6AB0006BFD1C849BFD1C849C15EC848C478C845C2EBC846C4FEC8C9C40AC9"
$"C4C485C999C42AC9D6C4C4CA68C4ADCA04C4DACACBC447CC3FC4F4CB8AC21BCB"
$"DCBDC3CB16BFEFCB79BDC3CB160006B7D6C41FB7D6C41FB6E3C41EB4FCC41AB5"
$"EFC41CB480C4A0B549C56BB4DAC553B4FDC5A3B4DFC68DB4CDC619B4E8C6CDB5"
$"7BC794B540C794B697C748B8D0C6B1B7B4C6FDB8D0C6B10006B86CC805B86CC8"
$"05B6D5C805B3A7C805B53EC805B37EC836B357C8ADB35BC874B34CC927B3FBC9"
$"A0B3B3C96AB352C9DEB3EACC08B32FCB3EB5DDCB99B9C2CABBB7CFCB2AB9C2CA"
$"BB0005B68CC41DB68CC41DB676C49EB5B2C4C5B60DC4B2B649C502B5B4C560B5"
$"DAC541B631C560B5F9C5E2B66CC58BB654C5E4B6EEC731B6DAC5F7B6EEC73100"
$"05B559C805B559C805B559C893B468C8C7B4C4C8A8B4BFC8F0B482C96AB500C9"
$"28B475C971B4C4CA0CB56BC985B540CA13B5B1CBA3B5EBCAD4B5B1CBA30005C2"
$"BFC846C2BFC846C2BFC8C4C3A4C8FCC34DC8D7C2FCC945C3B6C9B2C3A0C99EC3"
$"53C9B2C361CA26C2C9C9BCC291CA7EC26ACBEAC273CAF5C26ACBEA0005C0C6C7"
$"08C0C6C708C0B5C641C1ADC59FC10AC5A5C132C505C1FFC528C1B9C528C1E6C5"
$"0CC210C48EC14EC49FC1B5C475C137C3DDC139C43EC137C3DD0607FF17B9E9BD"
$"73B9E9BD73BA34BDA8BAB6BEB6BAAABE52BAD5BFB8B9B0C06BBA51C016B90EC0"
$"BFB8BCBE9BB8C8BF2DB8ACBDD7B9E9BD73B92BBCEBB9E9BD73BD73BD73021FBC"
$"D3C002BCD3C002BD47C002BE04C01FBDB3BFFFBE5BC041BE92C12ABE92C08ABE"
$"92C1BCBD8AC35ABDC6C292BD9EC406BE14C533BDD0C4B0BE3BC51EBE83C4ECBE"
$"60C506BEE7C4A1BF71C3D8BF3BC443BFCDC323BF51C167BFD7C249BE70BFECBD"
$"6FBC20BD7CBE1BBD68BBD6BD2BBB5FBD50BB96BD0EBB34BCBFBAF0BCEABB0FBC"
$"5DBAA9BB56BA7BBBDDBA82BB39BA7ABAFEBA7CBB1CBA7ABAC2BA7FBA4BBA99BA"
$"86BA89BA31BAA1B9FDBAB4BA17BAA9B951BAF7B875BC38B8BCBB77B870BC46B8"
$"67BC62B86BBC54B854BCA5B849BD3FB849BCEEB849BE56B882C049B899BF2DB8"
$"62C1D0B7D6C41FB750C2B9B7F2C469B862C50EB81FC4B8B8994EB953C59BB8EE"
$"C580B98BC5AABA04C5B9B9C7C5B3BA19C5BBBA44C5BEBA2FC5BDBA44C550BA49"
$"C479BA4BC4E2BA49C470BA48C45EBA49C467BA33C36DB8A6C1EDB8A6C33FB8A6"
$"C1A7B8DFC137B8BBC16BB993C034BCD3C002BBC2C002BCD3C002BCD3C002BCD3"
$"C002BCD3C002BCD3C002BCD3C002BCD3C0020608FF7FBBB3BE86BBB3BE86BBB3"
$"BE26BC4FBCEBBC13BCFEBC8ABCD8BD1BBD14BCF3BCEEBD5BBD51BD8A3CBD7ABD"
$"DEBD9ABE73BD9DBF67BD9EBEE3BD9CBFEEBC19BF6EBC5BBFA8BBD6BF35BBB3BE"
$"86BBB3BF05BBB3BE86BE860607FF17B9E9BD73B9E9BD73BA34BDA8BAB6BEB6BA"
$"AABE52BAD5BFB8B9B0C06BBA51C016B90EC0BFB8BCBE9BB8C8BF2DB8ACBDD7B9"
$"E9BD73B92BBCEBB9E9BD73BD73BD73021FBCD3C002BCD3C002BD47C002BE04C0"
$"1FBDB3BFFFBE5BC041BE92C12ABE92C08ABE92C1BCBD8AC35ABDC6C292BD9EC4"
$"06BE14C533BDD0C4B0BE3BC51EBE83C4ECBE60C506BEE7C4A1BF71C3D8BF3BC4"
$"43BFCDC323BF51C167BFD7C249BE70BFECBD6FBC20BD7CBE1BBD68BBD6BD2BBB"
$"5FBD50BB96BD0EBB34BCBFBAF0BCEABB0FBC5DBAA9BB56BA7BBBDDBA82BB39BA"
$"7ABAFEBA7CBB1CBA7ABAC2BA7FBA4BBA99BA86BA89BA31BAA1B9FDBAB4BA17BA"
$"A9B951BAF7B875BC38B8BCBB77B870BC46B867BC62B86BBC54B854BCA5B849BD"
$"3FB849BCEEB849BE56B882C049B899BF2DB862C1D0B7D6C41FB750C2B9B7F2C4"
$"69B862C50EB81FC4B8B8994EB953C59BB8EEC580B98BC5AABA04C5B9B9C7C5B3"
$"BA19C5BBBA44C5BEBA2FC5BDBA44C550BA49C479BA4BC4E2BA49C470BA48C45E"
$"BA49C467BA33C36DB8A6C1EDB8A6C33FB8A6C1A7B8DFC137B8BBC16BB993C034"
$"BCD3C002BBC2C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C002"
$"BCD3C0020608FF7FBBB3BE86BBB3BE86BBB3BE26BC4FBCEBBC13BCFEBC8ABCD8"
$"BD1BBD14BCF3BCEEBD5BBD51BD8A3CBD7ABDDEBD9ABE73BD9DBF67BD9EBEE3BD"
$"9CBFEEBC19BF6EBC5BBFA8BBD6BF35BBB3BE86BBB3BF05BBB3BE86BE860607FF"
$"17B9E9BD73B9E9BD73BA34BDA8BAB6BEB6BAAABE52BAD5BFB8B9B0C06BBA51C0"
$"16B90EC0BFB8BCBE9BB8C8BF2DB8ACBDD7B9E9BD73B92BBCEBB9E9BD73BD73BD"
$"730215BCD3C002BCD3C002BD47C002BE04C01FBDB3BFFFBE5BC041BE92C12ABE"
$"92C08ABE92C1BCBD8AC35ABDC6C292BD9EC406BE14C533BDD0C4B0BE3BC51EBE"
$"83C4ECBE60C506BEE7C4A1BF71C3D8BF3BC443BFCDC323BF51C167BFD7C249BE"
$"0CBEA6B817C1C9B90BC09FB80BC228B7D6C41FB776C2F5B7EEC46AB862C50EB8"
$"1FC4B8B8994EB953C59BB8EEC580B98BC5AABA04C5B9B9C7C5B3BA19C5BBBA44"
$"C5BEBA2FC5BDBA44C550BA49C479BA4BC4E2BA49C470BA48C45EBA49C467BA33"
$"C36DB8A6C1EDB8A6C33FB8A6C1A7B8DFC137B8BBC16BB993C034BCD3C002BBC2"
$"C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C0020608"
$"FF7FBBB3BE86BBB3BE86BBB3BE26BC4FBCEBBC13BCFEBC8ABCD8BD1BBD14BCF3"
$"BCEEBD5BBD51BD8A3CBD7ABDDEBD9ABE73BD9DBF67BD9EBEE3BD9CBFEEBC19BF"
$"6EBC5BBFA8BBD6BF35BBB3BE86BBB3BF05BBB3BE86BE860607FF17B9E9BD73B9"
$"E9BD73BA34BDA8BAB6BEB6BAAABE52BAD5BFB8B9B0C06BBA51C016B90EC0BFB8"
$"BCBE9BB8C8BF2DB8ACBDD7B9E9BD73B92BBCEBB9E9BD73BD73BD730215BCD3C0"
$"02BCD3C002BD47C002BE04C01FBDB3BFFFBE5BC041BE92C12ABE92C08ABE92C1"
$"BCBD8AC35ABDC6C292BD9EC406BE14C533BDD0C4B0BE3BC51EBE83C4ECBE60C5"
$"06BEE7C4A1BF71C3D8BF3BC443BFCDC323BF51C167BFD7C249BE0CBEA6B817C1"
$"C9B90BC09FB80BC228B7D6C41FB776C2F5B7EEC46AB862C50EB81FC4B8B8994E"
$"B953C59BB8EEC580B98BC5AABA04C5B9B9C7C5B3BA19C5BBBA44C5BEBA2FC5BD"
$"BA44C550BA49C479BA4BC4E2BA49C470BA48C45EBA49C467BA33C36DB8A6C1ED"
$"B8A6C33FB8A6C1A7B8DFC137B8BBC16BB993C034BCD3C002BBC2C002BCD3C002"
$"BCD3C002BCD3C002BCD3C002BCD3C002BCD3C002BCD3C0020608FF7FBBB3BE86"
$"BBB3BE86BBB3BE26BC4FBCEBBC13BCFEBC8ABCD8BD1BBD14BCF3BCEEBD5BBD51"
$"BD8A3CBD7ABDDEBD9ABE73BD9DBF67BD9EBEE3BD9CBFEEBC19BF6EBC5BBFA8BB"
$"D6BF35BBB3BE86BBB3BF05BBB3BE86BE860606FF07BA74BF2EBA74BF2EBA74BF"
$"6ABA0FBF9BBA46BF9BB9D7BF9BB9A9BF2EB9A9BF6AB9A9BEF1BA0FBEC1B9D7BE"
$"C1BA46BEC1BA74BF2EBA74BEF1BA74BF2EBF2E0606FF07BA74BF2EBA74BF2EBA"
$"74BF6ABA0FBF9BBA46BF9BB9D7BF9BB9A9BF2EB9A9BF6AB9A9BEF1BA0FBEC1B9"
$"D7BEC1BA46BEC1BA74BF2EBA74BEF1BA74BF2EBF2E0606FF07BA0FBEC1BA0FBE"
$"C1BA46BEC1BA74BF2EBA74BEF1BA74BF6ABA0FBF9BBA46BF9BB9D7BF9BB9A9BF"
$"2EB9A9BF6AB9A9BEF1BA0FBEC1B9D7BEC1BA0FBEC1BEC10607FF17BAB6BEB6BA"
$"B6BEB6BAAABE52B9E9BD73BA34BDA8B92BBCEBB8BCBE9BB8ACBDD7B8C8BF2DB9"
$"B0C06BB90EC0BFBA51C016BAB6BEB6BAD5BFB8BAB6BEB6BEB6BEB60606FF07BA"
$"0FBEC1BA0FBEC1BA46BEC1BA74BF2EBA74BEF1BA74BF6ABA0FBF9BBA46BF9BB9"
$"D7BF9BB9A9BF2EB9A9BF6AB9A9BEF1BA0FBEC1B9D7BEC1BA0FBEC1BEC10607FF"
$"17BAB6BEB6BAB6BEB6BAAABE52B9E9BD73BA34BDA8B92BBCEBB8BCBE9BB8ACBD"
$"D7B8C8BF2DB9B0C06BB90EC0BFBA51C016BAB6BEB6BAD5BFB8BAB6BEB6BEB6BE"
$"B60606FF07BCA7BECBBCA7BECBBCA7BF07BC42BF38BC7ABF38BC0ABF38BBDDBE"
$"CBBBDDBF07BBDDBE8FBC42BE5EBC0ABE5EBC7ABE5EBCA7BECBBCA7BE8FBCA7BE"
$"CBBECB0606FF07BCA7BECBBCA7BECBBCA7BF07BC42BF38BC7ABF38BC0ABF38BB"
$"DDBECBBBDDBF07BBDDBE8FBC42BE5EBC0ABE5EBC7ABE5EBCA7BECBBCA7BE8FBC"
$"A7BECBBECB0606FF07BC42BE5EBC42BE5EBC7ABE5EBCA7BECBBCA7BE8FBCA7BF"
$"07BC42BF38BC7ABF38BC0ABF38BBDDBECBBBDDBF07BBDDBE8FBC42BE5EBC0ABE"
$"5EBC42BE5EBE5E0609FF7F01BC4FBCEBBC4FBCEBBC13BCFEBBB3BE86BBB3BE26"
$"BBB3BF05BC19BF6EBBD6BF35BC5BBFA8BD9DBF67BD9CBFEEBD9EBEE3BD8A3CBD"
$"9ABE73BD7ABDDEBD1BBD14BD5BBD51BCF3BCEEBC4FBCEBBC8ABCD8BC4FBCEBBC"
$"EBBCEB0606FF07BC42BE5EBC42BE5EBC7ABE5EBCA7BECBBCA7BE8FBCA7BF07BC"
$"42BF38BC7ABF38BC0ABF38BBDDBECBBBDDBF07BBDDBE8FBC42BE5EBC0ABE5EBC"
$"42BE5EBE5E0609FF7F01BC4FBCEBBC4FBCEBBC13BCFEBBB3BE86BBB3BE26BBB3"
$"BF05BC19BF6EBBD6BF35BC5BBFA8BD9DBF67BD9CBFEEBD9EBEE3BD8A3CBD9ABE"
$"73BD7ABDDEBD1BBD14BD5BBD51BCF3BCEEBC4FBCEBBC8ABCD8BC4FBCEBBCEBBC"
$"EB060FFFFFFF17BCD3C002BCD3C002BBC2C002B8DFC137B993C034B958C1E4BA"
$"0DC33EB9B7C285BA36C396BA48C45EBA44C3F7BA49C467BA49C479BA49C470BA"
$"4BC4E2BA44C5BEBA44C550BB22C5CABC98C5A4BC0FC5ADBCB7C5A3BCF7C599BC"
$"D7C59FBD59C587BE14C533BDBBC564BDD0C4B0BD8AC35ABD9EC406BD83C321BD"
$"80C2B1BD80C2E8BD80C203BE04C01FBDBAC0D1BDB3BFFFBCD3C002BD47C002BC"
$"D3C002C002C002060FFFFFFF17BCD3C002BCD3C002BBC2C002B8DFC137B993C0"
$"34B958C1E4BA0DC33EB9B7C285BA36C396BA48C45EBA44C3F7BA49C467BA49C4"
$"79BA49C470BA4BC4E2BA44C5BEBA44C550BB22C5CABC98C5A4BC0FC5ADBCB7C5"
$"A3BCF7C599BCD7C59FBD59C587BE14C533BDBBC564BDD0C4B0BD8AC35ABD9EC4"
$"06BD83C321BD80C2B1BD80C2E8BD80C203BE04C01FBDBAC0D1BDB3BFFFBCD3C0"
$"02BD47C002BCD3C002C002C0020606FF07BA0DC33EBA0DC33EB9B7C285B8DFC1"
$"37B958C1E4B8BBC16BB8A6C1EDB8A6C1A7B8A6C33FBA48C45EBA33C36DBA44C3"
$"F7BA0DC33EBA36C396BA0DC33EC33E0606FF07BA0DC33EBA0DC33EB9B7C285B8"
$"DFC137B958C1E4B8BBC16BB8A6C1EDB8A6C1A7B8A6C33FBA48C45EBA33C36DBA"
$"44C3F7BA0DC33EBA36C396BA0DC33EC33E0606FF07BE04C01FBE04C01FBDBAC0"
$"D1BD80C2B1BD80C203BD80C2E8BD8AC35ABD83C321BDC6C292BE92C12ABE92C1"
$"BCBE92C08ABE04C01FBE5BC041BE04C01FC01F0606FF07BE04C01FBE04C01FBD"
$"BAC0D1BD80C2B1BD80C203BD80C2E8BD8AC35ABD83C321BDC6C292BE92C12ABE"
$"92C1BCBE92C08ABE04C01FBE5BC041BE04C01FC01F0609FF7F01BC98C5A4BC98"
$"C5A4BC0FC5ADBA44C5BEBB22C5CABA2FC5BDBA04C5B9BA19C5BBBA3FC5CCBAB6"
$"C618BA60C5FEBB8FC65CBD01C604BC5BC641BCFAC5E2BCF7C599BCF7C5BFBCD7"
$"C59FBC98C5A4BCB7C5A3BC98C5A4C5A4C5A40609FF7F01BC98C5A4BC98C5A4BC"
$"0FC5ADBA44C5BEBB22C5CABA2FC5BDBA04C5B9BA19C5BBBA3FC5CCBAB6C618BA"
$"60C5FEBB8FC65CBD01C604BC5BC641BCFAC5E2BCF7C599BCF7C5BFBCD7C59FBC"
$"98C5A4BCB7C5A3BC98C5A4C5A4C5A40612FFFFFFFF05BD01C604BD01C604BC5B"
$"C641BAB6C618BB8FC65CBA60C5FEBA04C5B9BA3FC5CCB9C7C5B3B953C59BB98B"
$"C5AAB925C608B8D0C6B1B8F7C65FB89BC720B86CC805B874C784B865C86EB8A2"
$"C990B874C8EBB8C5CA0FB9C2CABBB931CA73BAE2CB4ABDC3CB16BC95CB69BE20"
$"CAFCBEACCAA7BE70CAD7BF95C9EDBFD1C849BFD7C912BFCCC7ABBF69C6ABBF9A"
$"C719BF49C661BF16C606BF28C627BF23C645BF1EC6CABF2551BF03C7C43AC6FA"
$"BDBCC7BCBD34C6A8BD01C604BD11C65ABD01C604C604C6040612FFFFFFFF05BD"
$"01C604BD01C604BC5BC641BAB6C618BB8FC65CBA60C5FEBA04C5B9BA3FC5CCB9"
$"C7C5B3B953C59BB98BC5AAB925C608B8D0C6B1B8F7C65FB89BC720B86CC805B8"
$"74C784B865C86EB8A2C990B874C8EBB8C5CA0FB9C2CABBB931CA73BAE2CB4ABD"
$"C3CB16BC95CB69BE20CAFCBEACCAA7BE70CAD7BF95C9EDBFD1C849BFD7C912BF"
$"CCC7ABBF69C6ABBF9AC719BF49C661BF16C606BF28C627BF23C645BF1EC6CABF"
$"2551BF03C7C43AC6FABDBCC7BCBD34C6A8BD01C604BD11C65ABD01C604C604C6"
$"04060AFFFF05BD01C604BD01C604BD11C65A3AC6FABD34C6A8BDBCC7BCBF1EC6"
$"CABF03C7C4BF2551BF16C606BF23C645BF02C5A2BE83C4ECBED3C545BE60C506"
$"BE14C533BE3BC51EBDBBC564BCF7C599BD59C587BCF7C5BFBD01C604BCFAC5E2"
$"BD01C604C604C604060AFFFF05BD01C604BD01C604BD11C65A3AC6FABD34C6A8"
$"BDBCC7BCBF1EC6CABF03C7C4BF2551BF16C606BF23C645BF02C5A2BE83C4ECBE"
$"D3C545BE60C506BE14C533BE3BC51EBDBBC564BCF7C599BD59C587BCF7C5BFBD"
$"01C604BCFAC5E2BD01C604C604C604060CFFFF5FBE83C4ECBE83C4ECBED3C545"
$"BF16C606BF02C5A2BF28C627BF69C6ABBF49C661BFDEC6CAC0C6C708C052C6E9"
$"C0B5C641C1ADC59FC10AC5A5C132C505C1FFC528C1B9C528C1E6C50CC210C48E"
$"C14EC49FC1B5C475C137C3DDC139C43EC09FC3DBBF71C3D8C008C3D9BF3BC443"
$"BE83C4ECBEE7C4A1BE83C4ECC4ECC4EC060CFFFF5FBE83C4ECBE83C4ECBED3C5"
$"45BF16C606BF02C5A2BF28C627BF69C6ABBF49C661BFDEC6CAC0C6C708C052C6"
$"E9C0B5C641C1ADC59FC10AC5A5C132C505C1FFC528C1B9C528C1E6C50CC210C4"
$"8EC14EC49FC1B5C475C137C3DDC139C43EC09FC3DBBF71C3D8C008C3D9BF3BC4"
$"43BE83C4ECBEE7C4A1BE83C4ECC4ECC4EC020AC2BFC846C2BFC846C1C5C847BF"
$"D1C849C0CBC848BFD7C912BEACCAA7BF95C9EDBE70CAD7BDC3CB16BE20CAFCBF"
$"50CB5CC26ACBEAC0DDCBA3C273CAF5C361CA26C291CA7EC2C9C9BCC3B6C9B2C3"
$"53C9B2C3A0C99EC3A4C8FCC2FCC945C34DC8D7C2BFC846C2BFC8C4C2BFC846C2"
$"BFC846C2BFC846C2BFC846020AC2BFC846C2BFC846C1C5C847BFD1C849C0CBC8"
$"48BFD7C912BEACCAA7BF95C9EDBE70CAD7BDC3CB16BE20CAFCBF50CB5CC26ACB"
$"EAC0DDCBA3C273CAF5C361CA26C291CA7EC2C9C9BCC3B6C9B2C353C9B2C3A0C9"
$"9EC3A4C8FCC2FCC945C34DC8D7C2BFC846C2BFC8C4C2BFC846C2BFC846C2BFC8"
$"46C2BFC846060BFFFF17B9C2CABBB9C2CABBB931CA73B8A2C990B8C5CA0FB874"
$"C8EBB86CC805B865C86EB765C805B559C805B65FC805B559C893B468C8C7B4C4"
$"C8A8B4BFC8F0B482C96AB500C928B475C971B4C4CA0CB56BC985B540CA13B5B1"
$"CBA3B5EBCAD4B70CCB56B9C2CABBB867CB08B9C2CABBCABBCABB060BFFFF17B9"
$"C2CABBB9C2CABBB931CA73B8A2C990B8C5CA0FB874C8EBB86CC805B865C86EB7"
$"65C805B559C805B65FC805B559C893B468C8C7B4C4C8A8B4BFC8F0B482C96AB5"
$"00C928B475C971B4C4CA0CB56BC985B540CA13B5B1CBA3B5EBCAD4B70CCB56B9"
$"C2CABBB867CB08B9C2CABBCABBCABB020BB6EEC731B6EEC731B78FC706B8D0C6"
$"B1B82FC6DCB8F7C65FB953C59BB925C608B8EEC580B862C50EB8994EB81FC4B8"
$"B7D6C41FB7F2C469B768C41FB68CC41DB6FAC41EB676C49EB5B2C4C5B60DC4B2"
$"B649C502B5B4C560B5DAC541B631C560B5F9C5E2B66CC58BB654C5E4B6EEC731"
$"B6DAC5F7B6EEC731B6EEC731B6EEC731B6EEC731020BB6EEC731B6EEC731B78F"
$"C706B8D0C6B1B82FC6DCB8F7C65FB953C59BB925C608B8EEC580B862C50EB899"
$"4EB81FC4B8B7D6C41FB7F2C469B768C41FB68CC41DB6FAC41EB676C49EB5B2C4"
$"C5B60DC4B2B649C502B5B4C560B5DAC541B631C560B5F9C5E2B66CC58BB654C5"
$"E4B6EEC731B6DAC5F7B6EEC731B6EEC731B6EEC731B6EEC7310608FF7FBB56BA"
$"7BBB56BA7BBBDDBA82BCBFBAF0BC5DBAA9BCCEBAD5BCE9BA9CBCDCBAB9BDB4B8"
$"EDBE38B452BDFEB65CBE66B2B0BD64B421BDCDB37ABCDDB4F7BBD5B709BC5FB5"
$"E2BB4BB831BB56BA7BBB46B809BB56BA7BBA7B0608FF7FBB56BA7BBB56BA7BBB"
$"DDBA82BCBFBAF0BC5DBAA9BCCEBAD5BCE9BA9CBCDCBAB9BDB4B8EDBE38B452BD"
$"FEB65CBE66B2B0BD64B421BDCDB37ABCDDB4F7BBD5B709BC5FB5E2BB4BB831BB"
$"56BA7BBB46B809BB56BA7BBA7B0608FF5FB9FDBAB4B9FDBAB4B911B929B5A6B6"
$"91B787B7BFB45EB5C3B644B96BB5DEB8BC29B9F6B802BBB3B760BAF3B82CBBE5"
$"B875BC38B853BC12B8BCBB77B9FDBAB4B951BAF7B9FDBAB4BAB4BAB40608FF5F"
$"B9FDBAB4B9FDBAB4B911B929B5A6B691B787B7BFB45EB5C3B644B96BB5DEB8BC"
$"29B9F6B802BBB3B760BAF3B82CBBE5B875BC38B853BC12B8BCBB77B9FDBAB4B9"
$"51BAF7B9FDBAB4BAB4BAB4060CFFFF5FB4C4CA0CB4C4CA0CB56BC985B482C96A"
$"B475C971B500C928B468C8C7B4BFC8F0B4C4C8A8B559C805B559C893B4C8C805"
$"B3A7C805B437C805B37EC836B357C8ADB35BC874B34CC927B3FBC9A0B3B3C96A"
$"B352C9DEB3EACC08B32FCB3EB482CBE7B5B1CBA3B519CBC5B5EBCAD4B4C4CA0C"
$"B540CA13B4C4CA0CCA0CCA0C060CFFFF5FB4C4CA0CB4C4CA0CB56BC985B482C9"
$"6AB475C971B500C928B468C8C7B4BFC8F0B4C4C8A8B559C805B559C893B4C8C8"
$"05B3A7C805B437C805B37EC836B357C8ADB35BC874B34CC927B3FBC9A0B3B3C9"
$"6AB352C9DEB3EACC08B32FCB3EB482CBE7B5B1CBA3B519CBC5B5EBCAD4B4C4CA"
$"0CB540CA13B4C4CA0CCA0CCA0C020BB57BC794B57BC794B5F6C773B6EEC731B6"
$"7253B6DAC5F7B5F9C5E2B654C5E4B66CC58BB5B4C560B631C560B5DAC541B5B2"
$"C4C5B649C502B60DC4B2B68CC41DB676C49EB607C41CB4FCC41AB581C41BB480"
$"C4A0B549C56BB4DAC553B4FDC5A3B4DFC68DB4CDC619B4E8C6CDB57BC794B540"
$"C794B57BC794B57BC794B57BC794B57BC794020BB57BC794B57BC794B5F6C773"
$"B6EEC731B67253B6DAC5F7B5F9C5E2B654C5E4B66CC58BB5B4C560B631C560B5"
$"DAC541B5B2C4C5B649C502B60DC4B2B68CC41DB676C49EB607C41CB4FCC41AB5"
$"81C41BB480C4A0B549C56BB4DAC553B4FDC5A3B4DFC68DB4CDC619B4E8C6CDB5"
$"7BC794B540C794B57BC794B57BC794B57BC794B57BC794060CFFFF5FC361CA26"
$"C361CA26C291CA7EC26ACBEAC273CAF5C309CC06C447CC3FC3A8CC22C4F4CB8A"
$"C4C4CA68C4DACACBC4ADCA04C40AC9C4C42AC9D6C485C999C478C845C4FEC8C9"
$"C3E5C845C2BFC846C352C846C2BFC8C4C3A4C8FCC34DC8D7C2FCC945C3B6C9B2"
$"C3A0C99EC353C9B2C361CA26C2C9C9BCC361CA26CA26CA26060CFFFF5FC361CA"
$"26C361CA26C291CA7EC26ACBEAC273CAF5C309CC06C447CC3FC3A8CC22C4F4CB"
$"8AC4C4CA68C4DACACBC4ADCA04C40AC9C4C42AC9D6C485C999C478C845C4FEC8"
$"C9C3E5C845C2BFC846C352C846C2BFC8C4C3A4C8FCC34DC8D7C2FCC945C3B6C9"
$"B2C3A0C99EC353C9B2C361CA26C2C9C9BCC361CA26CA26CA26060BFFFF17C0C6"
$"C708C0C6C708C13AC727C222C766C1AEC747C2BDC6CBC257C542C34AC5F1C2CC"
$"C4C4C2AEC3E1C323C4A5C231C3E0C137C3DDC1B4C3DEC139C43EC210C48EC1B5"
$"C475C14EC49FC1FFC528C1E6C50CC1B9C528C1ADC59FC132C505C10AC5A5C0C6"
$"C708C0B5C641C0C6C708C708C708060BFFFF17C0C6C708C0C6C708C13AC727C2"
$"22C766C1AEC747C2BDC6CBC257C542C34AC5F1C2CCC4C4C2AEC3E1C323C4A5C2"
$"31C3E0C137C3DDC1B4C3DEC139C43EC210C48EC1B5C475C14EC49FC1FFC528C1"
$"E6C50CC1B9C528C1ADC59FC132C505C10AC5A5C0C6C708C0B5C641C0C6C708C7"
$"08C708060AFFFF05BA4BBA99BA4BBA99BA86BA89BAFEBA7CBAC2BA7FBAFCBA41"
$"BAFAB9CBBAFBBA06BAE7B9E8BAC3BA21BAD5BA04BA9CB9F5BA4DB99EBA74B9CA"
$"BA50B9CEBA56BA2FBA53B9FFBA3332B9EFBA26BA11BA29BA0DBA4DBA4BBA9932"
$"BA73BA4BBA99BA99BA99060AFFFF05BA4BBA99BA4BBA99BA86BA89BAFEBA7CBA"
$"C2BA7FBAFCBA41BAFAB9CBBAFBBA06BAE7B9E8BAC3BA21BAD5BA04BA9CB9F5BA"
$"4DB99EBA74B9CABA50B9CEBA56BA2FBA53B9FFBA3332B9EFBA26BA11BA29BA0D"
$"BA4DBA4BBA9932BA73BA4BBA99BA99BA990608FF7FB875BC38B875BC38B853BC"
$"12B802BBB3B82CBBE5B7EBBBD3B7BCBC15B7D3BBF4B7DDBC0FB81FBC03B7FEBC"
$"09B808BC22B7D9BC62B7F1BC42B809BC62B867BC62B838BC62B86BBC54B875BC"
$"38B870BC46B875BC38BC380608FF7FB875BC38B875BC38B853BC12B802BBB3B8"
$"2CBBE5B7EBBBD3B7BCBC15B7D3BBF4B7DDBC0FB81FBC03B7FEBC09B808BC22B7"
$"D9BC62B7F1BC42B809BC62B867BC62B838BC62B86BBC54B875BC38B870BC46B8"
$"75BC38BC38060BFFFF17BCE9BA9CBCE9BA9CBCDCBAB9BCBFBAF0BCCEBAD5BCEA"
$"BB0FBD2BBB5FBD0EBB34BD44BB5DBD77BB5BBD5DBB5CBD5FBB4CBD31BB2DBD48"
$"BB3CBD65BB1FBDCDBB02BD99BB11BD9FBAFEBD42BAF5BD70BAF9BD5DBAD6BD94"
$"BA9ABD79BAB8BD5BBA9BBCE9BA9CBD22BA9BBCE9BA9CBA9CBA9C060BFFFF17BC"
$"E9BA9CBCE9BA9CBCDCBAB9BCBFBAF0BCCEBAD5BCEABB0FBD2BBB5FBD0EBB34BD"
$"44BB5DBD77BB5BBD5DBB5CBD5FBB4CBD31BB2DBD48BB3CBD65BB1FBDCDBB02BD"
$"99BB11BD9FBAFEBD42BAF5BD70BAF9BD5DBAD6BD94BA9ABD79BAB8BD5BBA9BBC"
$"E9BA9CBD22BA9BBCE9BA9CBA9CBA9C480A0002000102400B5300000000000040"
$"00004640050000000A01010212400B5300000000000040000046400500000001"
$"178000040A01010312400B530000000000004000004640050000000117800004"
$"0A01010412400B5300000000000040000046400500000001178000040A010105"
$"12400B5300000000000040000046400500000001178000040A0102060712400B"
$"5300000000000040000046400500000001178000040A01010812400B53000000"
$"00000040000046400500000001178000040A01010912400B5300000000000040"
$"000046400500000001178000040A01010A12400B530000000000004000004640"
$"0500000001178000040A01010B12400B53000000000000400000464005000000"
$"01178000040A01010C12400B5300000000000040000046400500000001178000"
$"040A01010D12400B5300000000000040000046400500000001178000040A0101"
$"0E12400B5300000000000040000046400500000001178000040A01010F12400B"
$"5300000000000040000046400500000001178000040A01011012400B53000000"
$"00000040000046400500000001178000040A01011112400B5300000000000040"
$"000046400500000001178000040A01011212400B530000000000004000004640"
$"0500000001178000040A01011312400B53000000000000400000464005000000"
$"01178000040A01011412400B5300000000000040000046400500000001178000"
$"040A01011512400B5300000000000040000046400500000001178000040A0101"
$"1612400B5300000000000040000046400500000001178000040A01011712400B"
$"5300000000000040000046400500000001178000040A020318191A02400B5300"
$"00000000004000004640050000000A01031B1C1D12400B530000000000004000"
$"0046400500000001178000040A03031E1F2002400B5300000000000040000046"
$"40050000000A010321222312400B530000000000004000004640050000000117"
$"8000040A04012402400B530000000000004000004640050000000A0101251240"
$"0B5300000000000040000046400500000001178000040A0502262702400B5300"
$"00000000004000004640050000000A0102282912400B53000000000000400000"
$"46400500000001178000040A04012A02400B5300000000000040000046400500"
$"00000A01012B12400B5300000000000040000046400500000001178000040A05"
$"022C2D02400B530000000000004000004640050000000A01022E2F12400B5300"
$"000000000040000046400500000001178000040A06013002400B530000000000"
$"004000004640050000000A01013112400B530000000000004000004640050000"
$"0001178000040A07013202400B530000000000004000004640050000000A0101"
$"3312400B5300000000000040000046400500000001178000040A07013402400B"
$"530000000000004000004640050000000A01013512400B530000000000004000"
$"0046400500000001178000040A08013602400B53000000000000400000464005"
$"0000000A01013712400B5300000000000040000046400500000001178000040A"
$"09013802400B530000000000004000004640050000000A01013912400B530000"
$"0000000040000046400500000001178000040A0A013A02400B53000000000000"
$"4000004640050000000A01013B12400B53000000000000400000464005000000"
$"01178000040A0B013C02400B530000000000004000004640050000000A01013D"
$"12400B5300000000000040000046400500000001178000040A0C013E02400B53"
$"0000000000004000004640050000000A01013F12400B53000000000000400000"
$"46400500000001178000040A0D014002400B5300000000000040000046400500"
$"00000A01014112400B5300000000000040000046400500000001178000040A0E"
$"014202400B530000000000004000004640050000000A01014312400B53000000"
$"00000040000046400500000001178000040A0F014402400B5300000000000040"
$"00004640050000000A01014512400B5300000000000040000046400500000001"
$"178000040A10014602400B530000000000004000004640050000000A01014712"
$"400B5300000000000040000046400500000001178000040A11014802400B5300"
$"00000000004000004640050000000A01014912400B5300000000000040000046"
$"400500000001178000040A12014A02400B530000000000004000004640050000"
$"000A01014B12400B5300000000000040000046400500000001178000040A1301"
$"4C02400B530000000000004000004640050000000A01014D12400B5300000000"
$"000040000046400500000001178000040A14014E02400B530000000000004000"
$"004640050000000A01014F12400B530000000000004000004640050000000117"
$"8000040A08015002400B530000000000004000004640050000000A0101511240"
$"0B5300000000000040000046400500000001178000040A08015202400B530000"
$"000000004000004640050000000A01015312400B530000000000004000004640"
$"0500000001178000040A08015402400B53000000000000400000464005000000"
$"0A01015512400B530000000000004000004640050000000117800004"
};

View File

@@ -0,0 +1,106 @@
SUMMARY="All-platform P2P client based on eMule"
DESCRIPTION="aMule is a multi-platform client for the ED2K file sharing network and based on the \
windows client eMule. aMule started in August 2003, as a fork of xMule, which is a fork of lMule.
aMule currently supports Linux, FreeBSD, OpenBSD, Windows, MacOS X and X-Box on both 32 and 64 \
bit computers.
aMule is intended to be as user friendly and feature rich as eMule and to remain faithful to the \
look and feel of eMule so users familiar with either aMule or eMule will be able switch between \
the two easily.
Since aMule is based upon the eMule codebase, new features in eMule tend to find their way into \
aMule soon after their inclusion into eMule so users of aMule can expect to ride the cutting-edge \
of ED2k clients."
HOMEPAGE="http://www.amule.org/"
COPYRIGHT="2003-2020 aMule Team"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.sourceforge.net/project/amule/aMule/$portVersion/aMule-$portVersion.tar.gz"
CHECKSUM_SHA256="fa85a054153c9787fce2d35a5c5590a3d390429b8fa0c5d8f9ea69e9904c7b72"
SOURCE_DIR="aMule-$portVersion"
PATCHES="amule-$portVersion.patchset
wx3.2.patch
version_check.diff"
# credits for icon
# By helix84 and (eMule original) eMule team - own work; based on Image:EMule mascot.png, GPL,
# https://commons.wikimedia.org/w/index.php?curid=1969437
ADDITIONAL_FILES="amule.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
amule$secondaryArchSuffix = $portVersion
cmd:amule$secondaryArchSuffix = $portVersion
cmd:ed2k = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcryptopp$secondaryArchSuffix
# lib:libintl$secondaryArchSuffix
lib:libwx_baseu_3.2$secondaryArchSuffix
lib:libwx_baseu_net_3.2$secondaryArchSuffix
lib:libwx_gtk3u_core_3.2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_system$secondaryArchSuffix >= 1.70.0
devel:libboost_thread$secondaryArchSuffix >= 1.70.0
devel:libexecinfo$secondaryArchSuffix
devel:libcryptopp$secondaryArchSuffix
# devel:libintl$secondaryArchSuffix
devel:libwx_baseu_3.2$secondaryArchSuffix
devel:libwx_baseu_net_3.2$secondaryArchSuffix
devel:libwx_gtk3u_core_3.2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:msgfmt
cmd:msgmerge
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_EXE_LINKER_FLAGS="-lbsd -lnetwork" \
-DBUILD_TESTING=OFF
make -C build $jobArgs
}
INSTALL()
{
make -C build install
mkdir -p $appsDir
mv $binDir/amule $appsDir/aMule
# we are not linux
rm -rf $dataDir/applications
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local APP_NAME="aMule"
local LONG_INFO="$SUMMARY"
local APP_SIGNATURE="application/x-vnd.amule"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
-e "s|@APP_NAME@|$APP_NAME|" \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
$portDir/additional-files/amule.rdef.in > amule.rdef
addResourcesToBinaries amule.rdef $appsDir/aMule
addAppDeskbarSymlink $appsDir/aMule
}

View File

@@ -0,0 +1,80 @@
From 5401b5825357b2db9b3b3a364b286029d5c3f7be Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 11 Sep 2023 19:04:14 +0200
Subject: Fix int type errors
diff --git a/src/Types.h b/src/Types.h
index 098e026..0dde23d 100644
--- a/src/Types.h
+++ b/src/Types.h
@@ -94,13 +94,17 @@
* Backwards compatibility with emule.
* Note that the int* types are indeed unsigned.
*/
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
typedef uint8_t int8;
-typedef uint8_t uint8;
typedef uint16_t int16;
-typedef uint16_t uint16;
typedef uint32_t int32;
-typedef uint32_t uint32;
typedef uint64_t int64;
+#endif
+typedef uint8_t uint8;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
typedef uint64_t uint64;
typedef int8_t sint8;
typedef int16_t sint16;
--
2.37.3
From bf8b4ab3821eaba11ec029f773c792c67b2951be Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 11 Sep 2023 19:04:57 +0200
Subject: Fix linking errors with libnetwork and libbsd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d66ce7b..f30a28d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,8 @@ if (NOT SVNDATE)
message (STATUS "git revision ${SVNDATE} found")
endif()
+add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now
+
include (cmake/bfd.cmake)
configure_file (
--
2.37.3
From 8d7cff8fafa8def7884dab98da3a51a25459d9eb Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 11 Sep 2023 19:13:33 +0200
Subject: amule-fix-exception.patch (from upstream)
diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
index f04e375..a655452 100644
--- a/src/libs/common/MuleDebug.cpp
+++ b/src/libs/common/MuleDebug.cpp
@@ -55,7 +55,7 @@
#endif
#include <vector>
-
+#include <exception>
/**
* This functions displays a verbose description of
--
2.37.3

View File

@@ -0,0 +1,12 @@
Disable NewVersionCheck by Default (Closes: #554623)
--- a/src/Preferences.cpp
+++ b/src/Preferences.cpp
@@ -1211,7 +1211,7 @@ void CPreferences::BuildItemList( const
/**
* Version check
**/
- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
+ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
/**
* Obfuscation

View File

@@ -0,0 +1,461 @@
Description: Fixes for wxWidgets 3.2 compatibility
Largely based on patch from Mr Hyde <mrhyde@MM2018.local> in
https://github.com/amule-project/amule/pull/168
Author: Olly Betts <olly@survex.com>
Bug: https://github.com/amule-project/amule/issues/340
Bug-Debian: https://bugs.debian.org/1019841
Forwarded: no
Last-Update: 2023-01-09
--- a/src/ColorFrameCtrl.cpp
+++ b/src/ColorFrameCtrl.cpp
@@ -61,7 +61,7 @@
/////////////////////////////////////////////////////////////////////////////
void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour)
{
- m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID));
+ m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID));
Refresh(FALSE);
} // SetFrameColor
@@ -70,7 +70,7 @@
/////////////////////////////////////////////////////////////////////////////
void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour)
{
- m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID));
+ m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID));
// clear out the existing garbage, re-start with a clean plot
Refresh(FALSE);
--- a/src/DownloadListCtrl.cpp
+++ b/src/DownloadListCtrl.cpp
@@ -850,7 +850,7 @@
dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
dc->SetPen( colour.Blend(65).GetPen() );
} else {
- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID)));
dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
dc->SetPen(*wxTRANSPARENT_PEN);
}
@@ -1413,7 +1413,7 @@
dc->DrawLine( rect.x, rect.y + 2, rect.x + width, rect.y + 2 );
// Draw the green line
- dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxSOLID ) ));
+ dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxPENSTYLE_SOLID ) ));
dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 );
}
}
--- a/src/GenericClientListCtrl.cpp
+++ b/src/GenericClientListCtrl.cpp
@@ -660,7 +660,7 @@
dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
dc->SetPen( colour.Blend(65).GetPen() );
} else {
- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID)));
dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
dc->SetPen(*wxTRANSPARENT_PEN);
}
--- a/src/MuleColour.cpp
+++ b/src/MuleColour.cpp
@@ -35,7 +35,7 @@
std::map<uint32_t, wxPen*> wxPenCache;
std::map<uint32_t, wxBrush*> wxBrushCache;
-const wxPen& CMuleColour::GetPen(int width, int style) const
+const wxPen& CMuleColour::GetPen(int width, wxPenStyle style) const
{
#if USE_MULE_PEN_CACHE
wxPen* result = NULL;
@@ -61,7 +61,7 @@
#endif
}
-const wxBrush& CMuleColour::GetBrush(int style) const
+const wxBrush& CMuleColour::GetBrush(wxBrushStyle style) const
{
#if USE_MULE_BRUSH_CACHE
wxBrush* result = NULL;
--- a/src/MuleColour.h
+++ b/src/MuleColour.h
@@ -27,6 +27,9 @@
#include <wx/colour.h>
#include <wx/settings.h>
+#include <wx/pen.h> // needed for wxPenStyle enum values
+#include <wx/brush.h> // needed for wxBrushStyle enum values
+#include <wx/font.h> // needed for wxFontStyle enum values
#include "Types.h"
class wxPen;
@@ -95,8 +98,8 @@
return wxColor(m_red, m_green, m_blue);
}
- const wxPen& GetPen(int width = 1, int style = wxSOLID) const;
- const wxBrush& GetBrush(int style = wxSOLID) const;
+ const wxPen& GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const;
+ const wxBrush& GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const;
private:
uint8_t m_red;
--- a/src/MuleGifCtrl.cpp
+++ b/src/MuleGifCtrl.cpp
@@ -167,7 +167,7 @@
int x = (clientsize.GetWidth()-gifsize.GetWidth())/2;
int y = (clientsize.GetHeight()-gifsize.GetHeight())/2;
- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID)));
+ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID)));
dc.Clear();
dc.DrawBitmap(m_frame, x, y, true);
}
--- a/src/OScopeCtrl.cpp
+++ b/src/OScopeCtrl.cpp
@@ -74,7 +74,7 @@
PlotData_t* ppds = pdsTrends;
for(unsigned i=0; i<nTrends; ++i, ++ppds){
ppds->crPlot = (i<15 ? crPreset[i] : *wxWHITE);
- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID));
+ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID));
ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0;
}
@@ -166,7 +166,7 @@
if (ppds->crPlot == cr)
return;
ppds->crPlot = cr;
- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID));
+ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID));
InvalidateGraph();
}
@@ -179,7 +179,7 @@
}
m_bgColour = cr;
- brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxSOLID));
+ brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxBRUSHSTYLE_SOLID));
InvalidateCtrl() ;
}
@@ -196,7 +196,7 @@
wxMemoryDC dcGrid(m_bmapGrid);
- wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID));
+ wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_SOLID));
wxString strTemp;
// fill the grid background
@@ -213,7 +213,7 @@
dcGrid.SetPen(wxNullPen);
// create some fonts (horizontal and vertical)
- wxFont axisFont(10, wxSWISS, wxNORMAL, wxNORMAL, false);
+ wxFont axisFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false);
dcGrid.SetFont(axisFont);
// y max
@@ -320,7 +320,7 @@
// operation, preventing us from simply blitting the plot on top of
// the grid bitmap.
- dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxLONG_DASH)));
+ dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_LONG_DASH)));
for (unsigned j = 1; j < (nYGrids + 1); ++j) {
unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop();
--- a/src/SearchListCtrl.cpp
+++ b/src/SearchListCtrl.cpp
@@ -826,7 +826,7 @@
// Define the border of the drawn area
if (highlighted) {
- dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxSOLID)));
+ dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxPENSTYLE_SOLID)));
} else {
dc->SetPen(*wxTRANSPARENT_PEN);
dc->SetTextForeground(GetItemTextColour(item));
@@ -912,7 +912,7 @@
const int middle = cur_rec.y + ( cur_rec.height + 1 ) / 2;
// Set up a new pen for drawing the tree
- dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxSOLID)) );
+ dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxPENSTYLE_SOLID)) );
if (file->GetParent()) {
// Draw the line to the filename
--- a/src/ServerListCtrl.cpp
+++ b/src/ServerListCtrl.cpp
@@ -327,7 +327,7 @@
wxFont font = GetFont();
if ( highlight ) {
- font.SetWeight( wxBOLD );
+ font.SetWeight( wxFONTWEIGHT_BOLD );
m_connected = server;
}
--- a/src/extern/wxWidgets/listctrl.cpp
+++ b/src/extern/wxWidgets/listctrl.cpp
@@ -1453,7 +1453,7 @@
if ( highlighted )
dc->SetBrush( m_owner->GetHighlightBrush() );
else
- dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxSOLID)));
+ dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID)));
dc->SetPen( *wxTRANSPARENT_PEN );
@@ -2325,7 +2325,7 @@
(
wxSYS_COLOUR_HIGHLIGHT
),
- wxSOLID
+ wxBRUSHSTYLE_SOLID
));
m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush(
@@ -2333,7 +2333,7 @@
(
wxSYS_COLOUR_BTNSHADOW
),
- wxSOLID
+ wxBRUSHSTYLE_SOLID
));
SetScrollbars( 0, 0, 0, 0, 0, 0 );
@@ -2734,7 +2734,7 @@
// Ensure an uniform background color, as to avoid differences between
// the automatically cleared parts and the rest of the canvas.
- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID)));
// We need to clear the DC manually, since we intercept BG-erase events.
// Clearing must be done first thing because caching of the double-buffering causes artifacts otherwise.
@@ -2805,7 +2805,7 @@
if ( HasFlag(wxLC_HRULES) )
{
- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID));
+ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID));
wxSize clientSize = GetClientSize();
size_t i = visibleFrom;
@@ -2831,7 +2831,7 @@
// Draw vertical rules if required
if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
{
- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID));
+ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID));
wxRect firstItemRect, lastItemRect;
GetItemRect(visibleFrom, firstItemRect);
@@ -4859,12 +4859,15 @@
void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
{
+ // wxScrolledWindows::OnScroll is deprecated in wx 3.0.0 and it does not exist anymore in 3.1.0.
+ // Please also notice that call to
+ // - wxScrolledWindow::OnScroll
+ // - HandleOnScroll
+ // have been removed in code present in
+ // src/generic/listctrl.cpp, wxListMainWindow::OnScroll
+ // of wxWidgets 3.0
// FIXME
-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
- wxScrolledWindow::OnScroll(event);
-#else
HandleOnScroll( event );
-#endif
// update our idea of which lines are shown when we redraw the window the
// next time
--- a/src/extern/wxWidgets/listctrl.h
+++ b/src/extern/wxWidgets/listctrl.h
@@ -16,7 +16,6 @@
#include <wx/textctrl.h>
#define wxLC_OWNERDRAW 0x10000
-#define WXWIN_COMPATIBILITY_2_8 1
#include <wx/imaglist.h>
--- a/src/muuli_wdr.cpp
+++ b/src/muuli_wdr.cpp
@@ -77,7 +77,7 @@
CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, wxT(""), wxDefaultPosition, wxSize(-1,20), wxTE_MULTILINE );
item4->SetName( wxT("FastEd2kLinks") );
- item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
+ item2->Add( item4, 1, wxALL|wxEXPAND, 5 );
wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 );
item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") );
@@ -474,7 +474,7 @@
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
- item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item0->Add( item6, 1, wxGROW, 5 );
if (set_sizer)
{
@@ -1048,7 +1048,7 @@
wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,parent);
item3->SetName(wxT("dloadScope"));
wxASSERT( item3 );
- item1->Add( item3, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item1->Add( item3, 1, wxGROW|wxALL, 5 );
wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 );
item4->AddGrowableCol( 0 );
@@ -1089,7 +1089,7 @@
item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 );
- item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+ item0->Add( item1, 1, wxGROW|wxBOTTOM, 5 );
wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Upload-Speed") );
wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL );
@@ -1097,7 +1097,7 @@
wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,parent);
item16->SetName(wxT("uloadScope"));
wxASSERT( item16 );
- item14->Add( item16, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item14->Add( item16, 1, wxGROW|wxALL, 5 );
wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 );
item17->AddGrowableCol( 0 );
@@ -1138,7 +1138,7 @@
item14->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 );
- item0->Add( item14, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+ item0->Add( item14, 1, wxGROW|wxBOTTOM, 5 );
wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Connections") );
wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL );
@@ -1146,7 +1146,7 @@
wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,parent);
item29->SetName(wxT("otherScope"));
wxASSERT( item29 );
- item27->Add( item29, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item27->Add( item29, 1, wxGROW|wxALL, 5 );
wxFlexGridSizer *item30 = new wxFlexGridSizer( 2, 0, 0 );
item30->AddGrowableCol( 0 );
@@ -1187,16 +1187,15 @@
item27->Add( item30, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 );
- item0->Add( item27, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item0->Add( item27, 1, wxGROW|wxALL, 5 );
wxStaticBox *item41 = new wxStaticBox( parent, -1, _("Statistics Tree") );
wxStaticBoxSizer *item40 = new wxStaticBoxSizer( item41, wxVERTICAL );
wxTreeCtrl *item42 = new wxTreeCtrl( parent, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER );
item42->SetName( wxT("statTree") );
- item40->Add( item42, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
- item0->Add( item40, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item40->Add( item42, 1, wxGROW|wxALL, 5 );
+ item0->Add( item40, 1, wxGROW|wxALL, 5 );
if (set_sizer)
{
@@ -2030,7 +2029,7 @@
wxStaticText *item2 = new wxStaticText( parent, -1, _("!!! WARNING !!!"), wxDefaultPosition, wxDefaultSize, 0 );
item2->SetForegroundColour( *wxRED );
- item2->SetFont( wxFont( 24, wxROMAN, wxNORMAL, wxNORMAL ) );
+ item2->SetFont( wxFont( 24, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) );
item1->Add( item2, 0, wxALIGN_CENTER, 5 );
wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
--- a/src/utils/wxCas/src/wxcasframe.cpp
+++ b/src/utils/wxCas/src/wxcasframe.cpp
@@ -280,11 +280,11 @@
#ifdef __WINDOWS__
memdc.
- SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
+ SetFont ( wxFont ( 6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
#else
memdc.
- SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
+ SetFont ( wxFont ( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) );
#endif
memdc.
--- a/src/amuleDlg.cpp
+++ b/src/amuleDlg.cpp
@@ -763,7 +763,7 @@
if ( (true == skinChanged) || (currentState != s_oldState) ) {
wxWindowUpdateLocker freezer(m_wndToolbar);
- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONCONNECT);
+ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONCONNECT);
switch (currentState) {
case ECS_Connecting:
@@ -784,8 +784,6 @@
toolbarTool->SetNormalBitmap(m_tblist.GetBitmap(0));
}
- m_wndToolbar->InsertTool(0, toolbarTool);
- m_wndToolbar->Realize();
m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
s_oldState = currentState;
@@ -1416,7 +1414,7 @@
wxWindowUpdateLocker freezer(this);
#endif
- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONNETWORKS);
+ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS);
// set the log windows
wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
@@ -1507,12 +1505,9 @@
// Tool bar
- m_wndToolbar->InsertTool(2, toolbarTool);
m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()));
m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
- m_wndToolbar->Realize();
-
ShowConnectionState(); // status in the bottom right
m_searchwnd->FixSearchTypes();
}
--- a/src/amule-gui.cpp
+++ b/src/amule-gui.cpp
@@ -28,6 +28,7 @@
#include <common/ClientVersion.h>
#include <wx/clipbrd.h> // Needed for wxClipBoard
+#include <wx/sizer.h>
#include <wx/tokenzr.h> // Needed for wxStringTokenizer
#include "SharedFilesWnd.h" // Needed for CSharedFilesWnd
@@ -98,6 +99,11 @@
CamuleGuiBase::CamuleGuiBase()
{
+ // Disable these checks for now. The code really needs updating to
+ // eliminate these inconsistent flag uses, but these checks are new
+ // since wx3.0, and this should just return us to what 3.0 did.
+ wxSizerFlags::DisableConsistencyChecks();
+
amuledlg = NULL;
}