ooo-build r11432 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jan 28 19:17:37 2008
New Revision: 11432
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11432&view=rev

Log:
2008-01-28  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/cws-unifysound01-vcl-m4.diff,
          patches/src680/cws-unifysound01.diff: ooh680-m5


Added:
   trunk/patches/src680/cws-unifysound01-vcl-m4.diff
      - copied unchanged from r11431, /trunk/patches/src680/cws-unifysound01-vcl.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/cws-unifysound01-vcl.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan 28 19:17:37 2008
@@ -280,7 +280,10 @@
 [ CWSBackports < ooh680-m2 ]
 cws-unifysound01-vcl-m1.diff
 
-[ CWSBackports >= ooh680-m2 ]
+[ CWSBackports >= ooh680-m2 < ooh680-m5 ]
+cws-unifysound01-vcl-m4.diff
+
+[ CWSBackports >= ooh680-m5 ]
 cws-unifysound01-vcl.diff
 
 [ CWSBackports < ooh680-m4 ]
@@ -562,7 +565,7 @@
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
-[ QuickStarter < ooh60-m5 ]
+[ QuickStarter < ooh680-m5 ]
 # libstartup-notification is not necessary with oosplash.bin
 libsn-removal.diff, i#84179, jholesov
 
@@ -924,7 +927,7 @@
 # fix building with system neon-0.24
 ucb-neon-0.24.diff, pmladek, i#85265
 
-[ BuildBits >= ooh680-m4 ]
+[ BuildBits == ooh680-m4 ]
 # fix evoab2 build
 evoab2-adapt-to-new-api.diff, i#85487
 

Modified: trunk/patches/src680/cws-unifysound01-vcl.diff
==============================================================================
--- trunk/patches/src680/cws-unifysound01-vcl.diff	(original)
+++ trunk/patches/src680/cws-unifysound01-vcl.diff	Mon Jan 28 19:17:37 2008
@@ -678,8 +678,8 @@
 --- vcl/prj/build.lst	20 Sep 2007 16:24:09 -0000	1.55
 +++ vcl/prj/build.lst	4 Oct 2007 22:03:55 -0000	1.54.20.2
 @@ -1,4 +1,4 @@
--vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp SNDFILE:sndfile PORTAUDIO:portaudio tools transex3 NULL
-+vc	vcl	:	BOOST:boost FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 NULL
+-vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp SNDFILE:sndfile PORTAUDIO:portaudio tools transex3 icc NULL
++vc	vcl	:	BOOST:boost FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc NULL
  vc	vcl										usr1	-	all	vc_mkout NULL
  vc	vcl\inc									nmake	-	all	vc_inc NULL
  vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
@@ -2268,9 +2268,9 @@
 -.ENDIF
 -.ENDIF
 -
- .IF "$(WITH_LIBSN)"=="YES"
- CDEFS+=-DHAVE_LIBSN
- CFLAGS+=$(LIBSN_CFLAGS)
+ .IF "$(USE_XINERAMA)" != "NO"
+ CDEFS+=-DUSE_XINERAMA
+ .IF "$(USE_XINERAMA_VERSION)" == "Xorg"
 Index: vcl/unx/source/app/nassound.cxx
 ===================================================================
 RCS file: vcl/unx/source/app/nassound.cxx