FBReader: add recipe for 0.99.4 version

This commit is contained in:
Gerasim Troeglazov
2018-08-20 23:40:50 +10:00
parent 05dcd07450
commit 2ee37fb797
4 changed files with 1231 additions and 0 deletions

View File

@@ -0,0 +1,191 @@
resource app_flags B_MULTIPLE_LAUNCH;
resource app_version {
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_FINAL,
internal = 0,
short_info = "FBReader",
long_info = "@LONG_INFO@"
};
resource app_signature "@APP_SIGNATURE@";
resource file_types message {
"types" = "application/epub+zip",
"types" = "application/msword",
"types" = "application/x-fictionbook",
"types" = "application/x-fictionbook+xml",
"types" = "application/xhtml+xml",
"types" = "application/zip",
"types" = "text/html",
"types" = "text/plain",
"types" = "text/rtf",
"types" = "text/xml"
};
resource vector_icon {
$"6E63696605030F090002000602B89097BA5B513A3F73B8724447646C4AC28E00"
$"8E5613FFD08F4302000602B02CE4BBAF9E3B5B45AFF639497D8849CFDD00CC86"
$"2CFFE6C8A104007003F3D9B81F0019BCD120BCD120BCD120BCE420BCE420BE36"
$"B388C0E3B487BF8EB403C4F5B60FCD18B923C905B79DCD19BA79CD1ABD25CD18"
$"BBCFCD20BD73CCA7BDD1CCD5BD9ECC38BE43CB58BF25CBC1BEAECB7ABF33CBBE"
$"BF4DCB9CBF40CBC9BFB8CBC3C08FCBC2C024CBC4C16ECBC5C32BCBC2C24CCBC4"
$"C355CBA4C3A5CBC6C386C8C6C683C30BCC41C5E7C960C2FBCC51C2DDCC71C2EC"
$"CC60C2DDCC71C2CACC71C2CACC71C26ECC37C1AACBDAC20ACC0BBD11C98DB3DF"
$"C4F4B878C741B395C4CE20C487B34CC4A720C48720C04F20C04FB3A8BFC5B4F5"
$"BEABB44FBF39B4C0BE91B458BE59B48CBE76B457BD0EB457BA79B45A36B458BA"
$"5EB460BA29B457BA43B47FBA00B4D3B9C1B4ACB9E3B74DB7ACBC40B38131B596"
$"BC72B357BCD120BCA3B32DBCD1200010BCAEB437BCAEB437BC72B46EBBF9B4D9"
$"BC2CB499BBE0B4E6BBB5B50BBBCBB4F9BA81B610B818B819B949B711B7AEB865"
$"B6EBB911B750B8C0B6B6B942B64CB9A4B675B968BAFCBBAAC45BBFB9BFABBDB2"
$"C48EBFCCC4F5BFF0C4BEBFECC52DBFCEC58BBF74C55ABF9FC5B8BF49C6143EC5"
$"EDBF26C78FBDABCA7ABB0DC903BC5ACABEBAE1CB2EBA6FCAEFBAA0CB77BA2BCC"
$"0AB9A1CBCEB9F3C748B7D4BDC5B43AC287B606BD85B424BD07B3F8BD49B404BC"
$"E3B403BCAEB437BCCAB421BCAEB4370012B5EAB9E9B5EAB9E9B5AEBA1BB534BA"
$"7FB573BA50B521BAB7B529BB2BB52ABAF2B52ABC00B529BDAAB52ABCD5B527BD"
$"C5B54BBDEAB52EBDE2BA36C05DC409C543BF1FC2D1C41FC52FC43AC4F7C441C5"
$"1BC432C4A4C421C3FEC430C450C424C3FAC42DC3EEC42AC3F2C425C3B6C410C3"
$"43C43EC36DC410C343C410C33BC410C33BC425C307C420C296C41DC2CDC423C2"
$"13C423C10CC438C18FC453C0CEC4A2C046C47DC08BC423C009C31FBF9CC3A0BF"
$"D4C2EABF84C27D3FC2B6BF6ABE7CBD9BB676BA23BA79BBE0B648BA0DB5EAB9E9"
$"B61AB9FAB5EAB9E9000FCB95BA9ACB95BA9AC983BC73C55EC023C76DBE47C573"
$"C02FC59BC047C587C03BC549C095C497C121C4EDC0D8C48DC178C48FC227C48A"
$"C1D0C489C25DC490C2C8C48AC293C482C2F4C48FC34FC48BC323C48EC362C48E"
$"C388C48EC375C490C3B6C4A1C40FC496C3E3C48FC442C49DC4AEC49CC47AC4DD"
$"C477C552C3FDC516C438C79CC1B2CC30BD1FC9E6BF69CC50BD02CC49BCADCC46"
$"BCD3CC44BBC9CC44BA00CC4DBAE4CC07BA30CB95BA9ACBD0BA68CB95BA9A0009"
$"B596BF36B596BF36B55FBF65B4F2BFC4B527BF93B515BFDBB562BFFBB53BBFEC"
$"B9FBC1F9C32EC5F3BE95C3F5C359C602C3B6C612C387C62FC36CC5DEC2C9C594"
$"C317C5BFBEA4C380B658BF5BBA7EC16DB628BF44B5C8BF18B5FBBF27B5B4BF1B"
$"B596BF36B5A6BF2BB596BF360011B3DAC0B3B3DAC0B3B3DAC0B3B3D1C0AFB3D1"
$"C0AFB3D3C1CBB3D4C403B3CFC2E7B8C4C677C2A1CB65BDB1C8F2C2A2CA1EC2A3"
$"C792C2A2C8D8C2A5C77AC2B3C74CC2A0C75EC2A8C79EC2AEC844C2AFC7F2C2B2"
$"C8A4C2B6C962C2A4C904C2B9C95EC2C5C951C2C1C955C2CFC8F1C2CEC82EC2C2"
$"C88FC2D8C7DAC2CCC730C2DDC784C2FEC6F4C34AC66CC325C6B0C2CAC634C1C8"
$"C5C4C24AC5FBC184C5A9C0FCC570C143C583BCFEC3B225C03DB8FDC1F9B4DBC0"
$"2DB492C012B4B7C01FB453C046B3DAC0B3B413C079B3DAC0B30012C695C407C6"
$"95C407C65AC43EC5E6C4AEC617C46EC550C51DC44EC62AC4D2C5A7C43DC63FC4"
$"0AC6484BC642C41DC655C442C670C430C663C3F2C6BDC342C746C397C6FEC32C"
$"C7A0C33AC859C334C7FEC334C88AC337C8ECC335C8BBC333C919C339C974C334"
$"C947C339C987C33AC9AEC33AC99AC32CC9EBC33FCA69C33ACA2BC340CA8DC348"
$"CAD3C345CAB0C433C9F1C5FDC822C515C907C79AC685CAD4C34BC936C4E7CAE6"
$"C33CCAEFC30ECAF1C326CAF0C2AFCAEEC1F2CAEFC251CAEBC15ACAECC029CAEE"
$"C0C1C97BC175C695C407C806C2BCC695C4070205C2B6C96AC2CFC980C2A8C9A5"
$"C2AECA1FC2AFC9E3C2B0CA8DC2B2CB69C2A9CAFBC2CACB55C2E2CB1BC2EECB41"
$"C2D5CAA8C2CEC9C2C2D3CA35C2C9C9A4020CBCAEB437BC72B46EBCCAB421BD07"
$"B3F8BCE3B403BD49B404BDC5B43ABD85B424C287B606CC0AB9A1C748B7D4CBCE"
$"B9F3CB2EBA6FCB77BA2BCAEFBAA0CA7ABB0DCABEBAE1CA0FBA9EC927B9D2C9A9"
$"BA28C8AFB980C7C0B8D8C83DB923C70BB866C590B79DC652B7F9C3EBB6C2C064"
$"B599C22CB61EBF5FB554BD4AB4EFBE57B513BCDBB4DBBBF9B4D9BC6AB4D4BC2C"
$"B499020DB6EBB911B6B6B942B750B8C0B818B819B7AEB865B80FB82DB802B856"
$"B806B840B80CB877B83AB8AAB825B890B870B8E6B8DEB95CB8A2B925B974B9E1"
$"BAB7BAD0BA0EBA64BBC5BB97BE20BCBCBCF5BC28C052BDBBC501BEE6C2A1BE7E"
$"C55CBEF8C6143EC5B9BF09C5EDBF26C58BBF74C5B8BF49C55ABF9FC4F5BFF0C5"
$"2DBFCEC4BEBFECC45BBFB9C48EBFCCBFABBDB2B64CB9A4BAFCBBAAB675B96802"
$"16B529BB2BB52ABC00B52ABAF2B534BA7FB521BAB7B572BAB8B610BAF2B5C5BA"
$"D0B6EFBB56B8ACBC1BB7CEBBB8B9F8BCB8BC98BDDCBB49BD48BE23BE88C137BF"
$"E5BFACBF39C17DC005C20CC03FC1C1C02BC201C02EC1ECC00BC1F7C01DC222BF"
$"D5C27D3FC256BF9CC2B6BF6AC31FBF9CC2EABF84C3A0BFD4C4A2C046C423C009"
$"C47DC08BC423C10CC453C0CEC3F5C140C404C1C7C406C188C409C243C410C33B"
$"C3FAC2C0C410C33BC410C343C410C343C405C380C406C3FBC402C3BEC410C3F8"
$"C42DC3EEC423C3F1C42AC3F2C421C3FEC424C3FAC416C40FC409C436C409C420"
$"C406C48FC409C543C40BC4E9BF1FC2D1B54BBDEABA36C05DB52EBDE2B529BDAA"
$"B527BDC5B52ABCD50208B596BF36B55FBF65B5A6BF2BB5C8BF18B5B4BF1BB5FB"
$"BF27B658BF5BB628BF44BA7EC16DC2C9C594BEA4C380C317C5BFC3B6C612C36C"
$"C5DEC387C62FC32EC5F3C359C602BE95C3F5B562BFFBB9FBC1F9B53BBFECB4F2"
$"BFC4B515BFDBB527BF930208C567C0E4C523C11DC5C5C096C679BFF5C614C039"
$"51C002C6A1C01BC693C00EC68AC03DC655C07AC672C05EC5FAC0D1C54AC186C5"
$"A3C12CC510C1C0C48FC227C4DDC206C48AC1D0C497C121C48DC178C499C147C4"
$"9DC192C49BC16CC4EAC1640206C695C407C65AC43EC806C2BCCAECC029C97BC1"
$"75CAEEC0C1CAEEC1F2CAEBC15ACAB7C1CFCA46C18FCA83C1A6CA37C1885AC195"
$"CA29C18AC8B2C299C5E6C4AEC753C3ADC617C46E0206C655C12EC5BFC1B8C6B8"
$"C0DEC776C036C709C079C76AC06DC72BC0CBC754C0A3C68AC16BC549C2AEC5E9"
$"C20CC50FC2E7C48FC34FC4DCC32CC48BC323C490C2C8C482C2F4C52AC243020E"
$"B3D1C0AFB3D3C1CBB3D1C0AFB3DAC0B3B3DAC0B3B526C14FB7C5C275B678C1DD"
$"B9F8C36DBE5EC55BBC2CC461BEE7C598BFF8C612BF71C5D0C01CC621C06EC61B"
$"C04CC63EC0A6C5EAC0FCC570C0CFC5ABC143C583C1C8C5C4C184C5A9C24AC5FB"
$"C34AC66CC2CAC634C325C6B0C2CCC730C2FEC6F4C2C6C737C2B3C74CC2B9C745"
$"C2A0C75EC2A3C792C2A5C77AC2A2C8D8C2A1CB65C2A2CA1EBDB1C8F2B3D4C403"
$"B8C4C677B3CFC2E70206C58CC2A8C538C2F4C5EDC259C6A5C1B3C63DC1F8C6B1"
$"C1BFC6C8C1D6C6BDC1CAC69CC229C611C2A6C651C263C595C31DC4A1C40FC525"
$"C3A1C496C3E3C48EC388C490C3B6C4E8C3440207C511C629C4B1C66BC52BC612"
$"C569C629C54CC622C506C6A4C421C77EC48DC70AC3D2C7C5C33AC859C39DC82B"
$"C334C7FEC342C746C32CC7A0C344C76DC347C7B9C345C793C392C78DC40BC710"
$"C3C8C747C465C6C60207C430C812C3DEC85CC497C7BDC55DC70AC4EFC757C565"
$"C70FC57DC71DC575C719C568C74BC52CC79BC550C778C4A3C822C395C935C41B"
$"C8AAC37B58C339C974C35AC963C334C947C337C8ECC333C919C390C8AA0208C4"
$"A5C869C460C8AFC4DAC838C550C7E6C50CC800C561C7F2C55CC813C565C800C5"
$"49C842C4FFC888C522C865C475C90DC366CA1FC3F3C99BC351CA32C33FCA69C3"
$"46CA4EC33ACA2BC33AC9AEC32CC9EBC36CC985C3CDC930C3A0C95FC411570210"
$"BBB5B50BBA81B610BBCBB4F9BBF9B4D9BBE0B4E6BC6AB4D4BD4AB4EFBCDBB4DB"
$"BE57B513C064B599BF5FB554C22CB61EC590B79DC3EBB6C2C652B7F9C7C0B8D8"
$"C70BB866C83DB923C927B9D2C8AFB980C9A9BA28CA7ABB0DCA0FBA9EC903BC5A"
$"C6143EC78FBDABC5B9BF09C501BEE6C55CBEF8C2A1BE7EBE20BCBCC052BDBBBC"
$"F5BC28BAB7BAD0BBC5BB97BA0EBA64B8DEB95CB974B9E1B8A2B925B83AB8AAB8"
$"70B8E6B825B890B802B856B80CB877B806B840B818B819B80FB82DB949B71102"
$"0AB5EAB9E9B5AEBA1BB61AB9FAB676BA23B648BA0DBA79BBE0C27D3FBE7CBD9B"
$"C256BF9CC1ECC00BC222BFD5C1F7C01DC20CC03FC201C02EC1C1C02BC137BFE5"
$"C17DC005BFACBF39BC98BDDCBE23BE88BB49BD48B8ACBC1BB9F8BCB8B7CEBBB8"
$"B610BAF2B6EFBB56B5C5BAD0B534BA7FB572BAB8B573BA50021CCB95BA9AC983"
$"BC73CBD0BA68CC44BA00CC07BA30CC4DBAE4CC49BCADCC44BBC9CC46BCD3CC30"
$"BD1FCC50BD02C9E6BF69C552C3FDC79CC1B2C516C438C49DC4AEC4DDC477C49C"
$"C47AC4A1C40FC48FC442C525C3A1C611C2A6C595C31DC651C263C6C8C1D6C69C"
$"C229C6BDC1CAC6A5C1B3C6B1C1BFC63DC1F8C58CC2A8C5EDC259C538C2F4C48E"
$"C388C4E8C344C48EC375C48FC34FC48EC362C4DCC32CC549C2AEC50FC2E7C5E9"
$"C20CC72BC0CBC68AC16BC754C0A3C776C036C76AC06DC709C079C655C12EC6B8"
$"C0DEC5BFC1B8C490C2C8C52AC243C48AC293C48FC227C489C25DC4DDC206C54A"
$"C186C510C1C0C5A3C12CC655C07AC5FAC0D1C672C05EC6A1C01BC68AC03DC693"
$"C00EC679BFF551C002C614C039C567C0E4C5C5C096C523C11DC49DC192C4EAC1"
$"64C49BC16CC497C121C499C147C4EDC0D8C59BC047C549C095C587C03BC55EC0"
$"23C573C02FC76DBE470208B3DAC0B3B526C14FB413C079B492C012B453C046B4"
$"B7C01F25C03DB4DBC02DB8FDC1F9C0FCC570BCFEC3B2C0CFC5ABC06EC61BC0A6"
$"C5EAC04CC63EBFF8C612C01CC621BF71C5D0BE5EC55BBEE7C598BC2CC461B7C5"
$"C275B9F8C36DB678C1DD0204C404C1C7C409C243C406C188C423C10CC3F5C140"
$"C438C18FC420C296C423C213C41DC2CDC410C33BC425C307C3FAC2C002215AC1"
$"95C8B2C299CA29C18ACA46C18FCA37C188CA83C1A6CAEEC1F2CAB7C1CFCAEFC2"
$"51CAEFC30ECAF0C2AFCAF1C326CAD4C34BCAE6C33CC936C4E7C5FDC822C79AC6"
$"85C515C907C348CAD3C433C9F1C345CAB0C33FCA69C340CA8DC346CA4EC366CA"
$"1FC351CA32C3F3C99BC4FFC888C475C90DC522C865C55CC813C549C842C565C8"
$"00C550C7E6C561C7F2C50CC800C4A5C869C4DAC838C460C8AFC3CDC930C41157"
$"C3A0C95FC33AC9AEC36CC985C33AC99AC339C974C339C987C35AC963C395C935"
$"C37B58C41BC8AAC52CC79BC4A3C822C550C778C57DC71DC568C74BC575C719C5"
$"5DC70AC565C70FC4EFC757C430C812C497C7BDC3DEC85CC337C8ECC390C8AAC3"
$"35C8BBC33AC859C334C88AC39DC82BC421C77EC3D2C7C5C48DC70AC569C629C5"
$"06C6A4C54CC622C511C629C52BC612C4B1C66BC40BC710C465C6C6C3C8C747C3"
$"47C7B9C392C78DC345C793C342C746C344C76DC397C6FEC442C670C3F2C6BDC4"
$"30C663C40AC648C41DC6554BC642C44EC62AC43DC63FC4D2C5A7C5E6C4AEC550"
$"C51DC753C3AD0203C406C3FBC410C3F8C402C3BEC410C343C405C380C43EC36D"
$"C42DC3EEC425C3B6C423C3F10204C409C436C406C48FC409C420C421C3FEC416"
$"C40FC430C450C43AC4F7C432C4A4C441C51BC409C543C41FC52FC40BC4E90206"
$"C2B3C74CC2A8C79EC2B9C745C2CCC730C2C6C737C2DDC784C2CEC82EC2D8C7DA"
$"C2C2C88FC2C5C951C2CFC8F1C2C1C955C2B6C962C2B9C95EC2A4C904C2AEC844"
$"C2B2C8A4C2AFC7F20205C2B6C96AC2A8C9A5C2CFC980C2CEC9C2C2C9C9A4C2D3"
$"CA35C2E2CB1BC2D5CAA8C2EECB41C2B2CB69C2CACB55C2A9CAFBC2AECA1FC2B0"
$"CA8DC2AFC9E3020C6640CEC0BF83684062466246CD35C27DCD6CC334CDE4C35D"
$"CCEBC3ABCBFCC4AECC74C42EC9AFC713C51ACBE2C766C97DC4FECC01C4C2CC3A"
$"C4E5CC23C4A4CC46C463CC45C482CC43C3F0CC43C30BCC41C37DCC44C5E7C960"
$"CBA4C3A5C8C6C683CBC6C386CBC5C32BCBC4C355CBC2C24C514351C1D0C684C0"
$"86573AC90BBD69C953BCE4180A03011E023F9FC00000000000003F9FC8400000"
$"4400000A00080001020304050607023F9FC00000000000003F9FC84000004400"
$"000A010108023F9FC00000000000003F9FC84000004400000A010109023F9FC0"
$"0000000000003F9FC84000004400000A01010A023F9FC00000000000003F9FC8"
$"4000004400000A01010B023F9FC00000000000003F9FC84000004400000A0101"
$"0C023F9FC00000000000003F9FC84000004400000A01010D023F9FC000000000"
$"00003F9FC84000004400000A01010E023F9FC00000000000003F9FC840000044"
$"00000A01010F023F9FC00000000000003F9FC84000004400000A010110023F9F"
$"C00000000000003F9FC84000004400000A010111023F9FC00000000000003F9F"
$"C84000004400000A010112023F9FC00000000000003F9FC84000004400000A01"
$"0113023F9FC00000000000003F9FC84000004400000A020114023F9FC0000000"
$"0000003F9FC84000004400000A020115023F9FC00000000000003F9FC8400000"
$"4400000A040116023F9FC00000000000003F9FC84000004400000A020117023F"
$"9FC00000000000003F9FC84000004400000A020118023F9FC00000000000003F"
$"9FC84000004400000A040119023F9FC00000000000003F9FC84000004400000A"
$"02011A023F9FC00000000000003F9FC84000004400000A02011B023F9FC00000"
$"000000003F9FC84000004400000A02011C023F9FC00000000000003F9FC84000"
$"004400000A02011D023F9FC00000000000003F9FC8400000440000"
};

