From 3e7aea5a30e7c861b7507c68cdff8c998a60e2aa Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 26 Apr 2022 23:24:59 +1000 Subject: [PATCH] GCompris: bump version --- .../additional-files/gcompris.rdef.in | 151 +++++++++++++++++- ...ompris-0.70.recipe => gcompris-2.4.recipe} | 26 +-- ...is-0.70.patchset => gcompris-2.4.patchset} | 17 +- 3 files changed, 172 insertions(+), 22 deletions(-) rename games-kids/gcompris/{gcompris-0.70.recipe => gcompris-2.4.recipe} (80%) rename games-kids/gcompris/patches/{gcompris-0.70.patchset => gcompris-2.4.patchset} (69%) diff --git a/games-kids/gcompris/additional-files/gcompris.rdef.in b/games-kids/gcompris/additional-files/gcompris.rdef.in index 07d1a5ab9..c59ab977d 100644 --- a/games-kids/gcompris/additional-files/gcompris.rdef.in +++ b/games-kids/gcompris/additional-files/gcompris.rdef.in @@ -1,10 +1,10 @@ -resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; +resource app_flags B_SINGLE_LAUNCH; resource app_version { major = @MAJOR@, middle = @MIDDLE@, - minor = @MINOR@, + minor = 0, variety = B_APPV_FINAL, internal = 0, short_info = "GCompris", @@ -12,3 +12,150 @@ resource app_version { }; resource app_signature "application/x-vnd.qt5-GCompris"; + +resource vector_icon { + $"6E636966080500020106040000003E7FCBBE7FCB00000048398949594C0033FF" + $"FF5333FFFFD70066FFFF0034CC04015D02010606000000BEF141BEF141000000" + $"48D52047FDC200FFFFFF3300FF006600E4009900B200CC009900FF0080000400" + $"53020006033A3DD43A05FCBAAE253AF81E4A46D94A13DE00FFBD60A3945B09FF" + $"623A02020006023DFFE8B172342FA9573C1FF34778C54AF37500FFC389FF6533" + $"02020006023B6B723BFBC4BC16293B952348403847F78C00CB9866FF69350218" + $"0606FF07BFA520BFA520C6A220CC4DBFA5CC4DB8A8CC4DC6A2BFA5CC4DC6A2CC" + $"4DB8A9CC4D20BFA520C6A220B8A8BFA520B8A920BFA520200606FF07BFA5B3C9" + $"BFA5B3C9C632B3C9CB81BFA5CB81B918CB81C632BFA5CB81C632CB81B918CB81" + $"B3C9BFA5B3C9C632B3C9B918BFA5B3C9B918B3C9BFA5B3C9B3C9027CBFA5B3C9" + $"BFA5B3C9B91BB3C9B3C9BFA5B3C9B91BB3C9C106B475C394B406C259B485C3A6" + $"B49EC3CBB493C3B7B4B0C3EDB4B9C445B4B6C41AB68856BFA5CB81BABFCB81C1" + $"7BCB81C4C5CA57C337CB16C4A9C9D1C394C9AFC416C9A3C3A4C9B3C3C4C9BAC3" + $"B459C392C9AFC328C9BCC35AC9AEC2F2C9CAC290C9F7C2CAC9EEC202CA0DC0DF" + $"C9DDC16DC9EBC057C9D1BF42CA01BFC3C9CCBF14CA14BEB6CA45BEE6CA46BEA4" + $"CA45BE82CA45BE93CA45BDE7CA45BCB1CA45BD4CCA45BC99CA45BC67CA1FBC7D" + $"CA2ABC49CA11BC0AC9FE37CA06BBEDC9F7BBB2C9F1BBCFC9F3BBA5C9E3BB8DC9" + $"C7BB99C9D4BB5AC98EBAC5C966BB0BC97EBA66C946B9A5C904BA06C91DB95DC8" + $"A4B8CBC7E9B935C82DB8BEC7E1B8A2C7D5B8B0C7DAB88CC7CCB898C7B6B898C7" + $"CAB898C791B87E53B88CC772B862C70FB85AC67DB859C6C5B85CC612B861C53E" + $"B870C5A9B85DC51FB88FC4F3B87CC50AB8A3C4D8B8C5C49FB8B6C4BDB8E9C45C" + $"2FC3C5B8F8C411B8FEC362B8F5C29CB8EDC2FEB8FCC252B96AC1D8B945C214B9" + $"A9C171B987C074B9E0C0DCB96BC052B920C02CB945C040B8E9C00EB87BBFD2B8" + $"B2BFF0B81EBFA0B764BF3AB7C1BF6DB755BF32B736BF25B745BF2CB72FBF22B7" + $"20BF1BB727BF1EB71FBEFEB71ABEC4B71EBEE1B708BE50B66ABDC5B6C3BE0AB6" + $"38BD9FB5F1BD2FB618BD5FB5C6BCFCB55BBCABB595BCCCB545BC9FB516BC8DB5" + $"2EBC9425BC85B4CEBC72B4DABC88B5BFBBF3B665B9F0B5E2BAC3B684B9BEB6D6" + $"B974B6B1B9A0B6E9B95CB6FFB923B6F7B941B703B913B707B8F2B706B903B708" + $"B8D7B713B8C0B6F7B8CCB796B88AB88BB7F9B812B843B8F5B7B9B9CAB734B965" + $"B77CBA3EB6E2BAA2B5E2BA77B665BAA927BABFB5C0BAA3B5BFBAD1B5C1BAF5B5" + $"BFBAE3B5C1BB16B5BDBB57B5AEBB37B5B7BB74B5A5BBACB58DBB91B59ABBCAB5" + $"9EBC0BB5B2BBEAB5ABBC43B5BFBCB8B5BFBC7FB5C5BCDCB5BCBD20B5A5BCFFB5" + $"B3BD42B597BD88B569BD64B56DBD70B5AEBD94B63BBD76B5F8BDA2B65BBDCCB6" + $"94BDB5B67ABDE8B6B2BE2BB6DCBE11B6BFBDB3B706BD69B7EDBD61B768BD6DB8" + $"29BD9EB897BD82B862BDA8B8AABDB0B8D6BDAAB8C1BDB8B8F3BD7AB92DBD8DB9" + $"16BD2FB982BC70B9E3BCC3B997BC3FBA11BC0BBA8BBC1FBA4BBC05BA9EBBFBBA" + $"C5BC00BAB2BBE5BAE2BBC7BB24BBD3BB02BBB335BBCCBBD2BBB4BB9BBBD9BBF0" + $"BBD1BC11BBE0BBF5BBC2BC2DBBA7BC67BBB3BC49BB70BCEEBBDBBDE3BB7DBD72" + $"BC35BE51BD29BF00BCAFBEB7BD98BF43BE9BBF42BE1CBF53BEEBBF37BF82BF05" + $"BF36BF1DBFB93EC028BED9BFEFBEDDC05EBED5C0B7BF1FC090BEFFC0CABF2FC0" + $"CDBF48C0D6BF2FC0C7BF58C0BFBF7AC0C2BF69C0B6BF9BC0B8BFDEC0B5BFBCC0" + $"BFC024C0F9C0A3C0DAC065C113C0D8C14AC13FC12FC10BC164C16FC197C1D0C1" + $"7BC1A1C19EC1DBC1ACC1F1C1A5C1E6C1A5C1FCC19AC213C19FC208C18DC22EC1" + $"78C264C182C249C15EC2A9C14CC33CC14FC2F2C149C3ADC1B6C468C16CC413C1" + $"CFC484C1F5C4C0C1F4C499C1F9C504C1F9C58AC1EEC546C20EC611C30052C266" + $"C6DBC3B1C701C503C660C47BC6D6C550C61DC5D3C583C583C5C1C5FCC563C647" + $"C521C625C548C65EC506C67FC4C9C670C4E9C691C4A0C6A6C44BC694C473C6B6" + $"C494C72FC4E6C6E8C4CFC77BC500C801C4BBC7C2C4E8C861C474C8C8C3A4C893" + $"C40BC903C331C91DC235C948C2BDC8E8C19DC7B5C1B0C83EC151C7B5C16FC7B4" + $"C0ECC7B2C12D54C0ABC7F1C05EC7C542C827C024C89CBFBBC862BFF1C907BF58" + $"C92EBE51C936BEE4C928BDDBC8E1BD0AC93EBD69C930BCD6C986BC2DC968BC86" + $"C99FBC63C9E6BCC3C9BCBC97C9FABCD8C9F5BD25C9F1BD07C9FBBD4CCA12BD98" + $"CA05BD73CA38BE08CA8BBEDFCA7DBE68CA95BF38CA94BFEDCA91BF93CA96C024" + $"CA94C093CA9CC05CCA8CC0CBCA5BC135CA6BC0FFCA32C1B6CA22C2C6CA25C23F" + $"CA21C30FCA39C397CA14C354CA53C3C5CAB0C3F8CA7EC3E7CB37C2A0CB81BFA5" + $"CB81C12CCB81B91BBFA5B3C9C62FB3C9BFA5B3C9BFA5B3C9BFA5B3C9BFA5B3C9" + $"0009C373CA74C373CA74C280CB21BFFBCAA4C10CCA86BFBCCAABBF4FCAE2BF81" + $"CAB7BF10CB19BE9ACB0F3ECB0FBDE1CB0FBC6ECB0FBD27CB0FBDFFCB81C146CB" + $"65BFA8CB9EC20ACB4AC38ACADDC2CECB1CC399CAD7C3F4CA7AC427CA8DC3CCCA" + $"6CC373CA74C399CA85C373CA740005C82EC248C82EC248C7F8C28CC782C30AC7" + $"ADC2BE53C362C76AC429C76AC3C9C7C8C3FDC822C32CC7F2C381C845C2EEC82E" + $"C248C892C273C82EC2480004B85DC893B85DC893B846C8A5B812C8C5B830C8BF" + $"B861C906B906C97CB8B1C943B8C4C935B85DC893B8ADC8CFB85DC8930004C10C" + $"B85DC10CB85DC12BB86DC16BB88DC14BB87DC16FB879C178B850C174B864C154" + $"B854C10CB85DC130B859C10CB85D0008C4FAB7DFC4FAB7DFC4CDB7E6C4B0B78B" + $"C4D0B79BC476B76DC400B7ABC434B78FC35AB806C3ACB6EBC38BB748C3B2B6DD" + $"C42FB6EDC41DB6F0C465B6E5C4E2B6FFC4B7B6CEC50BB72DC55BB785C52BB75A" + $"C596B7BBC4FAB7DFC526B7D9C4FAB7DF0066CB7CBEEFCB7CBEEFCB50BD1FC9E6" + $"B9BDCACABB54C971B8ECC840B77DC8E4B82AC7EFB728C740B68CC79AB6D7C723" + $"B674C6DEB660C705B64BC6BBB673C6A9B615C69F28C51CB4F2C161B3EAC34923" + $"C1A7B419C24CB434C200B415C267B43FC276B47FC2B5B46AC1F9B4A7C0EDB47E" + $"C16CB475C09EB484C072B4EFC079B49FC06FB51BC074B59BC064B571C086B5CC" + $"C135B574C11FB58EC15CB547C196B504C12EB4E645B553C160B5FBC20EB637C1" + $"34B5EBC0B3B5B9C0E1B5A4C0AFB5BBC0A3B5F8C0A7B5F2C093B614C05B28C07A" + $"B626BFE0B6503FB6E8BF87B663BF44B72ABEFEB76BBF46B751BEC7B77EBE57B7" + $"A2BE8BB78ABE10B7C3BE5CB84FBE42B820BE6FB870BE8FB8D3BE6BB8BFBEF8B9" + $"0FBF9EB7EDBF72B824BFD8B7A3C067B79AC018B7B442B78DC0E4B740C0BCB731" + $"C165B772C1A1B888C18DB80DC1CAB888C206B83BC1AFB825C1C5B7F5C18EB735" + $"C197B796C1ECB771C24BB81DC22EB7B3C267B885C2EEB856C298B8C0C303B840" + $"C34FB7DBC323B7B3C375B7FDC33BB87EC375B86FC35DB89CC3B3B885C38CB88F" + $"C3E8B877C439B88EC406B87BC473B8A54DB8B0C4B1B8ACC52DB8B4C56DB91BC5" + $"50B8EC4FB99CC3CEB965C3E5B966C396B962C323B97649B961C2FAB987C2AAB9" + $"ACC2DBB9BBC275B99AC216B94CC244B96AC1D6B922C14EB8DDC194B8FCC0DBB8" + $"AABFDBB8A3C059B889BF9FB8AFBF36B8EEBF66B8C9BEFCB91ABE83B92FBEBDB8" + $"F3BE2AB98BBD76BA32BDECB9F9BD47BA49BCEBBA88BD0DBA5DBCC8BAB3BCB1BB" + $"1EBCC8BAEDBC9CBB4DBC91BB9BBC69BB64BCB4BBCCBCA6BC2CBCBEBBF3BC82BC" + $"80BC67BD4FBC22BCF2BCABBDA9BD7BBE44BD21BE02BDE03DBED1BE69BE5DBE87" + $"BF3EBE4DC01ABE0FBFA9BE17C0A7BE05C176BEB8C113BE5FC1B6BEF2C19DBF5C" + $"C1CFBF09C166BFB9C1B5C057C188BFFDC1E2C0B2C242C163C212C10BC257C189" + $"C284C1D5C273C1ADC298C203C263C246C278C21FC236C296C216C351C216C2F4" + $"C217C3B847C41EC248C3DBC2C6C45BC2BDC516C2C3C4C6C2B6C582C317C624C2" + $"D6C5CEC377C627C435C5F8C3DC50C4A1C5C4C522C50EC4D1C55FC56DC4C2C5D4" + $"C448C5BDC4BBC5EFC3C0C69AC336C638C38AC6F4C2E952C210C6E9C27BC6EEC1" + $"93C6F0C090C6E0C10BC6FFC020C7B6BF79C76CBFC5C7EDBF41C85EBEB8C849BF" + $"08C86ABE8BC861BE23C861BE51C861BE00C85DBDA9C86CBDC9C834BD53C76BBD" + $"58C77FBDA8C75EBD26C781BD11C761BD30C7A5BCEFC762BCBBC781BCCDC70ABC" + $"87C683BC11C6C4BC67C647BBC2C5E6BB14C615BB6AC5DABAFDC5A9BA27C564BA" + $"11C5F5BA40C66CBAD2C639BA9AC6C5BB34C74FBC18C717BBA053BC27C793BC4D" + $"C788BC45C7BCBC6B55BC7FC7E9BC83C894BC75C8D6BB9FC8CDBC09C8E1BB0CC8" + $"1ABAE6C872BB2CC7E8BABEC7A0BA56C7C8BA87C788BA39C75CB9DDC744BA0AC7" + $"8EB9BBC7D3B9F6C7A2B9D8C80DBA18C88ABA4AC84ABA36C8CCBA60C969BA77C9" + $"30BA4DC98C33C9BDBAF4C9A6BAD0C9E2BB2FCA26BBA8CA07BB6ACA57BC0ACAD9" + $"BC6FCA64BC4BCA8FBCE8CB10BDE6CAD7BD76CB55BE6BCB5ABF80CB5BBEECCB59" + $"C007CB3BC11ECB79C0A0CAF9C1A7CAEBC2FACAEBC262CAEE48CAF5C2DCCAF1C2" + $"E5CAEFC2E7CAEEC338CADBC335CB0AC33ECB45C1FFCB3EC21FCB7AC0FECB7CBE" + $"EFCB8BBFF5CB7CBEEF0004B63AB8F2B63AB8F2B644B8CCB613B8A4B62CB8BDB5" + $"61B998B471BBC2B4D4BAA5B55ABB0CB63AB8F2B549B9ABB63AB8F20004C0ECB7" + $"8DC0ECB78DC0E3B787C0CDB782C0D6B785C0CBB79DC0EFB7B0C0CBB7BBC0EEB7" + $"A5C0ECB78DC0EFB797C0ECB78D0004C0BA2DC0BA2DC0CCB815C0FEB827C0E6B8" + $"19C0FEB80CC0E7B7C3C10CB7CCC0A8B7B3C0BA2DC0B8B80DC0BA2D0005BEBDB6" + $"58BEBDB658BEF2B65BBF64B66BBF30B680BFB8B649BF44B5A5BF6727BF2BB58B" + $"BEC9B57DBEB3B512BED8B5C5BEBDB658BF17B627BEBDB6580009BBB8B496BBB8" + $"B496BBF0B4BBBC40B4EFBBF7B4E1BC73B4F8BCEBB4D9BCC3B503BD4DB474BE56" + $"B476BDE4B4BCBEB1B43EBF7122BEFDB3CEBFB922C01FB419BFE4B3F9C06EB445" + $"C0F7B3DCC0AFB3F3BEC5B39EBA8BB4F0BC88B3FDBAFCB511BBB8B496BB61B4D9" + $"BBB8B496000222BF5222BF5222BF4522BF5222BF4F22BF52001DB780C4F9B780" + $"C4F9B7B1C4B8B817C438B7F3C483B843C3DCB829C2EEB829C352B829C27BB871" + $"C1D9B829C239B8A6C191B8ECC0F6B8DDC152B84AC09CB703BFECB7A7C043B6D9" + $"BFD6B664BF8AB679BFBAB648BF49B644BEB6B663BEF5B62DBE86B5BDBE3AB5E0" + $"BE65B58ABDFCB527BD7FB562BDB6B4EFBD4BB471BD59B4B9BD33B421BD85B41E" + $"BCD9B426BD0EB40ABD2FB3EBBDDEB3F8BD8623BDDEB429BE33B427BDF1B42BBE" + $"77B430BEFFB42DBEBBB43DBF1CB418BF2BB435BF2BB40FBF2EB3FDBF34B406BF" + $"31B3ECBF42B3D7BF2FB3E0BF41B3BCBF2DB3D1C071B3D0C059B3D7C0D0B459C1" + $"D322C202B4A1C203B4C5C2BDB495C27825C310B566C3A0B548C33AB584C407B5" + $"97C4DEB585C474B5ABC562B654C5E2B5F3C592B66BC66CB6F0C72AB694C6C1B7" + $"1AC75AB76BC7BAB745C788B793C7EEB7CEC7B6B7A6C7ECB79AC749B791C656B7" + $"8AC6CDB798C5E5B780C4F9B7B1C565B780C4F90006B995B64FB995B64FB9CBB5" + $"F9BA04B534B9EDB597B8A7B5F1B676B824B771B6F2B70FB7F2B823B74CB79AB7" + $"9EB867B724B8EBB6D0B8AA2AB922B6ADB995B64FB972B688B995B64F0004B976" + $"C9C4B976C9C4BA0BCA1FBB4ACAADBAA8CA6DBB2DCA8DBAF5CA4DBB11CA6DBA77" + $"CA19B976C9C4B9F0C9FFB976C9C40003BB5FCAB5BB5FCAB5BBB2CAD6BC5DCB0B" + $"BC07CAF2BC0CCABABB5FCAB5BBD0CABDBB5FCAB50003BE62B595BE62B595BE1D" + $"B59DBE84B618BE5BB62BBEBAB601BE62B595BEA2B58EBE62B59502043C45C1AD" + $"45BAA2452C4F2C492C553C58355844584C4F4C554C4904032E2E513D56325647" + $"564B5004032C38243BB3D4B4972653405200000A0A0201140240FB3000000000" + $"00003FDE24C24DA2463BCC0A000114123FD6600000000000003FDE244024BC45" + $"779801178500040A050114023FD6600000000000003FDE244024BC4577980A00" + $"0100123E82060000000000003E871945DF904566AA01178400040A010101023E" + $"82060000000000003E871945DF904566AA0A020102023E82060000000000003E" + $"871945DF904566AA0A0311030405060708090A0B0C0D0E0F10111213023E8206" + $"0000000000003E871945DF904566AA0A060115123FD6600000000000003FDE24" + $"384BC442EF3001178422040A000116123FD6600000000000003FDE24384BC442" + $"EF3001178622040A070116123FD6600000000000003FDE24384BC442EF300117" + $"822204" +}; diff --git a/games-kids/gcompris/gcompris-0.70.recipe b/games-kids/gcompris/gcompris-2.4.recipe similarity index 80% rename from games-kids/gcompris/gcompris-0.70.recipe rename to games-kids/gcompris/gcompris-2.4.recipe index b05d3b8fc..d178909bf 100644 --- a/games-kids/gcompris/gcompris-0.70.recipe +++ b/games-kids/gcompris/gcompris-2.4.recipe @@ -2,7 +2,7 @@ SUMMARY="Educational software suite comprising of numerous activities for kids" DESCRIPTION="GCompris is a high quality educational software suite comprising \ of numerous activities for children aged 2 to 10. Some of the activities are game orientated, but nonetheless still educational." -HOMEPAGE="https://gcompris.net/index-en.html" +HOMEPAGE="https://gcompris.net/" COPYRIGHT=" 2014-2016 Bruno Coudoin 2014-2016 Johnny Jazeix @@ -17,54 +17,60 @@ COPYRIGHT=" 2015 Siddhesh suthar " LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://gcompris.net/download/qt/src/gcompris-qt-$portVersion.tar.xz" -CHECKSUM_SHA256="8a475ac354dad320dee1c1f6835fb1bb36ef91fe157870bda3562c5e1b8a2707" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz" +CHECKSUM_SHA256="fd066e6f8f2b6ab547703d0f80e3dce8d4e538aaec13354afea8c76f90a3592d" SOURCE_DIR="gcompris-qt-$portVersion" PATCHES="gcompris-$portVersion.patchset" ADDITIONAL_FILES="gcompris.rdef.in" -ARCHITECTURES="?all !x86_gcc2" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" gcompris$secondaryArchSuffix - app:GCompris$secondaryArchSuffix + app:GCompris " REQUIRES=" haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Multimedia$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix + lib:libQt5OpenGL$secondaryArchSuffix lib:libQt5Qml$secondaryArchSuffix lib:libQt5Quick$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix lib:libQt5Svg$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix lib:libQt5XmlPatterns$secondaryArchSuffix + lib:libssl$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libgl$secondaryArchSuffix # should come with devel:libQt5Gui + devel:libcrypto$secondaryArchSuffix + devel:libGL$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Multimedia$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix + devel:libQt5OpenGL$secondaryArchSuffix devel:libQt5Qml$secondaryArchSuffix devel:libQt5Quick$secondaryArchSuffix - devel:libQt5Sensors$secondaryArchSuffix devel:libQt5Svg$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libQt5Xml$secondaryArchSuffix devel:libQt5XmlPatterns$secondaryArchSuffix + devel:libssl$secondaryArchSuffix qt5:QmlBox2d " BUILD_PREREQUIRES=" cmd:cmake cmd:gcc$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:msgattrib " @@ -85,11 +91,9 @@ INSTALL() local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR=0 sed \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/gcompris.rdef.in > gcompris.rdef addResourcesToBinaries gcompris.rdef \ diff --git a/games-kids/gcompris/patches/gcompris-0.70.patchset b/games-kids/gcompris/patches/gcompris-2.4.patchset similarity index 69% rename from games-kids/gcompris/patches/gcompris-0.70.patchset rename to games-kids/gcompris/patches/gcompris-2.4.patchset index 20b4235cd..70fb35419 100644 --- a/games-kids/gcompris/patches/gcompris-0.70.patchset +++ b/games-kids/gcompris/patches/gcompris-2.4.patchset @@ -1,27 +1,26 @@ -From bdda155481ba5f6031e87b06da3258d2626e33c0 Mon Sep 17 00:00:00 2001 +From 6778909b16c804044adc5bec7ad54b609460be89 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 22 Apr 2017 14:24:24 +0200 Subject: Haiku patch - diff --git a/CMakeLists.txt b/CMakeLists.txt -index fee7efc..481ef10 100644 +index 1fabdfc..19e2347 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -147,6 +147,8 @@ if(CMAKE_HOST_APPLE) +@@ -158,6 +158,8 @@ set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer bac + if(CMAKE_HOST_APPLE) + set(_bundle_bin gcompris-qt.app/Contents/MacOS) set(_data_dest_dir bin/${_bundle_bin}/../Resources) - elseif(ANDROID) - set(_data_dest_dir android/assets) +elseif(HAIKU) + set(_data_dest_dir data/${GCOMPRIS_EXECUTABLE_NAME}) else() set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME}) endif() diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake -index f5479d8..e4e2b10 100644 +index 633bc35..5e589cf 100644 --- a/cmake/rcc.cmake +++ b/cmake/rcc.cmake -@@ -47,7 +47,7 @@ function(GCOMPRIS_ADD_RCC resource_path) +@@ -51,7 +51,7 @@ function(GCOMPRIS_ADD_RCC resource_path) if(CMAKE_HOST_APPLE) install(FILES ${CREATED_RCC} DESTINATION ${GCOMPRIS_EXECUTABLE_NAME}.app/Contents/MacOS/rcc) else() @@ -31,5 +30,5 @@ index f5479d8..e4e2b10 100644 add_custom_target( -- -2.12.2 +2.30.2