[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch, NONE, 1.1 openoffice.org.spec, 1.428, 1.429 sources, 1.108, 1.109



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8032

Modified Files:
	openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch 
Log Message:
try this

openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch:
 config_office/config_office/configure.in         |   21 ++
 config_office/config_office/set_soenv.in         |    1 
 prj/build.lst                                    |    0 
 solenv/solenv/config/ssrc680.ini                 |    2 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/prj/build.lst                            |    2 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  220 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   13 +
 11 files changed, 225 insertions(+), 40 deletions(-)

--- NEW FILE openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch ---
--- openoffice.org.orig/config_office/config_office/configure.in	2005-08-30 15:45:40.000000000 +0100
+++ openoffice.org/config_office/config_office/configure.in	2005-08-30 15:56:10.000000000 +0100
@@ -233,6 +233,9 @@
 AC_ARG_WITH(system-sablot,
 [  --with-system-sablot    Use sablot already on system
 ],,)
+AC_ARG_WITH(system-libxslt,
+[  --with-system-libxslt   Use libxslt already on system
+],,)
 AC_ARG_WITH(system-odbc,
 [  --with-system-odbc-headers     Use the odbc headers already on system
 ],,)
@@ -2613,6 +2616,22 @@
 AC_SUBST(DB_JAR)
 
 dnl ===================================================================
+dnl Check for system libxslt
+dnl ===================================================================
+AC_MSG_CHECKING([which libxslt to use])
+if test -n "$with_system_libxslt" && test "$with_system_libxslt" != "no"; then
+   AC_MSG_RESULT([external])
+   SYSTEM_LIBXSLT=YES
+
+   PKG_CHECK_MODULES( LIBXSLT, libxslt )
+else
+   AC_MSG_RESULT([none])
+   SYSTEM_LIBXSLT=NO
+fi
+AC_SUBST(SYSTEM_LIBXSLT)
+
+if test "$SYSTEM_LIBXSLT" == "NO"; then
+dnl ===================================================================
 dnl Check for system sablot
 dnl ===================================================================
 AC_MSG_CHECKING([which sablot to use])
@@ -2631,9 +2650,11 @@
 else
    AC_MSG_RESULT([internal])
    SYSTEM_SABLOT=NO
+   BUILD_TYPE="$BUILD_TYPE SABLOT"
 fi
 AC_SUBST(SYSTEM_SABLOT)
 AC_SUBST(SABLOT_LIBS)
+fi
 
 dnl ===================================================================
 dnl Check for system curl
diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
--- openoffice.org.orig/config_office/config_office/set_soenv.in	2005-08-30 15:45:40.000000000 +0100
+++ openoffice.org/config_office/config_office/set_soenv.in	2005-08-30 15:50:51.000000000 +0100
@@ -1747,6 +1747,7 @@
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
 ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
+ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
 ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
 ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
diff -ru solenv.orig/config/ssrc680.ini solenv/config/ssrc680.ini
--- openoffice.org.orig/solenv/solenv/config/ssrc680.ini	2005-08-30 15:56:42.000000000 +0100
+++ openoffice.org/solenv/solenv/config/ssrc680.ini	2005-08-30 15:57:12.000000000 +0100
@@ -108,7 +108,7 @@
 			BIG_SVX TRUE
 			BIG_GOODIES TRUE
 			BMP_WRITES_FLAG TRUE
-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD
+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD SABLOT
 			RES_ENUS TRUE
 			RES_GER TRUE
 			NO_REC_RES TRUE
Index: prj/build.lst
===================================================================
RCS file: /cvs/util/xmlhelp/prj/build.lst,v
retrieving revision 1.8
diff -u -p -u -r1.8 build.lst
--- openoffice.org.orig/xmlhelp/prj/build.lst	14 Feb 2002 13:22:16 -0000	1.8
+++ openoffice.org/xmlhelp/prj/build.lst	30 Aug 2005 15:09:51 -0000
@@ -1,4 +1,4 @@
-xh	xmlhelp	:	ucbhelper XmlSearch sablot jut unoil berkeleydb NULL
+xh	xmlhelp	:	ucbhelper XmlSearch SABLOT:sablot jut unoil berkeleydb NULL
 xh	xmlhelp									usr1	-	all	xh_mkout NULL
 xh	xmlhelp\source\helpprovider				nmake	-	all	xh_helpprovider NULL
 xh	xmlhelp\source\treeview					nmake	-	all	xh_treeview NULL
Index: source/cxxhelp/provider/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v
retrieving revision 1.16
diff -u -p -u -r1.16 makefile.mk
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/makefile.mk	11 Apr 2005 09:32:12 -0000	1.16
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/makefile.mk	30 Aug 2005 15:09:58 -0000
@@ -79,6 +79,12 @@ CFLAGS +=  -DHAVE_EXPAT_H
 CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
 .ENDIF
 
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+PKGCONFIG_MODULES=libxslt
+.INCLUDE: pkg_config.mk
+CFLAGS+=-DSYSTEM_LIBXSLT
+.ENDIF
+
 .IF "$(SYSTEM_SABLOT)" == "YES"
 CFLAGS+=-DSYSTEM_SABLOT
 .ENDIF
Index: source/cxxhelp/provider/urlparameter.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx,v
retrieving revision 1.36
diff -u -p -u -r1.36 urlparameter.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	30 Mar 2005 08:38:37 -0000	1.36
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/urlparameter.cxx	30 Aug 2005 15:09:59 -0000
@@ -87,6 +87,11 @@
 #ifndef _RTL_URI_HXX_
 #include <rtl/uri.hxx>
 #endif
+#ifdef SYSTEM_LIBXSLT
+#include <libxslt/xslt.h>
+#include <libxslt/transform.h>
+#include <libxslt/xsltutils.h>
+#else
 #ifdef SYSTEM_SABLOT
 #include <sablot.h>
 #include <shandler.h>
@@ -98,6 +103,7 @@
 #include <sablot/shandler.h>
 #endif
 #endif
+#endif
 #ifndef BERKELEYDBPROXY_DB_HXX_
 #include "db.hxx"
 #endif
@@ -749,8 +755,7 @@ bool URLParameter::query()
 	return ret;
 }
 
