[Libreoffice-commits] .: 2 commits - compilerplugins/Makefile-clang.mk xpdf/makefile.mk xpdf/xpdf-no-writable-literals.patch

[Libreoffice Gerrit user]

 compilerplugins/Makefile-clang.mk    |    4 ++++
 xpdf/makefile.mk                     |    2 +-
 xpdf/xpdf-no-writable-literals.patch |   21 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 98a6d76f1eb20346828056b906bd775c8247e992
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Oct 9 23:29:42 2012 +0200

    avoid the annoying xpdf warning about string literal conversion to error()
    
    Clang quotes it in the warning message, and tinderbox log parser highlights
    every single of the warnings because of the 'error'.
    
    Change-Id: I6a2addc6817d05d18dcc1985ecaca0b110045ecf

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index ff6dd6a..239912b 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -48,7 +48,7 @@ dummy:
 
 TARFILE_NAME=xpdf-3.02
 TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2
-PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch
+PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch xpdf-no-writable-literals.patch
 
 CONFIGURE_DIR=
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/xpdf/xpdf-no-writable-literals.patch b/xpdf/xpdf-no-writable-literals.patch
new file mode 100644
index 0000000..9a1366e
--- /dev/null
+++ b/xpdf/xpdf-no-writable-literals.patch
@@ -0,0 +1,21 @@
+--- misc/xpdf-3.02/xpdf/Error.h.sav	2007-02-27 23:05:52.000000000 +0100
++++ misc/build/xpdf-3.02/xpdf/Error.h	2012-10-09 23:24:12.002455791 +0200
+@@ -18,6 +18,6 @@
+ #include <stdio.h>
+ #include "config.h"
+ 
+-extern void CDECL error(int pos, char *msg, ...);
++extern void CDECL error(int pos, const char *msg, ...);
+ 
+ #endif
+--- misc/build/xpdf-3.02/xpdf/Error.cc.sav	2007-02-27 23:05:52.000000000 +0100
++++ misc/build/xpdf-3.02/xpdf/Error.cc	2012-10-09 23:24:27.813569809 +0200
+@@ -18,7 +18,7 @@
+ #include "GlobalParams.h"
+ #include "Error.h"
+ 
+-void CDECL error(int pos, char *msg, ...) {
++void CDECL error(int pos, const char *msg, ...) {
+   va_list args;
+ 
+   // NB: this can be called before the globalParams object is created
commit 06fb559a4bc7f2b8f14187d6f4399e87452b2809
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Oct 9 23:05:26 2012 +0200

    note about (not) linking llvm/clang libraries
    
    Change-Id: I628e3b99b69d238abc9df3e62e77b30eb85f1a0d

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index ca95f11..d175f23 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -30,6 +30,10 @@ CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 # All include locations needed.
 CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGBUILD)/include -I$(CLANGBUILD)/tools/clang/include
 
+# Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting
+# plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify
+# also all the dependency libraries.
+
 CLANGINDIR=$(SRCDIR)/compilerplugins/clang
 # Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt
 # plugin will cause cache misses with ccache.