From c46e08431365dffe1efd192dff2b5f70009af83a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 17 May 2022 15:38:56 +1000 Subject: [PATCH] Okteta: fix recipe * use official source uri * fix Qt plugins dir * fix mkspecs dir * fix lib version compat * remove mime cache files (!) * use system color theme * add new icon --- .../okteta/additional-files/okteta.rdef.in | 137 +++--------------- kde-apps/okteta/okteta-0.26.7.recipe | 81 ++++++----- .../okteta/patches/okteta-0.26.7.patchset | 59 +++++++- 3 files changed, 122 insertions(+), 155 deletions(-) diff --git a/kde-apps/okteta/additional-files/okteta.rdef.in b/kde-apps/okteta/additional-files/okteta.rdef.in index 5b03dfa6f..496901cff 100644 --- a/kde-apps/okteta/additional-files/okteta.rdef.in +++ b/kde-apps/okteta/additional-files/okteta.rdef.in @@ -15,129 +15,28 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; -resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK"; +resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK"; resource file_types message { "types" = "application/octet-stream" }; resource vector_icon { - $"6E6369660C03DCE26902000602000000BD55553D55550000004955554A000000" - $"63984BFF8FC27801DEE3729903E6EA97020012023C40003C8000BC80003C4000" - $"4895554B4AAA0000FFFF000002001602000000BC95553CAAAA00000048E6E649" - $"D73600B1FFDD055C020012023AD5553B0000BB00003AD55549BFFF4B35550000" - $"FFFF000002001602000000BC555A3C555A000000490A0649C3C300F2FFFF0587" - $"05BC0595390609FFFF01B520B520B520B520B520B6B7B520B9E8B520B84FB5A7" - $"BA42B6B73428BA9D28BB52B520BC07B5A7BBADB520C0D0B520CA60B520C598BC" - $"35CA60CA60CA60C34ACA60CA60C34ACA60B520CA60BC35C34AB520B520B520BC" - $"35B520B520B520B5200609FFFF01B520B520B520B520B520B68AB52030B520B7" - $"F5B5A7B9BAB6B7BA6F28BA1528BACAB520BB80B5A7BB25B520C047B520C9D7B5" - $"20C50FBC35C9D7CA60C9D7C34AC9D7CA6048CA60B520CA60BC07C34AB520B520" - $"B520BC35B520B520B520B5200606FF0740C8C840C8C840C8F5405840C922BFED" - $"58C04758C01A58C047C922C047C8C8C047C8F5C01AC8C840C8C8BFEDC8C840C8" - $"C8C8C80606FF07BF37C8C8BF37C8C8BF65C8C840C8C8BF92C8C840C89A40C83F" - $"40C86DBF92C83FBF37C83FBF65C83FBF37C86DBF37C8C8BF37C89ABF37C8C8C8" - $"C80606FF07BEB0C8C8BEB0C8C8BEB0C8F5BEB058BEB0C922BEDD58BF3758BF0A" - $"58BF37C922BF37C8C8BF37C8F5BF0AC8C8BEB0C8C8BEDDC8C8BEB0C8C8C8C806" - $"06FF073CC8C83CC8C8BE55C8C8BEB0C8C8BE82C8C8BEB0C89ABEB0C83FBEB0C8" - $"6DBE82C83F3CC83FBE55C83F3CC86D3CC8C83CC89A3CC8C8C8C80606FF07BD9F" - $"C8C8BD9FC8C8BD9FC8F5BD9F58BD9FC922BDCD583C58BDFA583CC9223CC8C83C" - $"C8F5BDFAC8C8BD9FC8C8BDCDC8C8BD9FC8C8C8C80606FF07BD18C8C8BD18C8C8" - $"BD45C8C8BD9FC8C8BD72C8C8BD9FC89ABD9FC83FBD9FC86DBD72C83FBD18C83F" - $"BD45C83FBD18C86DBD18C8C8BD18C89ABD18C8C8C8C80606FF0738C8C838C8C8" - $"38C8F5385838C922BCBD58BD1858BCEA58BD18C922BD18C8C8BD18C8F5BCEAC8" - $"C838C8C8BCBDC8C838C8C8C8C80606FF07BC07C8C8BC07C8C8BC35C8C838C8C8" - $"BC62C8C838C89A38C83F38C86DBC62C83FBC07C83FBC35C83FBC07C86DBC07C8" - $"C8BC07C89ABC07C8C8C8C80606FF07BB80C8C8BB80C8C8BB80C8F5BB8058BB80" - $"C922BBAD58BC0758BBDA58BC07C922BC07C8C8BC07C8F5BBDAC8C8BB80C8C8BB" - $"ADC8C8BB80C8C8C8C80606FF0734C8C834C8C8BB25C8C8BB80C8C8BB52C8C8BB" - $"80C89ABB80C83FBB80C86DBB52C83F34C83FBB25C83F34C86D34C8C834C89A34" - $"C8C8C8C80606FF07BA6FC8C8BA6FC8C8BA6FC8F5BA6F58BA6FC922BA9D583458" - $"BACA5834C92234C8C834C8F5BACAC8C8BA6FC8C8BA9DC8C8BA6FC8C8C8C80606" - $"FF07B9E8C8C8B9E8C8C8BA15C8C8BA6FC8C8BA42C8C8BA6FC89ABA6FC83FBA6F" - $"C86DBA42C83FB9E8C83FBA15C83FB9E8C86DB9E8C8C8B9E8C89AB9E8C8C8C8C8" - $"0606FF0730C8C830C8C830C8F5305830C922B98D58B9E858B9BA58B9E8C922B9" - $"E8C8C8B9E8C8F5B9BAC8C830C8C8B98DC8C830C8C8C8C80606FF07B8D8C8C8B8" - $"D8C8C8B905C8C830C8C8B932C8C830C89A30C83F30C86DB932C83FB8D8C83FB9" - $"05C83FB8D8C86DB8D8C8C8B8D8C89AB8D8C8C8C8C80606FF07B84FC8C8B84FC8" - $"C8B84FC8F5B84F58B84FC922B87D58B8D858B8AA58B8D8C922B8D8C8C8B8D8C8" - $"F5B8AAC8C8B84FC8C8B87DC8C8B84FC8C8C8C80606FF072CC83F2CC83F2CC86D" - $"2CC8C82CC89AB7F5C8C8B84FC8C8B822C8C8B84FC89AB84FC83FB84FC86DB822" - $"C83F2CC83FB7F5C83F2CC83FC83F0606FF07C598C8C8C598C8C8C56AC8C8C50F" - $"C8C8C53DC8C8C50FC8F5C50F58C50FC922C53D58C59858C56A58C598C922C598" - $"C8C8C598C8F5C598C8C8C8C80606FF0754C8C854C8C8C7E5C8C8C83FC8C8C812" - $"C8C8C83FC89AC83FC83FC83FC86DC812C83F54C83FC7E5C83F54C86D54C8C854" - $"C89A54C8C8C8C80606FF07C730C8C8C730C8C8C730C8F5C73058C730C922C75D" - $"585458C78A5854C92254C8C854C8F5C78AC8C8C730C8C8C75DC8C8C730C8C8C8" - $"C80606FF07C6A7C8C8C6A7C8C8C6D5C8C8C730C8C8C702C8C8C730C89AC730C8" - $"3FC730C86DC702C83FC6A7C83FC6D5C83FC6A7C86DC6A7C8C8C6A7C89AC6A7C8" - $"C8C8C80606FF0750C8C850C8C850C8F5505850C922C64D58C6A758C67A58C6A7" - $"C922C6A7C8C8C6A7C8F5C67AC8C850C8C8C64DC8C850C8C8C8C80606FF07C598" - $"C83FC598C83FC598C86DC598C8C8C598C89AC5C5C8C850C8C8C5F2C8C850C89A" - $"50C83F50C86DC5F2C83FC598C83FC5C5C83FC598C83FC83F0605FF01C9D7C83F" - $"C9D7C83FC97DC89AC8C858C922C8F5C92258C9D758C97D58C9D7C8F5C9D7C83F" - $"C9D7C89AC9D7C83FC83F0606FF0758405840C92240C8C840C8F540C8C8BFEDC8" - $"C8C047C8C8C01AC8F5C04758C047C922C04758C01A584058BFED5840400606FF" - $"0758BF3758BF3758BF65584058BF92C97D40C9D740C9AA40C9D7BF92C9D7BF37" - $"C9D7BF65C9AABF3758BF37C97DBF3758BF37BF370606FF0758BEB058BEB0C922" - $"BEB0C8C8BEB0C8F5BEB0C8C8BEDDC8C8BF37C8C8BF0AC8F5BF3758BF37C922BF" - $"3758BF0A58BEB058BEDD58BEB0BEB00606FF07583C583C58BE5558BEB058BE82" - $"C97DBEB0C9D7BEB0C9AABEB0C9D7BE82C9D73CC9D7BE55C9AA3C583CC97D3C58" - $"3C3C0606FF0758BD9F58BD9FC922BD9FC8C8BD9FC8F5BD9FC8C8BDCDC8C83CC8" - $"C8BDFAC8F53C583CC9223C58BDFA58BD9F58BDCD58BD9FBD9F0606FF0758BD18" - $"58BD1858BD4558BD9F58BD72C97DBD9FC9D7BD9FC9AABD9FC9D7BD72C9D7BD18" - $"C9D7BD45C9AABD1858BD18C97DBD1858BD18BD180606FF0758385838C92238C8" - $"C838C8F538C8C8BCBDC8C8BD18C8C8BCEAC8F5BD1858BD18C922BD1858BCEA58" - $"3858BCBD5838380606FF0758BC0758BC0758BC35583858BC62C97D38C9D738C9" - $"AA38C9D7BC62C9D7BC07C9D7BC35C9AABC0758BC07C97DBC0758BC07BC070606" - $"FF0758BB8058BB80C922BB80C8C8BB80C8F5BB80C8C8BBADC8C8BC07C8C8BBDA" - $"C8F5BC0758BC07C922BC0758BBDA58BB8058BBAD58BB80BB800606FF07583458" - $"3458BB2558BB8058BB52C97DBB80C9D7BB80C9AABB80C9D7BB52C9D734C9D7BB" - $"25C9AA345834C97D345834340606FF0758BA6F58BA6FC922BA6FC8C8BA6FC8F5" - $"BA6FC8C8BA9DC8C834C8C8BACAC8F5345834C9223458BACA58BA6F58BA9D58BA" - $"6FBA6F0606FF0758B9E858B9E858BA1558BA6F58BA42C97DBA6FC9D7BA6FC9AA" - $"BA6FC9D7BA42C9D7B9E8C9D7BA15C9AAB9E858B9E8C97DB9E858B9E8B9E80606" - $"FF0758305830C92230C8C830C8F530C8C8B98DC8C8B9E8C8C8B9BAC8F5B9E858" - $"B9E8C922B9E858B9BA583058B98D5830300606FF0758B8D858B8D858B9055830" - $"58B932C97D30C9D730C9AA30C9D7B932C9D7B8D8C9D7B905C9AAB8D858B8D8C9" - $"7DB8D858B8D8B8D80606FF0758B84F58B84FC922B84FC8C8B84FC8F5B84FC8C8" - $"B87DC8C8B8D8C8C8B8AAC8F5B8D858B8D8C922B8D858B8AA58B84F58B87D58B8" - $"4FB84F0606FF07582C582C58B7F558B84F58B822C97DB84FC9D7B84FC9AAB84F" - $"C9D7B822C9D72CC9D7B7F5C9AA2C582CC97D2C582C2C0207C83FB740C83FB740" - $"C83FBCBDC83F54C83FC23AC29554B74054BCEA54B80FC89AB9AFCA60B8DFC97D" - $"BF3FCA60CA60CA60C4CFCA60CA60C4B5CA6030CA60BF0AC9AAB8AAC83FB740C8" - $"F5B7F5C83FB7400205B740B740B740B740BCEAB740C840B740C295B740C840BC" - $"BDC84054C840C23AC29554B74054BCEA54B740C23AB740B740B740BCBDB740B7" - $"400205B740C730B740C730BCEAC730C840C730C295C730C840C75DC84054C840" - $"C78AC29554B74054BCEA54B740C78AB740C730B740C75DB740C7300207C730C6" - $"A7C730C6A7C23AC6A7B84FC6A7BD45C6A7B983C7E3BBEACA5ABAB7C91FC0BCCA" - $"5CCA5FCA5FC58ECA5ECA5FC56ACA60BB7FCA5FC07558BA6FC730B84FC840B95F" - $"C730BD17C730C6A7C730C1DFC730C6A70207B850B84FB850B84FB850BCF2B84F" - $"C638B850C195B84FC65DB84FC6A7B84FC682BD45C6A7C72FC6A7C23AC6A7C72F" - $"C682C72FC638C72FC65DC72FC195C730B84FC730BCF2C23AB84FB850B84FBD45" - $"B84FB850B84F0205B85050B85050BD4550C73050C23A50C730C64DC730C6A7C7" - $"30C67AC23AC6A7B850C6A7BD45C6A7B850C67AB85050B850C64DB850500205B9" - $"E8C1DFB9E8C1DFBB52C1DFBE27C1DFBCBDC1DFBE27C20DBE27C268BE27C23ABC" - $"BDC268B9E8C268BB52C268B9E8C23AB9E8C1DFB9E8C20DB9E8C1DF0205BEB0C1" - $"DFBEB0C1DF40C1DFC1E0C1DFC0D0C1DFC1E0C20DC1E0C268C1E0C23AC0D0C268" - $"BEB0C26840C268BEB0C23ABEB0C1DFBEB0C20DBEB0C1DF0205B9E848B9E848BB" - $"2548BDA048BC6248BDA0C31DBDA0C377BDA0C34ABC62C377B9E8C377BB25C377" - $"B9E8C34AB9E848B9E8C31DB9E84802053C483C48BEB048BFBF48BF3848BFBFC3" - $"1DBFBFC377BFBFC34ABF38C3773CC377BEB0C3773CC34A3C483CC31D3C480205" - $"B9E8C400B9E8C400BA9EC400BC0BC400BB55C400BC0BC42DBC0B4CBC0BC45ABB" - $"554CB9E84CBA9E4CB9E8C45AB9E8C400B9E8C42DB9E8C400020538C40038C400" - $"BDFAC400C0CFC400BF65C400C0CFC42DC0CF4CC0CFC45ABF654C384CBDFA4C38" - $"C45A38C40038C42D38C4000205B9E830B9E830BBAD30BF3730BD7230BF37B98D" - $"BF37B9E8BF37B9BABD72B9E8B9E8B9E8BBADB9E8B9E8B9BAB9E830B9E8B98DB9" - $"E830020540304030C0A230C26730C18530C267B98DC267B9E8C267B9BAC185B9" - $"E840B9E8C0A2B9E840B9BA403040B98D40300205B9E8BA6FB9E8BA6FBB25BA6F" - $"BDA0BA6FBC62BA6FBDA0BA9DBDA034BDA0BACABC6234B9E834BB2534B9E8BACA" - $"B9E8BA6FB9E8BA9DB9E8BA6F0205BEB0BA6FBEB0BA6FBF65BA6FC0CFBA6FC01A" - $"BA6FC0CFBA9DC0CF34C0CFBACAC01A34BEB034BF6534BEB0BACABEB0BA6FBEB0" - $"BA9DBEB0BA6F160A000100000A010101000A021002030405060708090A0B0C0D" - $"0E0F1011000A0206121314151617000A030118000A0210191A1B1C1D1E1F2021" - $"22232425262728000A040129000A05012A000A06012B000A07012C000A08012D" - $"000A09012E000A0A012F0840FF0A0A01300A3FFFFE2F1D8AAF1D8A3FFFFE39B4" - $"58B93D5520FF0A0A01310820FF0A0A01320820FF0A0A01330820FF0A0A013408" - $"20FF0A0B01350820FF0A0B01360820FF0A0B01370820FF0A0B01380820FF" + $"6E63696608020006023C92CE3DFE12BD0C003BED8B4ABE4C472B2700EFF5EEFF" + $"6BCC58031988030348AE34032A24240501020006023A0FC53D5688BDCFC13A5A" + $"A34B11F747DC2500FFFCF8FFAC7E25020006023A0FC53D5688BDCFC13A5AA34B" + $"11F747DC2500FFD297FF6B47020401650A0A04233F46545C3B3E300A04465846" + $"545C3B5C3E0A04233F46544657234108034A534E564E5A080343543E583E5C0A" + $"042C3F454C543C3F3408032D3F454C533D08024139383F08024A3D424408023D" + $"3C4640140A07010002402CE9000000000000401C71BC1AF2440E380A04030001" + $"021001178422040A000100000A010101000A020102000A030103100117821204" + $"0A03010330241B01178212040A030103124000000000000000003F8E0345FFFF" + $"C433C701178212040A030103123F54DC0000000000003F1C06485759C2CF1E01" + $"178212040A030103123F54DC0000000000003EAA0948B759C06D5C0117821204" + $"0A030103123EA9B80000000000003EAA0949EEB2C49B5701178212040A030104" + $"1001178200040A030104301A1C01178200040A03010412400000000000000000" + $"3F8AF8C70000C083A801178200040A030104124000000000000000003F8AF8C8" + $"2000C4A0EA01178200040A030104124000000000000000003F15F1C8E000C283" + $"A801178200040A030104124000000000000000003EA0EAC980003BA83A011782" + $"00040A050105000A0601061001178200040A0603080709100117810004" }; diff --git a/kde-apps/okteta/okteta-0.26.7.recipe b/kde-apps/okteta/okteta-0.26.7.recipe index b2eea5cea..1d0fed40b 100644 --- a/kde-apps/okteta/okteta-0.26.7.recipe +++ b/kde-apps/okteta/okteta-0.26.7.recipe @@ -14,12 +14,12 @@ in rows with the value on top of the character * Undo/redo support * Structures tool for analyzing and editing based on user-creatable structure definitions" HOMEPAGE="https://apps.kde.org/okteta/" -COPYRIGHT="2010-2021 KDE Organisation" +COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU GPL v2 GNU GPL v3" -REVISION="1" -SOURCE_URI="https://github.com/KDE/okteta/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="8b63bb48218f7b147488c08f512b3a777d1cb0c786e9ad8b8da66ea261de4862" +REVISION="2" +SOURCE_URI="https://download.kde.org/stable/okteta/$portVersion/src/okteta-$portVersion.tar.xz" +CHECKSUM_SHA256="f123b55690d6cf5f547e9a5db738a26729a82e7bd02cc0002238ce4d9fd530e3" SOURCE_DIR="okteta-$portVersion" PATCHES="okteta-$portVersion.patchset" ADDITIONAL_FILES="okteta.rdef.in" @@ -31,18 +31,25 @@ GLOBAL_WRITABLE_FILES=" settings/xdg/okteta-structures.knsrc keep-old " +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + PROVIDES=" okteta$secondaryArchSuffix = $portVersion app:Okteta$secondaryArchSuffix = $portVersion - cmd:struct2osd = $portVersion - lib:libKasten4Controllers$secondaryArchSuffix = 0.4.1 - lib:libKasten4Core$secondaryArchSuffix = 0.4.1 - lib:libKasten4Gui$secondaryArchSuffix = 0.4.1 - lib:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 - lib:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 - lib:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 - lib:libOkteta3Core$secondaryArchSuffix = 0.10.0 - lib:libOkteta3Gui$secondaryArchSuffix = 0.10.0 + cmd:struct2osd$commandSuffix = $portVersion + lib:libKasten4Controllers$secondaryArchSuffix = 0.4.1 compat >= 0.4 + lib:libKasten4Core$secondaryArchSuffix = 0.4.1 compat >= 0.4 + lib:libKasten4Gui$secondaryArchSuffix = 0.4.1 compat >= 0.4 + lib:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 compat >= 0.4 + lib:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 compat >= 0.4 + lib:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 compat >= 0.4 + lib:libOkteta3Core$secondaryArchSuffix = 0.10.0 compat >= 0.10 + lib:libOkteta3Gui$secondaryArchSuffix = 0.10.0 compat >= 0.10 " REQUIRES=" haiku$secondaryArchSuffix @@ -73,8 +80,8 @@ REQUIRES=" lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix - lib:libqca$secondaryArchSuffix >= 2 - lib:libQt5Core$secondaryArchSuffix >= 5.15 + lib:libqca$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix @@ -89,7 +96,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.48 + extra_cmake_modules$secondaryArchSuffix >= 5.93 shared_mime_info$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix @@ -119,7 +126,7 @@ BUILD_REQUIRES=" devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix devel:libqca$secondaryArchSuffix >= 2 - devel:libQt5Core$secondaryArchSuffix >= 5.15 + devel:libQt5Core$secondaryArchSuffix devel:libQt5DBus$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix @@ -134,14 +141,14 @@ BUILD_REQUIRES=" PROVIDES_devel=" okteta${secondaryArchSuffix}_devel = $portVersion - devel:libKasten4Controllers$secondaryArchSuffix = 0.4.1 - devel:libKasten4Core$secondaryArchSuffix = 0.4.1 - devel:libKasten4Gui$secondaryArchSuffix = 0.4.1 - devel:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 - devel:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 - devel:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 - devel:libOkteta3Core$secondaryArchSuffix = 0.10.0 - devel:libOkteta3Gui$secondaryArchSuffix = 0.10.0 + devel:libKasten4Controllers$secondaryArchSuffix = 0.4.1 compat >= 0.4 + devel:libKasten4Core$secondaryArchSuffix = 0.4.1 compat >= 0.4 + devel:libKasten4Gui$secondaryArchSuffix = 0.4.1 compat >= 0.4 + devel:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 compat >= 0.4 + devel:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 compat >= 0.4 + devel:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 compat >= 0.4 + devel:libOkteta3Core$secondaryArchSuffix = 0.10.0 compat >= 0.10 + devel:libOkteta3Gui$secondaryArchSuffix = 0.10.0 compat >= 0.10 " REQUIRES_devel=" okteta$secondaryArchSuffix == $portVersion base @@ -167,13 +174,15 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$binDir \ + -DCMAKE_INSTALL_PREFIX=$appsDir \ -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ -DCMAKE_INSTALL_LIBDIR=$libDir \ - -DCMAKE_INSTALL_BINDIR=$binDir \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DSHARE_INSTALL_PREFIX=$dataDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \ + -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make $jobArgs @@ -185,17 +194,18 @@ INSTALL() make install # move GUI to apps dir - mkdir $appsDir - mv $binDir/okteta $appsDir/Okteta + mv $commandBinDir/okteta $appsDir/Okteta - # move mkspecs - mv $binDir/mkspecs $addOnsDir/Qt5 + # move xdg files to settings dir + mv $appsDir/etc/xdg $settingsDir + rm -rf $appsDir/etc - # move xdg files and clean bindir - mv $binDir/etc/xdg $settingsDir - rm -r $binDir/etc + # cleanup + rm -rf $dataDir/{applications,config.kcfg,icons,metainfo} + rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} + rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} - rm -rf $dataDir/{applications,config.kcfg,icons,kservices5,metainfo,okteta} + fixPkgconfig prepareInstalledDevelLibs \ libKasten4Controllers \ @@ -209,6 +219,7 @@ INSTALL() packageEntries devel \ $libDir/cmake \ + $dataDir/Qt5 \ $developDir local APP_SIGNATURE="application/x-vnd.kde-okteta" diff --git a/kde-apps/okteta/patches/okteta-0.26.7.patchset b/kde-apps/okteta/patches/okteta-0.26.7.patchset index 0097a163e..68258c485 100644 --- a/kde-apps/okteta/patches/okteta-0.26.7.patchset +++ b/kde-apps/okteta/patches/okteta-0.26.7.patchset @@ -1,4 +1,4 @@ -From f3e3f2ecb037fb672208156bd66661fd7ffac30a Mon Sep 17 00:00:00 2001 +From 6ee1bb28686e898640e8dd25422667645c68b4e3 Mon Sep 17 00:00:00 2001 From: Ivan Holmes Date: Wed, 11 May 2022 04:32:47 +0100 Subject: patch out knsrcfiles @@ -20,3 +20,60 @@ index 332176a..13fe28a 100644 -- 2.30.2 + +From 6d36ec689c0762d0ce5ee55b5fec18a609a6a942 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 17 May 2022 15:25:22 +1000 +Subject: Workaround for mainWindow size bug + + +diff --git a/program/mainwindow.cpp b/program/mainwindow.cpp +index 7cc22dc..38a4ea9 100644 +--- a/program/mainwindow.cpp ++++ b/program/mainwindow.cpp +@@ -102,6 +102,7 @@ + // Qt + #include + #include ++#include + + namespace Kasten { + +@@ -148,6 +149,11 @@ OktetaMainWindow::OktetaMainWindow(OktetaProgram* program) + // tmp + addXmlGuiControllerFromFactory(ToolListMenuControllerFactory(this)); + addXmlGuiControllerFromFactory(ViewListMenuControllerFactory(viewManager(), viewArea())); ++ // Workaround for window height ++#ifdef Q_OS_HAIKU ++ setMaximumSize(QApplication::desktop()->screenGeometry().size() - QSize(0, 32)); ++ showMaximized(); ++#endif + } + + OktetaMainWindow::~OktetaMainWindow() = default; +-- +2.30.2 + + +From ccc9dceed0390e50037d901485775fe2708f4c1e Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 17 May 2022 15:25:52 +1000 +Subject: Disable color scheme + + +diff --git a/libs/kasten/controllers/CMakeLists.txt b/libs/kasten/controllers/CMakeLists.txt +index 78fcb01..53d61ed 100644 +--- a/libs/kasten/controllers/CMakeLists.txt ++++ b/libs/kasten/controllers/CMakeLists.txt +@@ -209,7 +209,7 @@ kastencontrollers_add_sublibrary(shellwindow/fullscreen + ) + + # KColorSchemeManager::createSchemeSelectionMenu misses to set UI string before 5.67 +-if(NOT KF5_VERSION VERSION_LESS "5.67.0") ++if(NOT KF5_VERSION VERSION_LESS "5.67.0" AND NOT HAIKU) + set(HAVE_UICOLORSCHEMECONTROLLER TRUE) + kastencontrollers_add_sublibrary(program/uicolorscheme + PUBLIC +-- +2.30.2 +