Author: dj Date: 2006-04-22 13:16:47 -0600 (Sat, 22 Apr 2006) New Revision: 1501
Added: trunk/OOo/OOo_2.0.2-jdk_1.5-1.patch trunk/OOo/OOo_2.0.2-print_fix-1.patch trunk/OOo/OOo_2.0.2-system_mozilla_fixes-1.patch trunk/OOo/OOo_2.0.2-xauth-1.patch Log: added OOo-2.0.2 patches Added: trunk/OOo/OOo_2.0.2-jdk_1.5-1.patch =================================================================== --- trunk/OOo/OOo_2.0.2-jdk_1.5-1.patch (rev 0) +++ trunk/OOo/OOo_2.0.2-jdk_1.5-1.patch 2006-04-22 19:16:47 UTC (rev 1501) @@ -0,0 +1,202 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2006-04-22 +Initial Package Version: 2.0.0 +Origin: ooo-build and self +Description: Fixes compilation with jdk-1.5.0. Updated for OOo-2.0.2. +Upstream Status: unknown (jdk-1.5.0 was targeted for 2.0.1?) + +diff -Naur OOB680_m5-orig/beanshell/bsh-2.0b4-src.patch OOB680_m5/beanshell/bsh-2.0b4-src.patch +--- OOB680_m5-orig/beanshell/bsh-2.0b4-src.patch 1969-12-31 18:00:00.000000000 -0600 ++++ OOB680_m5/beanshell/bsh-2.0b4-src.patch 2006-04-20 22:32:12.000000000 -0500 +@@ -0,0 +1,95 @@ ++--- misc/build/BeanShell/build.xml 2003-12-19 17:04:47.000000000 +0000 +++++ misc/build/BeanShell/build.xml 2003-12-19 17:53:18.000000000 +0000 ++@@ -17,7 +17,7 @@ ++ up the build dir! It has to be done manually the first time (or put ++ in the jar file). There must be a way to fix this... ++ --> ++-<project name="beanshell" default="compile" basedir="."> +++<project name="beanshell" default="jarall" basedir="."> ++ ++ <!-- Project Configuration --> ++ ++@@ -81,6 +84,9 @@ ++ value="bsh/servlet/*"/> ++ --> ++ +++ <property name="exclude-servlet" +++ value="bsh/servlet/*"/> +++ ++ <!-- Legacy excludes. Comment this *out* to build these legacy items --> ++ <property name="legacy-excludes" ++ value="bsh/JThis.java"/> ++--- misc/build/BeanShell/makefile.mk 1970-01-01 01:00:00.000000000 +0100 +++++ misc/build/BeanShell/makefile.mk 2003-12-19 17:04:47.000000000 +0000 ++@@ -1 +1,70 @@ ++-dummy +++#************************************************************************* +++# +++# $RCSfile: bsh-2.0b1-src.patch,v $ +++# +++# $Revision: 1.2 $ +++# +++# last change: $Author: kz $ $Date: 2005/03/01 13:13:04 $ +++# +++# The Contents of this file are made available subject to the terms of +++# either of the following licenses +++# +++# - GNU Lesser General Public License Version 2.1 +++# - Sun Industry Standards Source License Version 1.1 +++# +++# Sun Microsystems Inc., October, 2000 +++# +++# GNU Lesser General Public License Version 2.1 +++# ============================================= +++# Copyright 2000 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 +++# +++# +++# Sun Industry Standards Source License Version 1.1 +++# ================================================= +++# The contents of this file are subject to the Sun Industry Standards +++# Source License Version 1.1 (the "License"); You may not use this file +++# except in compliance with the License. You may obtain a copy of the +++# License at http://www.openoffice.org/license.html. +++# +++# Software provided under this License is provided on an "AS IS" basis, +++# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +++# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, +++# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. +++# See the License for the specific provisions governing your rights and +++# obligations concerning the Software. +++# +++# The Initial Developer of the Original Code is: Sun Microsystems, Inc. +++# +++# Copyright: 2000 by Sun Microsystems, Inc. +++# +++# All Rights Reserved. +++# +++# Contributor(s): _______________________________________ +++# +++# +++# +++#************************************************************************* +++ +++PRJ=..$/..$/..$/.. +++PRJNAME=ooo_beanshell +++TARGET=jarall +++ +++.INCLUDE : ant.mk +++ +++ALLTAR : ANTBUILD +++ +diff -Naur OOB680_m5-orig/beanshell/makefile.mk OOB680_m5/beanshell/makefile.mk +--- OOB680_m5-orig/beanshell/makefile.mk 2005-09-07 17:05:31.000000000 -0500 ++++ OOB680_m5/beanshell/makefile.mk 2006-04-20 22:32:12.000000000 -0500 +@@ -45,9 +45,9 @@ + + # --- Files -------------------------------------------------------- + +-TARFILE_NAME=bsh-2.0b1-src ++TARFILE_NAME=bsh-2.0b4-src + TARFILE_ROOTDIR=BeanShell +-PATCH_FILE_NAME=bsh-2.0b1-src.patch ++PATCH_FILE_NAME=bsh-2.0b4-src.patch + + ADDITIONAL_FILES=makefile.mk + +diff -Naur OOB680_m5-orig/beanshell/prj/d.lst OOB680_m5/beanshell/prj/d.lst +--- OOB680_m5-orig/beanshell/prj/d.lst 2005-03-01 07:14:23.000000000 -0600 ++++ OOB680_m5/beanshell/prj/d.lst 2006-04-20 22:32:12.000000000 -0500 +@@ -1 +1 @@ +-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar ++..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b4.jar %_DEST%\bin%_EXT%\bsh.jar +diff -Naur OOB680_m5-orig/filter/source/config/fragments/makefile.mk OOB680_m5/filter/source/config/fragments/makefile.mk +--- OOB680_m5-orig/filter/source/config/fragments/makefile.mk 2005-12-14 08:48:16.000000000 -0600 ++++ OOB680_m5/filter/source/config/fragments/makefile.mk 2006-04-20 22:32:12.000000000 -0500 +@@ -160,7 +160,7 @@ + XALANCLASS=$(SOLARBINDIR)/xalan.jar + CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))} + .ENDIF +-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl ++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl + .ENDIF + + # ----------------------------------------------------------------------------- +diff -Naur OOB680_m5-orig/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx OOB680_m5/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +--- OOB680_m5-orig/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 2006-02-10 07:01:39.000000000 -0600 ++++ OOB680_m5/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 2006-04-20 22:32:12.000000000 -0500 +@@ -170,7 +170,7 @@ + while ( ! mrQueue.IsEmpty()) + { + // Determine whether the system is idle. +- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow())); ++ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow()))); + if (nIdleState != tools::IdleDetection::IDET_IDLE) + { + if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0) +diff -Naur OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java +--- OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java 2005-10-24 12:58:33.000000000 -0500 ++++ OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java 2006-04-20 22:32:12.000000000 -0500 +@@ -127,8 +127,8 @@ + * <code>Vector</code> of <code>Document</code> objects. + */ + public Enumeration getDocumentEnumeration() { +- Enumeration enum = v.elements(); +- return (enum); ++ Enumeration uenum = v.elements(); ++ return (uenum); + } + + +diff -Naur OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +--- OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2005-10-24 13:12:55.000000000 -0500 ++++ OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2006-04-20 22:32:12.000000000 -0500 +@@ -155,14 +155,14 @@ + */ + public Document deserialize() throws ConvertException, IOException { + log("\nFound the XSLT deserializer"); +- Enumeration enum = cd.getDocumentEnumeration(); ++ Enumeration uenum = cd.getDocumentEnumeration(); + org.w3c.dom.Document domDoc=null; + DOMDocument docOut=null; + GenericOfficeDocument doc = null; + ByteArrayOutputStream baos =null; + GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output"); +- while (enum.hasMoreElements()) { +- docOut = (DOMDocument) enum.nextElement(); ++ while (uenum.hasMoreElements()) { ++ docOut = (DOMDocument) uenum.nextElement(); + } + domDoc = docOut.getContentDOM(); + try{ +diff -Naur OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +--- OOB680_m5-orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2005-10-24 13:13:41.000000000 -0500 ++++ OOB680_m5/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2006-04-20 22:32:12.000000000 -0500 +@@ -183,9 +183,9 @@ + String ext= ".txt"; + String mimeType = null; + ConverterInfo ci = this.getConverterInfo(); +- Enumeration enum = ci.getDeviceMime(); +- while (enum.hasMoreElements()) { +- mimeType= (String) enum.nextElement(); ++ Enumeration uenum = ci.getDeviceMime(); ++ while (uenum.hasMoreElements()) { ++ mimeType= (String) uenum.nextElement(); + } + try { + props.load(is); Added: trunk/OOo/OOo_2.0.2-print_fix-1.patch =================================================================== --- trunk/OOo/OOo_2.0.2-print_fix-1.patch (rev 0) +++ trunk/OOo/OOo_2.0.2-print_fix-1.patch 2006-04-22 19:16:47 UTC (rev 1501) @@ -0,0 +1,37 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2006-04-22 +Initial Package Version: 2.0.2 +Origin: Upstream CVS +Description: Fixes broken configure check and inability to save printer + settings. +Upstream Status: commited + +--- OOB680_m5-orig/config_office/configure.in 2006-04-20 22:31:44.000000000 -0500 ++++ OOB680_m5/config_office/configure.in 2006-04-20 22:34:53.000000000 -0500 +@@ -4170,22 +4170,22 @@ + + AC_MSG_CHECKING([whether to include PPDs]) + if test "$without_ppds" = "yes"; then +- AC_MSG_RESULT([yes]) +-else + AC_MSG_RESULT([no]) + WITHOUT_PPDS=YES + SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" ++else ++ AC_MSG_RESULT([yes]) + fi + AC_SUBST(WITHOUT_PPDS) + AC_SUBST(SCPDEFS) + + AC_MSG_CHECKING([whether to include AFMs]) + if test "$without_afms" = "yes"; then +- AC_MSG_RESULT([yes]) +-else + AC_MSG_RESULT([no]) + WITHOUT_AFMS=YES + SCPDEFS="$SCPDEFS -DWITHOUT_AFMS" ++else ++ AC_MSG_RESULT([yes]) + fi + AC_SUBST(WITHOUT_AFMS) + AC_SUBST(SCPDEFS) Added: trunk/OOo/OOo_2.0.2-system_mozilla_fixes-1.patch =================================================================== --- trunk/OOo/OOo_2.0.2-system_mozilla_fixes-1.patch (rev 0) +++ trunk/OOo/OOo_2.0.2-system_mozilla_fixes-1.patch 2006-04-22 19:16:47 UTC (rev 1501) @@ -0,0 +1,290 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2006-04-22 +Initial Package Version: 2.0.2 +Origin: http://ooo.ximian.com/ and self +Description: Fixes compilation with Mozilla Firefox. + Adds support for Seamonkey. + Adds support for standalone NSS/NSPR. +Upstream Status: submitted + +--- OOB680_m5-orig/config_office/configure.in 2006-04-20 22:55:18.000000000 -0500 ++++ OOB680_m5/config_office/configure.in 2006-04-20 23:00:01.000000000 -0500 +@@ -45,6 +45,10 @@ + AC_ARG_WITH(firefox, + [ --with-firefox Use Firefox instead of Mozilla Suite for building. + Only honoured with --with-system-mozilla ++],,enable_mozilla="yes") ++AC_ARG_WITH(seamonkey, ++[ --with-seamonkey Use Seamonkey instead of Mozilla Suite for building. ++ Only honoured with --with-system-mozilla + ],,) + AC_ARG_WITH(fonts, + [ --without-fonts Removes Bitstream Vera fonts from +@@ -2871,9 +2875,11 @@ + if test -n "$with_system_mozilla"; then + AC_MSG_RESULT([external]) + SYSTEM_MOZILLA=YES +- AC_MSG_CHECKING([whether to use Mozilla or Firefox]) ++ AC_MSG_CHECKING([whether to use Firefox, Mozilla, or Seamonkey]) + if test -n "$with_firefox" && test "$with_firefox" != "no"; then + moz_flavour=firefox ++ elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then ++ moz_flavour=seamonkey + else + moz_flavour=mozilla + fi +@@ -2906,6 +2912,8 @@ + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + ++ PKG_CHECK_MODULES( MOZ_PLUGIN, $moz_flavour-plugin ) ++ + MOZ_INC=`$PKG_CONFIG --variable=includedir $moz_flavour-xpcom` + MOZ_LIB=`$PKG_CONFIG --variable=libdir $moz_flavour-xpcom` + MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS +@@ -3028,6 +3036,7 @@ + AC_SUBST(MOZ_LIB_XPCOM) + AC_SUBST(MOZ_NSPR_CFLAGS) + AC_SUBST(MOZ_NSS_CFLAGS) ++AC_SUBST(MOZ_PLUGIN_CFLAGS) + AC_SUBST(MOZ_LDAP_CFLAGS) + + dnl =================================================================== +diff -Naur OOB680_m5-orig/config_office/set_soenv.in OOB680_m5/config_office/set_soenv.in +--- OOB680_m5-orig/config_office/set_soenv.in 2006-02-10 09:00:26.000000000 -0600 ++++ OOB680_m5/config_office/set_soenv.in 2006-04-20 22:36:39.000000000 -0500 +@@ -1745,6 +1745,7 @@ + ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" ); + ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" ); + ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" ); ++ToFile( "MOZ_PLUGIN_CFLAGS", "@MOZ_PLUGIN_CFLAGS@","e" ); + ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" ); + ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" ); + ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" ); +diff -Naur OOB680_m5-orig/extensions/source/plugin/util/makefile.pmk OOB680_m5/extensions/source/plugin/util/makefile.pmk +--- OOB680_m5-orig/extensions/source/plugin/util/makefile.pmk 2005-12-21 05:14:30.000000000 -0600 ++++ OOB680_m5/extensions/source/plugin/util/makefile.pmk 2006-04-20 22:36:39.000000000 -0500 +@@ -40,7 +40,6 @@ + .INCLUDE : sv.mk + + .IF "$(SYSTEM_MOZILLA)" == "YES" ++INCPRE+=$(MOZ_PLUGIN_CFLAGS) + CFLAGS+=-DSYSTEM_MOZILLA +-PKGCONFIG_MODULES=mozilla-plugin +-.INCLUDE : pkg_config.mk + .ENDIF +diff -Naur OOB680_m5-orig/libxmlsec/xmlsec1-1.2.6.patch OOB680_m5/libxmlsec/xmlsec1-1.2.6.patch +--- OOB680_m5-orig/libxmlsec/xmlsec1-1.2.6.patch 2005-12-29 10:14:51.000000000 -0600 ++++ OOB680_m5/libxmlsec/xmlsec1-1.2.6.patch 2006-04-20 22:36:39.000000000 -0500 +@@ -54,6 +54,122 @@ + NSS_CRYPTO_LIB="$PACKAGE-nss" + NSS_FOUND="no" + *************** ++*** 25766,25771 **** ++--- 25766,25868 ---- ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +++ echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5 +++ echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6 +++ +++ if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then +++ echo "$as_me:$LINENO: result: yes" >&5 +++ echo "${ECHO_T}yes" >&6 +++ succeeded=yes +++ +++ echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5 +++ echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6 +++ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` +++ echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5 +++ echo "${ECHO_T}$NSS_CFLAGS" >&6 +++ +++ echo "$as_me:$LINENO: checking NSS_LIBS" >&5 +++ echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6 +++ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` +++ echo "$as_me:$LINENO: result: $NSS_LIBS" >&5 +++ echo "${ECHO_T}$NSS_LIBS" >&6 +++ else +++ NSS_CFLAGS="" +++ NSS_LIBS="" +++ ## If we have a custom action on failure, don't print errors, but +++ ## do set a variable so people can do so. +++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` +++ +++ fi +++ +++ +++ +++ else +++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +++ echo "*** See http://www.freedesktop.org/software/pkgconfig"; +++ fi +++ fi +++ +++ if test $succeeded = yes; then +++ NSS_FOUND=yes +++ else +++ NSS_FOUND=no +++ fi +++ +++ if test "z$NSS_FOUND" = "zno" ; then +++ +++ succeeded=no +++ +++ if test -z "$PKG_CONFIG"; then +++ # Extract the first word of "pkg-config", so it can be a program name with args. +++ set dummy pkg-config; ac_word=$2 +++ echo "$as_me:$LINENO: checking for $ac_word" >&5 +++ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +++ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +++ echo $ECHO_N "(cached) $ECHO_C" >&6 +++ else +++ case $PKG_CONFIG in +++ [\\/]* | ?:[\\/]*) +++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +++ ;; +++ *) +++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +++ for as_dir in $PATH +++ do +++ IFS=$as_save_IFS +++ test -z "$as_dir" && as_dir=. +++ for ac_exec_ext in '' $ac_executable_extensions; do +++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +++ break 2 +++ fi +++ done +++ done +++ +++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +++ ;; +++ esac +++ fi +++ PKG_CONFIG=$ac_cv_path_PKG_CONFIG +++ +++ if test -n "$PKG_CONFIG"; then +++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +++ echo "${ECHO_T}$PKG_CONFIG" >&6 +++ else +++ echo "$as_me:$LINENO: result: no" >&5 +++ echo "${ECHO_T}no" >&6 +++ fi +++ +++ fi +++ +++ if test "$PKG_CONFIG" = "no" ; then +++ echo "*** The pkg-config script could not be found. Make sure it is" +++ echo "*** in your path, or set the PKG_CONFIG environment variable" +++ echo "*** to the full path to pkg-config." +++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +++ else +++ PKG_CONFIG_MIN_VERSION=0.9.0 +++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5 ++ echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6 ++ ++*************** ++*** 25808,25813 **** ++--- 25905,25911 ---- ++ NSS_FOUND=no ++ fi ++ +++ fi ++ fi ++ ++ if test "z$NSS_FOUND" = "zno" ; then ++*************** + *** 25817,25824 **** + ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION + fi +@@ -63,7 +179,7 @@ + + echo "$as_me:$LINENO: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5 + echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6 +---- 25817,25824 ---- ++--- 25915,25922 ---- + ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION + fi + +@@ -81,7 +197,7 @@ + if test "z$dir" = "z/usr/lib" ; then + NSPR_LIBS="$NSPR_LIBS_LIST" + else +---- 25853,25859 ---- ++--- 25951,25957 ---- + done + + for dir in $ac_nss_lib_dir ; do +@@ -98,7 +214,7 @@ + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" + else +---- 25939,25945 ---- ++--- 26037,26043 ---- + done + + for dir in $ac_nss_lib_dir ; do +@@ -143,6 +259,34 @@ + NSS_CRYPTO_LIB="$PACKAGE-nss" + NSS_FOUND="no" + *************** ++*** 521,529 **** ++ AC_MSG_RESULT(no) ++ NSS_FOUND="without" ++ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then ++! PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, ++ [NSS_FOUND=yes], ++ [NSS_FOUND=no]) ++ fi ++ ++ if test "z$NSS_FOUND" = "zno" ; then ++--- 521,536 ---- ++ AC_MSG_RESULT(no) ++ NSS_FOUND="without" ++ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then ++! dnl try system nspr and nss ++! PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION, ++ [NSS_FOUND=yes], ++ [NSS_FOUND=no]) +++ dnl fallback to the mozilla nspr and nss +++ if test "z$NSS_FOUND" = "zno" ; then +++ PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, +++ [NSS_FOUND=yes], +++ [NSS_FOUND=no]) +++ fi ++ fi ++ ++ if test "z$NSS_FOUND" = "zno" ; then ++*************** + *** 534,541 **** + ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION + fi +@@ -152,7 +296,7 @@ + + AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) + NSPR_INCLUDES_FOUND="no" +---- 534,541 ---- ++--- 541,548 ---- + ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION + fi + +@@ -170,7 +314,7 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSPR_LIBS="$NSPR_LIBS_LIST" +---- 570,576 ---- ++--- 577,583 ---- + done + + for dir in $ac_nss_lib_dir ; do +@@ -187,7 +331,7 @@ + dnl do not add -L/usr/lib because compiler does it anyway + if test "z$dir" = "z/usr/lib" ; then + NSS_LIBS="$NSS_LIBS_LIST" +---- 641,647 ---- ++--- 648,654 ---- + done + + for dir in $ac_nss_lib_dir ; do Added: trunk/OOo/OOo_2.0.2-xauth-1.patch =================================================================== --- trunk/OOo/OOo_2.0.2-xauth-1.patch (rev 0) +++ trunk/OOo/OOo_2.0.2-xauth-1.patch 2006-04-22 19:16:47 UTC (rev 1501) @@ -0,0 +1,18 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2006-04-22 +Initial Package Version: 2.0.2 +Origin: self +Description: Fixes compilation with xorg-6.9/7.0 +Upstream Status: submitted + +--- OOB680_m5-orig/vcl/util/makefile.mk 2005-12-19 11:21:56.000000000 -0600 ++++ OOB680_m5/vcl/util/makefile.mk 2006-03-26 22:28:25.000000000 -0600 +@@ -318,7 +318,7 @@ + SHL2STDLIBS+=$(LIBSN_LIBS) + .ENDIF + +-SHL2STDLIBS += -lXext -lSM -lICE -lX11 ++SHL2STDLIBS += -lXext -lSM -lICE -lX11 -lXau + .IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" + # needed by salprnpsp.cxx + SHL2STDLIBS+= -ldl -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
