[Libreoffice-commits] .: 2 commits - lcms2/lcms2-windows-export.patch lcms2/makefile.mk libcdr/libcdr-0.0.5.patch

[Tor Lillqvist]

 lcms2/lcms2-windows-export.patch |   18 ++++++++++++++++++
 lcms2/makefile.mk                |    2 +-
 libcdr/libcdr-0.0.5.patch        |   15 ---------------
 3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 6ea1578264b4aaf6384c654098915f6e952dd1b0
Author: Lubos Lunak <l.lunak at suse.cz>
Date:   Mon Mar 19 09:45:15 2012 +0200

    Define CMS_DLL in the header as that is how we build it
    
    Otherwise code using the lcms2 we build won't get the stdcall
    decorations and linking will fail.

diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch
new file mode 100644
index 0000000..9d6d26a
--- /dev/null
+++ b/lcms2/lcms2-windows-export.patch
@@ -0,0 +1,18 @@
+--- misc/build/lcms2-2.3/include/lcms2.h.sav	2011-12-15 16:45:47.000000000 +0100
++++ misc/build/lcms2-2.3/include/lcms2.h	2012-03-17 22:53:28.731585981 +0100
+@@ -192,6 +192,15 @@ typedef int                  cmsBool;
+ # endif
+ #endif
+ 
++// LibreOffice always builds this as DLL and with the stdcall calling
++// convention, so make this usable from outside without having to
++// specify CMS_DLL manually whenever the library is used.
++#ifndef CMS_DLL_BUILD
++#ifndef CMS_DLL
++#define CMS_DLL
++#endif
++#endif
++
+ // Calling convention -- this is hardly platform and compiler dependent
+ #ifdef CMS_IS_WINDOWS_
+ #  if defined(CMS_DLL) || defined(CMS_DLL_BUILD)
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 0c7f5d5..2be34b5 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
+PATCH_FILES = lcms2.patch lcms2-windows-export.patch
 
 .IF "$(SYSTEM_LCMS2)" == "YES"
 @all:
commit f257c29b6cfba0110bafe33bc02003cc757b5999
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Mar 19 09:42:19 2012 +0200

    Revert "lcms2 uses stdcall for some reason"
    
    Nah, will use the patch by Lubos instead.
    
    This reverts commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4.

diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch
index 279c365..b622bd6 100644
--- a/libcdr/libcdr-0.0.5.patch
+++ b/libcdr/libcdr-0.0.5.patch
@@ -18,18 +18,3 @@
  
  #endif
  
---- misc/libcdr-0.0.5/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.5/src/lib/makefile.mk
-@@ -32,6 +32,12 @@
- INCPRE+=$(LCMS2_CFLAGS)
- .ELSE
- INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
-+.IF "$(COM)" == "MSC"
-+# lcms2 gets built to use the stdcall calling convention, for some reason.
-+# The lcms2 headers need this in order to decorate functions with stdcall,
-+# so that they will be found when linking.
-+CDEFS+=-DCMS_DLL
-+.ENDIF
- .ENDIF
- 
- .IF "$(SYSTEM_ZLIB)" != "YES"