cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libreoffice: fix build with poppler-0.83

Browse source
This commit is contained in:
Martin Milata 2019-12-04 01:39:08 +01:00
parent b7c19e1b91
commit 7f1bf286dc
3 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/office/libreoffice/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@ -73,6 +73,12 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
# poppler-0.82 compatibility:
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/2eadd46a.patch";
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
})
./poppler-0.83.patch
];
tarballPath = "external/tarballs";

48
pkgs/applications/office/libreoffice/poppler-0.83.patch Normal file
View file

@ -0,0 +1,48 @@
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 26048177e87d..da7736f607f9 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,12 +491,12 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
gfree(pBuf);
}
-void PDFOutDev::printPath( GfxPath* pPath )
+void PDFOutDev::printPath( const GfxPath* pPath )
{
int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
for( int i=0; i<nSubPaths; i++ )
{
- GfxSubpath* pSub = pPath->getSubpath( i );
+ const GfxSubpath* pSub = pPath->getSubpath( i );
const int nPoints = pSub->getNumPoints();
printf( " subpath %d", pSub->isClosed() );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 02f6b59f6f15..1c7451a78601 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -149,7 +149,7 @@ namespace pdfi
int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
void writeFontFile( GfxFont* gfxFont ) const;
- static void printPath( GfxPath* pPath );
+ static void printPath( const GfxPath* pPath );
public:
explicit PDFOutDev( PDFDoc* pDoc );
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 42178b650cdd..b1a54bd09c5f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -68,7 +68,11 @@ int main(int argc, char **argv)
}
// read config file
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+ globalParams = std::make_unique<GlobalParams>();
+#else
globalParams = new GlobalParams();
+#endif
globalParams->setErrQuiet(true);
#if defined(_MSC_VER)
globalParams->setupBaseFonts(nullptr);

7
pkgs/applications/office/libreoffice/still.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
@ -73,6 +73,11 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/2eadd46a.patch";
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
})
./poppler-0.83.patch
];
tarballPath = "external/tarballs";