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

rpms/openoffice.org/devel openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch, NONE, 1.1 workspace.cmcfixes23.patch, NONE, 1.1 workspace.hroloader.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.8, 1.9 openoffice.org.spec, 1.567, 1.568 sources, 1.137, 1.138 openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch, 1.4, NONE openoffice.org-1.9.87.warnnoterroronmissing.patch, 1.1, NONE openoffice.org-1.9.89.ooo44027.pthreadchange.patch, 1.2, NONE openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch, 1.1, NONE openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch, 1.4, NONE



Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch 
	workspace.cmcfixes23.patch workspace.hroloader.patch 
Removed Files:
	openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch 
	openoffice.org-1.9.87.warnnoterroronmissing.patch 
	openoffice.org-1.9.89.ooo44027.pthreadchange.patch 
	openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch 
	openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch 
Log Message:
off we go

openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch:
 appopen.cxx |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch ---
Index: appopen.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/appopen.cxx,v
retrieving revision 1.96.32.2
retrieving revision 1.96.32.4
diff -u -r1.96.32.2 -r1.96.32.4
--- openoffice.org.orig/sfx2/appopen.cxx	26 Aug 2005 08:53:54 -0000	1.96.32.2
+++ openoffice.org/sfx2/appopen.cxx	27 Sep 2005 07:56:24 -0000	1.96.32.4
@@ -116,6 +116,9 @@
 #ifndef _COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP_
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #endif
+#ifndef _COM_SUN_STAR_TASK_ERRORCODEREQUEST_HPP_
+#include <com/sun/star/task/ErrorCodeRequest.hpp>
+#endif
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
@@ -154,7 +157,9 @@
 #ifndef _SFXECODE_HXX
 #include <svtools/sfxecode.hxx>
 #endif
-
+#ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
+#include <framework/preventduplicateinteraction.hxx>
+#endif
 #include <svtools/ehdl.hxx>
 #include <basic/sbxobj.hxx>
 #include <svtools/urihelper.hxx>
@@ -222,6 +227,8 @@
 using namespace ::cppu;
 using namespace ::sfx2;
 
+namespace css = ::com::sun::star;
+
 //=========================================================================
 
 class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
@@ -1086,6 +1093,32 @@
     		if ( nSID == SID_OPENTEMPLATE )
         		rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
 
+            // This helper wraps an existing (or may new created InteractionHandler)
+            // intercept all incoming interactions and provide usefull informations
+            // later if the following transaction was finished.
+
+            ::framework::PreventDuplicateInteraction*                 pHandler       = new ::framework::PreventDuplicateInteraction(::comphelper::getProcessServiceFactory());
+            css::uno::Reference< css::task::XInteractionHandler >     xHandler       (static_cast< css::task::XInteractionHandler* >(pHandler), css::uno::UNO_QUERY);
+            css::uno::Reference< css::task::XInteractionHandler >     xWrappedHandler;
+
+            // wrap existing handler or create new UUI handler
+            SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
+            if (pInteractionItem)
+            {
+                pInteractionItem->GetValue() >>= xWrappedHandler;
+    			rReq.RemoveItem( SID_INTERACTIONHANDLER );
+            }
+            if (xWrappedHandler.is())
+                pHandler->setHandler(xWrappedHandler);
+            else
+                pHandler->useDefaultUUIHandler();
+            rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHandler)) );
+
+            // define rules for this handler
+            css::uno::Type                                            aInteraction = ::getCppuType(static_cast< css::task::ErrorCodeRequest* >(0));
+            ::framework::PreventDuplicateInteraction::InteractionInfo aRule        (aInteraction, 1);
+            pHandler->addInteractionRule(aRule);
+
             for ( USHORT i = 0; i < pURLList->Count(); ++i )
             {
                 String aURL = *(pURLList->GetObject(i));
@@ -1096,7 +1129,25 @@
                 // geladen wird
                 // TODO/LATER: use URLList argument and always remove one document after another, each step in asychronous execution, until finished
                 // but only if reschedule is a problem
-                GetDispatcher_Impl()->Execute( SID_OPENDOC, rReq.IsSynchronCall() ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON, *rReq.GetArgs() );
+                GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs() );
+
+                // check for special interaction "NO MORE DOCUMENTS ALLOWED" and
+                // break loop then. Otherwise we risk showing the same interaction more then once.
+                if ( pHandler->getInteractionInfo(aInteraction, &aRule) )
+                {
+                    if (aRule.m_nCallCount > 0)
+                    {
+                        if (aRule.m_xRequest.is())
+                        {
+                            css::task::ErrorCodeRequest aRequest;
+                            if (aRule.m_xRequest->getRequest() >>= aRequest)
+                            {
+                                if (aRequest.ErrCode == ERRCODE_SFX_NOMOREDOCUMENTSALLOWED)
+                                    break;
+                            }
+                        }
+                    }
+                }
             }
 
             delete pURLList;

