rpms/openoffice.org/devel openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 19 07:28:51 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29034
Modified Files:
openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
Log Message:
alternative
openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch:
extensions/source/nsplugin/source/makefile.mk | 2 +-
source/nsplugin/source/makefile.mk | 0
2 files changed, 1 insertion(+), 1 deletion(-)
Index: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch 16 Jul 2005 16:46:24 -0000 1.1
+++ openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch 19 Jul 2005 07:28:46 -0000 1.2
@@ -5,13 +5,12 @@
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:
+@@ -81,7 +81,7 @@ 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
++INCPRE=-I/usr/include/nspr4 -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
More information about the fedora-cvs-commits
mailing list