summaryrefslogtreecommitdiff
path: root/app-office/scribus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
commitf516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree8bfecb640b7b6403d7a3d662d923eed630033da7 /app-office/scribus
parent1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
gentoo resync : 30.05.2020
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest3
-rw-r--r--app-office/scribus/files/scribus-1.5.5-qt-5.15.patch22
-rw-r--r--app-office/scribus/scribus-1.5.5-r1.ebuild1
3 files changed, 25 insertions, 1 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index f99a08ebe3c9..9ef03870d1f4 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -6,9 +6,10 @@ AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249ac
AUX scribus-1.5.5-poppler-0.83.patch 5538 BLAKE2B 0d4b14e157f47dc6f0811918a2423f726c7a7019f75e99fc98744ece42b9516e15612879d16705d585c56d7ccd15ed7f0381787915958bd104076c527552e971 SHA512 1866f9f7c0ba51cb2030ab3fc0905dc49ba905f8400adbcdcc0395c46196b042fce07d67aab70f5d3847c1c2e5a74468375c20e90b222d9e27141a1ce85fb01c
AUX scribus-1.5.5-poppler-0.84.patch 1359 BLAKE2B 7c0b3998fce5149a0b3d2e8d9f01ef66b2bd13d909d029f7970e264fa0d5fcc9e9beb16ecb77b858ff8ce237fb2d3ad8b7affa2d57b1d2719437869fc8bfafda SHA512 f593d62d3c7002e536f5d24c29ec7b54a6fb7f82ffb3c9363fc4816a27487a4c6929f174cb8808920d91ea2a57e181a9579b1d4182676a7e329775c1581143b6
AUX scribus-1.5.5-poppler-0.86.patch 14366 BLAKE2B 868382aa0bce211465ebe26a704b784fe44fe67bc39bdc62532a3e1ae29766cb077d1b3cba9c9f5aeebe2cdbfdcbd1d7b37e33ef747cd212e6dec10cbe250b77 SHA512 5aef27942d02097e2b67c8249188e885086046399edcbf41018fe7480c5d1b6705609326a0823d7aec9c5b20fc8dfb16cc6435118792952a5e141bd434550583
+AUX scribus-1.5.5-qt-5.15.patch 695 BLAKE2B 040f9736e94bf5137c5e4f049095186c9383ee49619015d62b4799501702117884315c05f838345158b7b9878bc4349115bec4d4ea47634a3eecc3b3011c5c36 SHA512 a614838aa44ace29fddc359fa4b9bf7e5955aafe2efc248646e2e72eea0ba73f77794783397c2e1b4a92e9687cc562e721c3b462b180d308124a3d9b94520574
AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-EBUILD scribus-1.5.5-r1.ebuild 4390 BLAKE2B ea711309e8db29264d6f2f618c84d022f35a8352f205f9abb3a46793ea1b95063a82942a5f8b604c9d4250f2daa3f2db93e4c2d8dd12c3609070268831ca4a02 SHA512 49ea3697a62d02d9b6c42c6c31f505e94f12ecc8ecf01081fc7198bd6403631a8c9feaadea0f9854f84be784997091d57b2e63b76d07fb3246722684c3ab0d01
+EBUILD scribus-1.5.5-r1.ebuild 4437 BLAKE2B bbdc4aca01970266c1f266609e4b7a43c760bcab70b05455f70e274a388d1e017330f387f1219b57f354a96f2c1493c4c6b41027d374f45f316c00ea277bf51b SHA512 d522010993b6805df278f55c62b876286d9cc700b46bbb3e1345a4a0cba23e0864c06f395f8c78a95731b2f7fc7c01df1ac0d613d6977b2864210b62c5805d95
EBUILD scribus-9999.ebuild 3984 BLAKE2B 0998817295edfa90796eb89669efc9cee334415c77196e649088f2c92ffb15d3a103479263052e75d169e2f749f17fac3ea5d3ca54c2b52d9cf83cd3f3212506 SHA512 f645622279c8c1b2524ac48807aeeedbfccdebbef6fc5f8609921da427af40d8810c25a97449d6e2cd0177bea59607ebd57cc4ede109e959f75d78db8c736814
MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
new file mode 100644
index 000000000000..4ece0feb8e44
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
@@ -0,0 +1,22 @@
+From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 29 Mar 2020 10:55:06 +0000
+Subject: [PATCH] #16076: Fix build with Qt 5.15 <heirecka>
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/ui/scresizecursor.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
+index f2c78e5ae7..85271ed861 100644
+--- a/scribus/ui/scresizecursor.cpp
++++ b/scribus/ui/scresizecursor.cpp
+@@ -12,6 +12,7 @@
+
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QPen>
+ #include <QBrush>
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
index 48d5cb285e7d..9ba577497293 100644
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.83.patch
"${FILESDIR}"/${P}-poppler-0.84.patch
"${FILESDIR}"/${P}-poppler-0.86.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch