diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-28 18:25:02 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-28 18:25:02 +0000 |
| commit | e4efcd34ce9df3558f78f5b121be9668190b247a (patch) | |
| tree | 572edd660d2ad96373aa50eb1f14621941fd4e81 /app-office | |
| parent | Security bump, bug #388769 (diff) | |
| download | gentoo-2-e4efcd34ce9df3558f78f5b121be9668190b247a.tar.gz gentoo-2-e4efcd34ce9df3558f78f5b121be9668190b247a.tar.bz2 gentoo-2-e4efcd34ce9df3558f78f5b121be9668190b247a.zip | |
Fixup patch as the 3.3 build system can't handle working with git stuff. Fixes bug #388697.
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff | 20 |
2 files changed, 6 insertions, 21 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 5b1d263e966f..8993098692fe 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.182 2011/10/27 17:23:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.183 2011/10/28 18:25:02 scarabeus Exp $ + + 28 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + files/libreoffice-3.3.4-poppler-0.18.0.diff: + Fixup patch as the 3.3 build system can't handle working with git stuff. + Fixes bug #388697. 27 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff b/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff index c88fa844a47e..0f279f93ef6e 100644 --- a/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff +++ b/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff @@ -1,21 +1,3 @@ -From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -Date: Tue, 19 Jul 2011 08:54:07 +0100 -Subject: [PATCH] poppler 0.17.0 changed its api for no some reason or other - -From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -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 | 8 ++++++++ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -diff --git sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index f7741b4..bd6d721 100644 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer ) @@ -42,8 +24,6 @@ index f7741b4..bd6d721 100644 { assert(link); -diff --git sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 3ac0f49..88a60d6 100644 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -65,7 +65,10 @@ class GfxPath; |