[Libreoffice] [REVIEW] fdo#39355 PDF A/1-a export broken / disabled patch hunk

Asking for review for backport to 3.4 of
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3b32204d9f900130cd1877675d8b51281b81f90d

fdo#39355: PDF A/1-a export broken in 64 bit builds: Adobe Acrobat
Reader complains about "Invalid Color Space".

This is nominated as "most annoying bug" for 3.4, and a regression.

This bug was corrected in OOo 3.2 by shipping a patch to SampleICC
(file icc/SampleICC-1.3.2.patch, hunk applying to file
misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h) that is applied at
build-time, to reuse the 64 bit int typedefs and endianness from sal
instead of using own (buggy) ones.
About history, see
 http://openoffice.org/bugzilla/show_bug.cgi?id=106523
 https://bugzilla.novell.com/show_bug.cgi?id=467181

It was broken again by
 commit cf6aa9b361479a482898d0728f6849953f25c6be
 Author: Tor Lillqvist <tlillqvist@novell.com> 
 Date:   Mon Jan 24 01:19:29 2011 +0200

     Use MSVC settings not just on x86

This commit adds to file icc/SampleICC-1.3.2.patch a hunk to be
applied to the same file, but without properly duplicating per-hunk
header in this context-diff format file:

*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h    Mon Aug 20 22:05:00 2007
--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h      Fri Jan 25 14:23:09 2008
***************
*** 87,93 ****
 NEW HUNK
*** 107,126 ****
 OLD HUNK

instead of

*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h    Mon Aug 20 22:05:00 2007
--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h      Fri Jan 25 14:23:09 2008
***************
*** 87,93 ****
 NEW HUNK
***************
*** 107,126 ****
 OLD HUNK

As a consequence, patch discards the old hunk as trailing garbage;
this can be seen by applying that patch with "patch --verbose".

Attached patch (equal to commit
3b32204d9f900130cd1877675d8b51281b81f90d
in core) reintroduces the "***************" header for the old hunk,
thus reenabling it.

-- 
Lionel

From 3b32204d9f900130cd1877675d8b51281b81f90d Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Fri, 2 Sep 2011 14:39:41 +0200
Subject: [PATCH] fdo#39355: reenable "use typedefs and endianess from sal" patch hunk

---
 icc/SampleICC-1.3.2.patch |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
index 3371520..cb65c42 100644
--- a/icc/SampleICC-1.3.2.patch
+++ b/icc/SampleICC-1.3.2.patch
@@ -1389,6 +1389,7 @@
   
     //Define how 64 bit integers are represented
     #define ICCUINT64 unsigned __int64
+***************
 *** 107,126 ****
   
   #else // non-PC, perhaps Mac or Linux
-- 
1.7.2.5