workspace.cmcfixes23.patch:
 config_office/configure.in                                           |    3 ++
 extensions/source/config/ldap/makefile.mk                            |    2 -
 inc_openoffice/unix/packagelist.txt                                  |    0 
 instsetoo_native/inc_openoffice/unix/packagelist.txt                 |   12 +++++-----
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    7 -----
 openoffice.org/solenv/inc/unxlngs3904.mk                             |    2 -
 registry/data/org/openoffice/Office/UI/GenericCommands.xcu           |    0 
 sal/osl/unx/process.c                                                |    2 -
 scp2/source/python/file_python.scp                                   |    2 -
 solenv/inc/unxlngi4.mk                                               |    2 -
 solenv/inc/unxlngi5.mk                                               |    2 -
 solenv/inc/unxlngi6.mk                                               |    2 -
 solenv/inc/unxlngp.mk                                                |    2 -
 solenv/inc/unxlngppc.mk                                              |    2 -
 solenv/inc/unxlngppc4.mk                                             |    2 -
 solenv/inc/unxlngr.mk                                                |    2 -
 solenv/inc/unxlngs.mk                                                |    2 -
 solenv/inc/unxlngx6.mk                                               |    2 -
 solenv/inc/unxlnxi.mk                                                |    2 -
 source/config/ldap/makefile.mk                                       |    0 
 source/python/file_python.scp                                        |    0 
 21 files changed, 23 insertions(+), 27 deletions(-)

--- NEW FILE workspace.cmcfixes23.patch ---
Index: registry/data/org/openoffice/Office/UI/GenericCommands.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu,v
retrieving revision 1.44
diff -u -r1.44 GenericCommands.xcu
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	11 Nov 2005 11:42:11 -0000	1.44
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	15 Nov 2005 19:23:54 -0000
@@ -5736,13 +5736,6 @@
                     <value xml:lang="en-US">Recent Doc~uments</value>
                 </prop>
             </node>
-            <!-- Not yet implemented: Hyperlink Bar:Find 
-            <node oor:name=".uno:InternetSearch" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Suchen</value>
-                    <value xml:lang="en-US">Find</value>
-                </prop>
-            </node> -->
         </node>
 		<node oor:name="Popups">
 			<node oor:name=".uno:HelpMenu" oor:op="replace">
Index: inc_openoffice/unix/packagelist.txt
===================================================================
RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
retrieving revision 1.20
diff -u -r1.20 packagelist.txt
--- openoffice.org.orig/instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
+++ openoffice.org/instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 08:52:06 -0000
@@ -246,15 +246,15 @@
 
 Start
 module = "gid_Module_Optional_Pymailmerge"
-solarispackagename = "openofficeorg-emailmerge"
-solarisrequires = "openofficeorg-pyuno"
-packagename = "openoffice.org-emailmerge"
-linuxreplaces = "openofficeorg-emailmerge"
-requires = "openoffice.org-pyuno"
+solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-emailmerge"
+solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+packagename = "%UNIXPRODUCTNAME-emailmerge"
+linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-emailmerge"
+requires = "%UNIXPRODUCTNAME-pyuno"
 copyright = "1999-2005 by OpenOffice.org"
 vendor = "OpenOffice.org"
 description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
 End
 
 Start
