[Libreoffice-commits] .: 2 commits - lcms2/lcms2-endian.patch lcms2/makefile.mk

[Libreoffice Gerrit user]

 lcms2/lcms2-endian.patch |   17 -----------------
 lcms2/makefile.mk        |    2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit d18455e24644a90cbf9f146ea8b4eed74180592b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 5 16:35:12 2012 +0200

    Revert "It seems that we have endianness problem in internal lcms2"
    
    This reverts commit d9ae7573083343b8db7fd65b5677a2132bd2e1e8.

diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch
deleted file mode 100644
index 01ffc1c..0000000
--- a/lcms2/lcms2-endian.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- misc/lcms2-2.3/include/lcms2.h	2011-12-15 16:45:47.000000000 +0100
-+++ misc/build/lcms2-2.3/include/lcms2.h	2012-10-05 14:49:09.721146003 +0200
-@@ -30,8 +30,12 @@
- 
- // ********** Configuration toggles ****************************************
- 
--// Uncomment this one if you are using big endian machines
--// #define CMS_USE_BIG_ENDIAN   1
-+#ifndef _WIN32
-+#include <endian.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define USE_BIG_ENDIAN   1
-+#endif
-+#endif /* !_WIN32 */
- 
- // Uncomment this one if your compiler/machine does NOT support the
- // "long long" type.
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 9260ad4..52b7b4a 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -39,7 +39,7 @@ TARGET=so_lcms2
 TARFILE_NAME=lcms2-2.3
 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85
 
-PATCH_FILES = lcms2.patch lcms2-endian.patch
+PATCH_FILES = lcms2.patch
 
 .IF "$(SYSTEM_LCMS2)" == "YES"
 @all:
commit 27a8a02826c40e57b96a4f27e4646ee44a21593a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 5 16:34:44 2012 +0200

    Revert "Oops"
    
    This reverts commit 03c766e6017cc3b7e18a8c5eef35ba7e84777d88.

diff --git a/lcms2/lcms2-endian.patch b/lcms2/lcms2-endian.patch
index e97e4e9..01ffc1c 100644
--- a/lcms2/lcms2-endian.patch
+++ b/lcms2/lcms2-endian.patch
@@ -9,7 +9,7 @@
 +#ifndef _WIN32
 +#include <endian.h>
 +#if __BYTE_ORDER == __BIG_ENDIAN
-+#define CMS_USE_BIG_ENDIAN   1
++#define USE_BIG_ENDIAN   1
 +#endif
 +#endif /* !_WIN32 */