BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libreoffice: use external Poppler 0.83 patch

Browse source
This commit is contained in:
Jan Tojnar 2019-12-04 11:59:05 +01:00
parent 14c1a446d8
commit b6284fd70f
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 20 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,12 +73,19 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
# poppler-0.82 compatibility:
# Poppler-0.82 compatibility
# https://gerrit.libreoffice.org/81545
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/2eadd46a.patch";
url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
})
./poppler-0.83.patch
# Poppler-0.83 compatibility
# https://gerrit.libreoffice.org/84384
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
})
];
tarballPath = "external/tarballs";

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

@ -1,48 +0,0 @@
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);

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

@ -73,11 +73,19 @@ in stdenv.mkDerivation rec {
patches = [
./xdg-open-brief.patch
# Poppler-0.82 compatibility
# https://gerrit.libreoffice.org/81545
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/2eadd46a.patch";
url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
})
./poppler-0.83.patch
# Poppler-0.83 compatibility
# https://gerrit.libreoffice.org/84384
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
})
];
tarballPath = "external/tarballs";