Index: source/python/file_python.scp
===================================================================
RCS file: /cvs/installation/scp2/source/python/file_python.scp,v
retrieving revision 1.13
diff -u -r1.13 file_python.scp
--- openoffice.org.orig/scp2/source/python/file_python.scp	11 Nov 2005 10:43:22 -0000	1.13
+++ openoffice.org/scp2/source/python/file_python.scp	18 Nov 2005 16:48:39 -0000
@@ -95,6 +95,7 @@
     Styles = (PACKED);
 End
 #endif
+#endif
 
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
@@ -110,7 +111,6 @@
     Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
-#endif
 
 // substitute for the python Windows basic scripts
 
--- openoffice.org.orig/sal/osl/unx/process.c	2005-01-27 23:02:00.000000000 +0100
+++ openoffice.org/sal/osl/unx/process.c	2005-01-27 23:04:54.000000000 +0100
@@ -533,7 +533,7 @@
 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
 	     		putenv(data.m_pszEnv[i]);
 
-#if defined(LINUX)
+#if defined(LINUX) && !defined(NPTL)
             /* mfe: linux likes to have just one thread when the exec family is called */
             /*      this np function has this purpose ...                              */
             pthread_kill_other_threads_np();
--- openoffice.org.orig/config_office/configure.in	2005-01-27 23:04:31.000000000 +0100
+++ openoffice.org/config_office/configure.in	2005-01-27 23:06:28.000000000 +0100
@@ -546,6 +546,9 @@
 		test_gtk=yes
 		test_kde=yes
 		test_cups=yes
+		if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
+			PTHREAD_CFLAGS="-DNPTL"
+		fi
 		_os=Linux
 		;;
 	gnu)
--- openoffice.org.orig/solenv/inc/unxlngp.mk	2005-01-28 00:28:08.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngp.mk	2005-01-28 00:28:18.000000000 +0100
@@ -65,7 +65,7 @@
 AFLAGS=
 
 # _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DGLIBC=2
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DGLIBC=2
 CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
 CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR
 
--- openoffice.org.orig/solenv/inc/unxlngr.mk	2005-01-28 00:28:33.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngr.mk	2005-01-28 00:28:40.000000000 +0100
@@ -73,7 +73,7 @@
 LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # this is a platform with JAVA support
 .IF "$(SOLAR_JAVA)"!=""
--- openoffice.org.orig/solenv/inc/unxlngi5.mk	2005-01-28 00:27:54.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngi5.mk	2005-01-28 00:28:02.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--- openoffice.org.orig/solenv/inc/unxlngppc4.mk	2005-01-28 00:28:18.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngppc4.mk	2005-01-28 00:28:24.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
 
 # this is a platform with JAVA support
 .IF "$(SOLAR_JAVA)"!=""
--- openoffice.org/solenv/inc/unxlngs3904.mk	2005-01-28 00:28:40.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngs3904.mk	2005-01-28 00:28:47.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # this is a platform with JAVA support
 .IF "$(SOLAR_JAVA)"!=""
--- openoffice.org.orig/solenv/inc/unxlngs.mk	2005-01-28 00:28:47.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngs.mk	2005-01-28 00:28:53.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # this is a platform with JAVA support
 .IF "$(SOLAR_JAVA)"!=""
--- openoffice.org.orig/solenv/inc/unxlngppc.mk	2005-01-28 00:28:24.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngppc.mk	2005-01-28 00:28:33.000000000 +0100
@@ -73,7 +73,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl 
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC 
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC 
 
 # this is a platform with JAVA support
 .IF "$(SOLAR_JAVA)"!="" 
