[Libreoffice-commits] .: 2 commits - distro-configs/Ark.conf.in distro-configs/Common.conf.in distro-configs/Pardus2007.conf.in distro-configs/Pardus2008.conf.in distro-configs/SUSE-reduced.conf.in patches/mono

[René Engelhard]

 distro-configs/Ark.conf.in          |    1 -
 distro-configs/Common.conf.in       |    1 -
 distro-configs/Pardus2007.conf.in   |    1 -
 distro-configs/Pardus2008.conf.in   |    1 -
 distro-configs/SUSE-reduced.conf.in |    1 -
 patches/mono/mono-build.diff        |   26 ++++++++++++++------------
 6 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 881efa672776178c53a58e810260c63399a7bde9
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 29 18:43:26 2010 +0200

    update mono-build.diff to apply

diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 4c6c20c..f2abb40 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -137,23 +137,25 @@ index 12fbec8..9c8aa00 100644
  AC_ARG_WITH(openldap,
  [  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
                            of the Netscape/Mozilla one
-@@ -1846,7 +1849,6 @@ AC_SUBST(USE_MINGW)
- dnl ===================================================================
- dnl  .NET needs special treatment
+@@ -1992,7 +1992,6 @@
+ dnl in fact apply equally to what we actually support, i.e.
+ dnl Visual Studio 2008 and 2010?)
  dnl ===================================================================
 -if test "$_os" = "WINNT"; then
  if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
- 	dnl Check midl.exe
- 	AC_PATH_PROG(MIDL_PATH, midl.exe)
-@@ -1903,6 +1905,8 @@ if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
- 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
- 	CSC_PATH=`cygpath -d "$CSC_PATH"`
- 	CSC_PATH=`cygpath -u "$CSC_PATH"`
+     dnl Check midl.exe
+     AC_PATH_PROG(MIDL_PATH, midl.exe)
+@@ -2049,7 +2048,9 @@
+     # Convert to posix path with 8.3 filename restrictions ( No spaces )
+     CSC_PATH=`cygpath -d "$CSC_PATH"`
+     CSC_PATH=`cygpath -u "$CSC_PATH"`
+-
 +    CSC="$CSC_PATH/csc.exe"
 +    AL="$CSC_PATH/al.exe"
- 
-     dnl Check mscoree.lib / .NET Frameworks dir
-     dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
++
+     dnl Check mscoree.lib / .NET Framework dir
+         AC_MSG_CHECKING(.NET Framework)
+         if test -n "$with_frame_home"; then
 @@ -1936,9 +1940,59 @@ if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
  	FRAME_HOME=`cygpath -u "$FRAME_HOME"`
  fi
commit 10c095166f4e5d02c05e81e6d517f805e8ea8e02
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 27 20:32:10 2010 +0200

    agg is gone, bin from distro-configs

diff --git a/distro-configs/Ark.conf.in b/distro-configs/Ark.conf.in
index 44e0ece..ee0d5ca 100644
--- a/distro-configs/Ark.conf.in
+++ b/distro-configs/Ark.conf.in
@@ -14,7 +14,6 @@
 --with-system-libxslt
 --with-system-boost
 --with-system-portaudio
---with-system-agg
 --with-system-hunspell
 --with-system-curl
 --with-system-expat
diff --git a/distro-configs/Common.conf.in b/distro-configs/Common.conf.in
index 23dc3e1..fd3ef5f 100644
--- a/distro-configs/Common.conf.in
+++ b/distro-configs/Common.conf.in
@@ -1,6 +1,5 @@
 --disable-binfilter
 --disable-crashdump
 --with-lang=\"@OOO_LANGS@\"
---without-agg
 --disable-fetch-external
 --with-vba-package-format=builtin
diff --git a/distro-configs/Pardus2007.conf.in b/distro-configs/Pardus2007.conf.in
index 10a55f2..66115eb 100644
--- a/distro-configs/Pardus2007.conf.in
+++ b/distro-configs/Pardus2007.conf.in
@@ -4,7 +4,6 @@
 --with-system-curl
 --with-system-expat
 --with-system-sndfile
---with-system-agg
 --with-system-expat
 --with-system-libxslt
 --with-system-jpeg
diff --git a/distro-configs/Pardus2008.conf.in b/distro-configs/Pardus2008.conf.in
index 25cd8d5..b08e03b 100644
--- a/distro-configs/Pardus2008.conf.in
+++ b/distro-configs/Pardus2008.conf.in
@@ -3,7 +3,6 @@
 --with-vendor=\"Pardus\"
 --with-system-curl
 --with-system-expat
---with-system-agg
 --with-system-expat
 --with-system-libxslt
 --with-system-jpeg
diff --git a/distro-configs/SUSE-reduced.conf.in b/distro-configs/SUSE-reduced.conf.in
index d2969a9..42d08b0 100644
--- a/distro-configs/SUSE-reduced.conf.in
+++ b/distro-configs/SUSE-reduced.conf.in
@@ -40,5 +40,4 @@
 --disable-vba
 --disable-Xaw
 
---without-agg
 --without-java