ooo-build r12633 - in trunk: . patches/dev300 patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu May 22 16:56:02 2008
New Revision: 12633
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12633&view=rev

Log:
2008-05-22  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/buildfix-filter-memcmp-header.diff: fixed build for 
	breakage for gcc 4.3.

	* patches/dev300/remove-sfx-notify-automation.diff:
	* patches/dev300/remove-sfx-notify-basic.diff:
	* patches/dev300/remove-sfx-notify-chart2.diff:
	* patches/dev300/remove-sfx-notify-sc.diff:
	* patches/dev300/remove-sfx-notify-sd.diff:
	* patches/dev300/remove-sfx-notify-sfx2.diff:
	* patches/dev300/remove-sfx-notify-svx.diff: moved & renamed from the 
	test patch directory.  They were originally named 
	sfx-broadcaster-hashset-*.diff.  These patches simply rename SFX_NOTIFY
	to Notify, since SFX_NOTIFY macro is obsolete.

	* patches/dev300/apply: apply these new patches.


Added:
   trunk/patches/dev300/buildfix-filter-memcmp-header.diff
   trunk/patches/dev300/remove-sfx-notify-automation.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-automation.diff
   trunk/patches/dev300/remove-sfx-notify-basic.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-basic.diff
   trunk/patches/dev300/remove-sfx-notify-chart2.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-chart2.diff
   trunk/patches/dev300/remove-sfx-notify-sc.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-sc.diff
   trunk/patches/dev300/remove-sfx-notify-sd.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-sd.diff
   trunk/patches/dev300/remove-sfx-notify-sfx2.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-sfx2.diff
   trunk/patches/dev300/remove-sfx-notify-svx.diff   (props changed)
      - copied unchanged from r12630, /trunk/patches/test/sfx-broadcaster-hashset-svx.diff
Removed:
   trunk/patches/test/sfx-broadcaster-hashset-automation.diff
   trunk/patches/test/sfx-broadcaster-hashset-basic.diff
   trunk/patches/test/sfx-broadcaster-hashset-chart2.diff
   trunk/patches/test/sfx-broadcaster-hashset-sc.diff
   trunk/patches/test/sfx-broadcaster-hashset-sd.diff
   trunk/patches/test/sfx-broadcaster-hashset-sfx2.diff
   trunk/patches/test/sfx-broadcaster-hashset-svx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May 22 16:56:02 2008
@@ -849,6 +849,15 @@
 scroll-accel-sc.diff, n#375909, i#71362, kohei
 scroll-accel-vcl.diff, n#375909, i#71362, kohei
 
+remove-sfx-notify-automation.diff
+remove-sfx-notify-basic.diff
+remove-sfx-notify-chart2.diff
+remove-sfx-notify-sc.diff
+remove-sfx-notify-sd.diff
+remove-sfx-notify-sfx2.diff
+remove-sfx-notify-svx.diff
+
+
 [ PopupRemoval ]
 # Remove unnecessary popups that might show up during startup.
 
@@ -1023,8 +1032,9 @@
 [ BuildBits == dev300-m12 ]
 fixup-system-hyph.diff, i#89468
 
-# gcc 4.3 requires #include <string.h> for strdup.
+# gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei
+buildfix-filter-memcmp-header.diff, kohei
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml

Added: trunk/patches/dev300/buildfix-filter-memcmp-header.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-filter-memcmp-header.diff	Thu May 22 16:56:02 2008
@@ -0,0 +1,13 @@
+diff --git filter/source/pdfimport/wrapper/wrapper.cxx filter/source/pdfimport/wrapper/wrapper.cxx
+index daa5e51..8855715 100755
+--- filter/source/pdfimport/wrapper/wrapper.cxx
++++ filter/source/pdfimport/wrapper/wrapper.cxx
+@@ -69,6 +69,8 @@
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/scoped_array.hpp>
+ 
++#include <string.h>
++
+ #include <hash_map>
+ 
+ #include "rtl/bootstrap.h"