pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: openoffice build problem
Hi,
it would have build if I didn't disable the xulrunner option:
/pkgsrc/misc/openoffice3/work.i386/OOO310_m19/extensions/source/nsplugin/source/npshell.cxx:
In function 'const char* NPP_GetMIMEDescription()':
/pkgsrc/misc/openoffice3/work.i386/OOO310_m19/extensions/source/nsplugin/source/npshell.cxx:406:28:
error: declaration of C function 'const char* NPP_GetMIMEDescription()'
conflicts with
/pkgsrc/misc/openoffice3/work.i386/OOO310_m19/solver/310/unxbsdi3.pro/inc/npsdk/npapi.h:539:7:
error: previous declaration 'char* NPP_GetMIMEDescription()' here
dmake: Error code 1, while making '../../../unxbsdi3.pro/slo/npshell.obj'
patch-ae was patched to work with newer firefox version but due too
the way how the include files for a newer firefox are integrated into
the build system this will fail, because that file is still build
using use the old xulrunner headers.
I hacked patch-ae with the attached version which works for me
but I do not know if that works if the xulrunner option is enabled.
After that the package finally build but it does not work :(
The soffice command opens a window and then quits.
Bernd
--- extensions/source/nsplugin/source/npshell.cxx.orig 2008-07-16
22:13:01.000000000 +0200
+++ extensions/source/nsplugin/source/npshell.cxx 2012-08-02
23:19:06.000000000 +0200
@@ -79,7 +79,7 @@
//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
-#ifdef UNIX
+#if 0 /* def UNIX */ /* types provided by nptypes.h */
# ifndef _UINT32
# if defined(__alpha) || defined(__LP64__)
typedef unsigned int uint32;
@@ -402,7 +402,11 @@
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument
Presentation Template;"
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
+#ifdef WITHOUT_MOZILLA
char*
+#else
+const char*
+#endif
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n", pMimeTypes);
--- extensions/source/nsplugin/source/makefile.mk.orig 2012-08-03
02:26:29.000000000 +0200
+++ extensions/source/nsplugin/source/makefile.mk 2012-08-03
02:24:28.000000000 +0200
@@ -42,6 +42,10 @@
INCPRE=$(SOLARINCDIR)$/npsdk
+.IF "$(WITH_MOZILLA)" == "NO"
+CFLAGS+=-DWITHOUT_MOZILLA
+.ENDIF
+
.IF "$(GUI)"=="UNX"
# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
Home |
Main Index |
Thread Index |
Old Index