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

[michael svn gnome org]

Author: michael
Date: Tue Jul 22 09:06:48 2008
New Revision: 13340
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13340&view=rev

Log:
2008-07-22  Michael Meeks  <michael meeks novell com>

        * patches/dev300/solenv-paths.diff,
        * patches/dev300/apply: fix bogus paths hurting RPM.



Added:
   trunk/patches/dev300/solenv-paths.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-scp2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 09:06:48 2008
@@ -2622,6 +2622,7 @@
 config_office-disable-atl.diff, thorsten
 tools-resmgr-expansion-fix.diff, i#90178, caolan
 xmlsecurity-disable-moz.diff, thorsten
+solenv-paths.diff, caolan
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Modified: trunk/patches/dev300/piece-scp2.diff
==============================================================================
--- trunk/patches/dev300/piece-scp2.diff	(original)
+++ trunk/patches/dev300/piece-scp2.diff	Tue Jul 22 09:06:48 2008
@@ -1,7 +1,7 @@
 --- scp2/prj/build.lst	2008-06-06 10:37:54.000000000 +0100
 +++ scp2/prj/build.lst	2008-06-06 10:37:54.000000000 +0100
 @@ -1,4 +1,4 @@
--cp    scp2    :    setup_native transex3 PYTHON:python ICU:icu NULL
+-cp    scp2    :    setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 +cp    scp2    :    soltools PYTHON:python ICU:icu NULL
  cp    scp2                        usr1     -    all    cp_mkout NULL
  cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
@@ -10,15 +10,33 @@
 
 --- scp2/source/ooo/makefile.mk
 +++ scp2/source/ooo/makefile.mk
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,6 @@
  # --- Settings -----------------------------------------------------
  
  .INCLUDE :  settings.mk
 -.INCLUDE :  i18npool/version.mk
-+# .INCLUDE :  i18npool/version.mk
  
  .IF "$(ENABLE_CRASHDUMP)"!=""
  SCPDEFS+=-DENABLE_CRASHDUMP
+@@ -164,7 +164,17 @@
+ .IF "$(SYSTEM_REDLAND)" == "YES"
+ SCPDEFS+=-DSYSTEM_REDLAND
+ .ELSE
+-.INCLUDE :  redlandversion.mk
++RAPTOR_MAJOR=1
++RAPTOR_MINOR=1
++RAPTOR_MICRO=0
++# rasqal has no stable abi
++RASQAL_MAJOR=0
++RASQAL_MINOR=0
++RASQAL_MICRO=0
++# redland has no stable abi
++REDLAND_MAJOR=0
++REDLAND_MINOR=0
++REDLAND_MICRO=0
+ SCPDEFS+=\
+     -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
+     -DRAPTOR_MINOR=$(RAPTOR_MINOR) \
 @@ -288,5 +288,5 @@
  $(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
  .ENDIF

Added: trunk/patches/dev300/solenv-paths.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-paths.diff	Tue Jul 22 09:06:48 2008
@@ -0,0 +1,27 @@
+diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap
+--- solenv/bin/langwrap	2008-01-10 12:24:02.000000000 +0000
++++ solenv/bin/langwrap	2008-01-10 12:26:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/solar/bin/perl -w
++#!/usr/bin/perl -w
+ #
+ # langwrap - language wrapper for building resources
+ #
+diff -ru openoffice.org/solenv/bin/modules/osarch.pm openoffice.org/solenv/bin/modules/osarch.pm
+--- solenv/bin/modules/osarch.pm	2008-01-10 12:24:02.000000000 +0000
++++ solenv/bin/modules/osarch.pm	2008-01-10 12:26:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/solar/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ # ***********************************************************************
+ # Description: 
+diff -ru openoffice.org/solenv/bin/pchdelta.py openoffice.org/solenv/bin/pchdelta.py
+--- solenv/bin/pchdelta.py	2008-01-10 12:24:02.000000000 +0000
++++ solenv/bin/pchdelta.py	2008-01-10 12:27:28.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/bin/python
++#!/usr/bin/python
+ 
+ # ------------------------------------------------------------------------------
+ # Hacky little delta debug tool to figure out the proper includes for a pch file