-
-
+#ifndef SYSTEM_LIBXSLT
 
 ////////////////////////////////////////////////////////////////////////////////
 //                           InutStreamTransformerImpl                        //
@@ -784,6 +789,7 @@ int schemehandlerclose( void *userData,
 						SablotHandle processor_,
 						int handle );
 
+#endif
 
 struct UserData {
 	
@@ -801,7 +807,124 @@ struct UserData {
 	URLParameter*                       m_pInitial;
 };
 
+#ifdef SYSTEM_LIBXSLT
+UserData *ugblData = 0;
+
+static int
+pkgMatch(const char * URI) {
+    if ((URI != NULL) && !strncmp(URI, "vnd.sun.star.pkg", 16))
+        return 1;
+    return 0;
+}
+
+static int
+helpMatch(const char * URI) {
+    if ((URI != NULL) && !strncmp(URI, "vnd.sun.star.help", 17))
+        return 1;
+    return 0;
+}
+
+static void *
+pkgOpen(const char * URI) {
+	rtl::OUString language,jar,path;
+
+	if( ugblData->m_pInitial->get_eid().getLength() )
+		return (void*)(new Reference< XHierarchicalNameAccess >);
+	else
+	{
+		jar = ugblData->m_pInitial->get_jar();
+		language = ugblData->m_pInitial->get_language();
+		path = ugblData->m_pInitial->get_path();
+	}
+            
+	Reference< XHierarchicalNameAccess > xNA(ugblData->m_pDatabases->jarFile( jar,language ));
+
+    Reference< XInputStream > xInputStream;
+
+	if( xNA.is() )
+	{
+		try
+		{
+			Any aEntry = xNA->getByHierarchicalName( path );
+			Reference< XActiveDataSink > xSink;
+			if( ( aEntry >>= xSink ) && xSink.is() )
+				xInputStream = xSink->getInputStream();
+		}
+		catch ( NoSuchElementException & )
+		{
+		}
+	}
+	
+	if( xInputStream.is() )
+	{
+		return new Reference<XInputStream>(xInputStream);
+	}
+	return 0;
+}
+
+static void *
+helpOpen(const char * URI) {
+	rtl::OUString language,jar,path;
 
+	URLParameter urlpar( rtl::OUString::createFromAscii( URI ),
+						 ugblData->m_pDatabases );
+		
+	jar = urlpar.get_jar();
+	language = urlpar.get_language();
+	path = urlpar.get_path();
+
+	Reference< XHierarchicalNameAccess > xNA(ugblData->m_pDatabases->jarFile( jar,language ));
+
+    Reference< XInputStream > xInputStream;
+
+	if( xNA.is() )
+	{
+		try
+		{
+			Any aEntry = xNA->getByHierarchicalName( path );
+			Reference< XActiveDataSink > xSink;
+			if( ( aEntry >>= xSink ) && xSink.is() )
+				xInputStream = xSink->getInputStream();
+		}
+		catch ( NoSuchElementException & )
+		{
+		}
+	}
+	
+	if( xInputStream.is() )
+		return new Reference<XInputStream>(xInputStream);
+	return 0;
+}
+
+static int
+helpRead(void * context, char * buffer, int len) {
+	Reference< XInputStream > *pRef = (Reference< XInputStream >*)context;
+
+	Sequence< sal_Int8 > aSeq;
+	len = (*pRef)->readBytes( aSeq,len);
+	memcpy(buffer, aSeq.getConstArray(), len);
+
+	return len;
+}
+
+static int
+pkgRead(void * context, char * buffer, int len) {
+	if( ugblData->m_pInitial->get_eid().getLength() )
+	{
+		ugblData->m_pDatabases->popupDocument( ugblData->m_pInitial,&buffer,&len);
+		return len;
+	}
+	else
+		return helpRead(context, buffer, len);
+}
+
+static int
+uriClose(void * context) {
+	Reference< XInputStream > *pRef = (Reference< XInputStream >*)context;
+	delete pRef;
+    return 0;
+}
+#endif
 
 InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
 												Databases*    pDatabases,
@@ -828,6 +951,7 @@ InputStreamTransformer::InputStreamTrans
 	}
 	else
 	{
+#ifndef SYSTEM_LIBXSLT
 		SchemeHandler schemeHandler;
 		schemeHandler.getAll = schemehandlergetall;
 		schemeHandler.freeMemory = schemehandlerfreememory;
@@ -835,6 +959,7 @@ InputStreamTransformer::InputStreamTrans
 		schemeHandler.get = schemehandlerget;
 		schemeHandler.put = schemehandlerput;
 		schemeHandler.close = schemehandlerclose;
+#endif
 	
 		UserData userData( this,urlParam,pDatabases );
 	
@@ -845,77 +970,78 @@ InputStreamTransformer::InputStreamTrans
         int last = 0;
         
 		parString[last++] = "Program";
-		parString[last++] = urlParam->getByName( "Program" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "Program" ) + rtl::OString('\'');
 		parString[last++] = "Database";
-		parString[last++] = urlParam->getByName( "DatabasePar" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "DatabasePar" ) + rtl::OString('\'');
 		parString[last++] = "Id";
-		parString[last++] = urlParam->getByName( "Id" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "Id" ) + rtl::OString('\'');
 		parString[last++] = "Path";
-		parString[last++] = urlParam->getByName( "Path" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "Path" ) + rtl::OString('\'');
 		parString[last++] = "Language";
-		parString[last++] = urlParam->getByName( "Language" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "Language" ) + rtl::OString('\'');
 		parString[last++] = "System";
-		parString[last++] = urlParam->getByName( "System" );
+		parString[last++] = rtl::OString('\'') + urlParam->getByName( "System" ) + rtl::OString('\'');
 		parString[last++] = "productname";
-		parString[last++] = rtl::OString(
+		parString[last++] = rtl::OString('\'') + rtl::OString(
             pDatabases->getProductName().getStr(),
             pDatabases->getProductName().getLength(),
-            RTL_TEXTENCODING_UTF8 );
+            RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
 		parString[last++] = "productversion";
-		parString[last++] = 
-            rtl::OString( pDatabases->getProductVersion().getStr(),
+		parString[last++] = rtl::OString('\'') + 
+            rtl::OString(  pDatabases->getProductVersion().getStr(),
                           pDatabases->getProductVersion().getLength(),
-                          RTL_TEXTENCODING_UTF8 );
+                          RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
 
         parString[last++] = "imgrepos";
-        parString[last++] = pDatabases->getImagesZipFileURL();
+        parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\'');
         parString[last++] = "hp";
-        parString[last++] = urlParam->getByName( "HelpPrefix" );
+        parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\'');
         
         if( parString[last-1].getLength() )
         {
             parString[last++] = "sm";
-            parString[last++] = "vnd.sun.star.help%3A%2F%2F";
+            parString[last++] = "'vnd.sun.star.help%3A%2F%2F'";
             parString[last++] = "qm";
-            parString[last++] = "%3F";
+            parString[last++] = "'%3F'";
             parString[last++] = "es";
-            parString[last++] = "%3D";
+            parString[last++] = "'%3D'";
             parString[last++] = "am";
-            parString[last++] = "%26";
+            parString[last++] = "'%26'";
             parString[last++] = "cl";
-            parString[last++] = "%3A";
+            parString[last++] = "'%3A'";
             parString[last++] = "sl";
-            parString[last++] = "%2F";
+            parString[last++] = "'%2F'";
             parString[last++] = "hm";
-            parString[last++] = "%23";
+            parString[last++] = "'%23'";
             parString[last++] = "cs";
-            parString[last++] = "css";
+            parString[last++] = "'css'";
 
             parString[last++] = "vendorname";
-            parString[last++] = 
+            parString[last++] = rtl::OString('\'') + 
                 rtl::OString( pDatabases->getVendorName().getStr(),
                               pDatabases->getVendorName().getLength(),
-                              RTL_TEXTENCODING_UTF8 );
+                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
             parString[last++] = "vendorversion";
-            parString[last++] = 
+            parString[last++] = rtl::OString('\'') + 
                 rtl::OString( pDatabases->getVendorVersion().getStr(),
                               pDatabases->getVendorVersion().getLength(),
-                              RTL_TEXTENCODING_UTF8 );
+                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
             parString[last++] = "vendorshort";
-            parString[last++] = 
+            parString[last++] = rtl::OString('\'') + 
                 rtl::OString( pDatabases->getVendorShort().getStr(),
                               pDatabases->getVendorShort().getLength(),
-                              RTL_TEXTENCODING_UTF8 );
+                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
         }
         
 		for( int i = 0; i < last; ++i )
 			parameter[i] = parString[i].getStr();
 		parameter[last] = 0;
 		
-	
+#ifndef SYSTEM_LIBXSLT	
 		SablotHandle p;
 		SablotCreateProcessor(&p);
 		SablotRegHandler( p,HLR_SCHEME,&schemeHandler,(void*)(&userData) );
+#endif
 		rtl::OUString xslURL = pDatabases->getInstallPathAsURL/*WithOutEncoding*/();
 		
 		rtl::OString xslURLascii( 
@@ -924,6 +1050,31 @@ InputStreamTransformer::InputStreamTrans
 			RTL_TEXTENCODING_ASCII_US/*osl_getThreadTextEncoding()*/);
 		xslURLascii += "main_transform.xsl";
 
+#ifdef SYSTEM_LIBXSLT
+		ugblData = &userData;
+
+		xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose);
+		xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
+
+		xsltStylesheetPtr cur = 
+			xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
+
+		xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/");
+
+		xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter);
+
+		xmlChar *doc_txt_ptr=0;
+		int doc_txt_len;
+		int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur);
+		addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
+		xmlFree(doc_txt_ptr);
+
+		xmlPopInputCallbacks();
+		xmlPopInputCallbacks();
+		xmlFreeDoc(res);
+		xmlFreeDoc(doc);
+		xsltFreeStylesheet(cur);
+#else
 #ifdef SYSTEM_SABLOT
 		SablotRunProcessor( p,
 							xslURLascii.getStr(),
@@ -941,6 +1092,7 @@ InputStreamTransformer::InputStreamTrans
 #endif
 		 
 		SablotDestroyProcessor( p );
+#endif
 	}
 }
 	
