openoffice.org-pld.patch

   1 diff -urN ooo-build-1.9.100.org/patches/src680/apply ooo-build-1.9.100/patches/src680/apply
   2 --- ooo-build-1.9.100.org/patches/src680/apply  2005-05-06 15:14:57.000000000 +0000
   3 +++ ooo-build-1.9.100/patches/src680/apply      2005-05-08 16:32:31.807428480 +0000
   4 @@ -57,6 +57,8 @@
   5  [ TemporaryHacks ]
   6  # Teach linkoo about types.rdb i#49104
   7  linkoo-types.diff
   8 +# fix mozilla
   9 +system-mozilla.diff
  10
  11  [ GCJ ]
  12  # qadevOOo fails with encoding errors...
  13 diff -urN ooo-build-1.9.100.org/patches/src680/system-mozilla.diff ooo-build-1.9.100/patches/src680/system-mozilla.diff
  14 --- ooo-build-1.9.100.org/patches/src680/system-mozilla.diff    1970-01-01 00:00:00.000000000 +0000
  15 +++ ooo-build-1.9.100/patches/src680/system-mozilla.diff        2005-05-08 16:31:14.699150720 +0000
  16 @@ -0,0 +1,22 @@
  17 +--- np_sdk/mozilla-source-M16-stub.patch.org   2005-05-08 17:17:25.759885456 +0000
  18 ++++ np_sdk/mozilla-source-M16-stub.patch       2005-05-08 17:17:55.449371968 +0000
  19 +@@ -1202,7 +1202,7 @@
  20 + ! .ENDIF
  21 + !
  22 + ! .IF "$(SYSTEM_MOZILLA)" == "YES"
  23 +-! INCPRE= -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
  24 ++! INCPRE= -I$(MOZ_NSS_CFLAGS) -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
  25 + ! .ENDIF
  26 + !
  27 + ! .IF "$(GUI)" == "UNX"
  28 +--- etensions/source/nsplugin/source/makefile.mk.org   2005-05-09 04:39:32.597010704 +0000
  29 ++++ extensions/source/nsplugin/source/makefile.mk      2005-05-09 04:40:03.547305544 +0000
  30 +@@ -81,7 +81,7 @@
  31 + .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
  32 + INC+= -DNP_LINUX
  33 + .IF "$(SYSTEM_MOZILLA)" == "YES"
  34 +-INCPRE=-I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
  35 ++INCPRE=-I$(MOZ_NSS_CFLAGS) -I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
  36 + # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
  37 + CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11
  38 + .ENDIF