Binary file not shown.

View File

@@ -0,0 +1,106 @@
SUMMARY="E-Book Reader. Supports many e-book formats"
DESCRIPTION="FBReader is an e-book reader for Linux, Microsoft Windows, Android, and other platforms.
It was originally written for the Sharp Zaurus and currently runs on many other mobile devices, like \
the Nokia Internet Tablets, as well as desktop computers.
Supported formats include EPUB, FictionBook, HTML, plucker, PalmDoc, zTxt, TCR, CHM, RTF, OEB, mobi \
without DRM, and plain-text."
HOMEPAGE="http://www.fbreader.org"
COPYRIGHT="Geometer Plus, LLC; FBReader.ORG Limited"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://www.fbreader.org/files/desktop/fbreader-sources-$portVersion.tgz"
CHECKSUM_SHA256="3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9"
PATCHES="fbreader-$portVersion.patchset"
ADDITIONAL_FILES="
fbreader.rdef.in
haikuicons.zip
"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
fbreader$secondaryArchSuffix = $portVersion
app:fbreader$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libfribidi$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
lib:libunibreak$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libfribidi$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Network$secondaryArchSuffix
devel:libQt5PrintSupport$secondaryArchSuffix
devel:libQt5Svg$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
devel:libunibreak$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:find
cmd:g++$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5
cmd:unzip
"
BUILD()
{
make INSTALLDIR=$appsDir/FBReader
}
INSTALL()
{
make INSTALLDIR=$appsDir/FBReader install
mv -f $appsDir/FBReader/bin/FBReader $appsDir/FBReader/FBReader
rm -rf $appsDir/FBReader/bin
unzip -o $sourceDir/../../additional-files/haikuicons.zip -d $appsDir/FBReader/pixmaps/FBReader
local APP_SIGNATURE="application/x-vnd.fbreader"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local LONG_INFO="$SUMMARY"
sed \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
$portDir/additional-files/fbreader.rdef.in > fbreader.rdef
addResourcesToBinaries fbreader.rdef $appsDir/FBReader/FBReader
addAppDeskbarSymlink $appsDir/FBReader/FBReader
}

