[Libreoffice] Introduce system-mozilla-headers switch

[Rene Engelhard]

On Mon, Nov 07, 2011 at 03:43:58PM +0100, Jan Holesovsky wrote:
> On 2011-11-06 at 17:49 +0100, Tomáš Chvátal wrote:
> 
> > It chages quite a bit albeit it works on linux without problem.
> > Testing on mac/win would be nice.
> 
> Unfortunately breaks on Windows (MinGW) :-( - will you have a look,
> please?

Also breaks on Linux for me.

Firstly, I need

diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 01e8a39..17a348e 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -36,7 +36,11 @@ USE_DEFFILE=TRUE

 .INCLUDE :     settings.mk

+.IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
+INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
+.ELSE
 INCPRE=$(SOLARINCDIR)$/npsdk
+.ENDIF

 .IF "$(GUI)"=="UNX"


which is trivial, though, but then I get

Compiling: extensions/source/nsplugin/source/npshell.cxx
x86_64-linux-gnu-g++  -fmessage-length=0 -c -O2 -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0   -DMOZ_X11 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/cairo -I. -I../../../unxlngx6.pro/inc/npsoplugin -I/usr/include/nspr -I/usr/include/xulrunner-7.0 -I../inc -I../../../inc/pch -I../../../inc -DNP_LINUX -I../../../unx/inc -I../../../unxlngx6.pro/inc -I. -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc/stl -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc/external -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/include -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solenv/unxlngx6/inc -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solenv/inc -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/res -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solenv/inc/Xp31 -I/usr/lib/jvm/java-6-openjdk-amd64/include -I/usr/lib/jvm/java-6-openjdk-amd64/include/linux -I/usr/lib/jvm/java-6-openjdk-amd64/include/native_threads/include  -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc/udkapi -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc/offapi -I/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/solver/unxlngx6.pro/inc/oovbaapi -I. -I../../../res -I. -pipe  -fvisibility-inlines-hidden -std=c++0x -Wno-deprecated-declarations -g -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DLINUX -DUNX -DVCL -DGCC -DX86_64 -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DHAVE_GCC_VISIBILITY_FEATURE -DX86_64 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/4.6 -DSUPD=350 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DHAVE_THREADSAFE_STATICS -DSOLAR_JAVA     -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../../unxlngx6.pro/slo/npshell.o /home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx
In file included from /home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:96:0:
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.hxx:40:5: error: 'uint16' does not name a type
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:464:5: error: 'uint16' has not been declared
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:465:5: error: 'int16' has not been declared
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx: In function 'NPError NPP_New(NPMIMEType, NPP, int, int, char**, char**, NPSavedData*)':
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:468:18: error: declaration of C function 'NPError NPP_New(NPMIMEType, NPP, int, int, char**, char**, NPSavedData*)' conflicts with
/usr/include/xulrunner-7.0/npapi.h:793:9: error: previous declaration 'NPError NPP_New(NPMIMEType, NPP, uint16_t, int16_t, char**, char**, NPSavedData*)' here
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx: In function 'NPError NPP_New(NPMIMEType, NPP, int, int, char**, char**, NPSavedData*)':
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:490:11: error: 'PluginInstance' has no member named 'mode'
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx: At global scope:
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:657:11: error: 'uint16' has not been declared
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx: In function 'NPError NPP_NewStream(NPP, NPMIMEType, NPStream*, NPBool, int*)':
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.0/extensions/source/nsplugin/source/npshell.cxx:657:24: error: declaration of C function 'NPError NPP_NewStream(NPP, NPMIMEType, NPStream*, NPBool, int*)' conflicts with
/usr/include/xulrunner-7.0/npapi.h:798:9: error: previous declaration 'NPError NPP_NewStream(NPP, NPMIMEType, NPStream*, NPBool, uint16_t*)' here
dmake:  Error code 1, while making '../../../unxlngx6.pro/slo/npshell.obj'

Grüße/Regards,

René
-- 
 .''`.  René Engelhard -- Debian GNU/Linux Developer
 : :' : http://www.debian.org | http://people.debian.org/~rene/
 `. `'  rene at debian.org | GnuPG-Key ID: D03E3E70
   `-   Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70