ooo-build r12292 - in trunk: . patches patches/dev300 patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Tue Apr 22 18:50:42 2008
New Revision: 12292
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12292&view=rev

Log:
2008-04-22  Petr Mladek  <pmladek suse cz>

	* patches/src680/nas-use-arch-flags.diff:
	* patches/src680/libxmlsec-system-nss.diff:
	* patches/dev300/apply: already applied in dev300-m4

	* patches/src680/warning-string-comparsion-sw.diff: better fix to avoid
	  the warnings, i#86880


Added:
   trunk/patches/dev300/Makefile.am
Removed:
   trunk/patches/src680/libxmlsec-system-nss.diff
   trunk/patches/src680/nas-use-arch-flags.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/Makefile.am
   trunk/patches/dev300/   (props changed)
   trunk/patches/dev300/apply
   trunk/patches/src680/warning-string-comparsion-sw.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 22 18:50:42 2008
@@ -1241,6 +1241,7 @@
 patches/apply.pl
 patches/Makefile
 patches/cairo/Makefile
+patches/dev300/Makefile
 patches/evo2/Makefile
 patches/emf+/Makefile
 patches/gstreamer/Makefile

Modified: trunk/patches/Makefile.am
==============================================================================
--- trunk/patches/Makefile.am	(original)
+++ trunk/patches/Makefile.am	Tue Apr 22 18:50:42 2008
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo emf+ evo2 gstreamer hotfixes mono ooxml scsolver src680 src680-only vba postgresql
+SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml scsolver src680 src680-only vba postgresql
 
 EXTRA_DIST=README apply.pl.in $(wildcard *.diff)

Added: trunk/patches/dev300/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/Makefile.am	Tue Apr 22 18:50:42 2008
@@ -0,0 +1,4 @@
+EXTRA_DIST = apply ${wildcard *.diff}
+
+patch.apply:
+	cd ../.. ; make patch.apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 22 18:50:42 2008
@@ -1012,9 +1012,6 @@
 # add -dontstrip option to the installer
 installer-strip-optional.diff, i#48814, pmladek
 
-# add possibility to set ARCH_FLAGS when building libnas
-#FIXME dev300: nas-use-arch-flags.diff, pmladek
-
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
@@ -1028,10 +1025,6 @@
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
-# fix build with system libnss installed apart from mozilla
-# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
-#FIXME dev300: libxmlsec-system-nss.diff, i#69368, pmladek
-
 xulrunner-1.9.diff, i#86670
 
 # allow separate helpcontent build

Modified: trunk/patches/src680/warning-string-comparsion-sw.diff
==============================================================================
--- trunk/patches/src680/warning-string-comparsion-sw.diff	(original)
+++ trunk/patches/src680/warning-string-comparsion-sw.diff	Tue Apr 22 18:50:42 2008
@@ -1,11 +1,11 @@
---- sw/source/filter/html/htmlforw.cxx.old	2007-09-27 11:48:34.000000000 +0200
-+++ sw/source/filter/html/htmlforw.cxx	2008-03-07 13:29:49.000000000 +0100
+--- sw/source/filter/html/htmlforw.cxx.old	2008-04-22 17:16:17.000000000 +0200
++++ sw/source/filter/html/htmlforw.cxx	2008-04-22 17:27:00.000000000 +0200
 @@ -1088,7 +1088,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
  
      sOut += sOptions;
  
 -    if( sHTML_IT_image == pType )
-+    if( !strcmp( sHTML_IT_image, pType ) )
++    if( (const sal_Char *)sHTML_IT_image == (const sal_Char *)pType )
      {
          aTmp = xPropSet->getPropertyValue(
                      OUString::createFromAscii( "ImageURL" ) );
@@ -14,7 +14,7 @@
          // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen,
          // das entsprechende Flag loeschen.
 -        nFrmOpts |= (sHTML_IT_image == pType
-+        nFrmOpts |= ( !strcmp ( sHTML_IT_image, pType )
++        nFrmOpts |= ((const sal_Char *)sHTML_IT_image == (const sal_Char *)pType
                              ? HTML_FRMOPTS_IMG_CONTROL_CSS1
                              : HTML_FRMOPTS_CONTROL_CSS1);
      }
@@ -24,9 +24,9 @@
      {
 -        sal_Bool bEdit = sHTML_textarea == pTag || sHTML_IT_file == pType ||
 -                     sHTML_IT_text == pType;
-+        sal_Bool bEdit = !strcmp ( sHTML_textarea, pTag ) || 
-+			 !strcmp ( sHTML_IT_file, pType ) ||
-+			 !strcmp (sHTML_IT_text, pType );
++        sal_Bool bEdit = (const sal_Char *)sHTML_textarea == (const sal_Char *)pTag ||
++                     (const sal_Char *)sHTML_IT_file == (const sal_Char *)pType ||
++                     (const sal_Char *)sHTML_IT_text == (const sal_Char *)pType;
  
          SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
                               RES_CHRATR_END );
@@ -35,7 +35,7 @@
      rWrt.Strm() << '>';
  
 -    if( sHTML_select == pTag )
-+    if( !strcmp ( sHTML_select, pTag ) )
++    if( (const sal_Char *)sHTML_select == (const sal_Char *)pTag )
      {
          aTmp = xPropSet->getPropertyValue(
                      OUString::createFromAscii( "StringItemList" ) );
@@ -44,7 +44,7 @@
          HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_select, sal_False );
      }
 -    else if( sHTML_textarea == pTag )
-+    else if( !strcmp ( sHTML_textarea, pTag ) )
++    else if( (const sal_Char *)sHTML_textarea == (const sal_Char *)pTag )
      {
          // In TextAreas duerfen keine zusaetzlichen Spaces oder LF exportiert
          // werden!
@@ -53,19 +53,19 @@
          HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_textarea, sal_False );
      }
 -    else if( sHTML_IT_checkbox == pType || sHTML_IT_radio == pType )
-+    else if( !strcmp ( sHTML_IT_checkbox, pType ) || 
-+	     !strcmp ( sHTML_IT_radio, pType ) )
++    else if( (const sal_Char *)sHTML_IT_checkbox == (const sal_Char *)pType ||
++	    (const sal_Char *)sHTML_IT_radio == (const sal_Char *)pType )
      {
          aTmp = xPropSet->getPropertyValue( OUString::createFromAscii("Label") );
          if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
---- sw/source/filter/rtf/rtfatr.cxx.old	2007-10-22 17:12:26.000000000 +0200
-+++ sw/source/filter/rtf/rtfatr.cxx	2008-03-07 13:34:55.000000000 +0100
+--- sw/source/filter/rtf/rtfatr.cxx.old	2008-04-22 17:16:30.000000000 +0200
++++ sw/source/filter/rtf/rtfatr.cxx	2008-04-22 17:32:08.000000000 +0200
 @@ -1615,7 +1615,7 @@ void ExportPICT(const Size &rOrig, const
      const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry,
      unsigned long nSize, SwRTFWriter &rWrt)
  {
 -    bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
-+    bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
++    bool bIsWMF = (const sal_Char *)pBLIPType == (const sal_Char *)sRTF_WMETAFILE ? true : false;
      if (pBLIPType && nSize && pGraphicAry)
      {
          rWrt.Strm() << '{' << sRTF_PICT;
@@ -74,7 +74,7 @@
       a wmf already then we don't need any such wrapping
      */
 -    bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
-+    bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
++    bool bIsWMF = (const sal_Char *)pBLIPType == (const sal_Char *)sRTF_WMETAFILE ? true : false;
      if (!bIsWMF)
  	    OutComment(rRTFWrt, sRTF_SHPPICT);