From 014f47ad3ef7e57cdf20b50f4ec6c0241e14b823 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 8 May 2005 17:19:28 +0000 Subject: [PATCH] - up Changed files: openoffice.org-pld.patch -> 1.5 --- openoffice.org-pld.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openoffice.org-pld.patch b/openoffice.org-pld.patch index 7386c1f..d44916e 100644 --- a/openoffice.org-pld.patch +++ b/openoffice.org-pld.patch @@ -14,14 +14,14 @@ diff -urN ooo-build-1.9.100.org/patches/src680/system-mozilla.diff ooo-build-1.9 --- ooo-build-1.9.100.org/patches/src680/system-mozilla.diff 1970-01-01 00:00:00.000000000 +0000 +++ ooo-build-1.9.100/patches/src680/system-mozilla.diff 2005-05-08 16:31:14.699150720 +0000 @@ -0,0 +1,11 @@ -+--- extensions.org/source/nsplugin/source/makefile.mk.org 2005-05-08 16:38:52.722520584 +0000 -++++ extensions/source/nsplugin/source/makefile.mk 2005-05-08 16:39:21.614128392 +0000 -+@@ -81,7 +81,7 @@ -+ .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" -+ INC+= -DNP_LINUX -+ .IF "$(SYSTEM_MOZILLA)" == "YES" -+-INCPRE=-I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin -++INCPRE=-I$(MOZ_NSS_CFLAGS) -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin -+ # not sure about -DMOZ_X11 but otheriwse some struct member don't exist... -+ CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11 -+ .ENDIF ++--- np_sdk/mozilla-source-M16-stub.patch.org 2005-05-08 17:17:25.759885456 +0000 +++++ np_sdk/mozilla-source-M16-stub.patch 2005-05-08 17:17:55.449371968 +0000 ++@@ -1202,7 +1202,7 @@ ++ ! .ENDIF ++ ! ++ ! .IF "$(SYSTEM_MOZILLA)" == "YES" ++-! INCPRE= -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin +++! INCPRE= -I$(MOZ_NSS_CFLAGS) -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin ++ ! .ENDIF ++ ! ++ ! .IF "$(GUI)" == "UNX" -- 2.44.0