ooo-build r12938 - in trunk: . bin distro-configs patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Jun 21 20:06:49 2008
New Revision: 12938
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12938&view=rev

Log:
2008-06-21  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/ac-objext-hack.diff: work around AC_PROG_CC and
          AC_PROG_CXX somehow not always setting ac_objext anymore by running
          AC_LANGUAGE_OBJEXT..
        * patches/dev300/static-libs-use-_pic.diff,
          patches/dev300/configures-explicit-arch.diff: update for m20
        * patches/dev300/apply,
          patches/dev300/buildfix-system-jfreereport.diff: buildfix for
          system-jfreereport with m20
        * bin/install-mono: update for scp2-3layer-nicer-paths.diff changes
          (add ./)


Added:
   trunk/patches/dev300/ac-objext-hack.diff
   trunk/patches/dev300/buildfix-system-jfreereport.diff
Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/distro-configs/CommonLinux.conf.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/static-libs-use-_pic.diff

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Sat Jun 21 20:06:49 2008
@@ -40,8 +40,8 @@
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
 	$SRCDIR/$dll.config.in >$OOINSTDIR/basis$VERSION/program/$dll.config
     if test -n "$OODESTDIR" ; then
-	file_list=`grep "^$OOINSTBASE/basis$VERSION/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
-	echo "$OOINSTBASE/basis$VERSION/program/$dll.config" >>$file_list
+	file_list=`grep "^$OOINSTBASE/./basis$VERSION/program/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+	echo "$OOINSTBASE/./basis$VERSION/program/$dll.config" >>$file_list
     fi
 done
 

Modified: trunk/distro-configs/CommonLinux.conf.in
==============================================================================
--- trunk/distro-configs/CommonLinux.conf.in	(original)
+++ trunk/distro-configs/CommonLinux.conf.in	Sat Jun 21 20:06:49 2008
@@ -12,7 +12,6 @@
 --with-system-stdlibs
 --with-system-zlib
 --with-unix-wrapper=ooffice OOO_BINSUFFIX@
---enable-evolution2
 --enable-atkbridge
 --with-alloc=system
 --with-vba-package-format=builtin

Added: trunk/patches/dev300/ac-objext-hack.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ac-objext-hack.diff	Sat Jun 21 20:06:49 2008
@@ -0,0 +1,16 @@
+--- config_office/configure.in	13 Jun 2008 14:10:42 -0000	1.271
++++ config_office/configure.in	21 Jun 2008 02:13:27 -0000
+@@ -2150,6 +2150,13 @@
+    fi
+ fi
+ 
++# normally AC_PROG_CC/_PROG_CXX call this with m4_expand_once, but
++# at least here starting with m20 it doesn't -> empty -> breaks all
++# kind of checks...
++if test -z "$ac_objext" ; then
++        _AC_COMPILER_OBJEXT
++fi
++
+ dnl *************************************************************
+ dnl Testing for exception handling - dwarf2 or sjlj exceptions...
+ dnl *************************************************************

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Jun 21 20:06:49 2008
@@ -255,6 +255,9 @@
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
+[ TemporaryHacks >= dev300-m20 ]
+# no idea why that (sometimes?) does not get called anymore
+ac-objext-hack.diff
 
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
@@ -911,6 +914,10 @@
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
+[ BuildBits >= dev300-m20 ]
+# fix reportdesign build
+buildfix-system-jfreereport.diff, i#90952, rengelha
+
 [ BuildBits < dev300-m20 ]
 # fix build with system-hunspell
 fix-system-hunspell.diff, i#87604

Added: trunk/patches/dev300/buildfix-system-jfreereport.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-system-jfreereport.diff	Sat Jun 21 20:06:49 2008
@@ -0,0 +1,11 @@
+--- reportdesign/java/com/sun/star/report/function/metadata/makefile.mk-old	2008-06-21 17:57:30.000000000 +0200
++++ reportdesign/java/com/sun/star/report/function/metadata/makefile.mk	2008-06-21 17:56:11.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ # JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+ .IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)
++CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)
+ .ELSE
+ JARFILES += jcommon-1.0.10.jar libformula-0.1.14.jar
+ .ENDIF

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Sat Jun 21 20:06:49 2008
@@ -153,15 +153,15 @@
 diff -u -u -r1.5.2.1 makefile.mk
 --- libtextcat/makefile.mk	2 Jan 2008 17:33:39 -0000	1.5.2.1
 +++ libtextcat/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -62,7 +62,7 @@
+@@ -57,7 +57,7 @@
+ #CONFIGURE_DIR=$(BUILD_DIR)
  
  #relative to CONFIGURE_DIR
--CONFIGURE_ACTION=configure CFLAGS="$(EXTRA_CFLAGS)"
-+CONFIGURE_ACTION=configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(EXTRA_CFLAGS)"
+-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_FLAGS=
  
  BUILD_ACTION=make
- 
 Index: libxml2/makefile.mk
 ===================================================================
 RCS file: /cvs/external/libxml2/makefile.mk,v

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	Sat Jun 21 20:06:49 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