[ooo-build-commit] 2 commits - bin/unpack patches/dev300 patches/mono
René Engelhard
rene at kemper.freedesktop.org
Mon Sep 28 14:52:01 PDT 2009
bin/unpack | 7
patches/dev300/apply | 31 +-
patches/dev300/build-java-target-m59.diff | 203 +++++++++++++++
patches/dev300/build-java-target.diff | 2
patches/dev300/icu-arm-m59.diff | 13
patches/dev300/icu-arm.diff | 5
patches/dev300/novell-win32-agfa-monotype-fonts-m59.diff | 167 ++++++++++++
patches/dev300/novell-win32-agfa-monotype-fonts.diff | 9
patches/mono/mono-testtools-m59.diff | 183 +++++++++++++
patches/mono/mono-testtools.diff | 16 -
10 files changed, 615 insertions(+), 21 deletions(-)
New commits:
commit b0fa1d4b72d03c7f9deaf0197a02c70301fbf685
Author: Rene Engelhard <rene at debian.org>
Date: Mon Sep 28 23:49:47 2009 +0200
dev300-m60 update
* patches/dev300/build-java-target-m59.diff: rotate
* patches/dev300/build-java-target.diff: update for m60
* patches/dev300/icu-arm-m59.diff: rotate
* patches/dev300/icu-arm.diff: update for m60
* patches/dev300/novell-win32-agfa-monotype-fonts-m59.diff: rotate
* patches/dev300/novell-win32-agfa-monotype-fonts.diff: update for m60
* patches/mono/mono-testtools-m59.diff: rotate
* patches/mono/mono-testtools.diff: update for m60
* patches/dev300/apply: adapt; disable patches integrated in m59 and m60
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 56869fe..5c5f498 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -741,9 +741,11 @@ chart-skip-hidden-cells-sc-fix.diff, i#101273, kohei
# Don't use pShapeContext after deleting the instance. Fixes SEGFAULT.
calc-filter-xml-free-context.diff, n#467536, jonp
+[ CalcFixes < dev300-m59 ]
# show COUNT and COUNTA results even if current range contains an error.
calc-status-bar-func.diff, n#430655, i#94618, kohei
+[ CalcFixes ]
# default output to new sheet, instead of current sheet.
calc-dp-default-new-sheet.diff, i#50886, kohei
@@ -1109,13 +1111,20 @@ split-icons-search-usr-share.diff, n#296502, pmladek
# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
-[ BuildBits ]
-novell-win32-agfa-monotype-fonts.diff, tml
+[ BuildBits < dev300-m60 ]
+novell-win32-agfa-monotype-fonts-m59.diff, tml
+# allow to define java target, so the build is usable with the JVM 1.5
+# even when it is built with JDK 1.6
+build-java-target-m59.diff, i#93115, pmladek
+[ BuildBits >= dev300-m60 ]
+novell-win32-agfa-monotype-fonts.diff, tml
# allow to define java target, so the build is usable with the JVM 1.5
# even when it is built with JDK 1.6
build-java-target.diff, i#93115, pmladek
+[ BuildBits ]
+
# do not create '.' subdirectories
# omit './' in paths
solenv-installer-cleaner-paths.diff, pmladek
@@ -1137,15 +1146,16 @@ build-prebuilt-stax.diff, i#93116, pmladek
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
-# add ro
-postset-add-ro.diff
-
# don't break dmake with environment variables containing space in the name
# [which is a broken setup, but apparently most apps don't break with that ;-)]
dmake-space-in-envvar-name.diff, i#101786, jholesov
armeabi-softfp-buildfix.diff, i#105302, doko
+[ BuildBits < dev300-m60 ]
+# add ro
+postset-add-ro.diff
+
[ Java14 ]
# enable build with Java 1.4; can't go upstream
@@ -1411,6 +1421,7 @@ psprint-postscript-page-setup.diff, i#65491, n#80448, jholesov
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
+[ VCL < dev300-m60 ]
prevent-multiple-window-resize-calls-when-maximised.diff, i#104469
[ SystemBits ]
@@ -1595,7 +1606,11 @@ build-mono-link.diff, jholesov
# the versioned assemblies into the system Global Assembly Cache (GAC)
mono-build-keyfile.diff, rodo
mono-climaker.diff, rodo
+[ Mono < dev300-m60 ]
+mono-testtools-m59.diff, rodo
+[ Mono >= dev300-m60 ]
mono-testtools.diff, rodo
+[ Mono ]
buildfix-testtool-disabled.diff, cbosdo
# FIXME: ooo310-m1: the makefile is quite rewritten;
@@ -2668,6 +2683,10 @@ palette-enhanced-hatch.diff
[ DebianBaseOnly ]
#configures-explicit-arch.diff
+
+[ DebianBaseOnly < dev300-m60 ]
+icu-arm-m59.diff, doko
+[ DebianBaseOnly >= dev300-m60 ]
icu-arm.diff, doko
@@ -3299,9 +3318,11 @@ edit-links-decode-unicode-uri.diff, i#104166, kohei
# cache fontconfig's pre-substitution result for better rendering performance.
fontconfig-cache-pre-substitution.diff, n#529532, kohei
+[ Fixes < dev300-m60 |
# FIXME: 2009-09-03: For some reason need to link with $(CPPULIB),
# i.e. -luno_cppu in vcl/util, otherwise get undefined refs. Remove
# this if some way to fix the root cause of the problem is found.
+# FIXME: 2009-09-28: Seems to be fixed in m60, --rengelhard
link-with-uno-cppu.diff, tml
[ Fixes < dev300-m58 ]
diff --git a/patches/dev300/build-java-target-m59.diff b/patches/dev300/build-java-target-m59.diff
new file mode 100644
index 0000000..27b2313
--- /dev/null
+++ b/patches/dev300/build-java-target-m59.diff
@@ -0,0 +1,203 @@
+--- configure.in.old 2009-04-06 20:56:26.000000000 +0200
++++ configure.in 2009-04-06 20:57:09.000000000 +0200
+@@ -575,6 +575,17 @@ AC_ARG_WITH(java,
+ no support for Java components, applets, accessibility
+ or XML filters.
+ ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
++AC_ARG_WITH(java_target_version,
++[ --with-java-target-version Generate class files that will work on JVMs with
++ the specified version. For example, use
++ --with-java-target-version=1.4 to make sure that the
++ application will work with JVM 1.4 even when compiled
++ with JDK 1.5.
++
++ This option is ignored when you compile with gcj/gij.
++
++ Usage: --with-java-target-version=<jvm version>
++],,)
+ AC_ARG_ENABLE(gcjaot,
+ [ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
+ support to speed up buildsi by compiling the jars also
+@@ -2733,6 +2744,44 @@ else
+ JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
+ fi
+
++_java_target_ver="1.5"
++dnl ===================================================================
++dnl Check for target java bytecode version
++dnl ===================================================================
++if test "$SOLAR_JAVA" != ""; then
++ AC_MSG_CHECKING([for target java bytecode version])
++ if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
++ AC_MSG_RESULT([default by $JDK])
++ if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
++ AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
++ fi
++ else
++ if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
++ _java_target_ver="$with_java_target_version"
++ AC_MSG_RESULT([$_java_target_ver])
++ elif test $_jdk_ver -gt 10000 ; then
++ _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
++ AC_MSG_RESULT([$_java_target_ver])
++ else
++ AC_MSG_ERROR([Unable to guess java bytecode version from java version!])
++ fi
++ fi
++
++ if ! test -z "$_java_target_ver" -o \
++ "$_java_target_ver" = "1.1" -o \
++ "$_java_target_ver" = "1.2" -o \
++ "$_java_target_ver" = "1.3" -o \
++ "$_java_target_ver" = "1.4" -o \
++ "$_java_target_ver" = "1.5" -o \
++ "$_java_target_ver" = "1.6" -o \
++ "$_java_target_ver" = "5" ; then
++ AC_MSG_ERROR([$_java_target_ver is not supported java bytecode version!])
++ fi
++
++ JAVA_SOURCE_VER="$_java_target_ver"
++ JAVA_TARGET_VER="$_java_target_ver"
++fi
++
+ dnl ===================================================================
+ dnl Checks for javac
+ dnl ===================================================================
+@@ -2793,6 +2842,17 @@ if test "$SOLAR_JAVA" != ""; then
+ fi
+ AC_SUBST(JAVACISGCJ)
+
++JAVACISKAFFE=""
++dnl ===================================================================
++dnl Checks that javac is kaffe
++dnl ===================================================================
++if test "$SOLAR_JAVA" != ""; then
++ if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
++ JAVACISKAFFE="yes"
++ fi
++fi
++AC_SUBST(JAVACISKAFFE)
++
+ dnl ===================================================================
+ dnl Checks for javadoc
+ dnl ===================================================================
+@@ -3007,6 +3067,8 @@ fi
+ AC_SUBST(JAVA_HOME)
+ AC_SUBST(JDK)
+ AC_SUBST(JAVAFLAGS)
++AC_SUBST(JAVA_SOURCE_VER)
++AC_SUBST(JAVA_TARGET_VER)
+ AC_SUBST(JAVAINTERPRETER)
+ AC_SUBST(JAVACOMPILER)
+ AC_SUBST(JAVAAOTCOMPILER)
+--- set_soenv.in.javatarget~ 2008-07-07 19:57:41.109846862 +0200
++++ set_soenv.in 2008-07-07 20:04:44.665095643 +0200
+@@ -1842,6 +1842,7 @@ ToFile( "DMAKEROOT", $DMAKEROOT,
+ if ( $JDK ne "gcj" ) {
+ ToFile( "CLASSPATH", $CLASSPATH, "e" );
+ ToFile( "XCLASSPATH", $XCLASSPATH, "e" );
++ ToFile( "JAVACISKAFFE", '@JAVACISKAFFE@', "e" );
+ }
+ else {
+ ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" );
+@@ -1852,6 +1853,8 @@ if ( $GUI eq "UNX" ) {
+ {
+ ToFile( "JDK", "@JDK@", "e" );
+ ToFile( "JAVAFLAGS", "@JAVAFLAGS@", "e" );
++ ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
++ ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
+ ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
+ ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" );
+ ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
+--- solenv/inc/antsettings.mk.old 2008-04-10 19:33:24.000000000 +0200
++++ solenv/inc/antsettings.mk 2008-08-25 13:52:31.000000000 +0200
+@@ -44,6 +44,18 @@ PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)
+ ANT*:=$(ANT_HOME)$/bin$/ant
+ ANT_BUILDFILE*=build.xml
+
++.IF "$(ANT_COMPILER_FLAGS)"==""
++.IF "$(JAVACISGCJ)" == "yes"
++ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
++.ENDIF
++.ENDIF
++
++.IF "$(ANT_JAVA_VER_FLAGS)"==""
++.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
++ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
++.ENDIF
++.ENDIF
++
+ .IF "$(ANT_DEBUG)"==""
+ .IF "$(debug)"==""
+ ANT_DEBUG=off
+@@ -65,21 +77,12 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ .ENDIF
+
+-.IF "$(JAVACISGCJ)" == "yes"
+-ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
+- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
+- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
+- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
++ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
++ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
++ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
++ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
+ -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ELSE
+-ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
+- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
+- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
+- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
+- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
+- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+-.ENDIF
+ .ELSE # No java
+ ANT=
+ ANT_FLAGS=
+--- solenv/inc/settings.mk.javatarget~ 2008-07-07 19:57:31.071845803 +0200
++++ solenv/inc/settings.mk 2008-07-07 20:04:44.669096361 +0200
+@@ -157,6 +157,9 @@ JAVAI:=$(JAVAINTERPRETER)
+ .IF "$(JAVACISGCJ)" == "yes"
+ JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
+ .ENDIF
++.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
++JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
++.ENDIF
+
+ #classpath and response
+ .IF "$(JDK)" == "J++"
+--- hsqldb/makefile.mk.old 2008-05-14 11:31:19.000000000 +0200
++++ hsqldb/makefile.mk 2008-08-25 16:11:36.000000000 +0200
+@@ -67,7 +67,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""
+--- rhino/makefile.mk.old 2008-04-11 09:01:54.000000000 +0200
++++ rhino/makefile.mk 2008-08-25 16:15:08.000000000 +0200
+@@ -55,7 +55,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+ .ENDIF
+
+ # --- Targets ------------------------------------------------------
+--- qadevOOo/makefile.mk.old 2009-02-12 14:55:56.000000000 +0100
++++ qadevOOo/makefile.mk 2009-02-17 17:19:53.000000000 +0100
+@@ -48,7 +48,7 @@ TST:
+
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+ .IF "$(ANT_HOME)"!="NO_ANT_HOME"
+-ANT_FLAGS+=-Dbuild.source=1.5
++ANT_FLAGS+=-Dbuild.source=$(JAVA_SOURCE_VER)
+ ALLTAR: ANTBUILD
+ .ENDIF
+ .ENDIF
diff --git a/patches/dev300/build-java-target.diff b/patches/dev300/build-java-target.diff
index 27b2313..024888b 100644
--- a/patches/dev300/build-java-target.diff
+++ b/patches/dev300/build-java-target.diff
@@ -198,6 +198,6 @@
.IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=1.5
+ANT_FLAGS+=-Dbuild.source=$(JAVA_SOURCE_VER)
+ .IF "$(L10N_framework)"==""
ALLTAR: ANTBUILD
.ENDIF
- .ENDIF
diff --git a/patches/dev300/icu-arm-m59.diff b/patches/dev300/icu-arm-m59.diff
new file mode 100644
index 0000000..c3d5c0b
--- /dev/null
+++ b/patches/dev300/icu-arm-m59.diff
@@ -0,0 +1,13 @@
+--- icu/makefile.mk~ 2009-09-12 12:57:47.000000000 +0200
++++ icu/makefile.mk 2009-09-12 13:13:18.000000000 +0200
+@@ -85,8 +85,8 @@
+ icu_LDFLAGS+=-Wl,-z,noexecstack
+ .ENDIF
+
+-icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
+-icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
++icu_CFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
++icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
+
+ BUILD_ACTION_SEP=;
+ # remove conversion and transliteration data to reduce binary size.
diff --git a/patches/dev300/icu-arm.diff b/patches/dev300/icu-arm.diff
index c3d5c0b..67c7d0d 100644
--- a/patches/dev300/icu-arm.diff
+++ b/patches/dev300/icu-arm.diff
@@ -1,12 +1,13 @@
--- icu/makefile.mk~ 2009-09-12 12:57:47.000000000 +0200
+++ icu/makefile.mk 2009-09-12 13:13:18.000000000 +0200
-@@ -85,8 +85,8 @@
+@@ -85,9 +85,9 @@
icu_LDFLAGS+=-Wl,-z,noexecstack
.ENDIF
-icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
--icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
+icu_CFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
+ icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
+-icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
+icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
BUILD_ACTION_SEP=;
diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts-m59.diff b/patches/dev300/novell-win32-agfa-monotype-fonts-m59.diff
new file mode 100644
index 0000000..24c7d6b
--- /dev/null
+++ b/patches/dev300/novell-win32-agfa-monotype-fonts-m59.diff
@@ -0,0 +1,167 @@
+--- configure.in
++++ configure.in
+@@ -75,6 +75,11 @@
+ distributions where AFM files or TrueType Fonts
+ are known to be available.
+ ],,)
++AC_ARG_WITH(agfa-monotype-fonts,
++[ --without-agfa-monotype-fonts Remove proprietary Agfa Monotype fonts
++ (even if present) in the openoffice.org installation
++ set.
++],,with_agfa_monotype_fonts="yes")
+ AC_ARG_ENABLE(epm,
+ [ --disable-epm OO.o includes self-packaging code, that requires
+ epm, however epm is useless for large scale
+@@ -4317,6 +4322,18 @@
+ fi
+ AC_SUBST(WITH_FONTS)
+
++AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
++if test "$with_agfa_monotype_fonts" != "no" -a -e ../agfa_monotype_fonts/download/agfa-monotype-fonts.tar.gz; then
++ AC_MSG_RESULT([yes])
++ WITH_AGFA_MONOTYPE_FONTS=YES
++ SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
++ BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
++else
++ AC_MSG_RESULT([no])
++ WITH_AGFA_MONOTYPE_FONTS=NO
++fi
++AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
++
+ dnl ===================================================================
+ dnl Test whether to include ppds
+ dnl ===================================================================
+--- agfa_monotype_fonts/makefile.mk.OLD 1970-01-01 02:00:00.000000000 +0200
++++ agfa_monotype_fonts/makefile.mk 2005-11-23 05:07:41.015625000 +0200
+@@ -0,0 +1,78 @@
++#*************************************************************************
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# last change: $Author$ $Date$
++#
++# The Contents of this file are made available subject to
++# the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++# GNU Lesser General Public License Version 2.1
++# =============================================
++# Copyright 2005 by Sun Microsystems, Inc.
++# 901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
++#
++# This library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++#*************************************************************************
++
++PRJ=.
++
++PRJNAME=agfa_monotype_fonts
++TARGET=agfa_monotype_fonts
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++TARFILE_NAME=agfa-monotype-fonts
++TARFILE_ROOTDIR=agfa-monotype-fonts
++
++PATCH_FILE_NAME=
++
++
++CONFIGURE_DIR=
++CONFIGURE_ACTION=
++
++BUILD_DIR=
++BUILD_ACTION=
++BUILD_FLAGS=
++
++# --- Targets ------------------------------------------------------
++
++all: \
++ $(MISC)$/remove_build.flag \
++ ALLTAR
++
++.INCLUDE : set_ext.mk
++.INCLUDE : target.mk
++
++.IF "$(WITH_AGFA_MONOTYPE_FONTS)"!="NO"
++.INCLUDE : tg_ext.mk
++.ENDIF
++
++# Since you never know what will be in a patch (for example, it may already
++# patch at configure level), we remove the entire package directory if a patch
++# is newer.
++$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME)
++ $(REMOVE_PACKAGE_COMMAND)
++ +$(TOUCH) $(MISC)$/remove_build.flag
+--- agfa_monotype_fonts/prj/d.lst.OLD 1970-01-01 02:00:00.000000000 +0200
++++ agfa_monotype_fonts/prj/d.lst 2005-11-23 04:52:41.531250000 +0200
+@@ -0,0 +1,2 @@
++mkdir: %_DEST%\pck%_EXT%
++..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
+--- agfa_monotype_fonts/prj/build.lst.OLD 1970-01-01 02:00:00.000000000 +0200
++++ agfa_monotype_fonts/prj/build.lst 2005-11-22 12:05:42.843750000 +0200
+@@ -0,0 +1,3 @@
++bs agfa_monotype_fonts : solenv NULL
++bs agfa_monotype_fonts usr1 - all amt_mkout NULL
++bs agfa_monotype_fonts nmake - all amt_fonts NULL
+--- scp2/source/ooo/file_font_ooo.scp.OLD 2005-09-09 04:37:10.000000000 +0300
++++ scp2/source/ooo/file_font_ooo.scp 2005-11-23 05:08:35.375000000 +0200
+@@ -151,3 +151,31 @@
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
+ #endif
+ #endif
++
++#ifdef WNT
++#ifdef WITH_AGFA_MONOTYPE_FONTS
++STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
++STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
++STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
++STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
++STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
++STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
++STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
++STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
++STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
++#endif
++#endif
+--- postprocess/prj/build.lst 2005-11-23 05:56:34.703125000 +0200
++++ postprocess/prj/build.lst 2005-11-23 05:56:48.812500000 +0200
+@@ -1,4 +1,4 @@
+-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+ po postprocess usr1 - all po_mkout NULL
+ po postprocess\checkxml nmake - all po_checkxml NULL
+ po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
index 24c7d6b..96e075e 100644
--- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff
+++ b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
@@ -125,11 +125,10 @@
+bs agfa_monotype_fonts nmake - all amt_fonts NULL
--- scp2/source/ooo/file_font_ooo.scp.OLD 2005-09-09 04:37:10.000000000 +0300
+++ scp2/source/ooo/file_font_ooo.scp 2005-11-23 05:08:35.375000000 +0200
-@@ -151,3 +151,31 @@
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
- #endif
- #endif
-+
+@@ -209,3 +209,30 @@
+ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
+ #endif
+
+#ifdef WNT
+#ifdef WITH_AGFA_MONOTYPE_FONTS
+STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
diff --git a/patches/mono/mono-testtools-m59.diff b/patches/mono/mono-testtools-m59.diff
new file mode 100644
index 0000000..a0fdc90
--- /dev/null
+++ b/patches/mono/mono-testtools-m59.diff
@@ -0,0 +1,183 @@
+--- testtools/source/bridgetest/cli/makefile.mk.old 2009-04-02 11:05:37.000000000 +0000
++++ testtools/source/bridgetest/cli/makefile.mk 2009-04-06 16:41:58.000000000 +0000
+@@ -50,28 +50,25 @@ DLLPRE =
+ CFLAGSENABLESYMBOLS:=-Z7
+ # ------------------------------------------------------------------
+
+-#These tests are for Windows only
+-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
+-
+-.IF "$(CCNUMVER)" >= "001399999999"
+-CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
+-SHL1STDLIBS = \
+- mscoree.lib \
+- msvcmrt.lib
+-.ELSE
+-CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
+-SHL1STDLIBS = \
+- mscoree.lib
+-.ENDIF
+-SLOFILES= \
++#.IF "$(CCNUMVER)" >= "001399999999"
++#CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
++#SHL1STDLIBS = \
++# mscoree.lib \
++# msvcmrt.lib
++#.ELSE
++#CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
++#SHL1STDLIBS = \
++# mscoree.lib
++#.ENDIF
++#SLOFILES= \
+ $(SLO)$/cli_cpp_bridgetest.obj
+
+-SHL1OBJS = $(SLOFILES)
++#SHL1OBJS = $(SLOFILES)
+
+-SHL1TARGET = $(TARGET)
++#SHL1TARGET = $(TARGET)
+
+-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
+-DEF1NAME = $(SHL1TARGET)
++#SHL1DEF = $(MISC)$/$(SHL1TARGET).def
++#DEF1NAME = $(SHL1TARGET)
+
+ .ENDIF
+
+@@ -92,7 +89,7 @@ CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cpp
+ CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll
+ CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
+
+-CSCFLAGS = -warnaserror+
++CSCFLAGS =
+ .IF "$(CCNUMVER)" <= "001399999999"
+ VBC_FLAGS = -warnaserror+
+ .ELSE
+@@ -149,8 +146,7 @@ $(BIN)$/cli_vb_bridgetest.uno.dll : \
+ -reference:$(CLI_TYPES_BRIDGETEST) \
+ -reference:System.dll \
+ -reference:System.Drawing.dll \
+- -reference:System.Windows.Forms.dll \
+- cli_vb_bridgetest.vb
++ -reference:System.Windows.Forms.dll
+
+ $(BIN)$/cli_vb_testobj.uno.dll : \
+ cli_vb_testobj.vb \
+@@ -181,9 +177,6 @@ $(BIN)$/cli_bridgetest_inprocess.exe : \
+ cli_bridgetest_inprocess.cs \
+ $(BIN)$/cli_cs_bridgetest.uno.dll \
+ $(BIN)$/cli_cs_testobj.uno.dll \
+- $(BIN)$/cli_vb_bridgetest.uno.dll \
+- $(BIN)$/cli_vb_testobj.uno.dll \
+- $(BIN)$/cli_cpp_bridgetest.uno.dll \
+ $(MISC)$/copyassemblies.done \
+ $(CLI_BASETYPES) \
+ $(CLI_URETYPES) \
+@@ -197,11 +190,7 @@ $(BIN)$/cli_bridgetest_inprocess.exe : \
+ -reference:$(CLI_CPPUHELPER) \
+ -reference:$(BIN)$/cli_cs_bridgetest.uno.dll \
+ -reference:$(BIN)$/cli_cs_testobj.uno.dll \
+- -reference:$(BIN)$/cli_vb_bridgetest.uno.dll \
+- -reference:$(BIN)$/cli_vb_testobj.uno.dll \
+- -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
+ cli_bridgetest_inprocess.cs
+ $(GNUCOPY) cli_bridgetest_inprocess.ini $(BIN)
+
+-.ENDIF
+
+--- testtools/source/bridgetest/idl/makefile.mk.old 2009-04-02 11:05:37.000000000 +0000
++++ testtools/source/bridgetest/idl/makefile.mk 2009-04-06 16:41:58.000000000 +0000
+@@ -51,8 +51,6 @@ $(BIN)$/bridgetest.rdb: bridgetest.idl
+ - $(RM) $@
+ $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd
+
+-.IF "$(GUI)" == "WNT"
+-.IF "$(COM)" != "GCC"
+
+ CLIMAKERFLAGS =
+ .IF "$(debug)" != ""
+@@ -68,5 +66,3 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)
+ -X $(SOLARBINDIR)$/types.rdb $<
+ $(TOUCH) $@
+
+-.ENDIF
+-.ENDIF # GUI, WNT
+--- testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs.old 2009-04-02 11:05:37.000000000 +0000
++++ testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs 2009-04-06 16:41:58.000000000 +0000
+@@ -130,26 +130,14 @@ public class BridgeTest
+ new uno.Any(
+ typeof (XSingleComponentFactory),
+ new Factory(
+- typeof (vb_testobj.VBBridgeTestObject),
+- "com.sun.star.test.bridge.cli_uno.VbTestObject" ) ) );
+- xSet.insert(
+- new uno.Any(
+- typeof (XSingleComponentFactory),
+- new Factory(
+- typeof (cpp_bridgetest.BridgeTest),
+- "com.sun.star.test.bridge.cli_uno.CppBridgeTest" ) ) );
+- xSet.insert(
+- new uno.Any(
+- typeof (XSingleComponentFactory),
+- new Factory(
+ typeof (cs_testobj.BridgeTest),
+ "com.sun.star.test.bridge.cli_uno.CsBridgeTest" ) ) );
+- xSet.insert(
+- new uno.Any(
+- typeof (XSingleComponentFactory),
+- new Factory(
+- typeof (vb_bridetest.BridgeTest),
+- "com.sun.star.test.bridge.cli_uno.VbBridgeTest" ) ) );
++
++/* {
++ Console.WriteLine(
++ "\n[cli bridgetest] C# client calls C# object [hack]");
++ cs_testobj.BridgeTest.perform_test (new cs_testobj.BridgeTestObject( xContext ));
++ } */
+
+ // I.
+ // direct unbridged test
+@@ -205,7 +193,7 @@ public class BridgeTest
+ // -s com.sun.star.test.bridge.cli_uno.VbBridgeTest
+ // -- com.sun.star.test.bridge.CppTestObject
+ // get CLI client
+- test_client =
++/* test_client =
+ xContext.getServiceManager().createInstanceWithContext(
+ "com.sun.star.test.bridge.cli_uno.VbBridgeTest",
+ xContext );
+@@ -214,7 +202,7 @@ public class BridgeTest
+ "\n[cli bridgetest] 4. Visual Basic client calls C++ (native) object" );
+ // run with native target object
+ xClient.run(
+- new String [] { "com.sun.star.test.bridge.CppTestObject" } );
++ new String [] { "com.sun.star.test.bridge.CppTestObject" } ); */
+
+ // V:
+ // uno -ro uno_services.rdb -ro uno_types.rdb
+@@ -237,7 +225,7 @@ public class BridgeTest
+ // uno -ro uno_services.rdb -ro uno_types.rdb
+ // -s com.sun.star.test.bridge.cli_uno.CppBridgeTest
+ // -- com.sun.star.test.bridge.CppTestObject
+- test_client =
++/* test_client =
+ xContext.getServiceManager().createInstanceWithContext(
+ "com.sun.star.test.bridge.cli_uno.CppBridgeTest",
+ xContext );
+@@ -246,7 +234,7 @@ public class BridgeTest
+ "\n[cli bridgetest] 6. CLI C++ client calls C++ object (native)");
+ // run with native target object
+ xClient.run(
+- new String [] { "com.sun.star.test.bridge.CppTestObject" } );
++ new String [] { "com.sun.star.test.bridge.CppTestObject" } );*/
+ }
+ }
+ catch (System.Exception exc)
+--- testtools/source/bridgetest/cli/cli_bridgetest_inprocess.ini.old 2009-04-02 11:05:37.000000000 +0000
++++ testtools/source/bridgetest/cli/cli_bridgetest_inprocess.ini 2009-04-06 16:41:58.000000000 +0000
+@@ -1,3 +1,3 @@
+ [Bootstrap]
+-UNO_TYPES=$SYSBINDIR/uno_types.rdb
+-UNO_SERVICES=$SYSBINDIR/uno_services.rdb
++UNO_TYPES=uno_types.rdb
++UNO_SERVICES=uno_services.rdb
diff --git a/patches/mono/mono-testtools.diff b/patches/mono/mono-testtools.diff
index a0fdc90..5d78a1d 100644
--- a/patches/mono/mono-testtools.diff
+++ b/patches/mono/mono-testtools.diff
@@ -87,21 +87,23 @@
--- testtools/source/bridgetest/idl/makefile.mk.old 2009-04-02 11:05:37.000000000 +0000
+++ testtools/source/bridgetest/idl/makefile.mk 2009-04-06 16:41:58.000000000 +0000
-@@ -51,8 +51,6 @@ $(BIN)$/bridgetest.rdb: bridgetest.idl
+@@ -51,6 +51,8 @@
- $(RM) $@
$(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd
--.IF "$(GUI)" == "WNT"
--.IF "$(COM)" != "GCC"
++.IF "$(GUI)" == "WNT"
++.IF "$(COM)" != "GCC"
CLIMAKERFLAGS =
.IF "$(debug)" != ""
-@@ -68,5 +66,3 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)
- -X $(SOLARBINDIR)$/types.rdb $<
+@@ -66,5 +68,7 @@
+ -X $(SOLARBINDIR)$/types.rdb $<
$(TOUCH) $@
--.ENDIF
--.ENDIF # GUI, WNT
++.ENDIF
++.ENDIF # GUI, WNT
+ .ENDIF # L10N_framework
+
--- testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs.old 2009-04-02 11:05:37.000000000 +0000
+++ testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs 2009-04-06 16:41:58.000000000 +0000
@@ -130,26 +130,14 @@ public class BridgeTest
commit 9338dd39dfeb25eadd5de6049d49224aa86fa9e5
Author: Rene Engelhard <rene at debian.org>
Date: Mon Sep 28 23:37:55 2009 +0200
fix unpack after the "minor cleanup"
* bin/unpack: guard check with version check
diff --git a/bin/unpack b/bin/unpack
index fe9a69b..18a2fe4 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -590,7 +590,12 @@ fi
APACHE_ANT='apache-ant-1.7.0'
APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
-check_file $SRCDIR/$APACHE_ANT_TARBALL
+ANT_VERSION=`ant -version | awk '{ print $4 }'`
+if test -x /usr/bin/ant && \
+ test "`echo $ANT_VERSION | cut -d. -f1`" = "1" \
+ -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" ]; then
+ check_file $SRCDIR/$APACHE_ANT_TARBALL
+fi
if test -f $SRCDIR/$APACHE_ANT_TARBALL; then
$echo_n "Extracting ant $echo_c"
More information about the ooo-build-commit
mailing list