rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1.2.2, 1.1.2.3

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Mar 7 19:50:50 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	workspace.cmcfixes43.patch 
Log Message:
add workspace.cmcfixes43.patch

workspace.cmcfixes43.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1.2.2 -r 1.1.2.3 workspace.cmcfixes43.patch
Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- workspace.cmcfixes43.patch	7 Mar 2008 17:52:31 -0000	1.1.2.2
+++ workspace.cmcfixes43.patch	7 Mar 2008 19:50:44 -0000	1.1.2.3
@@ -450,30010 +450,6 @@
  OBJFILES=\
          $(OBJ)$/HelpLinker.obj \
          $(OBJ)$/HelpCompiler.obj
-Index: tools/config_office/configure
-diff -u tools/config_office/configure:1.221 tools/config_office/configure:1.221.14.2
---- tools/config_office/configure:1.221	Tue Feb 19 04:37:19 2008
-+++ tools/config_office/configure	Thu Mar  6 01:46:23 2008
-@@ -1,26 +1,55 @@
- #! /bin/sh
- # From configure.in Revision .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -30,8 +59,43 @@
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -45,18 +109,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -64,157 +129,388 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
[...29648 lines suppressed...]
--if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
--  with_system_stdlibs=yes
--  AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
--  echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-+if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
-+  if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
-+    with_system_stdlibs=yes
-+    AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
-+    echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
-+  fi
- fi
- 
- dnl ===================================================================
-@@ -3361,7 +3370,8 @@
-    with_system_python=yes
- fi
- AC_MSG_CHECKING([which python to use])
--if test -n "$with_system_python" && test "$with_system_python" != "no"; then
-+if test -n "$with_system_python" -o -n "$with_system_libs" && \
-+	test "$with_system_python" != "no"; then
-    SYSTEM_PYTHON=YES
-    AC_MSG_RESULT([external])
-    AM_PATH_PYTHON([2.2])
-@@ -3669,7 +3679,8 @@
- dnl Check for system boost
- dnl ===================================================================
- AC_MSG_CHECKING([which boost to use])
--if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then
-+if test -n "$with_system_boost" -o -n "$with_system_headers" && \
-+	test "$with_system_boost" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_BOOST=YES
-    AC_LANG_PUSH([C++])
-@@ -3689,7 +3700,8 @@
- dnl Check for system vigra
- dnl ===================================================================
- AC_MSG_CHECKING([which vigra to use])
--if test -n "$with_system_vigra" && test "$with_system_vigra" != "no"; then
-+if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
-+	test "$with_system_vigra" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_VIGRA=YES
-    AC_LANG_PUSH([C++])
-@@ -3707,7 +3719,8 @@
- dnl Check for system odbc
- dnl ===================================================================
- AC_MSG_CHECKING([which odbc headers to use])
--if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then
-+if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
-+	test "$with_system_odbc_headers" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_ODBC_HEADERS=YES
- 
-@@ -3794,7 +3807,9 @@
-     AC_MSG_RESULT([external])
-     SYSTEM_MOZILLA=YES
-     AC_MSG_CHECKING([which Mozilla flavour to use])
--    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-+    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
-+      MOZ_FLAVOUR=libxul
-+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-       MOZ_FLAVOUR=xulrunner
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
-       MOZ_FLAVOUR=seamonkey
-@@ -3803,12 +3818,18 @@
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
-       MOZ_FLAVOUR=mozilla
-     else
--      MOZ_FLAVOUR=xulrunner
-+      MOZ_FLAVOUR=libxul
-     fi
-     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-     AC_MSG_RESULT($tmp)
- 
--    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
-+    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
-+    if test -z "$STANDALONENSS"; then
-+        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
-+    else
-+        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
-+        AC_SUBST(NSS_LIB)
-+    fi
- 
-     if $PKG_CONFIG --exists nspr ; then
-       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-@@ -3818,12 +3839,14 @@
-       PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
-     fi
- 
--    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
--    if test -z "$STANDALONENSS"; then
--        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
-+    if $PKG_CONFIG --exists libxul ; then
-+      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
-+      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-+      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
-     else
--        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
--        AC_SUBST(NSS_LIB)
-+      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
-+      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-+      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-     fi
- 
-     save_CPPFLAGS="$CPPFLAGS"
-@@ -3839,8 +3862,6 @@
-     CPPFLAGS="$save_CPPFLAGS"
-     LIBS="$save_LIBS"
- 
--    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
--    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-       AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
-@@ -3853,6 +3874,13 @@
- Please recompile $tmp with --enable-ldap or use --with-openldap.])
-       fi
-     fi
-+
-+    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-+    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-+    if test "$MOZ_FLAVOUR" == "libxul"; then
-+        MOZ_FLAVOUR="mozilla"
-+    fi
-+
- elif test "$enable_mozilla" = "no"; then
-     AC_MSG_RESULT([none])
-     WITH_MOZILLA=NO
-@@ -3989,7 +4017,8 @@
- dnl Check for system sane
- dnl ===================================================================
- AC_MSG_CHECKING([which sane header to use])
--if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then
-+if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
-+	test "$with_system_sane_header" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_SANE_HEADER=YES
-    AC_CHECK_HEADER(sane/sane.h, [],
-@@ -4186,7 +4215,8 @@
-    XRENDER_LINK=NO
- fi
- AC_MSG_CHECKING([which Xrender headers to use])
--if test -n "$with_system_xrender_headers" && test "$with_system_xrender_headers" != "no"; then
-+if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
-+	test "$with_system_xrender_headers" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_XRENDER_HEADERS=YES
-    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
-@@ -4421,7 +4451,8 @@
- dnl Check for system hunspell
- dnl ===================================================================
- AC_MSG_CHECKING([which libhunspell to use])
--if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
-+if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
-+	test "$with_system_hunspell" != "no"; then
-     AC_MSG_RESULT([external])
-     SYSTEM_HUNSPELL=YES
-     AC_LANG_PUSH([C++])
-@@ -4449,7 +4480,8 @@
- dnl Checking for altlinuxhyph
- dnl ===================================================================
- AC_MSG_CHECKING([which altlinuxhyph to use])
--if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
-+if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
-+	test "$with_system_altlinuxhyph" != "no"; then
-     AC_MSG_RESULT([external])
-     SYSTEM_HYPH=YES
-     AC_CHECK_HEADER(hyphen.h, [],
 Index: udk/jvmaccess/util/gcc3.map
 diff -u /dev/null udk/jvmaccess/util/gcc3.map:1.1.2.1
 --- /dev/null	Fri Mar  7 09:03:35 2008
@@ -30709,28 +705,6 @@
  
  #ifdef GCC
  namespace std
-Index: tools/solenv/inc/libs.mk
-diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1
---- tools/solenv/inc/libs.mk:1.126	Mon Feb 25 08:42:00 2008
-+++ tools/solenv/inc/libs.mk	Wed Mar  5 09:24:45 2008
-@@ -327,7 +327,7 @@
- SABLOT3RDLIB=-lsablot
- APP3RDLIB=-lapp
- SAMPLE3RDLIB=-lsample
--HNJLIB=-lhnj
-+HNJLIB*=-lhnj
- MYSPELLLIB=-lmyspell
- COSVLIB=-lcosv
- UDMLIB=-ludm
-@@ -483,7 +483,7 @@
- SABLOT3RDLIB= $(LIBPRE) sablot.lib
- APP3RDLIB= $(LIBPRE) app.lib
- SAMPLE3RDLIB= $(LIBPRE) sample.lib
--HNJLIB= libhnj.lib
-+HNJLIB*=libhnj.lib
- MYSPELLLIB= $(LIBPRE) myspell.lib
- COSVLIB= $(LIBPRE) cosv.lib
- UDMLIB= $(LIBPRE) udm.lib
 Index: udk/stoc/test/registry_tdprovider/makefile.mk
 diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1
 --- udk/stoc/test/registry_tdprovider/makefile.mk:1.4	Thu Sep  8 01:30:08 2005




More information about the fedora-extras-commits mailing list