--- openoffice.org.orig/solenv/inc/unxlngi4.mk	2005-01-28 00:27:47.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngi4.mk	2005-01-28 00:27:54.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--- openoffice.org.orig/solenv/inc/unxlngi6.mk	2005-01-28 00:28:03.000000000 +0100
+++ openoffice.org/solenv/inc/unxlngi6.mk	2005-01-28 00:28:08.000000000 +0100
@@ -72,7 +72,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--- openoffice.org.orig/solenv/inc/unxlnxi.mk	2005-01-28 00:29:00.000000000 +0100
+++ openoffice.org/solenv/inc/unxlnxi.mk	2005-01-28 00:29:06.000000000 +0100
@@ -64,7 +64,7 @@
 AFLAGS=
 
 # _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS
 CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
 CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR
 
--- openoffice.org.orig/solenv/inc/unxlngx6.mk	5 Oct 2005 11:36:34 -0000	1.2
+++ openoffice.org/solenv/inc/unxlngx6.mk	1 Nov 2005 19:12:24 -0000
@@ -45,7 +45,7 @@ JAVAFLAGSDEBUG=-g
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.9
diff -u -p -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/config/ldap/makefile.mk	8 Sep 2005 19:25:01 -0000	1.9
+++ openoffice.org/extensions/source/config/ldap/makefile.mk	13 Nov 2005 19:58:12 -0000
@@ -63,7 +63,7 @@ LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozi
 .ENDIF
 
 .IF "$(WITH_OPENLDAP)" == "YES"
-CFLAGS += -DWITH_OPENLDAP
+CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED
 .ENDIF
 
 SOLARINC+= $(LDAPSDKINCLUDES)

workspace.hroloader.patch:
 sal/osl/unx/conditn.c       |    9 +--------
 vcl/unx/gtk/app/gtkdata.cxx |    1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

--- NEW FILE workspace.hroloader.patch ---
Index: sal/osl/unx/conditn.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/conditn.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 conditn.c
--- openoffice.org.orig/sal/osl/unx/conditn.c	16 Mar 2001 13:14:43 -0000	1.4
+++ openoffice.org/sal/osl/unx/conditn.c	10 Mar 2005 10:11:43 -0000
@@ -234,13 +234,6 @@ sal_Bool SAL_CALL osl_resetCondition(osl
 	}
 
 	pCond->m_State = sal_False;
-    nRet = pthread_cond_broadcast(&pCond->m_Condition);
-	if ( nRet != 0 )
-	{
-       OSL_TRACE("osl_resetCondition : condition broadcast failed. Errno: %d; %s\n",
-                  nRet, strerror(nRet));
-		return sal_False;
-	}
 
     nRet = pthread_mutex_unlock(&pCond->m_Lock);
     if ( nRet != 0 )
@@ -278,7 +271,7 @@ oslConditionResult SAL_CALL osl_waitCond
 		return osl_cond_result_error;
 	}
 
-	while ( ! pCond->m_State )
+	if ( ! pCond->m_State )
 	{
 		if ( pTimeout )
 		{
Index: vcl/unx/gtk/app/gtkdata.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkdata.cxx,v
retrieving revision 1.15
diff -u -p -u -r1.15 gtkdata.cxx
--- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx 2 Feb 2005 16:41:15 -0000       1.15
+++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx 9 Mar 2005 17:40:02 -0000
@@ -716,7 +731,6 @@ void GtkXLib::Yield( BOOL bWait )
     {
         osl_releaseMutex( m_aDispatchMutex );
         osl_setCondition( m_aDispatchCondition ); // trigger non dispatch thread yields
-        osl_resetCondition( m_aDispatchCondition );
     }
 }


openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   18 -
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 -
 framework/source/services/substitutepathvars.cxx                     |   93 +++++++
 framework/util/makefile.mk                                           |    1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs           |    8 
 registry/schema/org/openoffice/Office/Common.xcs                     |    0 
 sfx2/source/appl/sfxhelp.cxx                                         |   66 ++++-
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/dialog/optgdlg.cxx                                            |    0 
 source/dialog/optgdlg.hxx                                            |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  132 ++++++----
 svx/source/dialog/optgdlg.hxx                                        |    3 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 -
 tools/source/rc/resmgr.cxx                                           |   19 +
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   24 +
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    8 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    4 
 32 files changed, 310 insertions(+), 115 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	18 Nov 2005 08:49:02 -0000	1.8
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	29 Nov 2005 20:04:46 -0000	1.9
@@ -810,3 +810,20 @@
      {
          aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
          aLocale.Country = OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) );
