mirrors/solus-packages
1
1
Fork 0
mirror of https://github.com/getsolus/packages.git synced 2025-04-25 20:30:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

scribus: Update to 1.6.4

Browse source 
**Summary**
- Full changelog [here](https://www.scribus.net/scribus-1-6-4-released/)

Signed-off-by: Algent Albrahimi <algent@protonmail.com>
This commit is contained in:
Algent Albrahimi 2025-04-24 21:52:03 +02:00
parent 163e0edc31
commit d158348780
No known key found for this signature in database
GPG key ID: FA8C3C575D0B54EC
4 changed files with 22 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/s/scribus/abi_symbols
View file

@ -1956,8 +1956,8 @@ scribus:_ZN10ScribusDoc13replaceStylesERK4QMapI7QStringS1_E
scribus:_ZN10ScribusDoc13undoRedoBeginEv
scribus:_ZN10ScribusDoc13updateNumbersEb
scribus:_ZN10ScribusDoc13updatePictDirERK7QString
scribus:_ZN10ScribusDoc14RecalcPicturesEP4QMapI7QStringS1_ES3_P12QProgressBar
scribus:_ZN10ScribusDoc14RecalcPicturesEPK5QListIP8PageItemEP4QMapI7QStringS7_ES9_P12QProgressBar
scribus:_ZN10ScribusDoc14RecalcPicturesEP4QMapI7QString18ScColorProfileInfoES4_P12QProgressBar
scribus:_ZN10ScribusDoc14RecalcPicturesEPK5QListIP8PageItemEP4QMapI7QString18ScColorProfileInfoESA_P12QProgressBar
scribus:_ZN10ScribusDoc14adjustItemSizeEP8PageItemb
scribus:_ZN10ScribusDoc14checkedPatternERK7QString
scribus:_ZN10ScribusDoc14createPageItemEN8PageItem8ItemTypeENS0_13ItemFrameTypeEdddddRK7QStringS5_
@ -1977,7 +1977,7 @@ scribus:_ZN10ScribusDoc14textSerializerEv
scribus:_ZN10ScribusDoc14updateContentsERK5QRect
scribus:_ZN10ScribusDoc14updateContentsEv
scribus:_ZN10ScribusDoc14updateEditItemEv
scribus:_ZN10ScribusDoc15OpenCMSProfilesE4QMapI7QStringS1_ES2_S2_S2_
scribus:_ZN10ScribusDoc15OpenCMSProfilesE4QMapI7QString18ScColorProfileInfoES3_S3_S3_
scribus:_ZN10ScribusDoc15ResetFormFieldsEv
scribus:_ZN10ScribusDoc15applyMasterPageERK7QStringi
scribus:_ZN10ScribusDoc15changeLayerNameEiRK7QString
@ -2123,7 +2123,7 @@ scribus:_ZN10ScribusDoc25itemSelection_SetFillRuleEbP9Selection
scribus:_ZN10ScribusDoc25itemSelection_SetFontSizeEiP9Selection
scribus:_ZN10ScribusDoc25itemSelection_SetLanguageERK7QStringP9Selection
scribus:_ZN10ScribusDoc25itemSelection_SetLineJoinEN2Qt12PenJoinStyleEP9Selection
scribus:_ZN10ScribusDoc25itemSelection_SetTrackingEiP9Selection
scribus:_ZN10ScribusDoc25itemSelection_SetTrackingEdP9Selection
scribus:_ZN10ScribusDoc25restoreMasterPageApplyingEP11SimpleStateb
scribus:_ZN10ScribusDoc25restoreMasterPageRenamingEP11SimpleStateb
scribus:_ZN10ScribusDoc25updateNotesFramesSettingsEPK10NotesStyle
@ -2190,6 +2190,7 @@ scribus:_ZN10ScribusDoc29itemSelection_SetLineGradientERK9VGradientP9Selection
scribus:_ZN10ScribusDoc29itemSelection_SetMaskGradientERK9VGradientP9Selection
scribus:_ZN10ScribusDoc29itemSelection_SetOutlineWidthEiP9Selection
scribus:_ZN10ScribusDoc29itemSelection_SetRenderIntentEiP9Selection
scribus:_ZN10ScribusDoc29itemSelection_SetWordTrackingEdP9Selection
scribus:_ZN10ScribusDoc29setLocationBasedPageLRMarginsEj
scribus:_ZN10ScribusDoc30applyPrefsPageSizingAndMarginsEbbbb
scribus:_ZN10ScribusDoc30itemSelection_DistributeBottomEv
@ -5905,8 +5906,8 @@ scribus:_ZN15PDFExportDialog15fileNameChangedEv
scribus:_ZN15PDFExportDialog16staticMetaObjectE
scribus:_ZN15PDFExportDialog16updateDocOptionsEv
scribus:_ZN15PDFExportDialog8DoExportEv
scribus:_ZN15PDFExportDialogC1EP7QWidgetRK7QStringRK4QMapIS2_iEP11ScribusViewR10PDFOptionsRKS5_IS2_S2_ERK7SCFontsSF_
scribus:_ZN15PDFExportDialogC2EP7QWidgetRK7QStringRK4QMapIS2_iEP11ScribusViewR10PDFOptionsRKS5_IS2_S2_ERK7SCFontsSF_
scribus:_ZN15PDFExportDialogC1EP7QWidgetRK7QStringRK4QMapIS2_iEP11ScribusViewR10PDFOptionsRKS5_IS2_18ScColorProfileInfoERK7SCFontsSG_
scribus:_ZN15PDFExportDialogC2EP7QWidgetRK7QStringRK4QMapIS2_iEP11ScribusViewR10PDFOptionsRKS5_IS2_18ScColorProfileInfoERK7SCFontsSG_
scribus:_ZN15PageItem_Spiral10recalcPathEv
scribus:_ZN15PageItem_Spiral11qt_metacallEN11QMetaObject4CallEiPPv
scribus:_ZN15PageItem_Spiral11qt_metacastEPKc
@ -5978,7 +5979,7 @@ scribus:_ZN15Prefs_PDFExport14addPDFVersionsEb
scribus:_ZN15Prefs_PDFExport14enableProfilesEi
scribus:_ZN15Prefs_PDFExport14languageChangeEv
scribus:_ZN15Prefs_PDFExport15restoreDefaultsEP16ApplicationPrefs
scribus:_ZN15Prefs_PDFExport15restoreDefaultsEP16ApplicationPrefsRK4QMapI7QStringS3_Eb
scribus:_ZN15Prefs_PDFExport15restoreDefaultsEP16ApplicationPrefsRK4QMapI7QString18ScColorProfileInfoEb
scribus:_ZN15Prefs_PDFExport16staticMetaObjectE
scribus:_ZN15Prefs_PDFExport17enablePDFXWidgetsEb
scribus:_ZN15Prefs_PDFExport19EmbeddingModeChangeEv
@ -7578,7 +7579,7 @@ scribus:_ZN21LineStyleItemDelegate16staticMetaObjectE
scribus:_ZN21Prefs_ColorManagement11cmActivatedEb
scribus:_ZN21Prefs_ColorManagement11qt_metacallEN11QMetaObject4CallEiPPv
scribus:_ZN21Prefs_ColorManagement11qt_metacastEPKc
scribus:_ZN21Prefs_ColorManagement11setProfilesEP16ApplicationPrefsP4QMapI7QStringS3_ES5_S5_S5_
scribus:_ZN21Prefs_ColorManagement11setProfilesEP16ApplicationPrefsP4QMapI7QString18ScColorProfileInfoES6_S6_S6_
scribus:_ZN21Prefs_ColorManagement14languageChangeEv
scribus:_ZN21Prefs_ColorManagement15restoreDefaultsEP16ApplicationPrefs
scribus:_ZN21Prefs_ColorManagement15simulatePrinterEb
@ -10265,7 +10266,7 @@ scribus:_ZNK10ScribusDoc15charStyleExistsERK7QString
scribus:_ZNK10ScribusDoc15getDocItemNamesEN8PageItem8ItemTypeE
scribus:_ZNK10ScribusDoc15getItemFromNameERK7QString
scribus:_ZNK10ScribusDoc15getUsedPatternsEv
scribus:_ZNK10ScribusDoc15getUsedProfilesER4QMapI7QStringS1_E
scribus:_ZNK10ScribusDoc15getUsedProfilesER4QMapI7QString18ScColorProfileInfoE
scribus:_ZNK10ScribusDoc15layerIDFromNameERK7QString
scribus:_ZNK10ScribusDoc15layerSelectableEi
scribus:_ZNK10ScribusDoc15marksLabelsListE8MarkType
@ -10806,6 +10807,7 @@ scribus:_ZNK14ScColorProfile18productDescriptionEv
scribus:_ZNK14ScColorProfile19isSuitableForOutputEv
scribus:_ZNK14ScColorProfile20channelsOfColorSpaceEv
scribus:_ZNK14ScColorProfile25channelsOfConnectionSpaceEv
scribus:_ZNK14ScColorProfile4infoEv
scribus:_ZNK14ScColorProfile4saveER10QByteArray
scribus:_ZNK14ScColorProfile8dataHashEv
scribus:_ZNK14ScColorProfileeqERKS_
@ -11411,6 +11413,7 @@ scribus:_ZNK8PageItem12isGroupChildEv
scribus:_ZNK8PageItem12isMasterItemEv
scribus:_ZNK8PageItem12visualHeightEv
scribus:_ZNK8PageItem13canBeLinkedToEPKS_
scribus:_ZNK8PageItem13checkMarkPathEv
scribus:_ZNK8PageItem13frameDisplaysEi
scribus:_ZNK8PageItem14frameOverflowsEv
scribus:_ZNK8PageItem14getAllChildrenEv

172
packages/s/scribus/files/poppler_25.02.0.patch
View file

@ -1,172 +0,0 @@
diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
index 92539d1..ac8e2eb 100644
--- a/scribus/plugins/import/pdf/importpdf.cpp
+++ b/scribus/plugins/import/pdf/importpdf.cpp
@@ -462,11 +462,11 @@ bool PdfPlug::convert(const QString& fn)
if (dev->isOk())
{
- OCGs* ocg = pdfDoc->getOptContentConfig();
+ POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig();
if (ocg && ocg->hasOCGs())
{
QStringList ocgNames;
- Array *order = ocg->getOrderArray();
+ POPPLER_CONST_25_02 Array *order = ocg->getOrderArray();
if (order)
{
for (int i = 0; i < order->getLength (); ++i)
diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
index b922816..b3d35f0 100644
--- a/scribus/plugins/import/pdf/importpdfconfig.h
+++ b/scribus/plugins/import/pdf/importpdfconfig.h
@@ -15,6 +15,12 @@ for which a new license (GPL+exception) is in place.
+ ((micro) * 1))
#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+#define POPPLER_CONST_25_02 const
+#else
+#define POPPLER_CONST_25_02
+#endif
+
#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0)
#define POPPLER_CONST_082 const
#else
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 0244c9f..72e11b4 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -2932,7 +2932,7 @@ void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef)
{
if (dictRef->isNull())
return;
- OCGs *contentConfig = m_catalog->getOptContentConfig();
+ POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig();
OptionalContentGroup *oc;
if (dictRef->isRef())
{
@@ -3081,10 +3081,11 @@ void SlaOutputDev::updateFont(GfxState *state)
SplashFontFile *fontFile;
SplashFontSrc *fontsrc = nullptr;
Object refObj, strObj;
-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0)
- int tmpBufLen = 0;
-#endif
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ std::vector<int> codeToGID;
+#else
int *codeToGID = nullptr;
+#endif
const double *textMat = nullptr;
double m11, m12, m21, m22, fontSize;
SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 };
@@ -3244,10 +3245,20 @@ void SlaOutputDev::updateFont(GfxState *state)
}
else
{
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ codeToGID.clear();
+#else
codeToGID = nullptr;
+#endif
n = 0;
}
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
+ goto err2;
+ }
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
{
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
@@ -3278,6 +3289,18 @@ void SlaOutputDev::updateFont(GfxState *state)
#endif
break;
case fontCIDType0COT:
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)
+ {
+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID();
+ n = codeToGID.size();
+ }
+ else
+ {
+ codeToGID.clear();
+ n = 0;
+ }
+#else
if (((GfxCIDFont *) gfxFont)->getCIDToGID())
{
n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen();
@@ -3289,7 +3312,15 @@ void SlaOutputDev::updateFont(GfxState *state)
codeToGID = nullptr;
n = 0;
}
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+#endif
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
+ goto err2;
+ }
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
{
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
@@ -3307,6 +3338,15 @@ void SlaOutputDev::updateFont(GfxState *state)
break;
case fontCIDType2:
case fontCIDType2OT:
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ codeToGID.clear();
+ n = 0;
+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0)
+ {
+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID();
+ n = codeToGID.size();
+ }
+#else
codeToGID = nullptr;
n = 0;
if (((GfxCIDFont *) gfxFont)->getCIDToGID())
@@ -3318,6 +3358,7 @@ void SlaOutputDev::updateFont(GfxState *state)
memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID));
}
}
+#endif
else
{
#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
@@ -3338,15 +3379,20 @@ void SlaOutputDev::updateFont(GfxState *state)
#endif
if (! ff)
goto err2;
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
- codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
- ff.reset();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get());
#else
- codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
- delete ff;
+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
#endif
+ ff.reset();
}
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0)
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
+ goto err2;
+ }
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0)
if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum)))
{
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");

7
packages/s/scribus/package.yml
View file

@ -1,8 +1,8 @@
name : scribus
version : 1.6.3
release : 59
version : 1.6.4
release : 60
source :
- https://sourceforge.net/projects/scribus/files/scribus/1.6.3/scribus-1.6.3.tar.gz : 100ac3060ba4813d274d00540378714d2b6d52b795cd9562c2b9885b9e04d2b5
- https://sourceforge.net/projects/scribus/files/scribus/1.6.4/scribus-1.6.4.tar.gz : d7cee18376a36817e510a3e8d1bb4dddbd0480a99a66111615987361907abab5
homepage : http://www.scribus.net
license :
- LGPL-2.0-or-later
@ -28,7 +28,6 @@ builddeps :
- pkgconfig(python3)
- libboost-devel
setup : |
%patch -p1 -i $pkgfiles/poppler_25.02.0.patch
%cmake_ninja \
-DWANT_NORPATH=1 \
-DWANT_GRAPHICSMAGICK=1 \

15
packages/s/scribus/pspec_x86_64.xml
View file

@ -3,8 +3,8 @@
<Name>scribus</Name>
<Homepage>http://www.scribus.net</Homepage>
<Packager>
<Name>Joey Riches</Name>
<Email>josephriches@gmail.com</Email>
<Name>Algent Albrahimi</Name>
<Email>algent@protonmail.com</Email>
</Packager>
<License>LGPL-2.0-or-later</License>
<License>BSD-3-Clause</License>
@ -1878,7 +1878,6 @@
<Path fileType="data">/usr/share/scribus/translations/scribus.th_TH.qm</Path>
<Path fileType="data">/usr/share/scribus/translations/scribus.tr.qm</Path>
<Path fileType="data">/usr/share/scribus/translations/scribus.uk.qm</Path>
<Path fileType="data">/usr/share/scribus/translations/scribus.untranslated.qm</Path>
<Path fileType="data">/usr/share/scribus/translations/scribus.zh_CN.qm</Path>
<Path fileType="data">/usr/share/scribus/translations/scribus.zh_TW.qm</Path>
<Path fileType="data">/usr/share/scribus/unicodenameslist.txt</Path>
@ -3600,12 +3599,12 @@
</Files>
</Package>
<History>
<Update release="59">
<Date>2025-03-11</Date>
<Version>1.6.3</Version>
<Update release="60">
<Date>2025-04-24</Date>
<Version>1.6.4</Version>
<Comment>Packaging update</Comment>
<Name>Joey Riches</Name>
<Email>josephriches@gmail.com</Email>
<Name>Algent Albrahimi</Name>
<Email>algent@protonmail.com</Email>
</Update>
</History>
</PISI>