ooo-build r13014 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jul  1 19:50:45 2008
New Revision: 13014
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13014&view=rev

Log:
        * download.in: add beb300-m.*
        * patches/dev300/configures-explicit-arch.diff,
          patches/dev300/static-libs-use-_pic.diff: update for icu disabling
          in speed-*.diff and hunspell changes
        * patches/dev300/apply,
          patches/dev300/reportdesigner-no-license-m21.diff,
          patches/dev300/reportdesigner-no-license.diff: beb300-m1 (and part
          of dev300-m23) support. Fix system-lucene.diff to be only applied
          to dev300.


Added:
   trunk/patches/dev300/reportdesigner-no-license-m21.diff
      - copied unchanged from r13011, /trunk/patches/dev300/reportdesigner-no-license.diff
Modified:
   trunk/ChangeLog
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/reportdesigner-no-license.diff
   trunk/patches/dev300/static-libs-use-_pic.diff

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Jul  1 19:50:45 2008
@@ -22,6 +22,7 @@
     'http:\/\/.*'                        => '',
     'binutils-.*'			 => '@MIRROR@/support',
     'gcc-.*'			 	 => '@MIRROR@/support',
+    'beb300-m.*'			 => '@MIRROR@/BEB300',
     'dev300-m.*'			 => '@MIRROR@/DEV300',
     'swext-dev300-m.*'			 => '@MIRROR@/DEV300',
     'src680-m.*'			 => '@MIRROR@/SRC680',

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul  1 19:50:45 2008
@@ -368,7 +368,12 @@
 
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
+[ FixesNotForUpstream >= beb300-m1 >= dev300-m23 ]
 reportdesigner-no-license.diff
+[ FixesNotForUpstream < beb300-m1 < dev300-m23 ]
+reportdesigner-no-license-m22.diff
+
+[ FixesNotForUpstream ]
 presentation-minimizer-no-license.diff
 pdfimport-no-license.diff
 presenterscreen-no-license.diff
@@ -940,7 +945,7 @@
 # fix reportdesign build
 buildfix-system-jfreereport.diff, i#90952, rengelha
 
-[ BuildBits >= dev300-m22 ]
+[ BuildBits >= dev300-m22 < beb300-m0 ]
 # system lucene
 system-lucene.diff
 

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Tue Jul  1 19:50:45 2008
@@ -137,12 +137,12 @@
 diff -u -u -r1.37.16.1 makefile.mk
 --- icu/makefile.mk	2 Jan 2008 17:31:44 -0000	1.37.16.1
 +++ icu/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -99,7 +99,7 @@
+@@ -96,7 +96,7 @@
  
  CONFIGURE_DIR=source
  
--CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
-+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
+-CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
++CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
  
  #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
  CONFIGURE_FLAGS=

Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff	(original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff	Tue Jul  1 19:50:45 2008
@@ -5,15 +5,15 @@
 diff -u -u -r1.4 description.xml
 --- reportdesign/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
 +++ reportdesign/util/description.xml	16 Jun 2008 15:02:24 -0000
-@@ -2,11 +2,6 @@
- <description xmlns="http://openoffice.org/extensions/description/2006";
-     xmlns:d="http://openoffice.org/extensions/description/2006"; 
-     xmlns:xlink="http://www.w3.org/1999/xlink";>
+@@ -6,11 +6,6 @@
+     <name lang="en-US">Sunâ Report Builder</name>
+     <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
+   </display-name>
 -  <registration>
 -    <simple-license accept-by="admin" default-license-id="en-US" >
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -    </simple-license>
 -  </registration>
-   <version value="1.0.4"/>
+   <version value="1.0.5"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>

Modified: trunk/patches/dev300/static-libs-use-_pic.diff
==============================================================================
--- trunk/patches/dev300/static-libs-use-_pic.diff	(original)
+++ trunk/patches/dev300/static-libs-use-_pic.diff	Tue Jul  1 19:50:45 2008
@@ -28,10 +28,10 @@
  .ELSE
  AGGLIB=-lagg$(OFFICEUPD)$(DLLPOSTFIX)
  .ENDIF
-@@ -335,7 +335,7 @@
- UDMLIB=-ludm
- HUNSPELLLIB*=-lhunspell
- ULINGULIB=-lulingu
+@@ -339,7 +339,7 @@
+ .ELSE
+ HUNSPELLLIB=-lhunspell-1.1
+ .ENDIF
 -MYTHESLIB=-lmythes
 +MYTHESLIB*=-lmythes
  PYUNOLIB=-lpyuno