@@ -1086,8 +1238,7 @@ void InputStreamTransformer::addToBuffer
 }
 
 
-
-
+#ifndef SYSTEM_LIBXSLT
 
 /**
  *    getAll: open the URI and return the whole string
@@ -1260,7 +1411,4 @@ int schemehandlerclose( void *userData,
 	return 0;
 }
 
-
-
-
-
+#endif
Index: util/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/util/makefile.mk,v
retrieving revision 1.7
diff -u -p -u -r1.7 makefile.mk
--- openoffice.org.orig/xmlhelp/util/makefile.mk	30 Mar 2005 08:38:50 -0000	1.7
+++ openoffice.org/xmlhelp/util/makefile.mk	30 Aug 2005 15:10:03 -0000
@@ -89,6 +89,11 @@ SABLOT3RDLIB=sablot.lib
 .ENDIF # wnt
 .ENDIF # sablot3rdlib
 
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+PKGCONFIG_MODULES=libxslt
+.INCLUDE: pkg_config.mk
+.ENDIF
+
 # --- Shared-Library ---------------------------------------------------
 
 SHL1TARGET=$(TARGET)$(UCP_VERSION)
@@ -102,11 +107,15 @@ SHL1STDLIBS=                     \
 	$(CPPULIB)               \
 	$(SALLIB)                \
 	$(VOSLIB)                \
-	$(SABLOT3RDLIB)          \
 	$(EXPATASCII3RDLIB)      \
 	$(UCBHELPERLIB)          \
 	$(BERKELEYLIB)
-#	$(BERKELEYCPPLIB)
+
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+	SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+.ELSE
+	SHL1STDLIBS+=$(SABLOT3RDLIB)
+.ENDIF
 
 SHL1LIBS =                       \
 	$(SLB)$/jaqe.lib         \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- openoffice.org.spec	30 Aug 2005 11:08:50 -0000	1.428
+++ openoffice.org.spec	30 Aug 2005 16:14:38 -0000	1.429
@@ -106,7 +106,7 @@
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
 BuildRequires: 	libidn-devel, libwpd-devel >= 0.8.0, sane-backends-devel
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
-BuildRequires:	evolution-data-server-devel, libxslt >= 1.1.14, unixODBC-devel
+BuildRequires:	evolution-data-server-devel, libxslt-devel, unixODBC-devel
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif
@@ -173,6 +173,7 @@
 Patch53: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
 Patch54: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
 Patch55: workspace.cmcfixes16.patch
+Patch56: openoffice.org-1.9.126.oooXXXXX.uselibxslt.xmlhelp.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -828,6 +829,7 @@
 %patch53 -p1 -b .ooo53699.uzipunused.postprocess.patch
 %patch54 -p1 -b .ooo53723.bulletexport.vcl.patch
 %patch55 -p1 -b .workspace.cmcfixes16.patch
+%patch56 -p1 -b .oooXXXXX.uselibxslt.xmlhelp.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -862,7 +864,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -3122,6 +3124,7 @@
 * Tue Aug 30 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.126-2
 - ooo#53956# thai dictionary
 - remove unslightly warning from gnomeprint
+- replace sablot with libxslt i.e. help application
 
 * Sat Aug 27 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.126-1
 - next version


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- sources	27 Aug 2005 19:47:31 -0000	1.108
+++ sources	30 Aug 2005 16:14:38 -0000	1.109
@@ -5,4 +5,4 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 73aac8274b29c79ac2041d0963faa2b8  openoffice.org-myspell-contrib.tar.gz
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
-41e807729c0349b86aa1f9e6f0b5a90a  SRC680_m126.tar.bz2
+c64966caa9742c05ffbf876bde97362e  SRC680_m126.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]