[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-5-g927c1ed
The following commit has been merged in the master branch:
commit 927c1ed3d8ce670fb681563c3cf4ea94abe62a36
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 6 18:44:59 2011 +0200
backport icc 64bit fix from master
diff --git a/changelog b/changelog
index 35e784a..8b6e95b 100644
--- a/changelog
+++ b/changelog
@@ -2,10 +2,13 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
* debian/patches/no-deprecated-options-in-qstart-wrappers.diff: use --writer
instead of -writer (closes: #638868)
+ * debian/patches/fix-sample-icc-1.3.2-patch.diff: backport from master: reenable
+ "use typedefs and endianess from sal" patch hunk to fix PDF A/1-a export
+ on 64bit archs, thanks lmanane for the patch
* debian/control.in: remove obsolete Pre-Depends on debconf in ure
- -- Rene Engelhard <rene@debian.org> Wed, 31 Aug 2011 19:28:35 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Sep 2011 18:43:10 +0200
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --git a/patches/fix-sample-icc-1.3.2-patch.diff b/patches/fix-sample-icc-1.3.2-patch.diff
new file mode 100644
index 0000000..42cbc91
--- /dev/null
+++ b/patches/fix-sample-icc-1.3.2-patch.diff
@@ -0,0 +1,26 @@
+diff --git a/home/rene/3b32204d9f900130cd1877675d8b51281b81f90d.patch b/home/rene/3b32204d9f900130cd1877675d8b51281b81f90d.patch
+new file mode 100644
+index 0000000..739f2e3
+--- /dev/null
++++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/fix-sample-icc-1.3.2-patch.diff
+@@ -0,0 +1,20 @@
++From 3b32204d9f900130cd1877675d8b51281b81f90d Mon Sep 17 00:00:00 2001
++From: Lionel Elie Mamane <lionel@mamane.lu>
++Date: Fri, 02 Sep 2011 12:39:41 +0000
++Subject: fdo#39355: reenable "use typedefs and endianess from sal" patch hunk
++
++---
++diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
++index 3371520..cb65c42 100644
++--- icc/SampleICC-1.3.2.patch
+++++ 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
++--
++cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index f3ca361..0dc9c15 100644
--- a/patches/series
+++ b/patches/series
@@ -23,3 +23,4 @@ fix-distro-config.diff
mipsel-jfw-plugin-arch.diff
oosplash-javaldx-path.diff
no-deprecated-options-in-qstart-wrappers.diff
+fix-sample-icc-1.3.2-patch.diff
--
LibreOffice packaging repository
Reply to: