mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-24 17:18:51 +02:00
texstudio, bump version, use icon from original source (#8724)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -23,25 +23,142 @@ resource file_types message {
|
||||
};
|
||||
|
||||
resource vector_icon {
|
||||
$"6E63696606050104015E020016023CC800389C28B89C283CC80049DBD7C6AAE1"
|
||||
$"00FFFFD3020006023C528F3751EBB751EB3C528F4B7DEB48205100474747FFA5"
|
||||
$"A0A002001602BC4E3DBC411E3C411EBC4E3D46B8F54AE35C0090FFD402000603"
|
||||
$"3C1F0A33E667B3E6673C1F0A491170CAF5AE0077D705818CFF05FF7ADC05140A"
|
||||
$"04323F373B43403F450A0C3351323F3F443F48374537493E4C3E4F374D37503E"
|
||||
$"533E570A043F45434043443F480A043E503E4C4248424B0A043E573E53424F42"
|
||||
$"530A04374937453A423A460A043750374C3B493B4D0A04374A3A4642493E4D0A"
|
||||
$"0437503A4D424F3E530A04232D2A2A372E32320A082332232D323232372E362F"
|
||||
$"472A4428340A0432373232372E37340A042F472E36323432440A0C42474A3F46"
|
||||
$"314C334E3B54355B37524156504F4D4D45484A0A0446314A2D4F2E4C330A0454"
|
||||
$"3558315E325B370A044E3C4C334F2E52390A04564F5141543D594A0612A298EA"
|
||||
$"AE0A3D4F454D4C56595D60544F55484E464C454A43403EBFC6BF0CBFB9BEDB38"
|
||||
$"423641BC11C047BB76C0042F3E28432E48364708022549505D100A0501131001"
|
||||
$"178522040A010112000A0004090A0B0C301F1F01178402040A03020B0C201F1F"
|
||||
$"0A020109201F1F0A04010A201F1F0A000700010203040708123F0C2700000000"
|
||||
$"00003EFCC64567C8442F0F01178522040A03020506023F0C270000000000003E"
|
||||
$"FCC64567C8442F0F0A03020708023F0C270000000000003EFCC64567C8442F0F"
|
||||
$"0A040101023F0C270000000000003EFCC64567C8442F0F0A020100023F0C2700"
|
||||
$"00000000003EFCC64567C8442F0F0A0303020304023F0C270000000000003EFC"
|
||||
$"C64567C8442F0F0A00050D0E0F101130202801178412040A030210112020280A"
|
||||
$"02020E0F2020280A04010D202028"
|
||||
$"6E63696619040033035A008C020006023AC0E13C24A3BC24A33AC0E147F3C24A"
|
||||
$"BC8A00222222FF3F43EF02001602346BD4000000000000346BD448554CC9DA75"
|
||||
$"000EFF8B050A04B693052305000200160334E74AB4BE6834C64734DF0E48296F"
|
||||
$"48062B000EC3C7FF150200160237E32900000000000037E32947CE3AC984CE00"
|
||||
$"0EFF8B0200160337E32900000000000037E32947DE94C984CE000EC3C7FF1502"
|
||||
$"00160237E32900000000000037E32947EE9CC984CE000EFF8B0200160337E329"
|
||||
$"00000000000037E32947FEF6C984CE000EC3C7FF150200160237E32900000000"
|
||||
$"000037E32947ADD7C984CE000EFF8B0200160337E32900000000000037E32947"
|
||||
$"BE32C984CE000EC3C7FF150200160239B893B8CA3B38AF0639DE4C496CE54985"
|
||||
$"90000EFF8B05D40200160239B893B8CA3B38AF0639DE4C4970F5498BB3000EFF"
|
||||
$"8B05AB02001602346BD4000000000000346BD446E539C9DA75000EFF8B04ABDD"
|
||||
$"02001602376277B7A27A36F243358BFD48E7294927E30052FFE8020002053C08"
|
||||
$"AA3C058DBD8D6F3A509D45E0EB4AF50500FFFF00FF192D8E61E73A3F1EC2D082"
|
||||
$"7F1486A2FFFFFFFF0005FF03FFE6011F0009B75726B75726B67A26B5C6B6F4B5"
|
||||
$"C6B617B5C6BD5DB5C6CA2DB5C6C3C5B5C6CB0AB757CBBEB67ACBBEBDBFCBBECA"
|
||||
$"8FCBBEC427CBBECB6CCBBECC20CA2DCC20CB0ACC20C3C5CC20B6F4CC20BD5DCC"
|
||||
$"20B617CA8FB563CB6DB563C427B563B757B563BDBFB563B757B5630009CB21C9"
|
||||
$"7BCB21C97BCB21CA2EC9DDCABFCA90CABFC375CABFB6A4CABFBD0CCABFB5F1CA"
|
||||
$"BFB560C97BB560CA2EB560C312B560B642B560BCAAB560B58FB6A4B4FDB5F1B4"
|
||||
$"FDBD0CB4FDC9DDB4FDC375B4FDCA90B4FDCB21B642CB21B58FCB21BCAACB21C9"
|
||||
$"7BCB21C312CB21C97B0009B6A4B585B6A4B585B63CB585B5E7B642B5E7B5DAB5"
|
||||
$"E7BCAAB5E7C97BB5E7C312B5E7C9E3B6A4CA38B63CCA38BD0CCA38C9DDCA38C3"
|
||||
$"75CA38CA45CA38CA9AC97BCA9AC9E3CA9AC312CA9AB642CA9ABCAACA9AB5DAC9"
|
||||
$"DDB585CA45B585C375B585B6A4B585BD0CB585B6A4B585020EB9F4B578B9F4B5"
|
||||
$"78B9F4B5C0B9F4B64FB9F4B607B9F4B6DCB9F4B7F5B9F4B768B9F4B8A1B9F4B9"
|
||||
$"F9B9F4B94DB9F5B9F9B9F7B9F9B9F6B9F9B9FCBA24BA30BA7CBA10BA54BA68BA"
|
||||
$"C3BAD7BAA4BAB3BAD5BAE333BAE9BA60BAE9BA7BBAEABA60BAEBBA60BAEABA60"
|
||||
$"BAEBB9B4BAEBB85CBAEBB908BAEBB7CFBAEBB6B6BAEBB743BAEBB64CBAEBB578"
|
||||
$"BAEBB5E2BA98B578B9F4B578BA46B578B9F4B578B9F4B578B9F4B578B9F4B578"
|
||||
$"020EB9F4B578B9F4B578B9F4B5C0B9F4B64FB9F4B607B9F4B6DCB9F4B7F5B9F4"
|
||||
$"B768B9F4B8A1B9F4B9F9B9F4B94DB9F5B9F9B9F7B9F9B9F6B9F9B9FCBA24BA30"
|
||||
$"BA7CBA10BA54BA68BAC3BAD7BAA4BAB3BAD5BAE333BAE9BA60BAE9BA7BBAEABA"
|
||||
$"60BAEBBA60BAEABA60BAEBB9B4BAEBB85CBAEBB908BAEBB7CFBAEBB6B6BAEBB7"
|
||||
$"43BAEBB64CBAEBB578BAEBB5E2BA98B578B9F4B578BA46B578B9F4B578B9F4B5"
|
||||
$"78B9F4B578B9F4B5780005BB04BA62BB04BA62BAF4BA77BABBBA51BAD4BA6FBA"
|
||||
$"A3BA32BAABB9F3BA9BBA08BABAB9DEBAF3BA04BADBB9E5BB0CBA23BB04BA62BB"
|
||||
$"13BA4DBB04BA62020BB66BB9B8B66BB9B8B64FB93CB676B87CB648B8E5B6AAB8"
|
||||
$"03B7712BB707B7A6B7DDB71CB8A7B6EAB825B6D8B92F2AB98AB767B92FB70BB9"
|
||||
$"DBB7BBBA80B8A0BA3EB857BB02B91CBC05BA14BB83B998BBB6BA0DBA0CBA9DBA"
|
||||
$"6DBA64B94EBB72B8D0BC5CB91ABB95B7F4BB74B66CB9B8B676BA04B66BB9B8B6"
|
||||
$"6BB9B8B66BB9B8B66BB9B8020BB66BB9B8B66BB9B8B64FB93CB676B87CB648B8"
|
||||
$"E5B6AAB803B7712BB707B7A6B7DDB71CB8A7B6EAB825B6D8B92F2AB98AB767B9"
|
||||
$"2FB70BB9DBB7BBBA80B8A0BA3EB857BB02B91CBC05BA14BB83B998BBB6BA0DBA"
|
||||
$"0CBA9DBA6DBA64B94EBB72B8D0BC5CB91ABB95B7F4BB74B66CB9B8B676BA04B6"
|
||||
$"6BB9B8B66BB9B8B66BB9B8B66BB9B80007B857B707B857B707B962B80EBB76BA"
|
||||
$"1BBA6CB914BAD4BA41BA0CBAA6BA62BA64B91BB99DB73BB78DB82BB895B766B7"
|
||||
$"79B7C7B726B7ABB737B7E3B714B81DB70AB7FBB717B838B701B857B707B834B7"
|
||||
$"09B857B7070003B791BB0BB791BB0BB791BA1BB84AB963B806B99CB8DFB8E6BA"
|
||||
$"90B8B9B9D9B879BA90B8B90003B7ABBB18B7ABBB18B7ABBA28B864B970B820B9"
|
||||
$"A9B8F9B8F4BAAAB8C7B9F3B886BAAAB8C70003B7C4BB3FB7C4BB3FB7C5BA4FB8"
|
||||
$"7EB997B83AB9CFB913B91ABAC3B8EDBA0CB8ACBAC3B8ED0003B7DEBB4CB7DEBB"
|
||||
$"4CB7DFBA5CB898B9A4B854B9DCB92DB927BADE2FBA26B8BABADE2F0003B75DBA"
|
||||
$"D7B75DBAD7B75DB9E7B816B92FB7D3B968B8ACB8B3BA5CB886B9A5B845BA5CB8"
|
||||
$"860003B777BAE5B777BAE5B777B9F5B831B93DB7EDB975B8C6B8C0BA76B893B9"
|
||||
$"BFB852BA76B893020BB66BB9B8B66BB9B8B64FB93CB676B87CB648B8E5B6AAB8"
|
||||
$"03B7712BB707B7A6B7DDB71CB8A7B6EAB825B6D8B92F2AB98AB767B92FB70BB9"
|
||||
$"DBB7BBBA80B8A0BA3EB857BB02B91CBC05BA14BB83B998BBB6BA0DBA0CBA9DBA"
|
||||
$"6DBA64B94EBB72B8D0BC5CB91ABB95B7F4BB74B66CB9B8B676BA04B66BB9B8B6"
|
||||
$"6BB9B8B66BB9B8B66BB9B80206B8F1BA1CB8F1BA1CBA82B9D1BDA6B93CBC14B9"
|
||||
$"87BD31BAA3BC46BD72BCBCBC0ABACABDD3B7D2BE95B94EBE34B832BD17B8F1BA"
|
||||
$"1CB891BB99B8F1BA1CB8F1BA1CB8F1BA1CB8F1BA1C0206B8F1BA1CB8F1BA1CBA"
|
||||
$"82B9D1BDA6B93CBC14B987BD31BAA3BC46BD72BCBCBC0ABACABDD3B7D2BE95B9"
|
||||
$"4EBE34B832BD17B8F1BA1CB891BB99B8F1BA1CB8F1BA1CB8F1BA1CB8F1BA1C02"
|
||||
$"06B8FDBA2FB8FDBA2FBA8FB9E5BDB3B950BC21B99ABD3EBAB7BC53BD85BCC9BC"
|
||||
$"1EBAD7BDE6B7DFBEA8B95BBE47B83EBD2BB8FEBA2FB89EBBADB8FEBA2FB8FDBA"
|
||||
$"2FB8FDBA2FB8FDBA2F0206B8FDBA2FB8FDBA2FBA8FB9E5BDB3B950BC21B99ABD"
|
||||
$"3EBAB7BC53BD85BCC9BC1EBAD7BDE6B7DFBEA8B95BBE47B83EBD2BB8FEBA2FB8"
|
||||
$"9EBBADB8FEBA2FB8FDBA2FB8FDBA2FB8FDBA2F0005BBB9BA5ABBB9BA5ABC6CBA"
|
||||
$"7FBBFEBC33BC8BBB53BB70BD14B9B9BD87BA6CBDACB905BD62B974BBADB8E6BC"
|
||||
$"8EBA01BACDBBB9BA5ABB05BA35BBB9BA5A020EB721B578B721B578B721B5C0B7"
|
||||
$"21B64FB721B607B721B6DCB721B7F5B721B768B721B8A1B721B9F9B721B94DB7"
|
||||
$"22B9F9B725B9F9B723B9F9B729BA24B75DBA7CB73DBA54B796BAC3B804BAA4B7"
|
||||
$"E0BAD5B81133B817BA60B817BA7BB817BA60B818BA60B818BA60B818B9B4B818"
|
||||
$"B85CB818B908B818B7CFB818B6B6B818B743B818B64CB818B578B818B5E2B7C6"
|
||||
$"B578B721B578B774B578B721B578B721B578B721B578B721B578020EB721B578"
|
||||
$"B721B578B721B5C0B721B64FB721B607B721B6DCB721B7F5B721B768B721B8A1"
|
||||
$"B721B9F9B721B94DB722B9F9B725B9F9B723B9F9B729BA24B75DBA7CB73DBA54"
|
||||
$"B796BAC3B804BAA4B7E0BAD5B81133B817BA60B817BA7BB817BA60B818BA60B8"
|
||||
$"18BA60B818B9B4B818B85CB818B908B818B7CFB818B6B6B818B743B818B64CB8"
|
||||
$"18B578B818B5E2B7C6B578B721B578B774B578B721B578B721B578B721B578B7"
|
||||
$"21B5780003BC1FBA90BC1FBA90BC91BB06BB87BCC6BC4DBC03BAFEBD4CB9D1BD"
|
||||
$"8ABA54BD99B9D1BD8A0003BC1FBA90BC1FBA90BC91BB06BB87BCC6BC4DBC03BA"
|
||||
$"FEBD4CB9D1BD8ABA54BD99B9D1BD8A0009BC0CC92DBC0CC92DBEA6C9E2C1DBCA"
|
||||
$"39BFAF5AC378CA4EC602C9A8C468C9BAC7A9C995C94CC804C900C966C9ADC63C"
|
||||
$"C9FEC0FACB20C3C8CA9ABFF0BB6ABABECD9AC3B3BB2BBA9FB9D9BC22B9E4BB4F"
|
||||
$"B9A1BDF4B9A0C6A1B918C357B980C86EBC0CC92CBB5DC92CBC0CC92C0002C4C7"
|
||||
$"B77FC4C7B77FC54DB77FC65AB77FC5D4B77FC65AB77F0002C4C7B77FC4C7B77F"
|
||||
$"C54DB77FC65AB77FC5D4B77FC65AB77F0019BF49C089BF49C089BF4EC10BBF59"
|
||||
$"C20FBF54C18DBF4BC20FBF2FC20FBF3DC20FBF27C1CABF0DC17CBF1BC199BEF6"
|
||||
$"C14CBEB0C113BED7C129BE8AC0FDBE19C0F1BE58C0F1BDD2C0F1BD43C0F1BD8A"
|
||||
$"C0F1BD43C298BD43C5E7BD43C440BD43C64DBD61C6A6BD4DC68DBD7DC6C8BDE4"
|
||||
$"C6D9BDA9C6D9BDF6C6D9BE19C6D9BE07C6D9BE19C6E9BE19C707BE19C6F8BD42"
|
||||
$"C707BB95C707BC6BC707BB95C6F8BB95C6D9BB95C6E9BBA6C6D9BBCAC6D9BBB8"
|
||||
$"C6D9BC0BC6D9BC53C69ABC38C6C4BC63C680BC6CC5E7BC6CC644BC6CC440BC6C"
|
||||
$"C0F1BC6CC298BC2FC0F1BBB5C0F1BBF2C0F1BB6EC0F1BB1EC102BB3CC0F7BAF7"
|
||||
$"C112BABAC15CBAD6C130BA9EC188BA89C20FBA8EC1C4BA7BC20FBA5EC20FBA6C"
|
||||
$"C20FBA64C18DBA70C089BA6AC10BBC0EC089BF49C089BDABC089BF49C0890028"
|
||||
$"C043C3C7C043C3C7C043C4A2C043C658C043C57DC0B2C658C191C658C122C658"
|
||||
$"C1E8C658C23FC62EC222C64AC266C608C280C567C27BC5C6C28EC567C2A9C567"
|
||||
$"C29BC567C2A9C628C2A9C7AAC2A9C6E9C29BC7AAC280C7AAC28EC7AAC275C759"
|
||||
$"C260C70EC26BC725C253C6F1C21EC6CBC23DC6DBC200C6BAC191C6B2C1D1C6B2"
|
||||
$"C122C6B2C043C6B2C0B2C6B2C043C769C043C8D6C043C81FC043C920C04CC95D"
|
||||
$"C046C94CC052C96CC06BC983C05DC979C07AC98CC0C1C991C097C991C117C991"
|
||||
$"C1C2C991C16CC991C218C991C27EC97DC257C98AC2A4C970C2EEC930C2CAC956"
|
||||
$"C31CC8FDC37CC84AC34BC8B1C38BC84AC3A9C84AC39AC84AC37DC8D5C326C9EB"
|
||||
$"C351C960C19FC9EBBE93C9EBC019C9EBBE93C9DCBE93C9BEBE93C9CDBEA4C9BE"
|
||||
$"BEC8C9BEBEB6C9BEBEECC9BEBF2EC9A1BF0EC9B4BF46C994BF5EC967BF56C981"
|
||||
$"BF67C94DBF6CC8C6BF6CC917BF6CC75EBF6CC48EBF6CC5F6BF6CC425BF4FC3CB"
|
||||
$"BF62C3E4BF34C3ABBEC8C39ABF07C39ABEB6C39ABE93C39ABEA4C39ABE93C38B"
|
||||
$"BE93C36DBE93C37CC019C36DC326C36DC19FC36DC32BC3E6C336C4D9C331C460"
|
||||
$"C328C4D9C30BC4D9C319C4D9C2FBC482C2D6C425C2E9C446C2C3C404C282C3DA"
|
||||
$"C2A7C3EBC264C3CEC1E4C3C8C22FC3C8C159C3C8C043C3C8C0CEC3C8C043C3C8"
|
||||
$"0030C7A9C36DC7A9C36DC816C41FC8EFC581C883C4D0C94AC614C9B8C699C98D"
|
||||
$"C671C9E4C6BFCA5FC6D95AC6D4CA5FC6E8CA5FC706CA5FC6F7C986C706C7D3C7"
|
||||
$"06C8ACC706C7D3C6F7C7D3C6D9C7D3C6E8C7FEC6D8C833C6CA55C6D3C843C6C3"
|
||||
$"C859C6A9C850C6B8C864C699C869C67AC869C68AC869C667C85FC642C865C655"
|
||||
$"C85AC634C821C5D6C845C610C7CBC548C71FC42BC775C4BAC6B5C4C0C5E1C5EA"
|
||||
$"C64BC555C5C0C619C5A5C649C5ABC639C59EC659C59BC67AC59BC669C59BC694"
|
||||
$"C5B9C6BBC5A5C6AAC5CDC6CCC62CC6D9C5F4C6D6C62CC6E8C62CC706C62CC6F7"
|
||||
$"C579C706C411C706C4C5C706C411C6F7C411C6D9C411C6E8C437C6D5C474C6BF"
|
||||
$"C458C6CCC4A2C6AAC4F8C669C4CFC68DC522C645C588C5C4C552C60EC5FFC51F"
|
||||
$"C6EEC3D5C677C47AC68BC335C5C3C1F5C627C295C572C173C4F4C0F6C52DC11F"
|
||||
$"C4BBC0CEC430C0B5C47AC0B8C430C0A6C430C088C430C097C51AC088C6EEC088"
|
||||
$"C604C088C6EEC097C6EEC0B5C6EEC0A6C6B3C0B8C673C0D5C68AC0C2C65DC0E8"
|
||||
$"C653C114C653C0FDC653C132C688C198C665C15EC6D6C217C771C315C724C296"
|
||||
$"C7CBC299C880C19FC825C21CC89FC173C8B9C145C8B2C155C8C0C134C8C4C112"
|
||||
$"C8C4C124C8C4C101C8B7C0E5C8C043C8ABC0D4C88CC0C1C89DC0C8C87BC0BAC8"
|
||||
$"21C0B5C857C0B6C821C0A6C821C088C821C097C8D5C088CA3CC088C989C088CA"
|
||||
$"3CC097CA3CC0B5CA3CC0A6CA12C0B8C9D4C0CBC9EFC0BFC9ACC0DEC965C117C9"
|
||||
$"87C0F7C944C137C8D7C1C8C914C172C872C254C7A9C36EC80EC2E1C7A9C36E1F"
|
||||
$"0A000100000A010101000A020102000A030103000A0401041001178022040A05"
|
||||
$"0105000A060106000A0701071001178022040A080108000A0901091001178000"
|
||||
$"040A0A010A1001178000040A0B010B1001178000040A0C010C1001178000040A"
|
||||
$"0D010D1001178000040A0E010E1001178000040A07010F1001178022040A0F01"
|
||||
$"10000A1001111001178022040A110112000A0701131001178022040A12011400"
|
||||
$"0A130115000A0401161001178022040A140117000A1501181001178022040A16"
|
||||
$"0119000A17011A000A17011B1001178000040A18011C000A18011D000A18011E"
|
||||
$"00"
|
||||
};
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
From ac69e8569f0be330535aba7de41bf4bed51e8619 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 4 Feb 2023 12:17:41 +0100
|
||||
Subject: Fix build with QuaZip-1.0
|
||||
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index bc81e52..2ab8eac 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -370,11 +370,9 @@ isEmpty(USE_SYSTEM_QUAZIP) {
|
||||
PKGCONFIG += quazip1-qt6
|
||||
}
|
||||
!versionGreaterOrEqual($$QT_VERSION, "6.0.0") {
|
||||
- message(System quazip5)
|
||||
- isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
|
||||
- isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
|
||||
- INCLUDEPATH += $${QUAZIP_INCLUDE}
|
||||
- LIBS += $${QUAZIP_LIB}
|
||||
+ message(System QuaZip)
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ PKGCONFIG += quazip1-qt5
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From bbb72716a20e67107be4f00d0f542e1a51cf8428 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 4 Feb 2023 12:18:22 +0100
|
||||
Subject: Don't include xkb for Haiku
|
||||
|
||||
|
||||
diff --git a/texstudio.pro b/texstudio.pro
|
||||
index 2ab8eac..4b0ba2f 100644
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -205,7 +205,9 @@ unix:!macx {
|
||||
}
|
||||
INSTALLS += applicationmenu
|
||||
INSTALLS += icon
|
||||
+!haiku {
|
||||
include(src/xkb/xkb.pri)
|
||||
+ }
|
||||
}
|
||||
|
||||
# ##########UNIX + MACX###############
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 2bc3e45915c179ecdd7102a9622fe34cd32b4e1b Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 4 Feb 2023 12:19:27 +0100
|
||||
Subject: Don't define WS_X11 for Haiku
|
||||
|
||||
|
||||
diff --git a/src/bidiextender.cpp b/src/bidiextender.cpp
|
||||
index 0e3794e..9dd55e1 100644
|
||||
--- a/src/bidiextender.cpp
|
||||
+++ b/src/bidiextender.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
//mostly taken from biditexmaker
|
||||
|
||||
-#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) )
|
||||
+#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) && !defined( Q_OS_HAIKU ) )
|
||||
#define WS_X11
|
||||
#endif
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
96
app-office/texstudio/patches/texstudio-4.5.2.patchset
Normal file
96
app-office/texstudio/patches/texstudio-4.5.2.patchset
Normal file
@@ -0,0 +1,96 @@
|
||||
From 463b888bf522688904335b0189086394976c9ae8 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Wed, 24 May 2023 19:50:31 +0200
|
||||
Subject: Force Qt6, disable xkb, set install paths
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cfde6d4..ba5a568 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,7 +39,7 @@ if(WIN32 AND NOT MSVC)
|
||||
add_compile_options(-Wa,-mbig-obj)
|
||||
endif()
|
||||
|
||||
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets LinguistTools REQUIRED)
|
||||
+find_package(QT NAMES Qt6 COMPONENTS Widgets LinguistTools REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Xml Concurrent Widgets UiTools REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS PrintSupport Svg Qml REQUIRED)
|
||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||
@@ -117,7 +117,7 @@ endif()
|
||||
if(WIN32)
|
||||
set(SOURCE_FILES ${SOURCE_FILES} win.rc)
|
||||
endif()
|
||||
-if(UNIX AND NOT APPLE)
|
||||
+if(UNIX AND NOT APPLE AND NOT HAIKU)
|
||||
add_subdirectory(src/xkb)
|
||||
endif()
|
||||
|
||||
@@ -430,7 +430,7 @@ endif()
|
||||
|
||||
## installation
|
||||
|
||||
-install(TARGETS texstudio DESTINATION bin)
|
||||
+install(TARGETS texstudio DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
option(APPDATA "Install appdata" ON)
|
||||
@@ -443,41 +443,41 @@ endif()
|
||||
|
||||
if(UNIX)
|
||||
install(DIRECTORY translation/
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
FILES_MATCHING
|
||||
PATTERN *.qm
|
||||
)
|
||||
install(DIRECTORY templates/
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
FILES_MATCHING
|
||||
PATTERN *
|
||||
)
|
||||
install(DIRECTORY utilities/dictionaries/
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
FILES_MATCHING
|
||||
PATTERN *
|
||||
)
|
||||
install(DIRECTORY utilities/manual/build/html/
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
FILES_MATCHING
|
||||
PATTERN *.html
|
||||
)
|
||||
install(DIRECTORY utilities/manual/build/html/_images
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
FILES_MATCHING
|
||||
PATTERN *.png
|
||||
)
|
||||
install(DIRECTORY utilities/manual/build/html/_sphinx_design_static
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
)
|
||||
install(DIRECTORY utilities/manual/build/html/_static
|
||||
- DESTINATION share/texstudio
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
|
||||
)
|
||||
- install(FILES utilities/manual/build/html/searchindex.js DESTINATION share/texstudio)
|
||||
- install(FILES utilities/latex2e.html DESTINATION share/texstudio)
|
||||
- install(FILES utilities/latex2e.css DESTINATION share/texstudio)
|
||||
- install(FILES utilities/list.png DESTINATION share/texstudio)
|
||||
- install(FILES utilities/AUTHORS DESTINATION share/texstudio)
|
||||
- install(FILES utilities/COPYING DESTINATION share/texstudio)
|
||||
- install(FILES utilities/manual/source/CHANGELOG.md DESTINATION share/texstudio)
|
||||
+ install(FILES utilities/manual/build/html/searchindex.js DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/latex2e.html DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/latex2e.css DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/list.png DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/COPYING DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
+ install(FILES utilities/manual/source/CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
|
||||
endif()
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -4,11 +4,11 @@ LaTeX documents. Our goal is to make writing LaTeX as easy and comfortable as \
|
||||
possible. Therefore TeXstudio has numerous features like syntax-highlighting, \
|
||||
integrated viewer, reference checking and various assistants. "
|
||||
HOMEPAGE="https://www.texstudio.org/"
|
||||
COPYRIGHT="2009-2022 Benito van der Zander"
|
||||
COPYRIGHT="2009-2023 Benito van der Zander"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="afcd10579266eb77c68a115f094b344a4bfe39d570bdb95b59ff91a3ed3e246c"
|
||||
CHECKSUM_SHA256="d43dd21a111aacf57e40b0ee27c94b9923f8fdbddec5bad919596abf9a03f3cf"
|
||||
SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
|
||||
PATCHES="texstudio-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="texstudio.rdef.in"
|
||||
@@ -25,26 +25,41 @@ REQUIRES="
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libhunspell_1.7$secondaryArchSuffix
|
||||
lib:libpoppler_cpp$secondaryArchSuffix
|
||||
lib:libpoppler_qt5$secondaryArchSuffix
|
||||
lib:libQt5Concurrent$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5DBus$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
lib:libQt5Sql$secondaryArchSuffix
|
||||
lib:libQt5Svg$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libQt5Xml$secondaryArchSuffix
|
||||
lib:libquazip1_qt5$secondaryArchSuffix
|
||||
lib:libpoppler_qt6$secondaryArchSuffix
|
||||
lib:libQt6Concurrent$secondaryArchSuffix
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Core5Compat$secondaryArchSuffix
|
||||
lib:libQt6DBus$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6UiTools$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6OpenGL$secondaryArchSuffix
|
||||
lib:libQt6OpenGLWidgets$secondaryArchSuffix
|
||||
lib:libQt6PrintSupport$secondaryArchSuffix
|
||||
lib:libQt6Qml$secondaryArchSuffix
|
||||
lib:libQt6Svg$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:libQt6Xml$secondaryArchSuffix
|
||||
lib:libquazip1_qt6$secondaryArchSuffix
|
||||
lib:libX11$secondaryArchSuffix
|
||||
lib:libXext$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
# TeXlive packages
|
||||
texlive_core$secondaryArchSuffix
|
||||
texlive
|
||||
texlive_basic
|
||||
texlive_bibtexextra
|
||||
texlive_binextra
|
||||
texlive_fontsextra
|
||||
texlive_fontsrecommended
|
||||
texlive_formatsextra
|
||||
texlive_games
|
||||
texlive_humanities
|
||||
texlive_latex
|
||||
texlive_latexextra
|
||||
texlive_latexrecommended
|
||||
texlive_mathscience
|
||||
texlive_music
|
||||
texlive_pictures
|
||||
# TeXlive language packages
|
||||
texlive_langarabic
|
||||
@@ -70,45 +85,47 @@ BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libhunspell_1.7$secondaryArchSuffix
|
||||
devel:libpoppler_qt5$secondaryArchSuffix
|
||||
devel:libQt5Concurrent$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5DBus$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5PrintSupport$secondaryArchSuffix
|
||||
devel:libQt5Sql$secondaryArchSuffix
|
||||
devel:libQt5Svg$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:libQt5Xml$secondaryArchSuffix
|
||||
devel:libquazip1_qt5$secondaryArchSuffix
|
||||
devel:libpoppler_qt6$secondaryArchSuffix
|
||||
devel:libQt6Core5Compat$secondaryArchSuffix
|
||||
devel:libQt6Concurrent$secondaryArchSuffix
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6DBus$secondaryArchSuffix
|
||||
devel:libQt6Gui$secondaryArchSuffix
|
||||
devel:libQt6UiTools$secondaryArchSuffix
|
||||
devel:libQt6Network$secondaryArchSuffix
|
||||
devel:libQt6PrintSupport$secondaryArchSuffix
|
||||
devel:libQt6Qml$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:libQt6Xml$secondaryArchSuffix
|
||||
devel:libquazip1_qt6$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:qmake$secondaryArchSuffix >= 5
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
qmake texstudio.pro \
|
||||
PREFIX=$appsDir \
|
||||
DATADIR=$dataDir \
|
||||
USE_SYSTEM_HUNSPELL=1 \
|
||||
USE_SYSTEM_QUAZIP=1 \
|
||||
QUAZIP_LIB=-lquazip1-qt5
|
||||
make $jobArgs
|
||||
export LDFLAGS="-lnetwork"
|
||||
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
|
||||
$cmakeDirArgs \
|
||||
-DCMAKE_INSTALL_BINDIR=$appsDir \
|
||||
-DQT_VERSION_MAJOR=6
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
make -C build install
|
||||
|
||||
mv $appsDir/bin/texstudio $appsDir/TeXstudio
|
||||
rm -rf $dataDir/{appdata,applications,icons} $appsDir/bin
|
||||
mv $appsDir/texstudio $appsDir/TeXstudio
|
||||
rm -rf $prefix/share
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.qt5-texstudio"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
Reference in New Issue
Block a user