kfg/portage
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated Qt patch for scribus.

Browse source
This commit is contained in:
László Valkó 2024-07-19 22:10:32 +02:00
parent 14177c5ddb
commit a6aa62fb1f
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
patches/app-office/scribus/scribus-qt.patch → patches/app-office/scribus-1.6.1-r1/scribus-qt.patch
View file

52
patches/app-office/scribus-1.6.2/scribus-qt.patch Normal file
View file

@ -0,0 +1,52 @@
--- a/scribus/plugins/gettext/htmlim/htmlreader.cpp 2024-06-15 16:22:25.000000000 +0200
+++ b/scribus/plugins/gettext/htmlim/htmlreader.cpp 2024-07-19 22:04:50.580447895 +0200
@@ -248,7 +248,7 @@
bool lcis = (chr.length() > 0 && chr[0].isSpace());
if (inPre)
{
- if (tmp.at(0) == "\n")
+ if (tmp.at(0) == '\n')
tmp = tmp.right(tmp.length() - 2);
}
else
--- a/scribus/plugins/gettext/sxwim/stylereader.cpp 2024-06-15 16:22:26.000000000 +0200
+++ b/scribus/plugins/gettext/sxwim/stylereader.cpp 2024-07-19 22:05:56.378519379 +0200
@@ -274,11 +274,11 @@
currentStyle->getFont()->setHscale(static_cast<int>(getSize(attrValue, -1.0)));
else if ((attrName == "style:text-position") &&
((attrValue.indexOf("sub") != -1) ||
- ((attrValue.at(0) == "-") && (attrValue.at(0) != "0"))))
+ ((attrValue.at(0) == '-') && (attrValue.at(0) != '0'))))
currentStyle->getFont()->toggleEffect(SUBSCRIPT);
else if ((attrName == "style:text-position") &&
((attrValue.indexOf("super") != -1) ||
- ((attrValue.at(0) != "-") && (attrValue.at(0) != "0"))))
+ ((attrValue.at(0) != '-') && (attrValue.at(0) != '0'))))
currentStyle->getFont()->toggleEffect(SUPERSCRIPT);
else if ((attrName == "fo:margin-top") && (pstyle != nullptr))
pstyle->setSpaceAbove(getSize(attrValue));
@@ -652,11 +652,11 @@
style->getFont()->setHscale(static_cast<int>(getSize(value, -1.0)));
else if ((key == "style:text-position") &&
((value.indexOf("sub") != -1) ||
- ((value.at(0) == "-") && (value.at(0) != "0"))))
+ ((value.at(0) == '-') && (value.at(0) != '0'))))
style->getFont()->toggleEffect(SUBSCRIPT);
else if ((key == "style:text-position") &&
((value.indexOf("super") != -1) ||
- ((value.at(0) != "-") && (value.at(0) != "0"))))
+ ((value.at(0) != '-') && (value.at(0) != '0'))))
style->getFont()->toggleEffect(SUPERSCRIPT);
else if ((key == "fo:margin-top") && (pstyle != nullptr))
pstyle->setSpaceAbove(getSize(value));
--- a/scribus/scribusapp.cpp 2024-06-15 16:22:33.000000000 +0200
+++ b/scribus/scribusapp.cpp 2024-07-19 22:06:24.697689389 +0200
@@ -282,7 +282,7 @@
}
else
{ //argument is not a known option, but either positional parameter or invalid.
- if (arg.at(0) == "-")
+ if (arg.at(0) == '-')
{
std::cout << tr("Invalid argument: %1").arg(arg).toLocal8Bit().data() << std::endl;
std::exit(EXIT_FAILURE);