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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Mar  3 08:52:14 2009
New Revision: 15439
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15439&view=rev

Log:
2009-03-03  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/reportdesigner-no-license-m3.diff,
          patches/dev300/reportdesigner-no-license.diff: proactive m4 update
        * patches/dev300/reportdesign-useless-jfreereport-dep.diff: delete
        * patches/dev300/configures-explicit-archs.diff: typo
        * patches/dev300/apply,
          patches/dev300/openjdk-mips-server.diff: fix mips:
          s/client/server/ (again?)


Added:
   trunk/patches/dev300/openjdk-mips-server.diff
   trunk/patches/dev300/reportdesigner-no-license-m3.diff
      - copied unchanged from r15438, /trunk/patches/dev300/reportdesigner-no-license.diff
Removed:
   trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/reportdesigner-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar  3 08:52:14 2009
@@ -378,12 +378,6 @@
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
-# FIXME: disabled since we need the dep here right now
-# (until the reportbuilderext changed get transferred to DEV300).
-# But then maybe it'll include this fix..
-#[ BuildBits ]
-#reportdesign-useless-jfreereport-dep.diff
-
 [ FixesNotForUpstream <= dev300-m41 <= ooo310-m0 ]
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions-m0.diff 
@@ -409,8 +403,12 @@
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
 
+[ ExtensionFixes < ooo310-m4 ]
+reportdesigner-no-license-m3.diff
 [ ExtensionFixes ]
 reportdesigner-no-license.diff
+
+[ ExtensionFixes ]
 presenterscreen-no-license.diff
 presentation-minimizer-no-license.diff
 # Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
@@ -1155,6 +1153,9 @@
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+# fix MIPS build with OpenJDK
+openjdk-mips-server.diff
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Tue Mar  3 08:52:14 2009
@@ -142,7 +142,7 @@
  
  #relative to CONFIGURE_DIR
 -CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-+CONFIGURE_ACTION=configure -host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
++CONFIGURE_ACTION=configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
  CONFIGURE_FLAGS=
  
  BUILD_ACTION=make

Added: trunk/patches/dev300/openjdk-mips-server.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/openjdk-mips-server.diff	Tue Mar  3 08:52:14 2009
@@ -0,0 +1,11 @@
+--- set_soenv.in	(Revision 268589)
++++ set_soenv.in	(Arbeitskopie)
+@@ -577,7 +577,7 @@
+       }
+ 
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
+    }

Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff	(original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff	Tue Mar  3 08:52:14 2009
@@ -1,7 +1,7 @@
 diff --git reportdesign/util/description.xml reportdesign/util/description.xml
 index 2ed058b..5ad0a26 100644
---- reportdesign/util/description.xml
-+++ reportdesign/util/description.xml
+--- reportbuilder/util/description.xml
++++ reportbuilder/util/description.xml
 @@ -6,11 +6,6 @@
      <name lang="en-US">Sunâ Report Builder</name>
      <!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
@@ -11,6 +11,6 @@
 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
 -    </simple-license>
 -  </registration>
-   <version value="1.0.9"/>
+   <version value="#VERSION#"/>
    <identifier value="com.sun.reportdesigner"/>
    <dependencies>