+Index: bin/modules/installer/scriptitems.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v
+retrieving revision 1.17
+diff -u -p -r1.17 scriptitems.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm	24 Feb 2005 16:21:15 -0000	1.17
++++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm	18 Mar 2005 22:39:42 -0000
+@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
+ 				$infoline = "ERROR: Removing file $filename from file list.\n";
+ 				push( @installer::globals::logfileinfo, $infoline);
+ 
+-				push(@missingfiles, "ERROR: File not found: $filename\n");	
+-				$error_occured = 1;
++				push(@missingfiles, "Warning: File not found: $filename\n");	
+ 
+ 				next;	# removing this file from list, if sourcepath is empty
+ 			}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- openoffice.org.spec	29 Nov 2005 09:35:11 -0000	1.567
+++ openoffice.org.spec	29 Nov 2005 20:04:47 -0000	1.568
@@ -1,6 +1,6 @@
 %define oootag SRC680
 %define ooomilestone 142
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 %define build_fc5 1
 %define build_fc4 0
@@ -159,41 +159,39 @@
 Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch8:  openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch9:  openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch10: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch11: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch14: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch15: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch16: workspace.epspreview.patch
-Patch17: openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch
-Patch18: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch19: workspace.dbwizardpp1.patch
-Patch20: workspace.cmcfixes21.patch
-Patch21: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch22: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch23: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch24: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch25: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch26: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch27: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch28: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch29: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch30: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch31: workspace.dmake43p01.patch
-Patch32: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch33: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch34: workspace.atkbridge.patch
-Patch35: workspace.cmcfixes20.patch
-Patch36: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch37: workspace.jaxpapi.patch
-Patch38: openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch
-Patch39: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
-Patch40: workspace.cmcfixes22.patch
-Patch41: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
-Patch42: openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
-Patch43: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch9:  openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch10: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch11: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch12: workspace.hroloader.patch
+Patch13: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch14: workspace.epspreview.patch
+Patch15: openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch
+Patch16: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch17: workspace.dbwizardpp1.patch
+Patch18: workspace.cmcfixes21.patch
+Patch19: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch20: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
+Patch21: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch22: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch23: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch24: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch25: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+Patch26: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch27: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch28: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
+Patch29: workspace.dmake43p01.patch
+Patch30: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch31: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch32: workspace.atkbridge.patch
+Patch33: workspace.cmcfixes20.patch
+Patch34: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch35: workspace.jaxpapi.patch
+Patch36: workspace.cmcfixes22.patch
+Patch37: workspace.cmcfixes23.patch
+Patch38: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
+Patch39: openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
+Patch40: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch41: openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -810,46 +808,44 @@
 %endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch9  -p1 -b .warnnoterroronmissing.patch
