Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2774ec31635c60cfd8ca2837f6d1cbe46739f959
commit 2774ec31635c60cfd8ca2837f6d1cbe46739f959 Author: Miklos Vajna <[email protected]> Date: Wed Oct 12 15:53:35 2011 +0200 libreoffice-3.4.3.2-2-i686 - add two patches to build with poppler-0.18 diff --git a/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch b/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch new file mode 100644 index 0000000..96541fb --- /dev/null +++ b/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch @@ -0,0 +1,38 @@ +From 911227ffc1a0f4a84afabe28f3cc5b54ab475f83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Fri, 2 Sep 2011 13:15:49 +0100 +Subject: [PATCH] Resolves: rhbz#735182 libreoffice doesn't build with + poppler-0.17.3 + +--- + .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index cf28922..3f1261c 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer ) + void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) + { + // dump JPEG file as-is ++#if POPPLER_CHECK_VERSION(0, 17, 3) ++ str = str->getBaseStream(); ++#else + str = ((DCTStream *)str)->getRawStream(); ++#endif + str->reset(); + + int c; +@@ -490,7 +494,7 @@ void PDFOutDev::endPage() + } + + #if POPPLER_CHECK_VERSION(0, 17, 0) +-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) ++void PDFOutDev::processLink(AnnotLink *link, Catalog *) + #else + void PDFOutDev::processLink(Link* link, Catalog*) + #endif +-- +1.7.6 + diff --git a/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch b/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch new file mode 100644 index 0000000..20cfa15 --- /dev/null +++ b/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch @@ -0,0 +1,51 @@ +From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001 +From: =?latin2?q?Caol=E1n=20McNamara?= <[email protected]> +Date: Tue, 19 Jul 2011 08:54:07 +0100 +Subject: [PATCH] poppler 0.17.0 changed its api for no some reason or other + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index f7741b4..df15a94 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -489,7 +489,11 @@ void PDFOutDev::endPage() + printf("endPage\n"); + } + ++#if POPPLER_CHECK_VERSION(0, 17, 0) ++void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) ++#else + void PDFOutDev::processLink(Link* link, Catalog*) ++#endif + { + assert(link); + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 3ac0f49..0fd43c5 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -65,7 +65,10 @@ class GfxPath; + class GfxFont; + class PDFDoc; + #ifndef SYSTEM_POPPLER ++#define POPPLER_CHECK_VERSION(major,minor,micro) (0) + typedef GString GooString; ++#else ++#include <glib/poppler-features.h> + #endif + + namespace pdfi +@@ -193,9 +196,13 @@ namespace pdfi + // Convert between device and user coordinates. + // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); + // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); +- ++ ++ #if POPPLER_CHECK_VERSION(0, 17, 0) ++ virtual void processLink(AnnotLink *link, Catalog *catalog); ++ #else + //----- link borders + virtual void processLink(Link *link, Catalog *catalog); ++ #endif + + //----- save/restore graphics state + virtual void saveState(GfxState *state); diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index c8d51d6..5fde1f5 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -6,7 +6,7 @@ pkgname=libreoffice pkgver=3.4.3.2 minor=${pkgver%%.?} # x.y.z major=${pkgver%%.?.?} # x.y -pkgrel=1 +pkgrel=2 pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org." url="http://www.documentfoundation.org/download/"; _F_gnome_desktop="y" @@ -14,8 +14,8 @@ Finclude gnome-scriptlet kde unset install depends=('libxml2' 'libart_lgpl' 'libsndfile' 'openjre' 'nas' 'fontconfig' 'libpng>=1.4.1' 'imagemagick' \ 'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ - 'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libwpd>=0.8.13' 'poppler' \ - 'sane-backends' 'lp_solve' 'silgraphite' 'libtextcat') + 'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libwpd>=0.8.13' 'poppler-glib>=0.18' \ + 'sane-backends' 'lp_solve' 'silgraphite' 'libtextcat' 'librdf') # this is here as gstreamer is only a makedepend rodepends=('flac' 'dejavu-ttf') makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 'apache-ant' \ @@ -35,8 +35,10 @@ modules=('artwork' 'base' 'bootstrap' 'calc' 'impress' 'translations' 'libs-core' 'libs-extern-sys' 'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing' 'ure' 'writer') -source=(0001-workaround-for-x86-gcc-4.6.1-link-failure.patch) -signatures=('') +source=(0001-workaround-for-x86-gcc-4.6.1-link-failure.patch \ + 0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch \ + 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch) +signatures=('' '' '') ext=bz2 for i in ${modules[@]} do _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
