diff --git a/media-sound/picard/additional-files/picard.rdef.in b/media-sound/picard/additional-files/picard.rdef.in index 4d87e5c87..4f09c876c 100644 --- a/media-sound/picard/additional-files/picard.rdef.in +++ b/media-sound/picard/additional-files/picard.rdef.in @@ -15,56 +15,79 @@ resource app_version { }; resource vector_icon array { - $"6E6369660603EB733B03771B850359136303B66BC203FFFEDB03D3562A090A04" - $"C016CBD3CA63C5E9CA63B96AC016B3810A04B4F1B96AB4F1C5E9BF3ECBD3BF3E" - $"B3810A06BB44BA46B83BBBBC29C496B97CC3DABBEDC594BD92BCBB020CBF3FB9" - $"C1BF3FB9C1BF37B9BFBF25B9BBBF2EB9BDBE2BB980BB0FBB37BC5EB915BAFCBB" - $"34BAD6BB32BAE9BB32BA39BB32B995BC3DB9B1BBA2B985BC93B9C8BD32B997BC" - $"EAB9FABD7ABA9ABDBBBA44BDABBAAEBDBEBAD7BDC0BAC2BDC0BB74BDC0BC18BC" - $"B5BBFBBD50BC2EBC3FBBACBB82BC01BBCCBCB9B9DCBEFEBA63BE15BA2DBF15BA" - $"68BF3FBA72BF2BBA6EBF3FBA720204BAC6BBCBBB2CBBCBBA60BBCBBA33BC61BA" - $"33BBFBBA33BCC7BABDBCF4BA57BCF4BB23BCF4BB56BC68BB56BCCEBB56BC0202" - $"15C550B89BC55FB8E0C541B856C4DBB7F5C517B81BC4B1B7DAC44EB7CCC480B7" - $"CCC3F2B7CCC36EB847C39FB7FAC334B8A4C374B96BC339B917C2D7BA1EC1C7BA" - $"25C1FCBA26C127B9E0C016B9C1C08EB9C7C016B9C1C016BA6EC016BA6EC080BA" - $"74C190BACAC106BA8BC190BACAC191BACAC191BACAC226BB0EC305BBFBC2A3BB" - $"74C2FFBC02C2F4BC12C2F9BC0AC2A7BC8DC347BD7FC2CCBD31C371BD9AC3D4BD" - $"A8C3A2BDA8C42FBDA8C4B4BD2DC483BD7AC502BCB1C462BBBFC4DDBC0EC426BB" - $"9AC398BB9FC3DCBB8FC355BB41C2B1BAAEC308BAF1C31EBA8CC401B9D2C39ABA" - $"4CC41AB9D9C44EB9DDC434B9DDC4A9B9DDC52DB962C4FDB9AFC553B927022DC6" - $"C8BF87C667BF97C6DABFB4C723BFF9C6F9BFDCC726BFFCC72FC002C72ABFFEC7" - $"5AC01CC7BDC02BC78BC02BC818C02BC89CBFAFC86CBFFCC8C2BF74C8BFBEE8C8" - $"CEBF2DC8B0BEA3C84ABE42C886BE68C8203CC7BDBE19C7EFBE19C7B7BE19C7AD" - $"BE1AC7B2BE1AC78EBD92C7AEBC33C785BCCAC7B3BC34C7BDBC3454BC34C818BC" - $"34C89CBBB9C86CBC06C8C2BB7EC8BFBAF2C8CEBB37C8B0BAADC84ABA4CC886BA" - $"72C820BA31C7BDBA23C7EFBA23C761BA23C6DDBA9EC70EBA51C698BB0CC709BB" - $"EEC6ADBB99C70ABBEFC70CBBF0C70BBBEFC6D2BCB4C70BBE60C6DBBDAFC705BE" - $"65C6F9BE71C6FEBE6BC6EFBE7CC6DDBE95C6E5BE88C6CFBEAAC6BEBED9C6C5BE" - $"C1C62DBEEEC597BF4FC5DEBF21C53FBF88C3F7BFC2C4ECBFBEC3A2BFB8C312BF" - $"BDC35DBFBAC2D4BFBFC240BFBDC294BFC2C207BFBAC1ABBF54C1E6BF97C15DBE" - $"FBC016BE7BC0F5BE8BC016BE7BC016BF28C016BF28C0A4BF35C129BFC7C0E5BF" - $"7AC169C010C237C06AC1B2C063C293C06FC318C06AC2DAC06CC384C066C46CC0" - $"88C3D9C063C4DDC0A4C6EBC2F3C677C22AC6E6C2F9C6DDC306C6E1C2FFC692C3" - $"7DC723C46AC6B1C41AC726C46DC72FC473C72AC46FC75AC48DC7BDC49CC78AC4" - $"9CC818C49CC89CC420C86CC46DC8C2C3E5C8BFC359C8CEC39EC8AFC314C84AC2" - $"B3C886C2D9C81FC299C7BD47C7EF47C7A647C77AC293C78FC28DC70BC1DEC540" - $"C03FC604C0CFC58EC023C5F6BFE0C5C4C001C634BFB8021AC5B0C56CC5DEC5A2" - $"C57EC531C4E7C510C535C510C4A8C510C43BC550C46BC526C3F5C58BC3E1C639" - $"C3D7C5E4C38DC657C2FBC673C329C674C2D7C671C29AC649C2C2C664C268C626" - $"C1E7C5F9C232C607C266C581C35AC3CEC2EBC4D1C3B3C3CBC434C34DC406C39A" - $"C47EC2D0C3D8C1E2C455C22DC3AFC1CAC351C1BDC380C1BDC2F4C1BDC26DC23E" - $"C29DC1EFC249C27BC250C307C23EC2C2C25FC343C2B3C39BC282C377C204C529" - $"C094C616C125C5D0C08FC618C085C61DC089C61AC051C634C016C640C02CC63B" - $"C016C640C016C6EDC016C6EDC02252C0CEC6B9C067C6E8C1B5C67FC239C6D8C1" - $"F5C6AAC265C6F6C2F1C720C29CC71BC2F6C720C2FFC720C2FAC720C35AC720C4" - $"2EC6D5C3DEC6F4C460C706C4E7C721C4A2C721C527C721C594C6E1C564C70AC5" - $"C9C6B3C5EFC62DC5EAC673C5F5C5E60207C3EDB8D8C3D2B903C3F4B8CDC40AB8" - $"BCC3FEB8C3C419B8B3C43BB8AEC429B8AEC44CB8AEC46BB8BCC45DB8B3C496B8" - $"D74CB93AC4A3B90FC477B955C43AB965C45AB965C429B965C409B956C41830C3" - $"DFB93C140A000100000A010101000A02010228202120FF0A02010328202120FF" - $"0A0301020818FF0A0401030818FF0A0101040818FF0A05010528202120FF0A05" - $"010628202120FF0A0501072820B38C20FF0A0401050818FF0A0001080820FF0A" - $"000108281F2920FF0A0401060818FF0A00010828B66FB52A20FF0A00010828B6" - $"72B92020FF0A00010828B676BD7B20FF0A0401070818FF0A00010828B20DBCB9" - $"20FF0A00010828B3A8BFDF20FF" + $"6E6369660B0500020006023C71A33D763DBE755C3D789749C3F347CCC000AB26" + $"BFFF791A88020006043CE650B990C43A7F633E07FC48D54D42FCF400C92BE475" + $"AB26BF7DFF8D57FFEB743B020006023C318B3A487CBD09B43EEB2D4B485C4817" + $"6F00EB743BFFC4582D04016D03EB733B03771B8503B66BC2020006043A00963A" + $"995DBAFB5C3A4C154AC55C47FBE600FFFEDB81F9F8D683E2E2C1FFE3E3C20201" + $"1602B8C5A9BD34AD3DFE93B97440475A124A0DC100F6FFDB03BDACA4150A0622" + $"31224E3E5C5248522D37260A042231224E3E5C3E3A0A0422313E3A522D37260A" + $"043E5C5248522D3E3A0A043E5E4E5E604854440A06BB44BA46B83BBBBC29C496" + $"B97CC3DABBEDC594BD92BCBB020CBF3FB9C1BF3FB9C1BF37B9BFBF25B9BBBF2E" + $"B9BDBE2BB980BB0FBB37BC5EB915BAFCBB34BAD6BB32BAE9BB32BA39BB32B995" + $"BC3DB9B1BBA2B985BC93B9C8BD32B997BCEAB9FABD7ABA9ABDBBBA44BDABBAAE" + $"BDBEBAD7BDC0BAC2BDC0BB74BDC0BC18BCB5BBFBBD50BC2EBC3FBBACBB82BC01" + $"BBCCBCB9B9DCBEFEBA63BE15BA2DBF15BA68BF3FBA72BF2BBA6EBF3FBA720204" + $"BAC6BBCBBB2CBBCBBA60BBCBBA33BC61BA33BBFBBA33BCC7BABDBCF4BA57BCF4" + $"BB23BCF4BB56BC68BB56BCCEBB56BC020215C351B7E6C376B823C32DB7AAC2AE" + $"B76DC2F3B77FC27D2BC21BB773C24BB763C1C4B790C16EB82FC183B7D6C153B8" + $"99C1D0B8DCC17DB89EC172B9B7C072BA13C0A5BA03BFC5BA04BEB8BA3DBF2CBA" + $"1DBEB8BA3DBEEEBAE1BEEEBAE1BF54BAC5C072BAC1BFDCBAB1C073BAC1C073BA" + $"C1C073BAC1C116BAD2C29ABBD3C212BB72C297BBDCC292BBEEC294BBE5C26FBC" + $"7CC353BD2FC2C6BD0CC383BD3BC3E6BD29C3B6BD39C43DBD0CC494BC6EC47EBC" + $"C6C4B7BBE0C3D2BB2DC460BB50C38EBB1CC309BB4DC344BB29C2ACBB0AC17CBA" + $"4CC1E4BA70C1D8BA09C275B911C23AB9A5C28FB910C2C2B904C2A9B90CC318B8" + $"E7C36FB8AEC359B907C380B86A0207C20EB837C200B86AC212B829C223B810C2" + $"19B81CC230B801C253B7EFC240B7F6C266B7E8C28DB7E8C27AB7E5C2C5B7EFC2" + $"D9B851C2E7B81FC2D0B871C294B89AC2B6B88DC281B8A1C25AB8A1C26DB8A3C2" + $"22B8990207C31CBC30C316BC6EC31EBC1FC32DBBFFC323BC0EC339BBEBC35EBB" + $"CFC34ABBDBC372BBC3C39FBBBBC389BBBCC3E2BBB8C40DBC26C413BBE9C409BC" + $"4DC3CBBC88C3F0BC72C3B7BC94C38ABC9CC3A0BC9BC347BC9E022DC540BF00C4" + $"F5BF10C550BF22C58BBF56C569BF40C58DBF57C594BF5CC590BF59C5B6BF6FC6" + $"03BF77C5DDBF78C64ABF74C6ACBF10C689BF4DC6C7BEE2C6BFBE76C6CEBEABC6" + $"B1BE42C65EBDFAC68EBE16C63CBDE7C5EFBDDFC616BDDEC5EBBDE0C5E3BDE0C5" + $"E7BDE0C5C6BD78C5D1BC6AC5B7BCDFC5D5BC6AC5DDBC6AC5D9BC6AC624BC67C6" + $"85BC04C663BC41C6A0BBD5C699BB6AC6A7BB9EC68ABB35C638BAEEC668BB09C6" + $"16BADBC5C9BAD3C5EFBAD1C582BAD6C520BB39C543BAFCC4EFBB8FC54FBC3AC5" + $"04BBFCC550BC3AC552BC3CC551BC3BC52CBCD4C568BE1BC53CBD95C564BE20C5" + $"5BBE29C55FBE24C553BE32C547BE45C54DBE3BC53DBE57C532BE7BC536BE69C4" + $"C2BE90C452BEDFC486BEBAC410BF0EC314BF45C3D1BF3AC2D2BF41C262BF49C2" + $"9DBF45C233BF4DC1C0BF50C201BF51C193BF4FC149BF04C178BF35C109BEC2C0" + $"07BE6AC0B4BE6FC007BE6AC00DBEEFC00DBEEFC07CBEF5C0E8BF60C0B1BF27C1" + $"1DBF97C1C0BFD544BFD4C207BFD6C26EBFCEC23EBFD2C2C1BFC7C376BFDAC303" + $"BFC2C3CEBFEBC57CC1A1C51BC10AC578C1A6C572C1B0C575C1ABC53CC20EC5B6" + $"C2C0C55AC286C5B8C2C2C5C0C2C6C5BBC2C4C5E1C2DAC62FC2E1C608C2E3C675" + $"C2DEC6D7C27BC6B4C2B8C6F2C24CC6EAC1E1C6F9C216C6DCC1ACC689C165C6B9" + $"C180C668C152C61AC14AC641C149C609C14BC5E7C153C5F8C14EC58BC0CBC417" + $"BF9BC4B4C003C453BF83C4A0BF4CC47BBF67C4CFBF2B0207C58BBB6FC571BB9A" + $"C593BB64C5A8BB53C59CBB5AC5B7BB4AC5D9BB45C5C8BB45C5EABB45C609BB53" + $"C5FBBB4AC634BB6EC626BBD1C641BBA6C615BBECC5D8BBFCC5F8BBFCC5C7BBFC" + $"C5A8BBEDC5B6BBF7C57DBBD30207C5C7BE73C5A4BE97C5D1BE6AC5EABE5DC5DC" + $"BE62C5FABE58C61CBE5AC60BBE57C62DBE5EC648BE72C63CBE66C66CBE95C64A" + $"BEF3C66DBECFC634BF0AC5F5BF0DC614BF13C5E4BF09C5C9BEF5C5D5BF01C5A5" + $"BED20207C5E1C1E9C5C6C214C5E8C1DEC5FEC1CCC5F2C1D4C60CC1C3C62E45C6" + $"1DC1BFC63F45C65FC1CCC650C1C3C689C1E7C67CC24AC697C21FC66BC265C62F" + $"C275C64EC275C61EC275C5FEC267C60DC271C5D3C24D021AC436C3C5C469C3E5" + $"C3FEC3A2C37BC3ACC3BAC399C3484AC2FFC40CC31CC3DEC2D5C44E48C4E0C2D3" + $"C49EC2B4C50EC243C549C269C53FC226C551C1EBC53FC212C54BC1B9C530C144" + $"C52CC185C525C18EC4ABC1E7C30AC1CDC3FAC22EC2F1C277C26BC265C2B5C295" + $"C1F2C1D1C15BC24AC178C1AAC151C159C15EC180C152C10EC176C0C1C201C0D4" + $"C1B4C0B3C23BC0DCC2ABC0BCC278C0F7C2D9C152C30BC121C2FAC128C47CC038" + $"C599C09CC53CC034C59CC02DC5A3C030C59FC009C5C2BFDCC5DBBFEDC5D2BFDC" + $"C5DBC008C668C008C668C011C664C090C60FC049C64FC13DC5A5C1C0C5CDC17D" + $"C5B8C1EBC5DAC268C5D9C221C5EAC26BC5D8C273C5D5C26FC5D7C2BDC5BEC357" + $"C54CC31DC579C38BC567C401C55BC3C8C56DC434C54BC47DC4FCC460C529C49D" + $"C4C9C49AC452C4A7C48CC48CC4170207C149C206C12EC231C150C1FAC165C1E9" + $"C159C1F1C174C1E0C196C1DBC185C1DBC1A7C1DBC1C6C1E9C1B8C1E0C1F1C203" + $"C1E4C267C1FFC23CC1D3C281C197C292C1B6C292C185C292C166C284C175C28D" + $"C13BC2690207C36AC464C34FC48EC371C458C386C447C37BC44EC395C43EC3B7" + $"C439C3A6C439C3C8C439C3E7C446C3D9C43DC412C461C405C4C4C420C499C3F4" + $"C4DFC3B8C4EFC3D7C4EFC3A7C4F0C387C4E2C396C4EBC35CC4C70A06BBEDB57D" + $"BD9B393E3ABFD9BCBCBCA3B55DBC30B52D0A043BBD0FBDC5CA453E5C3E3A0A04" + $"3E5CBFBCCA2B4039BEE7BD82120A040104000A0001001001178400040A010101" + $"000A020102000A030103000A0401050A3FF638BA34BA3A34BA3FF638C5A6E244" + $"614320FF0A040106281C2220FF0A070105281C2118FF0A080106281C2118FF0A" + $"06010728B174B38218FF0A04010828202120FF0A080308090A0818FF0A040028" + $"202120FF0A08040B0C0D0E0818FF0A04002820B38C20FF0A08030F10110818FF" + $"0A09021213000A0A011400" }; diff --git a/media-sound/picard/patches/picard-2.1.3.patchset b/media-sound/picard/patches/picard-2.1.3.patchset index 347e23b9d..982954c26 100644 --- a/media-sound/picard/patches/picard-2.1.3.patchset +++ b/media-sound/picard/patches/picard-2.1.3.patchset @@ -37,17 +37,18 @@ index 117391fc..839a2f20 100644 -- 2.21.0 -From 75d7a1fea21f169da24e9b1003d6b9f928dcdb71 Mon Sep 17 00:00:00 2001 +From 43065c9cfaed92f68d8c80aed220016e5815d260 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 29 Jan 2019 11:35:33 +0000 -Subject: [PATCH 2/2] Haiku: Use WebPositive as default browser +Subject: [PATCH 2/3] Haiku: open URLs with default browser +Try opening with "open", fall back to WebPositive --- - picard/util/webbrowser2.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + picard/util/webbrowser2.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/picard/util/webbrowser2.py b/picard/util/webbrowser2.py -index 7d003ccf..bacd8a13 100644 +index 7d003ccf..3c1c9c2a 100644 --- a/picard/util/webbrowser2.py +++ b/picard/util/webbrowser2.py @@ -17,7 +17,7 @@ @@ -59,13 +60,15 @@ index 7d003ccf..bacd8a13 100644 import webbrowser from PyQt5 import QtWidgets -@@ -32,6 +32,11 @@ in PyQt and also adds a utility function for opening Picard URLS. +@@ -32,6 +32,13 @@ in PyQt and also adds a utility function for opening Picard URLS. """ +if platform == "haiku1": ++ haiku_default = webbrowser.GenericBrowser("open") ++ webbrowser.register("haiku-default", None, haiku_default, True) + webpositive = webbrowser.GenericBrowser("WebPositive") -+ webbrowser.register("webpositive", None, webpositive, True) ++ webbrowser.register("webpositive", None, webpositive) + + def open(url): diff --git a/media-sound/picard/picard-2.1.3.recipe b/media-sound/picard/picard-2.1.3.recipe index f8cbb3fa5..0e287b81d 100644 --- a/media-sound/picard/picard-2.1.3.recipe +++ b/media-sound/picard/picard-2.1.3.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://picard.musicbrainz.org/" COPYRIGHT="2004-2019 Robert Kaye, Lukas Lalinsky, Laurent Monin, \ Sambhav Kothari, Philipp Wolfer and others" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz" CHECKSUM_SHA256="8e044fe68c44d345c19f98952c3c7f20c72da74dbac9ce7c7b0621e2d69885a7" SOURCE_DIR="picard-release-$portVersion"