mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Calligra: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,96 +0,0 @@
|
||||
|
||||
resource app_flags B_MULTIPLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
middle = @MIDDLE@,
|
||||
minor = @MINOR@,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "BrainDump",
|
||||
long_info = "@LONG_INFO@"
|
||||
};
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource vector_icon {
|
||||
$"6E63696606020102023DC0000000000000003D80004A00004A4000F401000044"
|
||||
$"FF0100000003010000020116043B73F1366FD3B526223A3B22497CE64B43AE70"
|
||||
$"F2A38ED4E1FF59020106033DC0000000000000003DC00049000048000031FFFF"
|
||||
$"FFD5FFE500FFFFC800020106033DC0000000000000003DC00049000048000000"
|
||||
$"FFE6A5E2FFBB03FFFFBF0005010E0204402052202E202040202E205240602E60"
|
||||
$"526060406052602E0405FE0148534858485848CAB0405EC18D5EBDF15E385838"
|
||||
$"CAB03858530405FE014B4B4B4D4B4D4BC6D24056C22856BD5656354D35C6D235"
|
||||
$"4D4B0005444D444DC56BC42F563856C0D4C883B7C14022C49622BAE9222A382A"
|
||||
$"B7C12AC0D43C4DBA13C42F3C4D08024050404202043C3C3CBF713CBCDD4036BE"
|
||||
$"D836C0A636443C44BCDD44BF714042C0A642BED8420203344A344ABBEAC4533C"
|
||||
$"4DBD00C4B83C4D344B374D344B020CBB4FBF39B999BF00BB22C006B991C0A1BA"
|
||||
$"6BC0A1B956C0A1B927C10AB927C0D0B927C144B991C174B956C174BADFC174BC"
|
||||
$"26BF3BBBF5C07DBCF2BF25BE42BE35BDAFBECABE6ABE0BBE40BD9FBE6ABDC8BE"
|
||||
$"17BD77BDABBDA1BDD4BD77BD2ABE2536BE6EBC7CBE6EBA4BBE6EB91936B919BD"
|
||||
$"3CB919BB89B8B0BB5AB8EABB5AB875BB5AB84636B846BB89B846BD89020DBD0E"
|
||||
$"C2CCBD0EC307BD0EC292BCA5C263BCDFC263BAB8C263B927C5E0B927C3F4B927"
|
||||
$"C5E5B927C5EFB927C5EAB900C5EAB8B0C5E7B8D8C5E7B875C5E7B846C651B846"
|
||||
$"C616B846C68BB8B0C6BAB875C6BABA28C6BABB5AC965BB5AC7ECBB5AC99F36C9"
|
||||
$"CEBB89C9CEBBFEC9CEBC2DC965BC2DC99FBC2DC7EEB9FEC628BB45C6ADB9FCC6"
|
||||
$"11B9FAC5E0B9FAC5F8B9FAC468BCA5C336BB2CC336BCDFC336021CCB20BF48CB"
|
||||
$"20C004CB20BE58CA16BCCDCAC0BD74CA31BC77CA3F36CA3FBC1ECA3FBA11C76C"
|
||||
$"B857C907B8A6C78BB808C79BB75EC79BB7B4C79BB64BC606B4F8C6F4B55EC479"
|
||||
$"B3BCC17B20C2C820C0C220BFB8B3E6C01EB35ABF53B35ABDF620BEAF20BCA920"
|
||||
$"B96BB4F834B3BCB87DB55EB7D6B75EB7D6B64BB7D6B7B4B805B857B7E6B808B6"
|
||||
$"6AB8A6B53236B532BA11B532BC1EB55BBCCDB540BC77B4B1BD74B451BF48B451"
|
||||
$"BE58B451C004B4EFC142B48CC0B2B488C1D7B451C33DB451C286B451C482B61B"
|
||||
$"C648B502C5ABB616C670B613C6C1B613C699B613C877B8D0CA7FB731C9FBB984"
|
||||
$"5EBC34CC71BACDCC71BDBECC71BFB8CA43BF13CB8EC05ECB8EC33DCC71C1B3CC"
|
||||
$"71C4A4CC71C6A1CA7FC5ED5EC840C9FBC95EC6C1C95EC877C95EC699C956C648"
|
||||
$"C95BC670CA6FC5ABCB20C33DCB20C482CB20C2865BC142CAE9C1D7CAE5C0B202"
|
||||
$"28BC34CB9EBDEACB9EBB0CCB9EB974C9F5B9FFCAFBB967C9DBB933C9C0B94FC9"
|
||||
$"C8B7D8C963B6E6C6C1B6E6C828B6E6C68CB6F6C622B6ECC656B700C5F1B6BAC5"
|
||||
$"ACB6E7C5C0B5C3C53FB524C33DB524C44AB524C2C2B580C1E6B544C24EB61EC2"
|
||||
$"71B7CFC2C5B6EDC2C5B809C2C5B838C25CB838C296B838C221B7CFC1F2B809C1"
|
||||
$"F2B656C1F2B524BF48B524C0C0B524BE7DB619BD3CB57EBDBEB63DBD1FB637BC"
|
||||
$"C4B649BCEEB616BC72B60536B605BC1BB605BA4BB8B0B919B737B919BA28B919"
|
||||
$"BB5A36BB5ABA4BBB5ABBFE36BC2DBB89BC2DBBFEBC2DBC2D36BC2DBBFEBC2DB9"
|
||||
$"EAB8E9B848BABBB866B8BFB802B8A9B75EB8A9B7B1B8A9B6A2B9BDB5BAB91BB6"
|
||||
$"00B9C4B5B8B9D0B5B2B9CAB5B6BA02B59FBA72B595BA39B595BB23B595BC0DB6"
|
||||
$"97BBC0B5F8BC27B6CBBC9AB6C7BC66B6E1BCCFB6AEBCCBB63ABCE5B66FBC73B5"
|
||||
$"85BB0CB4D4BBCCB502BC19B430BDF6B3D3BD23B3D3BEB4B3D3BF4FB52BBF4FB4"
|
||||
$"6DBF4FB52BBF4FBA81BF4FBA81BEF0BA35BDF6BA08BE78BA08BDBCBA08BD8DBA"
|
||||
$"72BD8DBA38BD8DBAACBDF6BADBBDBCBADBBEB4BADBBF4FBC34BF4FBB76BF4FBC"
|
||||
$"34BF4FC61CBF4FC61CBECCC573BD39C4B9BE13C4F3BD01C4AABCB8C503BCC7C4"
|
||||
$"CBBCA9C53CBD02C585BCCAC576BE5DC5E2BF4F56BF4FC71DBF4FCA3A0226C8B7"
|
||||
$"C5ACC9ADC53FC88AC5C0C87AC622C871C5F1C885C656C88BC6C1C88BC68CC88B"
|
||||
$"C828C63EC9C0C799C963C622C9C8C5FCC9F5C60AC9DBC572CAFBC33DCB9EC465"
|
||||
$"CB9EC187CB9EC02256C022CA3AC022C866C01EC82BC021C848C021C822C022C8"
|
||||
$"0FC022C819C022C80FC022BA72C022BA72C022B9B4C17BB919C0BDB919C1B5B9"
|
||||
$"19C1E4B8B0C1E4B8EAC1E4B875C17BB846C1B5B846C0F9B846C022B8BEC081B8"
|
||||
$"73C022B8BEC022B52BC022B52BC022B46DC17BB3D3C0BDB3D3C24EB3D3C465B4"
|
||||
$"D4C357B430C3A5B502C2A6B63AC2FEB585C28CB66FC2D6B6C7C2A2B6AEC30BB6"
|
||||
$"E1C363B697C34AB6CBC3B1B5F8C4FFB595C44EB595C538B595C5A1B5B2C56FB5"
|
||||
$"9FC5A7B5B6C5B3B5BAC5ADB5B8C656B600C6C8B75EC6C8B6A2C6C8B7B1C688B8"
|
||||
$"48C6B2B802C4B6B866C34436C344B9EAC344BBFEC3ADBC2DC373BC2DC3E8BC2D"
|
||||
$"C41736C417BBFEC417BA4BC6C1B919C549B919C83AB919C96C36C96CBA4BC96C"
|
||||
$"BC1BC939BCC4C95BBC72C928BCEEC958BD3CC934BD1FC9F3BDBECA4DBF48CA4D"
|
||||
$"BE7DCA4DC0C0C7A2C1F2C91BC1F2C768C1F2C739C25CC739C221C739C296C7A2"
|
||||
$"C2C5C768C2C556C2C5C9F0C1E6C953C271CA2DC24ECA4DC33DCA4DC2C2CA4DC4"
|
||||
$"4A020CC6C1C030C6FCC030C5E7C030C503BEC9C530BF96C6B9BE8FC80CBB53C8"
|
||||
$"0CBD18C80CBB19C7A2BAE9C7DDBAE9C768BAE9C739BB53C739BB19C739BCCBC4"
|
||||
$"8FBDFDC607BDFDC3D6BDFDC2A7BD30C329BDB5C27EBD07C212BD2FC23CBD06C1"
|
||||
$"E8BD58C210BDC4C1E8BD9BC2A3BE5AC42DBECBC360BEB5C45DC00CC6C1C103C5"
|
||||
$"73C103C6FCC103C72BC09AC72BC0D4C72BC05F020DC570C506C5AAC506C547C5"
|
||||
$"06C4F8C50EC51FC509C4F8C509C4F8C4FFC4F8C504C4F8C312C17BC182C367C1"
|
||||
$"82C140C182C111C1EBC111C1B1C111C226C17BC255C140C255C2F3C255C425C4"
|
||||
$"FFC425C387C425C517C421C547C424C52FC2DAC5CCC1F256C1F2C70DC1F2C8BE"
|
||||
$"C25CC8EDC222C8EDC296C8EDC2C556C2C5C8BEC2C5C70BC570C5D9C3F7C5D9C5"
|
||||
$"AAC5D9C5D9C570C5D9C5AAC5D9C5350F0A000100023EE0000000000000003C80"
|
||||
$"004840004AC0000A0101011001178400040A020101000A010202031001178400"
|
||||
$"040A030102000A030103000A0401041001178422040A0401051001178422040A"
|
||||
$"010106023EBDFE0000000000003E5F1946829F4400000A01010602BEBDFE0000"
|
||||
$"000000003E5F194B5EA64400000A050107023EE1C60000000000003E5F19463B"
|
||||
$"384400000A050108023EE1C60000000000003E5F19463B384400000A0503090A"
|
||||
$"0B023EE1C60000000000003E5F19463B384400000A05010C023EE1C600000000"
|
||||
$"00003E5F19463B384400000A05010D023EE1C60000000000003E5F19463B3844"
|
||||
$"0000"
|
||||
};
|
||||
@@ -15,6 +15,8 @@ resource app_version {
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "application/postscript",
|
||||
"types" = "application/x-karbon",
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
|
||||
resource app_flags B_MULTIPLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
middle = @MIDDLE@,
|
||||
minor = @MINOR@,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "Plan",
|
||||
long_info = "@LONG_INFO@"
|
||||
};
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "application/x-vnd.kde.plan",
|
||||
"types" = "application/x-vnd.kde.kplato"
|
||||
};
|
||||
|
||||
resource vector_icon {
|
||||
$"6E6369660F04016B0501020116023ADC300000000000003892334BD21D4CC6D3"
|
||||
$"7BF1FFFF05E2020016033B5CE30000000000003AA0BB4B0A724C2F8800EFBCFC"
|
||||
$"FFF802001602393D3E0000000000003508D04C88844D9D090082FFE002000603"
|
||||
$"356DEEB56DEE356DEE356DEE4D27AE4AAE2D00FFEED58CDBAB5FCEFFEED50200"
|
||||
$"0602372910B7291037D94537D9454D2A31474EB000FFEABAFFFFF6E302000602"
|
||||
$"37A527B7A52737A48837A4884D671F4841EB00F0AB06FFFBB50D0200060237D9"
|
||||
$"E4B7D9E43728713728714DADC448662B00A52A04FFFDB44B0200060338C87F38"
|
||||
$"610BB9E1613A450F4BF96D483949002AA80D77049D04FF0766020201060236FC"
|
||||
$"EE361B07B4AF7D35CF9D4C3D6F464BA100010000FFFFAA000500020006033C2B"
|
||||
$"213B379FBC94193D79D449DF0D473A1B00B77A04B1FFAA00FFFFAA00030680E7"
|
||||
$"150A09C03DD167C138D262C2C0D0D3C524D262C942CCC2D262C816CFEEC69DD0"
|
||||
$"E9C798C4A7CD7B0A04CF7150D167C4A7CF71C3ACCDF8C5240605AE02B60FC429"
|
||||
$"BB45CA4BB8D2C71BBDB9CD7BBFDED0C9CFFCC788C2B1BCCE0605AE02B60FC429"
|
||||
$"BB45CA4BB8D2C71BBDB9CD7BBFDED0C9CFFCC788C2B1BCCE0A04CB88CA15C98E"
|
||||
$"CA0CCB07C816CEF8C81C0606AE0BB447C497BC51C9FBB85EC73BC074CCDEC486"
|
||||
$"CF50CF7FC262C458BCFDC948BF9AC1CCBBA340BA0B0609AEEA02B447C497BC51"
|
||||
$"C9FBB85EC73BC074CCDEC486CF50C8FFCA0C5C54CB63C739CF7FC262C458BCFD"
|
||||
$"C948BF9AC1CCBBA340BA0B0606BA0AC20AC0E5CDD4B51BD09AB5CDCF37B46AD1"
|
||||
$"FDB730D14CB893C582C45DBFF5C6720802B83BC75AC378BC5B0802BA5BC8DD50"
|
||||
$"3A0002BCD9CA75BCD9CA75BEE4C871543EC717BF78543E0802BF04CC4C5D3E00"
|
||||
$"04C1CBCDC5C1CBCDC5C934C544CCE9C0EFCCE9C0FDCCE9C0DACCE9C0DACCDEC0"
|
||||
$"DACCF0C0DACCDEC104CCECC0E8CCDEC1040802B755C16DC889CB120802BB9FBD"
|
||||
$"1861500604ABB349C497B4F2C5B2B349C497BF93B920C1CBBAC8B5C7C63F0404"
|
||||
$"FAB3B1C448BF7CB96AC1ACBAB9C1ACBAB9C1A5BAEAB5FBC5E1BDBFBEA2B5FBC5"
|
||||
$"E10604ABB349C497B4F2C5B2B349C497BF93B920C1CBBAC8B5C7C63F0A04314C"
|
||||
$"38453C47354F0607FA2A4A545D555F536051CBD6C7D95F4ECC5AC5945E4D564D"
|
||||
$"524F4E4E0A03242B2A262E2D160A00020001023F18CA0000000000003F36D941"
|
||||
$"A405BE1B720A010102123F18CA0000000000003F36D941A405BE1B7201178600"
|
||||
$"040A020103023F18CA0000000000003F36D941A405BE1B720A030104023F18CA"
|
||||
$"0000000000003F36D941A405BE1B720A010105123F18CA0000000000003F36D9"
|
||||
$"41A405BE1B7201178600040A040106023F18CA0000000000003F36D941A405BE"
|
||||
$"1B720A0D0112023FF79E00000000000040140ABB84A2C21F8D0A0A0112024062"
|
||||
$"35000000000000407A71461853C810BE0A0E0112023FEE4F0000000000003FC1"
|
||||
$"AF491DE8C65B160A0C0108123F18CA0000000000003F36D941A405BE1B720117"
|
||||
$"8100040A0C0109123F18CA0000000000003F36D941A405BE1B7201178100040A"
|
||||
$"01010A123F18CA0000000000003F36D941A405BE1B7201178100040A01010B12"
|
||||
$"3F18CA0000000000003F36D941A405BE1B7201178100040A01010C123F18CA00"
|
||||
$"00000000003F36D941A405BE1B7201178100040A0D0111023EFCAB0000000000"
|
||||
$"003F17C042D71C3FC2B70A01010D123F18CA0000000000003F36D941A405BE1B"
|
||||
$"7201178100040A01010E123F18CA0000000000003F36D941A405BE1B72011781"
|
||||
$"00040A0C0110123F18CA0000000000003F36D941A405BE1B7201178003040A0C"
|
||||
$"010F123F18CA0000000000003F36D941A405BE1B7201178003040A0C010F123F"
|
||||
$"18CA0000000000003F36D941A405BE1B7201178203040A01011420303B0A0101"
|
||||
$"14203932"
|
||||
};
|
||||
@@ -15,6 +15,8 @@ resource app_version {
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "application/vnd.ms-excel",
|
||||
"types" = "application/vnd.oasis.opendocument.spreadsheet",
|
||||
|
||||
@@ -15,6 +15,8 @@ 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 file_types message {
|
||||
"types" = "application/x-kpresenter",
|
||||
"types" = "application/vnd.ms-powerpoint",
|
||||
|
||||
BIN
app-office/calligra/additional-files/template_icons.zip
Normal file
BIN
app-office/calligra/additional-files/template_icons.zip
Normal file
Binary file not shown.
@@ -15,6 +15,8 @@ resource app_version {
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "application/msword",
|
||||
"types" = "text/plain",
|
||||
|
||||
@@ -3,29 +3,26 @@ DESCRIPTION="Calligra Suite is a collection of office applications linked \
|
||||
together by a common base. This common base assures that all office \
|
||||
application can work together and also share a common look and feel."
|
||||
HOMEPAGE="https://www.calligra.org/"
|
||||
COPYRIGHT="2010-2018 KDE Organisation"
|
||||
COPYRIGHT="2010-2020 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2
|
||||
GNU GPL v2"
|
||||
REVISION="6"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/KDE/calligra/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="33054f2309a3e3d274100d1485a46f50ca227cfafa66c34a3483c550ccc84ef4"
|
||||
CHECKSUM_SHA256="ddfefdcf181e1e56cc6b4c8117ffa590b6c57b054fdf8d0c7e4a58b4819866c7"
|
||||
SOURCE_FILENAME="calligra-$portVersion.tar.gz"
|
||||
PATCHES="
|
||||
calligra-$portVersion.patchset
|
||||
poppler-76.patchset
|
||||
"
|
||||
PATCHES="calligra-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
karbon.rdef.in
|
||||
plan.rdef.in
|
||||
sheets.rdef.in
|
||||
stage.rdef.in
|
||||
words.rdef.in
|
||||
template_icons.zip
|
||||
"
|
||||
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="16.0.0"
|
||||
libVersion="17.0.0"
|
||||
|
||||
PROVIDES="
|
||||
calligra$secondaryArchSuffix = $portVersion
|
||||
@@ -36,8 +33,6 @@ PROVIDES="
|
||||
lib:libflake$secondaryArchSuffix = $libVersion
|
||||
lib:libkarboncommon$secondaryArchSuffix = $libVersion
|
||||
lib:libkarbonui$secondaryArchSuffix = $libVersion
|
||||
lib:libkdeinit5_calligraplan$secondaryArchSuffix = $libVersion
|
||||
lib:libkdeinit5_calligraplanwork$secondaryArchSuffix = $libVersion
|
||||
lib:libkdeinit5_calligrasheets$secondaryArchSuffix = $libVersion
|
||||
lib:libkdeinit5_calligrastage$secondaryArchSuffix = $libVersion
|
||||
lib:libkdeinit5_calligrawords$secondaryArchSuffix = $libVersion
|
||||
@@ -63,15 +58,6 @@ PROVIDES="
|
||||
lib:libkplatoui$secondaryArchSuffix = $libVersion
|
||||
lib:libkundo2$secondaryArchSuffix = $libVersion
|
||||
lib:libpigmentcms$secondaryArchSuffix = $libVersion
|
||||
lib:libplankundo2$secondaryArchSuffix = $libVersion
|
||||
lib:libplanmain$secondaryArchSuffix = $libVersion
|
||||
lib:libplanodf$secondaryArchSuffix = $libVersion
|
||||
lib:libplanplugin$secondaryArchSuffix = $libVersion
|
||||
lib:libplanprivate$secondaryArchSuffix = $libVersion
|
||||
lib:libplanstore$secondaryArchSuffix = $libVersion
|
||||
lib:libplanwidgets$secondaryArchSuffix = $libVersion
|
||||
lib:libplanwidgetutils$secondaryArchSuffix = $libVersion
|
||||
lib:libplanworkfactory$secondaryArchSuffix = $libVersion
|
||||
lib:librtfreader$secondaryArchSuffix = $libVersion
|
||||
lib:libwordsprivate$secondaryArchSuffix = $libVersion
|
||||
"
|
||||
@@ -254,6 +240,11 @@ BUILD_PREREQUIRES="
|
||||
cmd:python
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
unzip -o $sourceDir/../../additional-files/template_icons.zip -d $sourceDir
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build
|
||||
@@ -270,7 +261,7 @@ BUILD()
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DICONV_INCLUDE_DIR=/system/$relativeIncludeDir \
|
||||
-DKDE_INSTALL_DATAROOTDIR=$dataDir \
|
||||
-DPRODUCTSET="karbon plan sheets words stage okular" \
|
||||
-DPRODUCTSET="karbon sheets words stage okular" \
|
||||
-DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" \
|
||||
-DRELEASE_BUILD=ON \
|
||||
-DBUILD_UNMAINTAINED=ON \
|
||||
@@ -288,10 +279,9 @@ INSTALL()
|
||||
mv calligrasheets Sheets
|
||||
mv calligrawords Words
|
||||
mv calligrastage Stage
|
||||
mv calligraplan Plan
|
||||
mv karbon Karbon
|
||||
|
||||
rm -rf $appsDir/Calligra/{etc,calligraplanwork}
|
||||
rm -rf $appsDir/Calligra/etc
|
||||
|
||||
mkdir -p "$dataDir/deskbar/menu/Applications/Calligra"
|
||||
|
||||
@@ -347,18 +337,6 @@ INSTALL()
|
||||
addResourcesToBinaries $sourceDir/build/karbon.rdef $appsDir/Calligra/Karbon
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Karbon "Calligra/Karbon"
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.calligra-plan"
|
||||
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/plan.rdef.in > $sourceDir/build/plan.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/build/plan.rdef $appsDir/Calligra/Plan
|
||||
addAppDeskbarSymlink $appsDir/Calligra/Plan "Calligra/Plan"
|
||||
|
||||
packageEntries okular_plugins \
|
||||
$addOnsDir/Qt5/okular \
|
||||
$libDir/libkookularGenerator_odp.so \
|
||||
@@ -1,727 +0,0 @@
|
||||
From c5e122d8241ea369f43b5de9356ac7d38893efb0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 22:52:53 +1000
|
||||
Subject: Disable DBUS for Haiku
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 65d0cb1..eddd6b6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -364,6 +364,12 @@ add_definitions(
|
||||
-DQT_NO_CAST_TO_ASCII
|
||||
)
|
||||
|
||||
+if(HAIKU)
|
||||
+ add_definitions(
|
||||
+ -DQT_NO_DBUS
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
# only with this definition will all the FOO_TEST_EXPORT macro do something
|
||||
# TODO: check if this can be moved to only those places which make use of it,
|
||||
# to reduce global compiler definitions that would trigger a recompile of
|
||||
diff --git a/filters/sheets/CMakeLists.txt b/filters/sheets/CMakeLists.txt
|
||||
index e84a1f3..90e708a 100644
|
||||
--- a/filters/sheets/CMakeLists.txt
|
||||
+++ b/filters/sheets/CMakeLists.txt
|
||||
@@ -21,8 +21,9 @@ if(SHOULD_BUILD_FILTER_QUATTROPRO_TO_SHEETS)
|
||||
endif()
|
||||
|
||||
add_subdirectory( html )
|
||||
+if(NOT HAIKU)
|
||||
add_subdirectory( latex )
|
||||
-
|
||||
+endif()
|
||||
add_subdirectory( excel )
|
||||
|
||||
if(SHOULD_BUILD_FILTER_XLSX_TO_ODS)
|
||||
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
|
||||
index 52f2c12..89907b0 100644
|
||||
--- a/libs/CMakeLists.txt
|
||||
+++ b/libs/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@ if (SHOULD_BUILD_LIB_KOMAIN)
|
||||
add_subdirectory( main )
|
||||
endif ()
|
||||
|
||||
-if (SHOULD_BUILD_FEATURE_SCRIPTING)
|
||||
+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
|
||||
add_subdirectory( kross )
|
||||
endif ()
|
||||
|
||||
diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt
|
||||
index 4e8f04c..d0fb4e6 100644
|
||||
--- a/libs/main/CMakeLists.txt
|
||||
+++ b/libs/main/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@ set(komain_LIB_SRCS
|
||||
Calligra2Migration.cpp
|
||||
)
|
||||
|
||||
-if( Qt5DBus_FOUND )
|
||||
+if( Qt5DBus_FOUND AND NOT HAIKU )
|
||||
set(komain_LIB_SRCS ${komain_LIB_SRCS}
|
||||
KoApplicationAdaptor.cpp
|
||||
KoViewAdaptor.cpp
|
||||
diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
|
||||
index 68a9b3d..3d1a068 100644
|
||||
--- a/libs/main/KoDocument.cpp
|
||||
+++ b/libs/main/KoDocument.cpp
|
||||
@@ -417,8 +417,9 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
+#ifndef QT_NO_DBUS
|
||||
::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
|
||||
-
|
||||
+#endif
|
||||
m_uploadJob = 0;
|
||||
document->setModified( false );
|
||||
emit document->completed();
|
||||
diff --git a/plan/src/libs/main/CMakeLists.txt b/plan/src/libs/main/CMakeLists.txt
|
||||
index 5a27cca..8a7f2ea 100644
|
||||
--- a/plan/src/libs/main/CMakeLists.txt
|
||||
+++ b/plan/src/libs/main/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ set(komain_LIB_SRCS
|
||||
Calligra2Migration.cpp
|
||||
)
|
||||
|
||||
-if( Qt5DBus_FOUND )
|
||||
+if( Qt5DBus_FOUND AND NOT HAIKU )
|
||||
set(komain_LIB_SRCS ${komain_LIB_SRCS}
|
||||
KoApplicationAdaptor.cpp
|
||||
KoViewAdaptor.cpp
|
||||
diff --git a/plan/src/libs/main/KoDocument.cpp b/plan/src/libs/main/KoDocument.cpp
|
||||
index 03ad374..fedeb4e 100644
|
||||
--- a/plan/src/libs/main/KoDocument.cpp
|
||||
+++ b/plan/src/libs/main/KoDocument.cpp
|
||||
@@ -417,8 +417,9 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
+#ifndef QT_NO_DBUS
|
||||
::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
|
||||
-
|
||||
+#endif
|
||||
m_uploadJob = 0;
|
||||
document->setModified( false );
|
||||
emit document->completed();
|
||||
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
|
||||
index d5b6241..2cdcb12 100644
|
||||
--- a/sheets/CMakeLists.txt
|
||||
+++ b/sheets/CMakeLists.txt
|
||||
@@ -144,7 +144,7 @@ set (functions_DIR_SRCS
|
||||
functions/helper.cpp
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set (interfaces_DIR_SRCS
|
||||
interfaces/MapAdaptor.cpp
|
||||
interfaces/SheetAdaptor.cpp
|
||||
@@ -239,7 +239,7 @@ set (calligrasheetscommon_LIB_SRCS
|
||||
${ui_DIR_SRCS}
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set (calligrasheetscommon_LIB_SRCS
|
||||
${calligrasheetscommon_LIB_SRCS}
|
||||
${interfaces_DIR_SRCS}
|
||||
diff --git a/sheets/plugins/CMakeLists.txt b/sheets/plugins/CMakeLists.txt
|
||||
index b18b166..c576b92 100644
|
||||
--- a/sheets/plugins/CMakeLists.txt
|
||||
+++ b/sheets/plugins/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
add_subdirectory( calendar )
|
||||
add_subdirectory( solver )
|
||||
-if (SHOULD_BUILD_FEATURE_SCRIPTING)
|
||||
+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
|
||||
add_subdirectory( scripting )
|
||||
endif ()
|
||||
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
|
||||
index b678457..3a069dd 100644
|
||||
--- a/stage/part/CMakeLists.txt
|
||||
+++ b/stage/part/CMakeLists.txt
|
||||
@@ -133,7 +133,7 @@ set( calligrastageprivate_LIB_SRCS
|
||||
tools/KPrPlaceholderToolFactory.cpp
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set( calligrastageprivate_LIB_SRCS
|
||||
${calligrastageprivate_LIB_SRCS}
|
||||
KPrViewAdaptor.cpp
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
From 29cc7e3f189aa7bfbd4d5479a648e42a3bca1e02 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 22:53:43 +1000
|
||||
Subject: Add missing includes
|
||||
|
||||
|
||||
diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
|
||||
index 0ffdcf6..cdca006 100644
|
||||
--- a/libs/widgets/KoCsvImportDialog.cpp
|
||||
+++ b/libs/widgets/KoCsvImportDialog.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "KoCsvImportDialog.h"
|
||||
|
||||
// Qt
|
||||
+#include <QButtonGroup>
|
||||
#include <QTextCodec>
|
||||
#include <QTextStream>
|
||||
|
||||
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
index f91555c..2b9d044 100644
|
||||
--- a/libs/widgets/KoPageLayoutWidget.cpp
|
||||
+++ b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
#include "KoPageLayoutWidget.h"
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
#include <ui_KoPageLayoutWidget.h>
|
||||
|
||||
#include <KoUnit.h>
|
||||
diff --git a/plan/src/kptview.h b/plan/src/kptview.h
|
||||
index 44d1193..a98e553 100644
|
||||
--- a/plan/src/kptview.h
|
||||
+++ b/plan/src/kptview.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "kptcontext.h"
|
||||
#include "kptviewbase.h"
|
||||
|
||||
+#include <QActionGroup>
|
||||
#include <QDockWidget>
|
||||
#include <QMap>
|
||||
|
||||
diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
|
||||
index f34e702..0e6db7b 100644
|
||||
--- a/plan/src/kptviewlist.cpp
|
||||
+++ b/plan/src/kptviewlist.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QStyle>
|
||||
#include <QBrush>
|
||||
#include <QContextMenuEvent>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
#include <kmessagebox.h>
|
||||
diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
|
||||
index 7991faf..54e3a87 100644
|
||||
--- a/plan/src/libs/ui/kptaccountseditor.cpp
|
||||
+++ b/plan/src/libs/ui/kptaccountseditor.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <QContextMenuEvent>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
|
||||
#include <KLocalizedString>
|
||||
#include <kactioncollection.h>
|
||||
diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
|
||||
index 00ea3af..491cb1e 100644
|
||||
--- a/plan/src/libs/ui/kptdocumentspanel.h
|
||||
+++ b/plan/src/libs/ui/kptdocumentspanel.h
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include "kptdocuments.h"
|
||||
|
||||
+#include <QModelIndexList>
|
||||
#include <QWidget>
|
||||
#include <kundo2qstack.h>
|
||||
|
||||
diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
|
||||
index d1c3b1f..ccf6177 100644
|
||||
--- a/plan/src/libs/ui/kptitemviewsettup.cpp
|
||||
+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "KoPageLayoutWidget.h"
|
||||
|
||||
+#include <QHeaderView>
|
||||
#include <QPushButton>
|
||||
|
||||
|
||||
diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
|
||||
index 5f79abf..d08d7f2 100644
|
||||
--- a/plan/src/libs/ui/kpttaskeditor.cpp
|
||||
+++ b/plan/src/libs/ui/kpttaskeditor.cpp
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <QVBoxLayout>
|
||||
#include <QDragMoveEvent>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
#include <kactionmenu.h>
|
||||
diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
index 344ebc2..9146f06 100644
|
||||
--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <KFile>
|
||||
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QTreeView>
|
||||
#include <QStandardItemModel>
|
||||
#include <QModelIndex>
|
||||
diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
index c9e17b7..b67e984 100644
|
||||
--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
#include <KoUnit.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
|
||||
{
|
||||
public:
|
||||
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
index c0d5136..d2a772e 100644
|
||||
--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
// Qt
|
||||
#include <QAbstractItemModel>
|
||||
+#include <QAction>
|
||||
|
||||
// Calligra
|
||||
#include <KoIcon.h>
|
||||
diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
|
||||
index ed10919..8f52177 100644
|
||||
--- a/plugins/formulashape/FormulaToolWidget.cpp
|
||||
+++ b/plugins/formulashape/FormulaToolWidget.cpp
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <QWidgetAction>
|
||||
#include <QTableWidget>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
|
||||
diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
|
||||
index a0a9832..7d7db53 100644
|
||||
--- a/sheets/dialogs/LayoutDialog.cpp
|
||||
+++ b/sheets/dialogs/LayoutDialog.cpp
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <QIntValidator>
|
||||
+#include <QButtonGroup>
|
||||
#include <QCheckBox>
|
||||
#include <QFrame>
|
||||
#include <QLabel>
|
||||
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
|
||||
index ae743da..69ed856 100644
|
||||
--- a/stage/part/KPrPresentationTool.cpp
|
||||
+++ b/stage/part/KPrPresentationTool.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "KPrPresentationTool.h"
|
||||
|
||||
+#include <QFrame>
|
||||
#include <QWidget>
|
||||
#include <QVBoxLayout>
|
||||
#include <QPainter>
|
||||
diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
index d64208c..bfddb3a 100644
|
||||
--- a/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
+++ b/words/part/dialogs/KWAnchoringProperties.cpp
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include <kundo2command.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
#include <QComboBox>
|
||||
|
||||
const int KWAnchoringProperties::vertRels[4][20] = {
|
||||
diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
index e38599a..7e8b2d5 100644
|
||||
--- a/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
+++ b/words/part/dialogs/KWRunAroundProperties.cpp
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#include <kundo2command.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
|
||||
: m_state(state)
|
||||
{
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
From f8e6895705b012be6a14095556c16339cc73d56b Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 23:43:09 +1000
|
||||
Subject: Don't use kdirnotify include without DBUS
|
||||
|
||||
|
||||
diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
|
||||
index 3d1a068..a6cc484 100644
|
||||
--- a/libs/main/KoDocument.cpp
|
||||
+++ b/libs/main/KoDocument.cpp
|
||||
@@ -57,7 +57,9 @@
|
||||
#include <MainDebug.h>
|
||||
#include <kconfiggroup.h>
|
||||
#include <kio/job.h>
|
||||
+#ifndef QT_NO_DBUS
|
||||
#include <kdirnotify.h>
|
||||
+#endif
|
||||
#include <KBackup>
|
||||
|
||||
#include <QMimeDatabase>
|
||||
diff --git a/plan/src/libs/main/KoDocument.cpp b/plan/src/libs/main/KoDocument.cpp
|
||||
index fedeb4e..ac5791f 100644
|
||||
--- a/plan/src/libs/main/KoDocument.cpp
|
||||
+++ b/plan/src/libs/main/KoDocument.cpp
|
||||
@@ -57,7 +57,9 @@
|
||||
#include <MainDebug.h>
|
||||
#include <kconfiggroup.h>
|
||||
#include <kio/job.h>
|
||||
+#ifndef QT_NO_DBUS
|
||||
#include <kdirnotify.h>
|
||||
+#endif
|
||||
#include <KBackup>
|
||||
|
||||
#include <QMimeDatabase>
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
From 5c04250dcf4785391b4c2f014751b53968adad53 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 22:55:18 +1000
|
||||
Subject: Fix for poppler-076
|
||||
|
||||
|
||||
diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
|
||||
index c3e96b0..e910dae 100644
|
||||
--- a/filters/karbon/pdf/PdfImport.cpp
|
||||
+++ b/filters/karbon/pdf/PdfImport.cpp
|
||||
@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
|
||||
if (dev->isOk()) {
|
||||
int rotate = 0;
|
||||
- GBool useMediaBox = gTrue;
|
||||
- GBool crop = gFalse;
|
||||
- GBool printing = gFalse;
|
||||
+ bool useMediaBox = true;
|
||||
+ bool crop = false;
|
||||
+ bool printing = false;
|
||||
pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
|
||||
dev->dumpContent();
|
||||
}
|
||||
@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
delete globalParams;
|
||||
globalParams = 0;
|
||||
|
||||
- // check for memory leaks
|
||||
- Object::memCheck(stderr);
|
||||
-
|
||||
return KoFilter::OK;
|
||||
}
|
||||
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
index 931917a..52bb37d 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
@@ -39,7 +39,7 @@ class SvgOutputDev::Private
|
||||
{
|
||||
public:
|
||||
Private(const QString &fname)
|
||||
- : svgFile(fname), defs(0), body(0), state(gTrue)
|
||||
+ : svgFile(fname), defs(0), body(0), state(true)
|
||||
, brush(Qt::SolidPattern) {}
|
||||
|
||||
~Private() {
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
QString defsData;
|
||||
QTextStream * defs;
|
||||
QTextStream * body;
|
||||
- GBool state;
|
||||
+ bool state;
|
||||
QSizeF pageSize;
|
||||
QPen pen;
|
||||
QBrush brush;
|
||||
@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
|
||||
: d(new Private(fileName))
|
||||
{
|
||||
if (! d->svgFile.open(QIODevice::WriteOnly)) {
|
||||
- d->state = gFalse;
|
||||
+ d->state = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev()
|
||||
delete d;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::isOk()
|
||||
+bool SvgOutputDev::isOk()
|
||||
{
|
||||
return d->state;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::upsideDown()
|
||||
+bool SvgOutputDev::upsideDown()
|
||||
{
|
||||
- return gTrue;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::useDrawChar()
|
||||
+bool SvgOutputDev::useDrawChar()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::interpretType3Chars()
|
||||
+bool SvgOutputDev::interpretType3Chars()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
|
||||
@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
|
||||
.arg(matrix.dx()) .arg(matrix.dy());
|
||||
}
|
||||
|
||||
-QString SvgOutputDev::convertMatrix(double * matrix)
|
||||
+QString SvgOutputDev::convertMatrix(const double * matrix)
|
||||
{
|
||||
return QString("matrix(%1 %2 %3 %4 %5 %6)")
|
||||
.arg(matrix[0]).arg(matrix[1])
|
||||
@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke()
|
||||
return stroke;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
|
||||
{
|
||||
int render = state->getRender();
|
||||
// check for invisible text -- this is used by Acrobat Capture
|
||||
@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
|
||||
QString str;
|
||||
|
||||
- char * p = s->getCString();
|
||||
+ const char * p = s->c_str();
|
||||
int len = s->getLength();
|
||||
CharCode code;
|
||||
Unicode *u = nullptr;
|
||||
@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
double x = state->getCurX();
|
||||
double y = state->getCurY();
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
|
||||
|
||||
QMatrix mirror;
|
||||
@@ -451,11 +451,11 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
*d->body << " y=\"" << y << "px\"";
|
||||
|
||||
if (font && font->getFamily()) {
|
||||
- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
|
||||
- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
|
||||
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
|
||||
+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
|
||||
} else if (font && font->getName()) {
|
||||
- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
|
||||
- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
|
||||
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
|
||||
+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
|
||||
}
|
||||
*d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
|
||||
|
||||
@@ -474,9 +474,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
*d->body << "</text>" << endl;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool /*inlineImg*/)
|
||||
+ bool /*interpolate*/, int *maskColors, bool inlineImg)
|
||||
{
|
||||
ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
|
||||
imgStr->reset();
|
||||
@@ -488,7 +488,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
if (maskColors) {
|
||||
for (int y = 0; y < height; y++) {
|
||||
dest = (unsigned int *)(buffer + y * 4 * width);
|
||||
- Guchar * pix = imgStr->getLine();
|
||||
+ unsigned char * pix = imgStr->getLine();
|
||||
colorMap->getRGBLine(pix, dest, width);
|
||||
|
||||
for (int x = 0; x < width; x++) {
|
||||
@@ -507,7 +507,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
} else {
|
||||
for (int y = 0; y < height; y++) {
|
||||
dest = (unsigned int *)(buffer + y * 4 * width);
|
||||
- Guchar * pix = imgStr->getLine();
|
||||
+ unsigned char * pix = imgStr->getLine();
|
||||
colorMap->getRGBLine(pix, dest, width);
|
||||
}
|
||||
|
||||
@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
return;
|
||||
}
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix m;
|
||||
m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
|
||||
|
||||
@@ -543,10 +543,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
delete imgStr;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
|
||||
-{
|
||||
- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
|
||||
-}
|
||||
-
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
|
||||
index 85fe55d..df2805c 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.h
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.h
|
||||
@@ -44,47 +44,44 @@ public:
|
||||
explicit SvgOutputDev(const QString &fileName);
|
||||
virtual ~SvgOutputDev();
|
||||
|
||||
- GBool isOk();
|
||||
+ bool isOk();
|
||||
|
||||
- virtual GBool upsideDown();
|
||||
- virtual GBool useDrawChar();
|
||||
- virtual GBool interpretType3Chars();
|
||||
- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
|
||||
- virtual void endPage();
|
||||
+ bool upsideDown() override;
|
||||
+ bool useDrawChar() override;
|
||||
+ bool interpretType3Chars() override;
|
||||
+ void startPage(int pageNum, GfxState *state, XRef *xref) override;
|
||||
+ void endPage() override;
|
||||
|
||||
// path painting
|
||||
- virtual void stroke(GfxState * state);
|
||||
- virtual void fill(GfxState * state);
|
||||
- virtual void eoFill(GfxState *state);
|
||||
+ void stroke(GfxState * state) override;
|
||||
+ void fill(GfxState * state) override;
|
||||
+ void eoFill(GfxState *state) override;
|
||||
|
||||
// text
|
||||
- virtual void drawString(GfxState * state, GooString * s);
|
||||
+ void drawString(GfxState * state, const GooString * s) override;
|
||||
|
||||
// images
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
+ void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool inlineImg);
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool interpolate, int *maskColors, GBool inlineImg);
|
||||
+ bool interpolate, int *maskColors, bool inlineImg) override;
|
||||
|
||||
// styles
|
||||
- virtual void updateAll(GfxState *state);
|
||||
- virtual void updateFillColor(GfxState *state);
|
||||
- virtual void updateStrokeColor(GfxState *state);
|
||||
- virtual void updateFillOpacity(GfxState *state);
|
||||
- virtual void updateStrokeOpacity(GfxState *state);
|
||||
- virtual void updateLineJoin(GfxState *state);
|
||||
- virtual void updateLineCap(GfxState *state);
|
||||
- virtual void updateMiterLimit(GfxState *state);
|
||||
- virtual void updateLineWidth(GfxState *state);
|
||||
+ void updateAll(GfxState *state) override;
|
||||
+ void updateFillColor(GfxState *state) override;
|
||||
+ void updateStrokeColor(GfxState *state) override;
|
||||
+ void updateFillOpacity(GfxState *state) override;
|
||||
+ void updateStrokeOpacity(GfxState *state) override;
|
||||
+ void updateLineJoin(GfxState *state) override;
|
||||
+ void updateLineCap(GfxState *state) override;
|
||||
+ void updateMiterLimit(GfxState *state) override;
|
||||
+ void updateLineWidth(GfxState *state) override;
|
||||
|
||||
/// Dumps content to svg file
|
||||
void dumpContent();
|
||||
private:
|
||||
QString convertPath(GfxPath *path);
|
||||
QString convertMatrix(const QMatrix &matrix);
|
||||
- QString convertMatrix(double * matrix);
|
||||
+ QString convertMatrix(const double * matrix);
|
||||
QString printFill();
|
||||
QString printStroke();
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
||||
From 61b6090fe3f6d5bde7894479c9c377944e13a274 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 7 Jan 2020 21:02:55 +1000
|
||||
Subject: Fix build for Qt 5.14
|
||||
|
||||
|
||||
diff --git a/plan/src/workpackage/view.cpp b/plan/src/workpackage/view.cpp
|
||||
index 3ce4769..583558f 100644
|
||||
--- a/plan/src/workpackage/view.cpp
|
||||
+++ b/plan/src/workpackage/view.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <QPointer>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
+#include <QMap>
|
||||
|
||||
#include <KLocalizedString>
|
||||
#include <ktoolbar.h>
|
||||
diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h
|
||||
index b10547e..1942d3b 100644
|
||||
--- a/plan/src/workpackage/view.h
|
||||
+++ b/plan/src/workpackage/view.h
|
||||
@@ -24,11 +24,13 @@
|
||||
#include <KoView.h>
|
||||
|
||||
#include <QStackedWidget>
|
||||
+#include <QMap>
|
||||
|
||||
class QPrinter;
|
||||
class QPrintDialog;
|
||||
class QMenu;
|
||||
class QActionGroup;
|
||||
+class QAction;
|
||||
|
||||
class KActionCollection;
|
||||
|
||||
diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
index b10b230..f9a4684 100644
|
||||
--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <kdatepicker.h>
|
||||
|
||||
+#include <QDate>
|
||||
#include <QPushButton>
|
||||
|
||||
namespace Calligra
|
||||
--
|
||||
2.24.1
|
||||
|
||||
175
app-office/calligra/patches/calligra-3.2.0.patchset
Normal file
175
app-office/calligra/patches/calligra-3.2.0.patchset
Normal file
@@ -0,0 +1,175 @@
|
||||
From 7308b46e19879b7b5e80a1de78c580ac08aa0a5b Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 4 May 2020 15:43:23 +1000
|
||||
Subject: Fix build for Haiku
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a302e49..0089ef2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -347,6 +347,12 @@ add_definitions(
|
||||
-DQT_NO_CAST_TO_ASCII
|
||||
)
|
||||
|
||||
+if(HAIKU)
|
||||
+ add_definitions(
|
||||
+ -DQT_NO_DBUS
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
# only with this definition will all the FOO_TEST_EXPORT macro do something
|
||||
# TODO: check if this can be moved to only those places which make use of it,
|
||||
# to reduce global compiler definitions that would trigger a recompile of
|
||||
diff --git a/filters/sheets/CMakeLists.txt b/filters/sheets/CMakeLists.txt
|
||||
index e84a1f3..90e708a 100644
|
||||
--- a/filters/sheets/CMakeLists.txt
|
||||
+++ b/filters/sheets/CMakeLists.txt
|
||||
@@ -21,8 +21,9 @@ if(SHOULD_BUILD_FILTER_QUATTROPRO_TO_SHEETS)
|
||||
endif()
|
||||
|
||||
add_subdirectory( html )
|
||||
+if(NOT HAIKU)
|
||||
add_subdirectory( latex )
|
||||
-
|
||||
+endif()
|
||||
add_subdirectory( excel )
|
||||
|
||||
if(SHOULD_BUILD_FILTER_XLSX_TO_ODS)
|
||||
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
|
||||
index 52f2c12..89907b0 100644
|
||||
--- a/libs/CMakeLists.txt
|
||||
+++ b/libs/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@ if (SHOULD_BUILD_LIB_KOMAIN)
|
||||
add_subdirectory( main )
|
||||
endif ()
|
||||
|
||||
-if (SHOULD_BUILD_FEATURE_SCRIPTING)
|
||||
+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
|
||||
add_subdirectory( kross )
|
||||
endif ()
|
||||
|
||||
diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt
|
||||
index 9aaa9b1..82b4d0e 100644
|
||||
--- a/libs/main/CMakeLists.txt
|
||||
+++ b/libs/main/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@ set(komain_LIB_SRCS
|
||||
Calligra2Migration.cpp
|
||||
)
|
||||
|
||||
-if( Qt5DBus_FOUND )
|
||||
+if( Qt5DBus_FOUND AND NOT HAIKU )
|
||||
set(komain_LIB_SRCS ${komain_LIB_SRCS}
|
||||
KoApplicationAdaptor.cpp
|
||||
KoViewAdaptor.cpp
|
||||
diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
|
||||
index 66d9618..a43497a 100644
|
||||
--- a/libs/main/KoDocument.cpp
|
||||
+++ b/libs/main/KoDocument.cpp
|
||||
@@ -57,7 +57,9 @@
|
||||
#include <MainDebug.h>
|
||||
#include <kconfiggroup.h>
|
||||
#include <kio/job.h>
|
||||
+#ifndef QT_NO_DBUS
|
||||
#include <kdirnotify.h>
|
||||
+#endif
|
||||
#include <KBackup>
|
||||
|
||||
#include <QMimeDatabase>
|
||||
@@ -415,8 +417,9 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
+#ifndef QT_NO_DBUS
|
||||
::org::kde::KDirNotify::emitFilesAdded(QUrl::fromLocalFile(m_url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()));
|
||||
-
|
||||
+#endif
|
||||
m_uploadJob = 0;
|
||||
document->setModified( false );
|
||||
emit document->completed();
|
||||
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
index a3816f9..7b2c2fc 100644
|
||||
--- a/libs/widgets/KoPageLayoutWidget.cpp
|
||||
+++ b/libs/widgets/KoPageLayoutWidget.cpp
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
#include "KoPageLayoutWidget.h"
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
#include <ui_KoPageLayoutWidget.h>
|
||||
|
||||
#include <KoUnit.h>
|
||||
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
|
||||
index 87a8e6f..372a228 100644
|
||||
--- a/sheets/CMakeLists.txt
|
||||
+++ b/sheets/CMakeLists.txt
|
||||
@@ -149,7 +149,7 @@ set (functions_DIR_SRCS
|
||||
functions/helper.cpp
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set (interfaces_DIR_SRCS
|
||||
interfaces/MapAdaptor.cpp
|
||||
interfaces/SheetAdaptor.cpp
|
||||
@@ -244,7 +244,7 @@ set (calligrasheetscommon_LIB_SRCS
|
||||
${ui_DIR_SRCS}
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set (calligrasheetscommon_LIB_SRCS
|
||||
${calligrasheetscommon_LIB_SRCS}
|
||||
${interfaces_DIR_SRCS}
|
||||
diff --git a/sheets/plugins/CMakeLists.txt b/sheets/plugins/CMakeLists.txt
|
||||
index b18b166..c576b92 100644
|
||||
--- a/sheets/plugins/CMakeLists.txt
|
||||
+++ b/sheets/plugins/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
add_subdirectory( calendar )
|
||||
add_subdirectory( solver )
|
||||
-if (SHOULD_BUILD_FEATURE_SCRIPTING)
|
||||
+if (SHOULD_BUILD_FEATURE_SCRIPTING AND NOT HAIKU)
|
||||
add_subdirectory( scripting )
|
||||
endif ()
|
||||
diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
index 0c5eeb6..5611383 100644
|
||||
--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <kdatepicker.h>
|
||||
|
||||
+#include <QDate>
|
||||
#include <QPushButton>
|
||||
#include <QDate>
|
||||
|
||||
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
|
||||
index 264d2fc..1eaff01 100644
|
||||
--- a/stage/part/CMakeLists.txt
|
||||
+++ b/stage/part/CMakeLists.txt
|
||||
@@ -135,7 +135,7 @@ set( calligrastageprivate_LIB_SRCS
|
||||
tools/KPrPlaceholderToolFactory.cpp
|
||||
)
|
||||
|
||||
-if(Qt5DBus_FOUND)
|
||||
+if(Qt5DBus_FOUND AND NOT HAIKU)
|
||||
set( calligrastageprivate_LIB_SRCS
|
||||
${calligrastageprivate_LIB_SRCS}
|
||||
KPrViewAdaptor.cpp
|
||||
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
|
||||
index 3007f91..9a42e4f 100644
|
||||
--- a/stage/part/KPrPresentationTool.cpp
|
||||
+++ b/stage/part/KPrPresentationTool.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "KPrPresentationTool.h"
|
||||
|
||||
+#include <QFrame>
|
||||
#include <QWidget>
|
||||
#include <QVBoxLayout>
|
||||
#include <QPainter>
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@@ -1,275 +0,0 @@
|
||||
From d45159790f175dcffde6e6c32d0dd7484575b123 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 22:55:18 +1000
|
||||
Subject: Fix for poppler-076
|
||||
|
||||
|
||||
diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
|
||||
index c3e96b0..e910dae 100644
|
||||
--- a/filters/karbon/pdf/PdfImport.cpp
|
||||
+++ b/filters/karbon/pdf/PdfImport.cpp
|
||||
@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
|
||||
if (dev->isOk()) {
|
||||
int rotate = 0;
|
||||
- GBool useMediaBox = gTrue;
|
||||
- GBool crop = gFalse;
|
||||
- GBool printing = gFalse;
|
||||
+ bool useMediaBox = true;
|
||||
+ bool crop = false;
|
||||
+ bool printing = false;
|
||||
pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
|
||||
dev->dumpContent();
|
||||
}
|
||||
@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
delete globalParams;
|
||||
globalParams = 0;
|
||||
|
||||
- // check for memory leaks
|
||||
- Object::memCheck(stderr);
|
||||
-
|
||||
return KoFilter::OK;
|
||||
}
|
||||
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
index 931917a..52bb37d 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
@@ -39,7 +39,7 @@ class SvgOutputDev::Private
|
||||
{
|
||||
public:
|
||||
Private(const QString &fname)
|
||||
- : svgFile(fname), defs(0), body(0), state(gTrue)
|
||||
+ : svgFile(fname), defs(0), body(0), state(true)
|
||||
, brush(Qt::SolidPattern) {}
|
||||
|
||||
~Private() {
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
QString defsData;
|
||||
QTextStream * defs;
|
||||
QTextStream * body;
|
||||
- GBool state;
|
||||
+ bool state;
|
||||
QSizeF pageSize;
|
||||
QPen pen;
|
||||
QBrush brush;
|
||||
@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
|
||||
: d(new Private(fileName))
|
||||
{
|
||||
if (! d->svgFile.open(QIODevice::WriteOnly)) {
|
||||
- d->state = gFalse;
|
||||
+ d->state = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev()
|
||||
delete d;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::isOk()
|
||||
+bool SvgOutputDev::isOk()
|
||||
{
|
||||
return d->state;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::upsideDown()
|
||||
+bool SvgOutputDev::upsideDown()
|
||||
{
|
||||
- return gTrue;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::useDrawChar()
|
||||
+bool SvgOutputDev::useDrawChar()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::interpretType3Chars()
|
||||
+bool SvgOutputDev::interpretType3Chars()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
|
||||
@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
|
||||
.arg(matrix.dx()) .arg(matrix.dy());
|
||||
}
|
||||
|
||||
-QString SvgOutputDev::convertMatrix(double * matrix)
|
||||
+QString SvgOutputDev::convertMatrix(const double * matrix)
|
||||
{
|
||||
return QString("matrix(%1 %2 %3 %4 %5 %6)")
|
||||
.arg(matrix[0]).arg(matrix[1])
|
||||
@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke()
|
||||
return stroke;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
|
||||
{
|
||||
int render = state->getRender();
|
||||
// check for invisible text -- this is used by Acrobat Capture
|
||||
@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
|
||||
QString str;
|
||||
|
||||
- char * p = s->getCString();
|
||||
+ const char * p = s->c_str();
|
||||
int len = s->getLength();
|
||||
CharCode code;
|
||||
Unicode *u = nullptr;
|
||||
@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
double x = state->getCurX();
|
||||
double y = state->getCurY();
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
|
||||
|
||||
QMatrix mirror;
|
||||
@@ -451,11 +451,11 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
*d->body << " y=\"" << y << "px\"";
|
||||
|
||||
if (font && font->getFamily()) {
|
||||
- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
|
||||
- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
|
||||
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
|
||||
+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
|
||||
} else if (font && font->getName()) {
|
||||
- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
|
||||
- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
|
||||
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
|
||||
+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
|
||||
}
|
||||
*d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
|
||||
|
||||
@@ -474,9 +474,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
*d->body << "</text>" << endl;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool /*inlineImg*/)
|
||||
+ bool /*interpolate*/, int *maskColors, bool inlineImg)
|
||||
{
|
||||
ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
|
||||
imgStr->reset();
|
||||
@@ -488,7 +488,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
if (maskColors) {
|
||||
for (int y = 0; y < height; y++) {
|
||||
dest = (unsigned int *)(buffer + y * 4 * width);
|
||||
- Guchar * pix = imgStr->getLine();
|
||||
+ unsigned char * pix = imgStr->getLine();
|
||||
colorMap->getRGBLine(pix, dest, width);
|
||||
|
||||
for (int x = 0; x < width; x++) {
|
||||
@@ -507,7 +507,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
} else {
|
||||
for (int y = 0; y < height; y++) {
|
||||
dest = (unsigned int *)(buffer + y * 4 * width);
|
||||
- Guchar * pix = imgStr->getLine();
|
||||
+ unsigned char * pix = imgStr->getLine();
|
||||
colorMap->getRGBLine(pix, dest, width);
|
||||
}
|
||||
|
||||
@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
return;
|
||||
}
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix m;
|
||||
m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
|
||||
|
||||
@@ -543,10 +543,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
delete imgStr;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
|
||||
-{
|
||||
- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
|
||||
-}
|
||||
-
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
|
||||
index 85fe55d..df2805c 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.h
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.h
|
||||
@@ -44,47 +44,44 @@ public:
|
||||
explicit SvgOutputDev(const QString &fileName);
|
||||
virtual ~SvgOutputDev();
|
||||
|
||||
- GBool isOk();
|
||||
+ bool isOk();
|
||||
|
||||
- virtual GBool upsideDown();
|
||||
- virtual GBool useDrawChar();
|
||||
- virtual GBool interpretType3Chars();
|
||||
- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
|
||||
- virtual void endPage();
|
||||
+ bool upsideDown() override;
|
||||
+ bool useDrawChar() override;
|
||||
+ bool interpretType3Chars() override;
|
||||
+ void startPage(int pageNum, GfxState *state, XRef *xref) override;
|
||||
+ void endPage() override;
|
||||
|
||||
// path painting
|
||||
- virtual void stroke(GfxState * state);
|
||||
- virtual void fill(GfxState * state);
|
||||
- virtual void eoFill(GfxState *state);
|
||||
+ void stroke(GfxState * state) override;
|
||||
+ void fill(GfxState * state) override;
|
||||
+ void eoFill(GfxState *state) override;
|
||||
|
||||
// text
|
||||
- virtual void drawString(GfxState * state, GooString * s);
|
||||
+ void drawString(GfxState * state, const GooString * s) override;
|
||||
|
||||
// images
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
+ void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool inlineImg);
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool interpolate, int *maskColors, GBool inlineImg);
|
||||
+ bool interpolate, int *maskColors, bool inlineImg) override;
|
||||
|
||||
// styles
|
||||
- virtual void updateAll(GfxState *state);
|
||||
- virtual void updateFillColor(GfxState *state);
|
||||
- virtual void updateStrokeColor(GfxState *state);
|
||||
- virtual void updateFillOpacity(GfxState *state);
|
||||
- virtual void updateStrokeOpacity(GfxState *state);
|
||||
- virtual void updateLineJoin(GfxState *state);
|
||||
- virtual void updateLineCap(GfxState *state);
|
||||
- virtual void updateMiterLimit(GfxState *state);
|
||||
- virtual void updateLineWidth(GfxState *state);
|
||||
+ void updateAll(GfxState *state) override;
|
||||
+ void updateFillColor(GfxState *state) override;
|
||||
+ void updateStrokeColor(GfxState *state) override;
|
||||
+ void updateFillOpacity(GfxState *state) override;
|
||||
+ void updateStrokeOpacity(GfxState *state) override;
|
||||
+ void updateLineJoin(GfxState *state) override;
|
||||
+ void updateLineCap(GfxState *state) override;
|
||||
+ void updateMiterLimit(GfxState *state) override;
|
||||
+ void updateLineWidth(GfxState *state) override;
|
||||
|
||||
/// Dumps content to svg file
|
||||
void dumpContent();
|
||||
private:
|
||||
QString convertPath(GfxPath *path);
|
||||
QString convertMatrix(const QMatrix &matrix);
|
||||
- QString convertMatrix(double * matrix);
|
||||
+ QString convertMatrix(const double * matrix);
|
||||
QString printFill();
|
||||
QString printStroke();
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Reference in New Issue
Block a user