[crux-commits] ports/contrib (3.5): scribus: cleaned footprint and fixed build against qt 5.15 and recent poppler

crux at crux.nu crux at crux.nu
Fri Jul 10 13:03:19 UTC 2020


commit 582179c673e2f253b0310a7265661b0888ae8b7a
Author: Tim Biermann <tbier at posteo.de>
Date:   Fri Jul 10 12:45:04 2020 +0000

    scribus: cleaned footprint and fixed build against qt 5.15 and recent poppler

diff --git a/scribus/.footprint b/scribus/.footprint
index ec1c60027..080cb27e8 100644
--- a/scribus/.footprint
+++ b/scribus/.footprint
@@ -2,7 +2,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/scribus
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libpoppler.so.92
 drwxr-xr-x	root/root	usr/lib/scribus/
 drwxr-xr-x	root/root	usr/lib/scribus/plugins/
 drwxr-xr-x	root/root	usr/lib/scribus/plugins/gettext/
@@ -100,38 +99,6 @@ drwxr-xr-x	root/root	usr/share/mime/packages/
 drwxr-xr-x	root/root	usr/share/scribus/
 drwxr-xr-x	root/root	usr/share/scribus/dicts/
 drwxr-xr-x	root/root	usr/share/scribus/dicts/hyph/
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_ca_ES.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_cs_CZ.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_cy_GB.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_de_1901.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_de_DE.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_en_EN.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_es_ES.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_fi_FI.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hu_HU.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_da_DK.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_de_CH.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_de_DE.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_en_GB.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_en_US.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_fr.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_ia.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_ml_IN.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_nb_NO.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_nn_NO.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_pl_PL.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_hyph_ro_RO.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_id_ID.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_is_IS.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_ku.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_lt_LT.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_pt_BR.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_pt_PT.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_ru_RU_0.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_sk_SK.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_sl_SI.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_sv_SE.txt
--rw-r--r--	root/root	usr/share/scribus/dicts/hyph/README_uk_UA.txt
 -rw-r--r--	root/root	usr/share/scribus/dicts/hyph/hyph_af.dic
 -rw-r--r--	root/root	usr/share/scribus/dicts/hyph/hyph_bg.dic
 -rw-r--r--	root/root	usr/share/scribus/dicts/hyph/hyph_ca.dic
@@ -1548,7 +1515,6 @@ drwxr-xr-x	root/root	usr/share/scribus/profiles/
 -rw-r--r--	root/root	usr/share/scribus/profiles/GenericCMYK.txt
 -rw-r--r--	root/root	usr/share/scribus/profiles/ISOcoated_v2_300_bas.icc
 -rw-r--r--	root/root	usr/share/scribus/profiles/ISOcoated_v2_300_bas.txt
--rw-r--r--	root/root	usr/share/scribus/profiles/Readme
 -rw-r--r--	root/root	usr/share/scribus/profiles/sRGB.icm
 -rw-r--r--	root/root	usr/share/scribus/profiles/sRGB_icc22.icm
 -rw-r--r--	root/root	usr/share/scribus/profiles/sRGB_icc22.txt
@@ -1593,7 +1559,6 @@ drwxr-xr-x	root/root	usr/share/scribus/swatches/
 -rw-r--r--	root/root	usr/share/scribus/swatches/Bundesregierung_HKS.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/CIE-HLC.sbz
 -rw-r--r--	root/root	usr/share/scribus/swatches/CIE-LAB.sbz
--rw-r--r--	root/root	usr/share/scribus/swatches/COPYING_RESENE.txt
 -rw-r--r--	root/root	usr/share/scribus/swatches/Classic_Kit.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/CrayonTM.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/Creative_Commons_2013.xml
@@ -1613,7 +1578,6 @@ drwxr-xr-x	root/root	usr/share/scribus/swatches/
 -rw-r--r--	root/root	usr/share/scribus/swatches/Inkscape.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/JIS_8721.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/Japanese_Traditional.xml
--rw-r--r--	root/root	usr/share/scribus/swatches/Japanese_Traditional_README.txt
 -rw-r--r--	root/root	usr/share/scribus/swatches/LaTeX_Beamer.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/LibreOffice.xml
 -rw-r--r--	root/root	usr/share/scribus/swatches/NBS-ISCC_Colors.xml
diff --git a/scribus/.signature b/scribus/.signature
index 662ac79d4..89177ab1a 100644
--- a/scribus/.signature
+++ b/scribus/.signature
@@ -1,7 +1,12 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31Zj5BlZ3CD3XIZVAYP4hg40rBZF/XhRk0KVFAyPOv0mDHKEhrUAH72tDe1mbK7woXcL9+TrlAfvKWVmVBMkOgM=
-SHA256 (Pkgfile) = 160cbb2cfad82942724e35129a23b96d211a5c9b46ac09835216acf5aa778aa8
-SHA256 (.footprint) = 240f0ff314d31e0ca57ae578f4c86e5f646cce020b1e1bf44963cd933a384db3
+RWSagIOpLGJF32/LwaeIMNdeltnogcOco6LpkPwcrRKa0itAHhhOLs90TMgING1Tc3iqYv3o3Xu+BV8fUFTf8DOayZAzxJpnUgw=
+SHA256 (Pkgfile) = 317eb30d23aad38c6b1ebc6f0f584a816d5c05c4c3c422646c15e07437458edd
+SHA256 (.footprint) = 833e7fc010236a1ab333bd103b2d72b50fa75565c720ad10b54274d6de0678a1
 SHA256 (scribus-1.5.5.tar.xz) = 7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
 SHA256 (6db15ec1.patch) = a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f
