GNOME.org
 

ooo-build r11802 - in trunk: . patches/src680 patches/svgimport

Author: rengelhard
Date: Tue Mar  4 17:27:42 2008
New Revision: 11802
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11802&view=rev

Log:
2008-03-04  Rene Engelhard  <rene debian org>

        * patches/src680/ubuntu-xulrunner-1.9.diff: ... rename
        * patches/src680/xulrunner-1.9.diff: ... to this and add patch from
          issue 86670 from cmc
        * patches/src680/cws-s390port01.diff: two more #include <string.h>'s
          for gcc 4.3
        * patches/src680/gcc-4.3-bridges.diff: except.cxx for ia64
        * patches/svgimport/svg-filter.diff: add #include <limits.h> to work
          around build failure with gcc 4.3 (spirit uses INT_MAX)


Added:
   trunk/patches/src680/xulrunner-1.9.diff
      - copied, changed from r11784, /trunk/patches/src680/ubuntu-xulrunner-1.9.diff
Removed:
   trunk/patches/src680/ubuntu-xulrunner-1.9.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/cws-s390port01.diff
   trunk/patches/src680/gcc-4.3-bridges.diff
   trunk/patches/svgimport/svg-filter.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Mar  4 17:27:42 2008
@@ -1132,6 +1132,8 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
 libxmlsec-system-nss.diff, i#69368, pmladek
 
+xulrunner-1.9.diff, i#86670
+
 # allow separate helpcontent build
 #FIXME src680: separate-helpcontent.diff, jholesov
 
@@ -1834,7 +1836,6 @@
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
-ubuntu-xulrunner-1.9.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff

Modified: trunk/patches/src680/cws-s390port01.diff
==============================================================================
--- trunk/patches/src680/cws-s390port01.diff	(original)
+++ trunk/patches/src680/cws-s390port01.diff	Tue Mar  4 17:27:42 2008
@@ -278,7 +278,7 @@
 diff -u -u -p -b -w -B -r1.4 -r1.4.92.1
 --- bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	16 Sep 2006 15:48:49 -0000	1.4
 +++ bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	29 Feb 2008 14:56:00 -0000	1.4.92.1
-@@ -36,34 +36,26 @@
+@@ -36,34 +36,27 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_bridges.hxx"
  
@@ -301,6 +301,7 @@
  
  #include "share.hxx"
 +#include <stdio.h>
++#include <string.h>
  
  
 -using namespace ::osl;
@@ -846,15 +847,20 @@
 diff -u -u -p -b -w -B -r1.5 -r1.5.92.1
 --- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	16 Sep 2006 15:49:02 -0000	1.5
 +++ bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	29 Feb 2008 14:56:00 -0000	1.5.92.1
-@@ -46,7 +46,7 @@
+@ -46,10 +46,12 @@
  #include <osl/diagnose.h>
  #include <osl/mutex.hxx>
- 
+
 -#include <bridges/cpp_uno/bridge.hxx>
 +#include <com/sun/star/uno/genfunc.hxx>
  #include <typelib/typedescription.hxx>
  #include <uno/any2.h>
- 
+
++#include <string.h>
++
+ #include "share.hxx"
+
+
 @@ -291,4 +291,4 @@ void fillUnoException( __cxa_exception *
  }
  

Modified: trunk/patches/src680/gcc-4.3-bridges.diff
==============================================================================
--- trunk/patches/src680/gcc-4.3-bridges.diff	(original)
+++ trunk/patches/src680/gcc-4.3-bridges.diff	Tue Mar  4 17:27:42 2008
@@ -18,3 +18,13 @@
  #include <dlfcn.h>
  #include <cxxabi.h>
  #include <hash_map>
+--- bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx-old	2008-03-04 11:42:43.000000000 +0100
++++ bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx	2008-03-04 11:43:03.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>

