[arch-commits] Commit in openoffice-base-devel/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Tuesday, December 9, 2008 @ 04:01:20
  Author: andyrtr
Revision: 21059

new snapshot, added a buildfix patch

Added:
  openoffice-base-devel/trunk/extensions-missing-MOZ_INC.diff
Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD

---------------------------------+
 ChangeLog                       |    7 +---
 PKGBUILD                        |    3 +
 extensions-missing-MOZ_INC.diff |   63 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-12-09 07:17:38 UTC (rev 21058)
+++ ChangeLog	2008-12-09 09:01:20 UTC (rev 21059)
@@ -1,8 +1,7 @@
-2008-12-04 Andreas Radke <andyrtr at archlinux.org>
+openoffice-base-devel - 3.1_dev300_m37-1
+- next snapshot
+- add buildfix for xulrunner header location changes
 
-	3.1_dev300_m37-1
-	- next snapshot
-
 openoffice-base-devel - 3.1_dev300_m35-1
 - next snapshot
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-09 07:17:38 UTC (rev 21058)
+++ PKGBUILD	2008-12-09 09:01:20 UTC (rev 21059)
@@ -38,6 +38,7 @@
 	shell.patch
 	system_hsqldb.diff
 	buildfix-openjdk-6-no-rhino.diff
+	extensions-missing-MOZ_INC.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -67,7 +68,7 @@
 
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
-#	patch -Np0 -i ${srcdir}/system_hsqldb.diff || return 1
+	patch -Np0 -i ${srcdir}/extensions-missing-MOZ_INC.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix-openjdk-6-no-rhino.diff || return 1
 
 	# allows xmlsec to be able to read the format of the digital certificates.

Added: extensions-missing-MOZ_INC.diff
===================================================================
--- extensions-missing-MOZ_INC.diff	                        (rev 0)
+++ extensions-missing-MOZ_INC.diff	2008-12-09 09:01:20 UTC (rev 21059)
@@ -0,0 +1,63 @@
+Modified: cws/configuretoplevel/configure.in
+==============================================================================
+--- config_office/configure.in	Mon Dec  8 16:39:46 2008	(r265012)
++++ config_office/configure.in	Mon Dec  8 16:51:28 2008	(r265013)
+@@ -4028,7 +4028,7 @@
+ 
+     if $PKG_CONFIG --exists libxul ; then
+       PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
+-      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`/stable
+       MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+       if ! test -e "$MOZ_LIB/libxul.so"; then
+          MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
+
+Index: makefile.mk
+===================================================================
+--- extensions/source/plugin/base/makefile.mk	(Revision 264632)
++++ extensions/source/plugin/base/makefile.mk	(Arbeitskopie)
+@@ -37,10 +37,19 @@
+ 
+ .INCLUDE :  ..$/util$/makefile.pmk
+ 
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC) -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) -I$(MOZ_INC)$/nspr
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
++.ENDIF
+ CDEFS+=-DOJI
+ .ENDIF
+ 
+Index: makefile.mk
+===================================================================
+--- extensions/source/plugin/unx/makefile.mk	(Revision 264632)
++++ extensions/source/plugin/unx/makefile.mk	(Arbeitskopie)
+@@ -45,10 +45,19 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC) -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) -I$(MOZ_INC)$/nspr
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
++.ENDIF
+ CDEFS+=-DOJI
+ .ENDIF
+ 
+