[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch, NONE, 1.1 openoffice.org.spec, 1.319, 1.320



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18490

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch 
Log Message:
attempt alternative nspr config

openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch:
 extensions/source/nsplugin/source/makefile.mk |    3 ++-
 source/nsplugin/source/makefile.mk            |    0 
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch ---
Index: source/nsplugin/source/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
retrieving revision 1.13
diff -u -p -r1.13 makefile.mk
--- openoffice.org.orig/extensions/source/nsplugin/source/makefile.mk	31 May 2005 17:09:00 -0000	1.13
+++ openoffice.org/extensions/source/nsplugin/source/makefile.mk	16 Jul 2005 16:43:22 -0000
@@ -81,7 +81,8 @@ dummy:
 .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
+PKGCONFIG_MODULES=mozilla-plugin
+.INCLUDE: pkg_config.mk
 # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
 CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11
 .ENDIF


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- openoffice.org.spec	16 Jul 2005 11:52:56 -0000	1.319
+++ openoffice.org.spec	16 Jul 2005 16:46:24 -0000	1.320
@@ -161,6 +161,7 @@
 Patch60: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
 Patch61: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
 Patch62: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
+Patch63: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -808,6 +809,7 @@
 %if %{build_fc5}
 %patch62 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
 %endif
+%patch63 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
 
 %if %{includeexternals}
 #start ludicrous workaround


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]