Copied: trunk/patches/src680/xulrunner-1.9.diff (from r11784, /trunk/patches/src680/ubuntu-xulrunner-1.9.diff)
==============================================================================
--- /trunk/patches/src680/ubuntu-xulrunner-1.9.diff	(original)
+++ trunk/patches/src680/xulrunner-1.9.diff	Tue Mar  4 17:27:42 2008
@@ -1,6 +1,20 @@
---- config_office/configure.in.old	2007-11-02 03:25:07.000000000 -0500
-+++ config_office/configure.in	2008-02-19 16:54:11.000000000 -0600
-@@ -3521,7 +3521,9 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.249
+diff -u -r1.249 configure.in
+--- config_office/configure.in	19 Feb 2008 12:37:37 -0000	1.249
++++ config_office/configure.in	4 Mar 2008 08:43:21 -0000
+@@ -466,7 +466,7 @@
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=<flavour>. Supported are:
+-                          xulrunner (default), firefox, seamonkey, mozilla
++                          libxul (default), firefox, seamonkey, mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+ [  --with-stlport         The location that STLport is installed in. The STL
+@@ -3794,7 +3794,9 @@
      AC_MSG_RESULT([external])
      SYSTEM_MOZILLA=YES
      AC_MSG_CHECKING([which Mozilla flavour to use])
@@ -11,46 +25,59 @@
        MOZ_FLAVOUR=xulrunner
      elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
        MOZ_FLAVOUR=seamonkey
-@@ -3535,8 +3537,6 @@
+@@ -3803,12 +3805,24 @@
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
+       MOZ_FLAVOUR=mozilla
+     else
+-      MOZ_FLAVOUR=xulrunner
++      MOZ_FLAVOUR=libxul
+     fi
      tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
      AC_MSG_RESULT($tmp)
  
 -    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
--
++    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++    if test "$MOZ_FLAVOUR" == "libxul"; then
++        MOZ_FLAVOUR="mozilla"
++    fi
++
++    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
++    if test -z "$STANDALONENSS"; then
++        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    else
++        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
++        AC_SUBST(NSS_LIB)
++    fi
+ 
      if $PKG_CONFIG --exists nspr ; then
        PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
-@@ -3566,9 +3566,20 @@
+@@ -3818,12 +3832,14 @@
+       PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
+     fi
+ 
+-    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
+-    if test -z "$STANDALONENSS"; then
+-        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    if $PKG_CONFIG --exists libxul ; then
++      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+     else
+-        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+-        AC_SUBST(NSS_LIB)
++      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+     fi
+ 
+     save_CPPFLAGS="$CPPFLAGS"
+@@ -3839,8 +3855,6 @@
      CPPFLAGS="$save_CPPFLAGS"
      LIBS="$save_LIBS"
  
 -    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
 -    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
--    MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-+    if $PKG_CONFIG --exists $MOZ_FLAVOUR-xpcom ; then
-+      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
-+      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-+      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-+      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-+    elif $PKG_CONFIG --exists $MOZ_FLAVOUR-embedding ; then
-+      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-embedding )
-+      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-embedding`/unstable
-+      MOZ_LIB=`$PKG_CONFIG --variable=sdkdir $MOZ_FLAVOUR-embedding`/lib
-+      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-+    else
-+      AC_MSG_ERROR([Could not find xpcom.])
-+    fi
-+
+     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
      if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
-       if test -d "$MOZ_INC/ldap"; then
---- extensions/source/plugin/util/makefile.pmk.old	2007-02-06 06:59:38.000000000 -0600
-+++ extensions/source/plugin/util/makefile.pmk	2008-02-20 08:31:33.000000000 -0600
-@@ -39,6 +39,6 @@
- 
- .IF "$(SYSTEM_MOZILLA)" == "YES"
- CFLAGS+=-DSYSTEM_MOZILLA
--PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin
-+PKGCONFIG_MODULES=mozilla-plugin
- .INCLUDE : pkg_config.mk
- .ENDIF

Modified: trunk/patches/svgimport/svg-filter.diff
==============================================================================
--- trunk/patches/svgimport/svg-filter.diff	(original)
+++ trunk/patches/svgimport/svg-filter.diff	Tue Mar  4 17:27:42 2008
@@ -1405,7 +1405,7 @@
 index 0000000..790281d
 --- /dev/null
 +++ filter/source/svgimport/parserfragments.cxx
-@@ -0,0 +1,344 @@
+@@ -0,0 +1,346 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -1430,6 +1430,8 @@
 +#include <basegfx/tools/canvastools.hxx>
 +#include <com/sun/star/geometry/AffineMatrix2D.hpp>
 +
++// workaround. spirit uses INT_MAX.
++#include <limits.h>
 +#include <boost/bind.hpp>
 +#include <boost/spirit.hpp>
 +#include <numeric>
@@ -8869,7 +8871,7 @@
 index 0000000..ebafca5
 --- /dev/null
 +++ filter/source/svgimport/units.cxx
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,84 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -8891,6 +8893,8 @@
 +
 +#include "units.hxx"
 +#include <rtl/ustring.hxx>
++// workaround. spirit uses INT_MAX.
++#include <limits.h>
 +#include <boost/spirit.hpp>
 +
 +namespace svgi
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]