-%patch10 -p1 -b .ooo44027.pthreadchange.patch
-%patch11 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch13 -p1 -b .ooo54603.fontconfig.patch
-%patch14 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch15 -p1 -b .NONE.gcc3gcj4.patch
-%patch16 -p1 -b .workspace.epspreview.patch
-%patch17 -p1 -b .ooo50857.gtkslowunderkde.vcl.patch
-%patch18 -p1 -b .ooo51931.systemxmlsec.patch
-%patch19 -p1 -b .workspace.dbwizardpp1.patch
-%patch20 -p1 -b .workspace.cmcfixes21.patch
-%patch21 -p1 -b .ooo52428.execshield.bridges.patch
+%patch9  -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch10 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch11 -p1 -b .ooo54603.fontconfig.patch
+%patch12 -p1 -b .workspace.hroloader.patch
+%patch13 -p1 -b .NONE.gcc3gcj4.patch
+%patch14 -p1 -b .workspace.epspreview.patch
+%patch15 -p1 -b .ooo50857.gtkslowunderkde.vcl.patch
+%patch16 -p1 -b .ooo51931.systemxmlsec.patch
+%patch17 -p1 -b .workspace.dbwizardpp1.patch
+%patch18 -p1 -b .workspace.cmcfixes21.patch
+%patch19 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch22 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch23 -p1 -b .ooo54692.fasterhelpcontent2.patch
-%patch24 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch20 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
+%patch21 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch22 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %else
-%patch25 -p1 -b .ooo51718.rpath.patch
+%patch23 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch26 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch27 -p1 -b .ooo54586.nfslock.sal.patch
-%patch28 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch29 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch30 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch31 -p1 -b .dmake43p01.patch
+%patch24 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch25 -p1 -b .ooo54586.nfslock.sal.patch
+%patch26 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch27 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch28 -p1 -b .ooo54040.savecrash.svtools.patch
+%patch29 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch32 -p1 -b .ooo54479.systemicu.patch
+%patch30 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch33 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch34 -p1 -b .workspace.atkbridge.patch
-%patch35 -p1 -b .workspace.cmcfixes20.patch
-%patch36 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch37 -p1 -b .workspace.jaxpapi.patch
-%patch38 -p1 -b .oooXXXXX.extensions.openldapapi.patch
-%patch39 -p1 -b .oooXXXXX.m400.buildissues.patch
-%patch40 -p1 -b .workspace.cmcfixes22.patch
-%patch41 -p1 -b .oooXXXXX.systemxalan.patch
-%patch42 -p1 -b .oooXXXXX.vcl.missingglyph.patch
-%patch43 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch31 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch32 -p1 -b .workspace.atkbridge.patch
+%patch33 -p1 -b .workspace.cmcfixes20.patch
+%patch34 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch35 -p1 -b .workspace.jaxpapi.patch
+%patch36 -p1 -b .workspace.cmcfixes22.patch
+%patch37 -p1 -b .workspace.cmcfixes23.patch
+%patch38 -p1 -b .oooXXXXX.systemxalan.patch
+%patch39 -p1 -b .oooXXXXX.vcl.missingglyph.patch
+%patch40 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch41 -p1 -b .ooo58618.sfx2.interactionhandler.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3299,9 +3295,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Nov 29 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.2
+* Tue Nov 29 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.3
+- workaround for illadvised last minute "interaction handler" workspace merge
+
+* Tue Nov 29 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.2
 - rh#174147# openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
 - rh#174148# openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+- openoffice.org-1.9.87.warnnoterroronmissing.patch not going to be upstreamed
 
 * Thu Nov 17 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.1-0.142.1
 - next version


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	24 Nov 2005 18:55:27 -0000	1.137
+++ sources	29 Nov 2005 20:04:50 -0000	1.138
@@ -3,7 +3,7 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
-ab46792df4dd81f27a9c08d1e18a35a8  openoffice.org-simple-crash_report.sh
 2cd37ed5f2ac9fa129f6aaaa3491988f  openoffice.org-myspell-contrib.tar.gz
 33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
 b5a28a9d77c1d63da16b3683f63def45  SRC680_m142.tar.bz2
+f2ff7bd2aa4b017331d34d8e68b54356  openoffice.org-simple-crash_report.sh


--- openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch DELETED ---


--- openoffice.org-1.9.87.warnnoterroronmissing.patch DELETED ---


--- openoffice.org-1.9.89.ooo44027.pthreadchange.patch DELETED ---


--- openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch DELETED ---


--- openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch DELETED ---


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