+SHA256 (b51c2bab.patch) = 5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b
+SHA256 (37425599.patch) = 7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694
+SHA256 (17d6a983.patch) = 0378bb9f945df0368fba4372c540440e39ecab7d7e102111419b0db871283922
+SHA256 (scribus-boost-1.71.patch) = 19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e
+SHA256 (scribus-poppler-0.86.patch) = ac660067894effdde20e92c2f32095336707a7f6f3f277316498999096f65445
 SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
diff --git a/scribus/Pkgfile b/scribus/Pkgfile
index c30db6185..4876ff740 100644
--- a/scribus/Pkgfile
+++ b/scribus/Pkgfile
@@ -1,21 +1,24 @@
 # Description: layout tool
 # URL:         http://scribus.net
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on:  boost cups harfbuzz-icu hunspell libart_lgpl qt5
+# Depends on:  boost cups harfbuzz-icu hunspell libart_lgpl poppler qt5
 
 name=scribus
 version=1.5.5
 release=1
 source=(https://downloads.sourceforge.net/$name/$name-$version.tar.xz
   https://github.com/scribusproject/scribus/commit/6db15ec1.patch
+  https://github.com/scribusproject/scribus/commit/b51c2bab.patch
+  https://github.com/scribusproject/scribus/commit/37425599.patch
+  https://github.com/scribusproject/scribus/commit/17d6a983.patch
+  scribus-boost-1.71.patch scribus-poppler-0.86.patch
   https://poppler.freedesktop.org/poppler-0.82.0.tar.xz)
 
 # snatched from contrib/inkscape, thx romster :>
 poppler() {
 #-boehm-gc boost gsl gtkmm poppler-glib popt
 #+cmake cairo lcms2 boehm-gc boost gsl gtkmm popt
-  cd poppler-0.82.0
-  cmake . \
+  cmake -Spoppler-0.82.0 -Bbuild -GNinja \
     -DCMAKE_INSTALL_PREFIX=$SRC/poppler \
     -DCMAKE_INSTALL_LIBDIR=$SRC/poppler/lib \
     -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
@@ -28,9 +31,8 @@ poppler() {
     -DENABLE_CMS=lcms2 \
     -DENABLE_LIBOPENJPEG=none \
     -DWITH_NSS3=OFF
-
-  make
-  make install
+  cmake --build build
+  cmake --install build
 
   install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.92
 
@@ -43,22 +45,35 @@ build() {
   # build a static poppler to use with the build
   # scribus is using the internal poppler api which
   # is known to break every other release
-  poppler
-  cd $name-$version
-  # fix building against poppler 0.82.0
-  patch -Np1 -i $SRC/6db15ec1.patch
+  #poppler
+
+  # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/scribus
+  patch -Np1 -d $name-$version -i $SRC/6db15ec1.patch
+  patch -Np1 -d $name-$version -i $SRC/b51c2bab.patch
+  patch -Np1 -d $name-$version -i $SRC/37425599.patch
+  patch -Np1 -d $name-$version -i $SRC/scribus-poppler-0.86.patch
+  patch -Np1 -d $name-$version -i $SRC/scribus-boost-1.71.patch
+  patch -Np1 -d $name-$version -i $SRC/17d6a983.patch
+
+  # clean up poppler build dir if there is one
+  [[ -e build ]] && rm -rf build || true
   sed \
     -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
     -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
-    -i scribus/plugins/scriptplugin/{samples,scripts}/*
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-  make DESTDIR=$PKG install
+    -i $name-$version/scribus/plugins/scriptplugin/{samples,scripts}/*
+  cmake -S$name-$version -Bbuild -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -Wno-dev
+  cmake --build build
+  DESTDIR=$PKG cmake --install build
 
   rm -rf $PKG/usr/share/man/de
   rm -rf $PKG/usr/share/man/pl
   rm -rf $PKG/usr/share/doc
-  rm -rf $PKG/usr/share/$name/scripts/{ChangeLog,NEWS,TODO}
-  rm -rf $PKG/usr/share/scribus/dicts/README_*
+  find $PKG \(\
+    -iname '*changelog*' -o \
+    -iname '*news*' -o \
+    -iname '*todo*' -o \
+    -iname '*readme*' -o \
+    -iname '*copying*' \) -exec rm -fr '{}' \+
 }
diff --git a/scribus/scribus-boost-1.71.patch b/scribus/scribus-boost-1.71.patch
new file mode 100644
index 000000000..ccb250407
--- /dev/null
+++ b/scribus/scribus-boost-1.71.patch
@@ -0,0 +1,12 @@
+diff --git a/scribus/plugins/tools/2geomtools/CMakeLists.txt b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+index 9b6683cbb..d2e1ee5ea 100644
+--- a/scribus/plugins/tools/2geomtools/CMakeLists.txt
++++ b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+@@ -3,6 +3,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
+-include_directories( ${Boost_INCLUDE_DIR} )
++include_directories( ${Boost_INCLUDE_DIRS} )
+ add_subdirectory (meshdistortion)
+ add_subdirectory (pathalongpath)
diff --git a/scribus/scribus-poppler-0.86.patch b/scribus/scribus-poppler-0.86.patch
new file mode 100644
index 000000000..fa7667c91
--- /dev/null
+++ b/scribus/scribus-poppler-0.86.patch
@@ -0,0 +1,186 @@
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef..7fe18d86b 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -792,13 +792,13 @@ bool PdfPlug::convert(const QString& fn)
+ 								if (names.isDict())
+ 								{
+ 									LinkAction *linkAction = nullptr;
+-									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
++									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()).get();
+ 									if (linkAction)
+ 									{
+ 										LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
+ 										if (jsa->isOk())
+ 										{
+-											QString script = UnicodeParsedString(jsa->getScript());
++											QString script = QString::fromStdString(jsa->getScript());
+ 											if (script.startsWith("this."))
+ 											{
+ 												script.remove(0, 5);
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 93ceb1e30..d14dfa1d9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -289,7 +289,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *a
+ 		{
+ 			Object actionObject = additionalActionsObject.dictLookup(key);
+ 			if (actionObject.isDict())
+-				linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
++				linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()).get();
+ 		}
+ 	}
+ 	return linkAction;
+@@ -420,7 +420,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 			if (ndst)
+ 			{
+-				LinkDest *dstn = pdfDoc->findDest(ndst);
++				LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 				if (dstn)
+ 				{
+ 					if (dstn->getKind() == destXYZ)
+@@ -464,7 +464,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 			if (ndst)
+ 			{
+-				LinkDest *dstn = pdfDoc->findDest(ndst);
++				LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 				if (dstn)
+ 				{
+ 					if (dstn->getKind() == destXYZ)
+@@ -482,7 +482,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 	{
+ 		LinkURI *gto = (LinkURI*)act;
+ 		validLink = true;
+-		fileName = UnicodeParsedString(gto->getURI());
++		fileName = QString::fromStdString(gto->getURI());
+ 	}
+ 	if (validLink)
+ 	{
+@@ -895,7 +895,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			if (jsa->isOk())
+ 			{
+ 				ite->annotation().setActionType(1);
+-				ite->annotation().setAction(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setAction(QString::fromStdString(jsa->getScript()));
+ 			}
+ 		}
+ 		else if (Lact->getKind() == actionGoTo)
+@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 				if (ndst)
+ 				{
+-					LinkDest *dstn = pdfDoc->findDest(ndst);
++					LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 					if (dstn)
+ 					{
+ 						if (dstn->getKind() == destXYZ)
+@@ -984,7 +984,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ 				if (ndst)
+ 				{
+-					LinkDest *dstn = pdfDoc->findDest(ndst);
++					LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ 					if (dstn)
+ 					{
+ 						if (dstn->getKind() == destXYZ)
+@@ -1004,7 +1004,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 		else if (Lact->getKind() == actionUnknown)
+ 		{
+ 			LinkUnknown *uno = (LinkUnknown*)Lact;
+-			QString actString = UnicodeParsedString(uno->getAction());
++			QString actString = QString::fromStdString(uno->getAction());
+ 			if (actString == "ResetForm")
+ 			{
+ 				ite->annotation().setActionType(4);
+@@ -1048,7 +1048,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 		{
+ 			LinkNamed *uno = (LinkNamed*)Lact;
+ 			ite->annotation().setActionType(10);
+-			ite->annotation().setAction(UnicodeParsedString(uno->getName()));
++			ite->annotation().setAction(QString::fromStdString(uno->getName()));
+ 		}
+ 		else
+ 			qDebug() << "Found unsupported Action of type" << Lact->getKind();
+@@ -1061,7 +1061,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setD_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1075,7 +1075,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setE_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1089,7 +1089,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setX_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1103,7 +1103,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setFo_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1117,7 +1117,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setBl_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1131,7 +1131,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setC_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}
+@@ -1145,7 +1145,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setF_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 				ite->annotation().setFormat(5);
+ 			}
+@@ -1160,7 +1160,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setK_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 				ite->annotation().setFormat(5);
+ 			}
+@@ -1175,7 +1175,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 			LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ 			if (jsa->isOk())
+ 			{
+-				ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
++				ite->annotation().setV_act(QString::fromStdString(jsa->getScript()));
+ 				ite->annotation().setAAact(true);
+ 			}
+ 		}


More information about the crux-commits mailing list