[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1-l10n, updated. cb6801247316d2fc9e41144ab96ef7c504e6b9be
The following commit has been merged in the ubuntu-natty-3.3.1-l10n branch:
commit 57b2a590832dd96d13bce2ef4bdd7994a13b925c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 17:38:11 2011 +0100
fix jpeg lib location
diff --git a/patches/fix-jpeg.diff b/patches/fix-jpeg.diff
new file mode 100644
index 0000000..775dbde
--- /dev/null
+++ b/patches/fix-jpeg.diff
@@ -0,0 +1,14 @@
+--- /dev/null 2011-03-24 08:52:39.733176002 +0100
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/fix-jpeg.diff 2011-03-24 17:33:16.160731102 +0100
+@@ -0,0 +1,11 @@
++--- solenv/inc/libs.mk_old 2011-03-24 17:32:00.940731121 +0100
+++++ solenv/inc/libs.mk 2011-03-24 17:27:16.820731193 +0100
++@@ -211,7 +211,7 @@
++ .IF "$(OS)" == "FREEBSD"
++ JPEG3RDLIB=/usr/local/lib/libjpeg.so
++ .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
++-JPEG3RDLIB=/usr/lib64/libjpeg.so
+++JPEG3RDLIB=/usr/lib/x86_64-linux-gnu/libjpeg.so
++ .ELSE
++ JPEG3RDLIB=/usr/lib/libjpeg.so
++ .ENDIF
diff --git a/patches/series b/patches/series
index f31dad2..8f48e6e 100644
--- a/patches/series
+++ b/patches/series
@@ -14,3 +14,4 @@ human-icons-add.diff
lp-integration.diff
disable-integrated-ubuntupatches.diff
fix-lo-desktop-pot.diff
+fix-jpeg.diff
--
LibreOffice packaging repository
Reply to: