ooo-build r14769 - in trunk: . patches/dev300
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14769 - in trunk: . patches/dev300
- Date: Mon, 8 Dec 2008 00:01:01 +0000 (UTC)
Author: rengelhard
Date: Mon Dec 8 00:01:01 2008
New Revision: 14769
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14769&view=rev
Log:
fix up patch...
Added:
trunk/patches/dev300/extensions-missing-MOZ_INC.diff (contents, props changed)
- copied, changed from r14768, /trunk/patches/dev300/pluginapp-missing-MOZ_INC.diff
Removed:
trunk/patches/dev300/pluginapp-missing-MOZ_INC.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Dec 8 00:01:01 2008
@@ -1097,7 +1097,7 @@
config_office-openjdk-paths.diff, i91783
# actually add mozilla includes
-pluginapp-missing-MOZ_INC.diff, i#96912
+extensions-missing-MOZ_INC.diff, i#96912
[ BuildBits < dev300-m36 ]
# fixes parallel build
Copied: trunk/patches/dev300/extensions-missing-MOZ_INC.diff (from r14768, /trunk/patches/dev300/pluginapp-missing-MOZ_INC.diff)
==============================================================================
--- /trunk/patches/dev300/pluginapp-missing-MOZ_INC.diff (original)
+++ trunk/patches/dev300/extensions-missing-MOZ_INC.diff Mon Dec 8 00:01:01 2008
@@ -1,13 +1,24 @@
Index: makefile.mk
===================================================================
---- extensions/source/plugin/unx/makefile.mk (Revision 264632)
-+++ extensions/source/plugin/unx/makefile.mk (Arbeitskopie)
-@@ -54,6 +54,8 @@
+--- extensions/source/plugin/base/makefile.mk (Revision 264632)
++++ extensions/source/plugin/base/makefile.mk (Arbeitskopie)
+@@ -37,10 +37,19 @@
- .IF "$(WITH_MOZILLA)" != "NO"
+ .INCLUDE : ..$/util$/makefile.pmk
-+CFLAGS+=-I$(MOZ_INC)
-+
- .IF "$(DISABLE_XAW)" == "TRUE"
- CDEFS+=-DDISABLE_XAW
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC)$/plugin
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
++.ENDIF
+ .IF "$(SOLAR_JAVA)" != ""
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC)$/java
++INCPRE+=-I$(MOZ_INC)$/nspr
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
++.ENDIF
+ CDEFS+=-DOJI
.ENDIF
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]