View File

@@ -0,0 +1,934 @@
From d9450aa0a758bb411ffc2b224a59cde409ffbe67 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 22:00:43 +1000
Subject: Fix for Qt5 build
diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
index dfcbc0b..bd2689e 100644
--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
@@ -17,9 +17,9 @@
* 02110-1301, USA.
*/
-#include <QtGui/QBoxLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QToolBar>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolBar>
#include <QtGui/QKeyEvent>
#include "ZLQtApplicationWindow.h"
diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
index 6241514..e0b143b 100644
--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
@@ -17,17 +17,17 @@
* 02110-1301, USA.
*/
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include <QtGui/QPixmap>
#include <QtGui/QImage>
#include <QtGui/QIcon>
-#include <QtGui/QToolBar>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
-#include <QtGui/QLayout>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLayout>
#include <QtGui/QWheelEvent>
-#include <QtGui/QDockWidget>
+#include <QtWidgets/QDockWidget>
#include <QtCore/QObjectList>
#include <ZLibrary.h>
diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
index 3b4fd3a..42ff2c8 100644
--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
@@ -22,8 +22,8 @@
#include <map>
-#include <QtGui/QMainWindow>
-#include <QtGui/QAction>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QAction>
#include <QtGui/QCursor>
class QDockWidget;
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
index 24eb897..c17e86c 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
@@ -17,8 +17,8 @@
* 02110-1301, USA.
*/
-#include <QtGui/QApplication>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QPushButton>
#include <ZLDialogManager.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
index 068039d..811cec8 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
@@ -20,8 +20,8 @@
#ifndef __ZLQTDIALOG_H__
#define __ZLQTDIALOG_H__
-#include <QtGui/QDialog>
-#include <QtGui/QLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLayout>
#include <ZLDialog.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
index e8ff422..352c350 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
@@ -17,10 +17,10 @@
* 02110-1301, USA.
*/
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QWidget>
-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
#include "ZLQtDialogContent.h"
#include "ZLQtOptionView.h"
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
index d5eb4d4..2fc769b 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
@@ -17,11 +17,11 @@
* 02110-1301, USA.
*/
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QFileDialog>
#include <QtGui/QClipboard>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
#include "ZLQtDialogManager.h"
#include "ZLQtDialog.h"
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
index ec9e73c..a50a40d 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
@@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QFileDialog>
#include "ZLQtOpenFileDialog.h"
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
index 48a1b8f..90d50fb 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
@@ -19,16 +19,16 @@
#include <cctype>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
-#include <QtGui/QGroupBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QSlider>
-#include <QtGui/QLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QLayout>
#include <ZLStringUtil.h>
#include <ZLDialogManager.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
index f6c36fb..7fe855a 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
@@ -17,11 +17,11 @@
* 02110-1301, USA.
*/
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QButtonGroup>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QButtonGroup>
#include <QtGui/QResizeEvent>
#include <ZLDialogManager.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
index e38b62a..ad26fba 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
@@ -20,9 +20,9 @@
#ifndef __ZLQTOPTIONSDIALOG_H__
#define __ZLQTOPTIONSDIALOG_H__
-#include <QtGui/QWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QDialog>
#include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
index 98e469e..5a1d574 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
@@ -19,11 +19,11 @@
#include <unistd.h>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
#include <QtCore/QThreadPool>
#include "../dialogs/ZLQtDialogManager.h"
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
index df6c73b..837bce5 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
@@ -22,11 +22,11 @@
#include <string>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
#include <QtGui/QCursor>
-#include <QtGui/QDialog>
-#include <QtGui/QProgressBar>
-#include <QtGui/QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLabel>
#include <QtCore/QRunnable>
#include <ZLProgressDialog.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
index 65530be..d1750e6 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
@@ -19,12 +19,12 @@
#include <algorithm>
-#include <QtGui/QSplitter>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QScrollBar>
#include <QtGui/QResizeEvent>
#include <QtCore/QDebug>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
#include <ZLFile.h>
#include <ZLibrary.h>
diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
index 9cf7c47..03f1223 100644
--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
@@ -24,12 +24,12 @@
#include <QtCore/QSet>
#include <QtCore/QMap>
-#include <QtGui/QDialog>
-#include <QtGui/QScrollArea>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QWidget>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QWidget>
#include <ZLTreeDialog.h>
diff --git a/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp b/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
index 50a9f09..cf70b7a 100644
--- a/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+++ b/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
@@ -48,4 +48,5 @@ void ZLQtFSManager::normalizeRealPath(std::string &path) const {
static const std::string replacement = (const char*)QDir::homePath().toUtf8();
path = replacement + path.substr(1);
}
+ ZLUnixFSManager::normalizeRealPath(path);
}
diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
index c08c536..a714fa9 100644
--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
+++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
@@ -20,7 +20,7 @@
#ifndef __ZLQAPPLICATION_H__
#define __ZLQAPPLICATION_H__
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
class ZLQApplication : public QApplication {
diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
index 9648e95..a544031 100644
--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
@@ -19,7 +19,7 @@
#include <QtCore/QTextCodec>
#include <QtCore/QFile>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include <QtGui/QFileOpenEvent>
#include <ZLApplication.h>
@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
new ZLQApplication(argc, argv);
- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
+ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
ZLibrary::parseArguments(argc, argv);
diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
index 47067d3..119a5ee 100644
--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
@@ -24,7 +24,9 @@
#include <QtCore/QDir>
#include <QtCore/QList>
#include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
+#include <QtNetwork/QNetworkCookie>
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkProxy>
@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
QNetworkReply *reply = NULL;
if (!scope.request->postParameters().empty()) {
QByteArray data;
- QUrl tmp;
+ QUrlQuery tmp;
typedef std::pair<std::string, std::string> string_pair;
foreach (const string_pair &pair, scope.request->postParameters()) {
tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
}
- data = tmp.encodedQuery();
+ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
} else {
reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
index cdaef01..a259c65 100644
--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
@@ -3,7 +3,7 @@
#include <QtCore/QTimer>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
#include <QtGui/QColor>
class QtWaitingSpinner : public QWidget {
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
index a3e5b35..ab41684 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
@@ -17,14 +17,14 @@
* 02110-1301, USA.
*/
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
#include <QtGui/QPixmap>
#include <QtGui/QPalette>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
-#include <QtGui/QScrollBar>
#include <QtCore/QTimer>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
#include <QtCore/QDebug>
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
index 4f09cfc..51f1545 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
@@ -20,12 +20,12 @@
#ifndef __ZLQTITEMSLISTWIDGET_H__
#define __ZLQTITEMSLISTWIDGET_H__
-#include <QtGui/QWidget>
-#include <QtGui/QFrame>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QScrollArea>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QScrollArea>
#include <ZLTreeTitledNode.h>
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
index 472f05f..b9809c8 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
@@ -17,10 +17,10 @@
* 02110-1301, USA.
*/
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QScrollBar>
-#include <QtGui/QGraphicsDropShadowEffect>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QGraphicsDropShadowEffect>
#include <QtCore/QDebug>
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
index 1b8ebcc..6f3b4e3 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
@@ -20,11 +20,11 @@
#ifndef __ZLQTPREVIEWWIDGET_H__
#define __ZLQTPREVIEWWIDGET_H__
-#include <QtGui/QWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QVBoxLayout>
#include <QtCore/QSet>
#include <ZLTreePageNode.h>
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
index 1cddaf9..2b65cc1 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
@@ -18,9 +18,9 @@
*/
#include <QtCore/QDebug>
-#include <QtGui/QStyle>
-#include <QtGui/QCompleter>
-#include <QtGui/QStringListModel>
+#include <QtCore/QStringListModel>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QCompleter>
#include <ZLibrary.h>
#include <ZLFile.h>
diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
index f6e174c..c360965 100644
--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
@@ -21,8 +21,8 @@
#define __ZLQTSEARCHFIELD_H__
#include <QtCore/QSet>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
#include "QtWaitingSpinner.h"
#include "ZLQtItemsListWidget.h"
diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
index 4f5d196..615050c 100644
--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
@@ -19,8 +19,8 @@
#include <algorithm>
-#include <QtGui/QLayout>
-#include <QtGui/QScrollBar>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QScrollBar>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QMouseEvent>
@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint() {
void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
if (direction == ZLView::VERTICAL) {
- myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
- myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
+ myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
+ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
} else {
- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
+ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
+ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
}
}
diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
index 6fabf00..ccec1e3 100644
--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
@@ -20,7 +20,7 @@
#ifndef __ZLQTVIEWWIDGET_H__
#define __ZLQTVIEWWIDGET_H__
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
#include "../../../../core/src/view/ZLViewWidget.h"
#include <ZLApplication.h>
--
2.16.4
From 903ff2dcec06ca2bc7e8313fda3221489b485b4f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 22:02:18 +1000
Subject: Fix narrowing conversion
diff --git a/fbreader/src/formats/doc/OleStorage.cpp b/fbreader/src/formats/doc/OleStorage.cpp
index 016f9fd..a7ab81a 100644
--- a/fbreader/src/formats/doc/OleStorage.cpp
+++ b/fbreader/src/formats/doc/OleStorage.cpp
@@ -59,7 +59,7 @@ bool OleStorage::init(shared_ptr<ZLInputStream> stream, std::size_t streamSize)
clear();
return false;
}
- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
+ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
clear();
return false;
--
2.16.4
From 46dc211cbe0617e09a85f70631ab25b387cc184a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 22:04:48 +1000
Subject: Add haiku platform support
diff --git a/fbreader/data/default/external.haiku.xml b/fbreader/data/default/external.haiku.xml
new file mode 120000
index 0000000..bf36177
--- /dev/null
+++ b/fbreader/data/default/external.haiku.xml
@@ -0,0 +1 @@
+external.desktop.xml
\ No newline at end of file
diff --git a/fbreader/data/default/keymap.haiku.xml b/fbreader/data/default/keymap.haiku.xml
new file mode 100644
index 0000000..b795bd8
--- /dev/null
+++ b/fbreader/data/default/keymap.haiku.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keymap>
+ <binding key="&lt;L&gt;" action="showLibrary"/>
+ <binding key="&lt;W&gt;" action="showNetLibrary"/>
+ <binding key="&lt;O&gt;" action="preferences"/>
+ <binding key="&lt;LeftArrow&gt;" action="undo"/>
+ <binding key="&lt;RightArrow&gt;" action="redo"/>
+ <binding key="&lt;C&gt;" action="toc"/>
+ <binding key="&lt;Ctrl&gt;+&lt;F&gt;" action="search"/>
+ <binding key="&lt;F&gt;" action="search"/>
+ <binding key="&lt;P&gt;" action="findPrevious"/>
+ <binding key="&lt;F3&gt;" action="findNext"/>
+ <binding key="&lt;N&gt;" action="findNext"/>
+ <binding key="&lt;PageDown&gt;" action="pageForward"/>
+ <binding key="&lt;PageUp&gt;" action="pageBackward"/>
+ <binding key="&lt;DownArrow&gt;" action="lineForward"/>
+ <binding key="&lt;UpArrow&gt;" action="lineBackward"/>
+ <binding key="&lt;MouseScrollDown&gt;" action="mouseScrollForward"/>
+ <binding key="&lt;MouseScrollUp&gt;" action="mouseScrollBackward"/>
+ <binding key="&lt;Ctrl&gt;+&lt;Home&gt;" action="gotoHome"/>
+ <binding key="&lt;Home&gt;" action="gotoSectionStart"/>
+ <binding key="&lt;End&gt;" action="gotoSectionEnd"/>
+ <binding key="&lt;Esc&gt;" action="cancel"/>
+ <binding key="&lt;=&gt;" action="increaseFont"/>
+ <binding key="&lt;-&gt;" action="decreaseFont"/>
+ <binding key="&lt;D&gt;" action="toggleIndicator"/>
+ <binding key="&lt;Return&gt;" action="toggleFullscreen"/>
+ <binding key="&lt;A&gt;" action="addBook"/>
+ <binding key="&lt;I&gt;" action="bookInfo"/>
+ <binding key="&lt;R&gt;" action="rotate"/>
+ <binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="nextTOCSection"/>
+ <binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="previousTOCSection"/>
+ <binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
+ <binding key="&lt;G&gt;" action="gotoPageNumber"/>
+ <binding key="&lt;Z&gt;" action="debugNL"/>
+</keymap>
diff --git a/fbreader/data/icons/application/haiku.png b/fbreader/data/icons/application/haiku.png
new file mode 120000
index 0000000..b463b00
--- /dev/null
+++ b/fbreader/data/icons/application/haiku.png
@@ -0,0 +1 @@
+48x48.png
\ No newline at end of file
diff --git a/fbreader/data/icons/booktree/haiku b/fbreader/data/icons/booktree/haiku
new file mode 120000
index 0000000..5524476
--- /dev/null
+++ b/fbreader/data/icons/booktree/haiku
@@ -0,0 +1 @@
+22x22-transparent-png
\ No newline at end of file
diff --git a/fbreader/data/icons/filetree/haiku b/fbreader/data/icons/filetree/haiku
new file mode 120000
index 0000000..5524476
--- /dev/null
+++ b/fbreader/data/icons/filetree/haiku
@@ -0,0 +1 @@
+22x22-transparent-png
\ No newline at end of file
diff --git a/fbreader/data/icons/toolbar/haiku b/fbreader/data/icons/toolbar/haiku
new file mode 120000
index 0000000..a98d612
--- /dev/null
+++ b/fbreader/data/icons/toolbar/haiku
@@ -0,0 +1 @@
+32x32-transparent-png
\ No newline at end of file
diff --git a/fbreader/haiku/Makefile b/fbreader/haiku/Makefile
new file mode 100644
index 0000000..ebb2f06
--- /dev/null
+++ b/fbreader/haiku/Makefile
@@ -0,0 +1,9 @@
+ROOTDIR = $(CURDIR)/../..
+include $(ROOTDIR)/makefiles/config.mk
+
+install:
+ @install -m 0644 ../data/default/config.desktop.xml $(DESTDIR)$(SHAREDIR)/FBReader/default/config.xml
+ @install -m 0644 ../data/default/keymap.desktop.xml $(DESTDIR)$(SHAREDIR)/FBReader/default/keymap.xml
+ @install -m 0644 ../data/default/styles.desktop.xml $(DESTDIR)$(SHAREDIR)/FBReader/default/styles.xml
+ @install -d $(DESTDIR)$(IMAGEDIR)
+clean:
diff --git a/makefiles/arch/haiku.mk b/makefiles/arch/haiku.mk
new file mode 100644
index 0000000..64ee9ab
--- /dev/null
+++ b/makefiles/arch/haiku.mk
@@ -0,0 +1,21 @@
+include $(ROOTDIR)/makefiles/arch/unix.mk
+
+INSTALLDIR = ${INSTALLDIR}
+IMAGEDIR = $(INSTALLDIR)/pixmaps
+APPIMAGEDIR = $(INSTALLDIR)/pixmaps/%APPLICATION_NAME%
+
+ZLSHARED = no
+CC = gcc
+AR = ar rsu
+LD = g++
+
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -fPIC
+LDFLAGS =
+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+
+MOC = /bin/moc
+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+
+RM = rm -rvf
+RM_QUIET = rm -rf
diff --git a/zlibrary/ui/data/keynames.haiku-qt4.xml b/zlibrary/ui/data/keynames.haiku-qt4.xml
new file mode 100644
index 0000000..813443b
--- /dev/null
+++ b/zlibrary/ui/data/keynames.haiku-qt4.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keynames>
+ <key code="0x01000000" name="&lt;Esc&gt;"/>
+ <key code="0x1B" name="&lt;Esc&gt;"/>
+ <key code="0x01000001" name="&lt;Tab&gt;"/>
+ <key code="0x01000002" name="&lt;BackTab&gt;"/>
+ <key code="0x01000003" name="&lt;BackSpace&gt;"/>
+ <key code="0x01000004" name="&lt;Return&gt;"/>
+ <key code="0xD" name="&lt;Return&gt;"/>
+ <key code="0x01000005" name="&lt;Enter&gt;"/>
+ <key code="0x01000006" name="&lt;Insert&gt;"/>
+ <key code="0x01000007" name="&lt;Delete&gt;"/>
+ <key code="0x01000008" name="&lt;Pause&gt;"/>
+ <key code="0x01000009" name="&lt;Print&gt;"/>
+ <key code="0x0100000a" name="&lt;SysReq&gt;"/>
+ <key code="0x0100000b" name="&lt;Clear&gt;"/>
+ <key code="0x01000010" name="&lt;Home&gt;"/>
+ <key code="0x01000011" name="&lt;End&gt;"/>
+ <key code="0x01000012" name="&lt;LeftArrow&gt;"/>
+ <key code="0x01000013" name="&lt;UpArrow&gt;"/>
+ <key code="0x01000014" name="&lt;RightArrow&gt;"/>
+ <key code="0x01000015" name="&lt;DownArrow&gt;"/>
+ <key code="0x01000016" name="&lt;PageUp&gt;"/>
+ <key code="0x01000017" name="&lt;PageDown&gt;"/>
+ <key code="0x01000030" name="&lt;F1&gt;"/>
+ <key code="0x01000031" name="&lt;F2&gt;"/>
+ <key code="0x01000032" name="&lt;F3&gt;"/>
+ <key code="0x01000033" name="&lt;F4&gt;"/>
+ <key code="0x01000034" name="&lt;F5&gt;"/>
+ <key code="0x01000035" name="&lt;F6&gt;"/>
+ <key code="0x01000036" name="&lt;F7&gt;"/>
+ <key code="0x01000037" name="&lt;F8&gt;"/>
+ <key code="0x01000038" name="&lt;F9&gt;"/>
+ <key code="0x01000039" name="&lt;F10&gt;"/>
+ <key code="0x0100003a" name="&lt;F11&gt;"/>
+ <key code="0x0100003b" name="&lt;F12&gt;"/>
+ <key code="0x0100003c" name="&lt;F13&gt;"/>
+ <key code="0x20" name="&lt;Space&gt;"/>
+ <key code="0x01000024" name="&lt;CapsLock&gt;"/>
+ <key code="0x01000025" name="&lt;NumLock&gt;"/>
+ <key code="0x01000026" name="&lt;ScrollLock&gt;"/>
+ <key code="0x01000020" name="&lt;Shift&gt;"/>
+ <key code="0x01000021" name="&lt;Ctrl&gt;"/>
+ <key code="0x01000023" name="&lt;Alt&gt;"/>
+ <key code="0x01000053" name="&lt;Win&gt;"/>
+ <key code="0x30" name="&lt;0&gt;"/>
+ <key code="0x31" name="&lt;1&gt;"/>
+ <key code="0x32" name="&lt;2&gt;"/>
+ <key code="0x33" name="&lt;3&gt;"/>
+ <key code="0x34" name="&lt;4&gt;"/>
+ <key code="0x35" name="&lt;5&gt;"/>
+ <key code="0x36" name="&lt;6&gt;"/>
+ <key code="0x37" name="&lt;7&gt;"/>
+ <key code="0x38" name="&lt;8&gt;"/>
+ <key code="0x39" name="&lt;9&gt;"/>
+ <key code="0x41" name="&lt;A&gt;"/>
+ <key code="0x42" name="&lt;B&gt;"/>
+ <key code="0x43" name="&lt;C&gt;"/>
+ <key code="0x44" name="&lt;D&gt;"/>
+ <key code="0x45" name="&lt;E&gt;"/>
+ <key code="0x46" name="&lt;F&gt;"/>
+ <key code="0x47" name="&lt;G&gt;"/>
+ <key code="0x48" name="&lt;H&gt;"/>
+ <key code="0x49" name="&lt;I&gt;"/>
+ <key code="0x4A" name="&lt;J&gt;"/>
+ <key code="0x4B" name="&lt;K&gt;"/>
+ <key code="0x4C" name="&lt;L&gt;"/>
+ <key code="0x4D" name="&lt;M&gt;"/>
+ <key code="0x4E" name="&lt;N&gt;"/>
+ <key code="0x4F" name="&lt;O&gt;"/>
+ <key code="0x50" name="&lt;P&gt;"/>
+ <key code="0x51" name="&lt;Q&gt;"/>
+ <key code="0x52" name="&lt;R&gt;"/>
+ <key code="0x53" name="&lt;S&gt;"/>
+ <key code="0x54" name="&lt;T&gt;"/>
+ <key code="0x55" name="&lt;U&gt;"/>
+ <key code="0x56" name="&lt;V&gt;"/>
+ <key code="0x57" name="&lt;W&gt;"/>
+ <key code="0x58" name="&lt;X&gt;"/>
+ <key code="0x59" name="&lt;Y&gt;"/>
+ <key code="0x5A" name="&lt;Z&gt;"/>
+ <modifier code="0x08000000" name="&lt;Alt&gt;"/>
+ <modifier code="0x04000000" name="&lt;Ctrl&gt;"/>
+</keynames>
diff --git a/zlibrary/ui/data/style.haiku.qss b/zlibrary/ui/data/style.haiku.qss
new file mode 100644
index 0000000..db53d4d
--- /dev/null
+++ b/zlibrary/ui/data/style.haiku.qss
@@ -0,0 +1,14 @@
+/*QLineEdit:focus#search-field {
+ border-style: solid;
+ border-width: 2px;
+ border-radius: 12px;
+ border-color: #6F9FCF;
+}
+
+QLineEdit#search-field {
+ border-style: solid;
+ border-width: 1px;
+ border-radius: 12px;
+ border-color: #8D8D8D;
+}*/
+
--
2.16.4
From 831737591550b32e23971d3f527a8657564c8fa9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 22:05:17 +1000
Subject: Fix haiku build
diff --git a/fbreader/Makefile b/fbreader/Makefile
index 0d5ac7b..7a2bbb9 100644
--- a/fbreader/Makefile
+++ b/fbreader/Makefile
@@ -22,7 +22,7 @@ all: .resources
fi; \
done;
@echo -n 'Linking $(TARGET) ...'
- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+ @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 -liconv
@echo ' OK'
FBSHAREDIR = $(DESTDIR)$(SHAREDIR)/FBReader
diff --git a/fbreader/scripts/install_help.sh b/fbreader/scripts/install_help.sh
index 00fdf3e..f95e359 100755
--- a/fbreader/scripts/install_help.sh
+++ b/fbreader/scripts/install_help.sh
@@ -6,7 +6,7 @@ if [ $# != 2 ]; then
fi;
case "$1" in
- desktop|openzaurus_640x480|pdaxrom|pepperpad3|zaurus_640x480|macosx)
+ desktop|openzaurus_640x480|pdaxrom|pepperpad3|zaurus_640x480|macosx|haiku)
platform=desktop;
;;
maemo)
diff --git a/makefiles/target.mk b/makefiles/target.mk
index 2f4d572..f26afa4 100644
--- a/makefiles/target.mk
+++ b/makefiles/target.mk
@@ -1,4 +1,4 @@
-TARGET_ARCH = desktop
+TARGET_ARCH = haiku
UI_TYPE = qt4
#TARGET_STATUS = debug
#ZLSHARED = no
diff --git a/zlibrary/core/Makefile b/zlibrary/core/Makefile
index 55c9401..ef41c2c 100644
--- a/zlibrary/core/Makefile
+++ b/zlibrary/core/Makefile
@@ -23,7 +23,7 @@ SUBDIRS_ALL = src/library src/typeId src/util src/constants src/logger src/files
SUBDIRS = src/library src/typeId src/util src/constants src/logger src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/unix/time src/runnable src/network src/network/requests src/blockTreeView src/tree
-ifeq "<$(TARGET_ARCH)>" "$(findstring <$(TARGET_ARCH)>, <desktop> <pepperpad3> <macosx> <bb10>)"
+ifeq "<$(TARGET_ARCH)>" "$(findstring <$(TARGET_ARCH)>, <desktop> <haiku> <pepperpad3> <macosx> <bb10>)"
SUBDIRS += src/desktop/application src/desktop/dialogs
endif
@@ -50,7 +50,7 @@ $(TARGET): .objects
@echo -n 'Creating $@ ...'
@$(RM_QUIET) $(TARGET)
ifeq "$(ZLSHARED)" "yes"
- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS)
+ @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) -liconv
#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(ZLUI_LIB) -ldl -liconv
@ln -sf $(TARGET) $(TARGET_SONAME)
@ln -sf $(TARGET) $(TARGET_SHORTNAME)
--
2.16.4
From b43ad0a48e35760e1ee917534f7294baa7ebfa09 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 23:34:22 +1000
Subject: Fix segfault when book reopened
diff --git a/fbreader/src/fbreader/FBReader.cpp b/fbreader/src/fbreader/FBReader.cpp
index f4825b0..e1c1b04 100644
--- a/fbreader/src/fbreader/FBReader.cpp
+++ b/fbreader/src/fbreader/FBReader.cpp
@@ -298,7 +298,6 @@ void FBReader::openBookInternal(shared_ptr<Book> book) {
bookTextView.setModel(0, 0);
bookTextView.setContentsModel(0);
contentsView.setModel(0);
- myModel.reset();
myModel = new BookModel(book);
ZLTextHyphenator::Instance().load(book->language());
bookTextView.setModel(myModel->bookTextModel(), book);
--
2.16.4
From 50e1bcb248a38ebc945ecdcbe4614a4ff26a6140 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Aug 2018 23:35:03 +1000
Subject: Set haiku settings folder
diff --git a/makefiles/arch/haiku.mk b/makefiles/arch/haiku.mk
index 64ee9ab..2934de9 100644
--- a/makefiles/arch/haiku.mk
+++ b/makefiles/arch/haiku.mk
@@ -9,7 +9,7 @@ CC = gcc
AR = ar rsu
LD = g++
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -fPIC
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -fPIC -DXMLCONFIGHOMEDIR=\"~/config/settings/\"
LDFLAGS =
EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
--
2.16.4