rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.4, 1.5 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.17, 1.18 openoffice.org.spec, 1.921, 1.922

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 29 13:42:28 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch 
Log Message:
fix a few bugs

openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch:
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |    2 ++
 source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx         |    0 
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch ---
Index: source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx,v
retrieving revision 1.7
diff -u -r1.7 uno2cpp.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx	1 Dec 2006 14:17:59 -0000	1.7
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx	29 Jan 2007 11:21:29 -0000
@@ -295,9 +295,11 @@
 		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
 		break;
 	case typelib_TypeClass_FLOAT:
+		aRet.f.xmm0 = d0;
 		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
 		break;
 	case typelib_TypeClass_DOUBLE:
+		aRet.f.xmm0 = d0;
 		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
 		break;
     default: {

openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
 desktop/scripts/soffice.sh |   32 ++++++++++----------------------
 scripts/soffice.sh         |    0 
 2 files changed, 10 insertions(+), 22 deletions(-)

Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch	5 May 2006 10:27:57 -0000	1.4
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch	29 Jan 2007 13:42:26 -0000	1.5
@@ -5,7 +5,7 @@
 diff -u -p -r1.17 soffice.sh
 --- openoffice.org.orig/desktop/scripts/soffice.sh	15 Jun 2005 08:16:47 -0000	1.17
 +++ openoffice.org/desktop/scripts/soffice.sh	5 Jul 2005 07:49:51 -0000
-@@ -79,81 +79,6 @@
+@@ -77,28 +79,16 @@
  # change back directory
  cd "$sd_cwd"
  
@@ -17,102 +17,70 @@
 -    fi
 -fi
 -
--# set search path for shared libraries
+ # set search path for shared libraries
 -add_moz_lib=
 -for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
 -	test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
 -done
--case $sd_platform in
--  AIX)
--    # this is a temporary hack until we can live with the default search paths
--    if [ $LIBPATH ]; then
--      SYSTEM_LIBPATH=$LIBPATH
--      export SYSTEM_LIBPATH
+ case $sd_platform in
+   AIX)
+     # this is a temporary hack until we can live with the default search paths
+     if [ $LIBPATH ]; then
+       SYSTEM_LIBPATH=$LIBPATH
+       export SYSTEM_LIBPATH
 -      LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
--    else
++      LIBPATH="$sd_prog":$LIBPATH
+     else
 -      LIBPATH="$sd_prog$add_moz_lib"
--    fi
--    export LIBPATH
--    ;;
--
--  Darwin)
--    # this is a temporary hack until we can live with the default search paths
--    if [ $DYLD_LIBRARY_PATH ]; then 
--      SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
--      export SYSTEM_DYLD_LIBRARY_PATH
++      LIBPATH="$sd_prog"
+     fi
+     export LIBPATH
+     ;;
+@@ -108,9 +98,9 @@
+     if [ $DYLD_LIBRARY_PATH ]; then 
+       SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+       export SYSTEM_DYLD_LIBRARY_PATH
 -      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
--    else
++      DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH
+     else
 -      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
--    fi
--    export DYLD_LIBRARY_PATH
--    ;;
--
--  HP-UX)
--    # this is a temporary hack until we can live with the default search paths
--    if [ $SHLIB_PATH ]; then
--      SYSTEM_SHLIB_PATH=$SHLIB_PATH
--      export SYSTEM_SHLIB_PATH
++      DYLD_LIBRARY_PATH="$sd_prog"
+     fi
+     export DYLD_LIBRARY_PATH
+     ;;
+@@ -120,9 +110,9 @@
+     if [ $SHLIB_PATH ]; then
+       SYSTEM_SHLIB_PATH=$SHLIB_PATH
+       export SYSTEM_SHLIB_PATH
 -      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
--    else
++      SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH
+     else
 -      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
--    fi
--    export SHLIB_PATH
--    ;;
--
--  IRIX*)
--    # this is a temporary hack until we can live with the default search paths
--    if [ $LD_LIBRARYN32_PATH ]; then
--       SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
--       export SYSTEM_LD_LIBRARYN32_PATH
++      SHLIB_PATH="$sd_prog":/usr/openwin/lib
+     fi
+     export SHLIB_PATH
+     ;;
+@@ -132,9 +122,9 @@
+     if [ $LD_LIBRARYN32_PATH ]; then
+        SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
+        export SYSTEM_LD_LIBRARYN32_PATH
 -       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
--    else
++       LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH
+     else
 -       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
--    fi
--    export LD_LIBRARYN32_PATH
--    ;;
--
--  *)
--    # this is a temporary hack until we can live with the default search paths
--    if [ $LD_LIBRARY_PATH ]; then
--      SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
--      export SYSTEM_LD_LIBRARY_PATH
++       LD_LIBRARYN32_PATH=:"$sd_prog"
+     fi
+     export LD_LIBRARYN32_PATH
+     ;;
+@@ -144,9 +134,9 @@
+     if [ $LD_LIBRARY_PATH ]; then
+       SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+       export SYSTEM_LD_LIBRARY_PATH
 -      LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
--    else
++      LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH
+     else
 -      LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
--    fi
--    export LD_LIBRARY_PATH
--    ;;
--esac
--
- #collect all bootstrap variables specified on the command line
- #so that they can be passed as arguments to javaldx later on
- for arg in $@
-@@ -167,23 +92,11 @@
- if [ -x "$sd_prog/javaldx" ] ; then
-     java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
-     if [ "$java_ld_library_path" != "" ] ; then
--        case $sd_platform in
--            AIX)
--                LIBPATH=${java_ld_library_path}:${LIBPATH}
--                ;;
--            Darwin)
--                DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
--                ;;
--            HP-UX)
--                SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
--                ;;
--            IRIX*)
--                LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
--                ;;
--            *)
--                LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
--                ;;
--        esac
-+          if [ $LD_LIBRARY_PATH ]; then
-+              LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+          else
-+              LD_LIBRARY_PATH=${java_ld_library_path}
-+          fi
++      LD_LIBRARY_PATH="$sd_prog"
      fi
- fi
- 
+     export LD_LIBRARY_PATH
+     ;;

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/cupsmgr.hxx                                         |    0 
 inc/jobset.hxx                                          |    0 
 inc/print.hxx                                           |    0 
 inc/printdlg.hxx                                        |    0 
 inc/psprint/ppdparser.hxx                               |    0 
 inc/psprint/printerinfomanager.hxx                      |    0 
 openoffice.org.orig/svtools/source/dialogs/printdlg.src |   10 
 psprint/inc/cupsmgr.hxx                                 |    2 
 psprint/inc/psprint/ppdparser.hxx                       |    4 
 psprint/inc/psprint/printerinfomanager.hxx              |    2 
 psprint/source/printer/cupsmgr.cxx                      |   19 
 psprint/source/printergfx/printerjob.cxx                |    3 
 source/dialogs/makefile.mk                              |    0 
 source/dialogs/printdlg.cxx                             |    0 
 source/dialogs/printdlg.hrc                             |    0 
 source/dialogs/printdlg.src                             |    0 
 source/gdi/jobset.cxx                                   |    0 
 source/gdi/print.cxx                                    |    0 
 source/printer/cupsmgr.cxx                              |    0 
 source/printergfx/printerjob.cxx                        |    0 
 svtools/inc/printdlg.hxx                                |    2 
 svtools/source/dialogs/makefile.mk                      |    4 
 svtools/source/dialogs/printdlg.cxx                     |  530 +++++++++++++++-
 svtools/source/dialogs/printdlg.hrc                     |    2 
 svtools/util/makefile.mk                                |    8 
 util/makefile.mk                                        |    0 
 vcl/inc/jobset.hxx                                      |    3 
 vcl/inc/print.hxx                                       |    3 
 vcl/source/gdi/jobset.cxx                               |  194 +++++
 vcl/source/gdi/print.cxx                                |   11 
 30 files changed, 784 insertions(+), 13 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	12 Dec 2006 20:27:39 -0000	1.17
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	29 Jan 2007 13:42:26 -0000	1.18
@@ -5,16 +5,16 @@
 diff -u -r1.40 printerjob.cxx
 --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	24 Oct 2006 15:06:47 -0000	1.40
 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx	9 Nov 2006 10:40:31 -0000
-@@ -740,6 +744,9 @@
+@@ -740,6 +740,9 @@
      if( ! pKey || ! pValue )
          return true;
  
 +    if (pValue->m_bCupsOnly)
 +        return true;
 +
-     String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) );
-     aFeature += pKey->getKey();
-     aFeature += ' ';
+     OStringBuffer aFeature(256);
+     aFeature.append( "[{\n" );
+     if( bUseIncluseFeature )
 Index: inc/psprint/ppdparser.hxx
 ===================================================================
 RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
@@ -351,7 +351,36 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
-@@ -475,9 +487,10 @@ void CUPSManager::initialize()
+@@ -407,10 +407,15 @@
+         m_pDests( NULL ),
+         m_bNewDests( false )
+ {
++    startsearch();
++}
++
++void CUPSManager::startsearch()
++{
+     m_aDestThread = osl_createThread( run_dest_thread_stub, this );
+ }
+ 
+-CUPSManager::~CUPSManager()
++void CUPSManager::stopsearch()
+ {
+     if( m_aDestThread )
+     {
+@@ -422,6 +427,11 @@
+ 
+     if( m_nDests && m_pDests )
+         m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
++}
++
++CUPSManager::~CUPSManager()
++{
++    stopsearch();
+     delete m_pCUPSWrapper;
+ }
+ 
+@@ -475,9 +485,10 @@
  
      // clear old stuff
      m_aCUPSDestMap.clear();
@@ -360,10 +389,10 @@
      if( ! (m_nDests && m_pDests ) )
          return;
 +#endif
- 
-     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-     int nPrinter = m_nDests;
-@@ -550,6 +563,10 @@ void CUPSManager::initialize()
+     
+     // check for CUPS server(?) > 1.2
+     // since there is no API to query, check for options that were
+@@ -569,6 +580,10 @@
  
      m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
  #endif // ENABLE_CUPS
@@ -374,6 +403,40 @@
  }
  
  #ifdef ENABLE_CUPS
+Index: inc/cupsmgr.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v
+retrieving revision 1.9
+diff -u -r1.9 cupsmgr.hxx
+--- openoffice.org.orig/psprint/inc/cupsmgr.hxx	10 Jul 2006 16:29:13 -0000	1.9
++++ openoffice.org/psprint/inc/cupsmgr.hxx	29 Jan 2007 13:36:19 -0000
+@@ -99,7 +99,9 @@
+     virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo );
+ 
+     // check if the printer configuration has changed
++    virtual void startsearch ();
+     virtual bool checkPrintersChanged( bool bWait );
++    virtual void stopsearch ();
+ 
+     // members for administration (->padmin)
+     // disable for CUPS
+Index: inc/psprint/printerinfomanager.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v
+retrieving revision 1.15.2.1
+diff -u -r1.15.2.1 printerinfomanager.hxx
+--- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx	24 Jan 2007 15:06:04 -0000	1.15.2.1
++++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx	29 Jan 2007 13:36:31 -0000
+@@ -188,7 +188,9 @@
+     // check if the printer configuration has changed
+     // if bwait is true, then this method waits for eventual asynchronous
+     // printer discovery to finish
++    virtual void startsearch();
+     virtual bool checkPrintersChanged( bool bWait );
++    virtual void stopsearch();
+ 
+     // members for administration (->padmin)
+ 
 Index: inc/printdlg.hxx
 ===================================================================
 RCS file: /cvs/util/svtools/inc/printdlg.hxx,v
@@ -648,7 +711,7 @@
 +	{
 +		const PPDKey* pKey = 0;
 +
-+		if (pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("Duplex"))))
++		if ((pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("Duplex")))))
 +		{
 +			if (const PPDValue* pVal = aInfo.m_aContext.getValue( pKey ))
 +			{
@@ -668,7 +731,7 @@
 +			}
 +		}
 +
-+		if (pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("PageSize"))))
++		if ((pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("PageSize")))))
 +		{
 +			int select = -1;
 +			const PPDValue* pSelectValue = sSelectedPaper.Len() ? 0 : aInfo.m_aContext.getValue(pKey);
@@ -706,7 +769,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -623,15 +906,241 @@
+@@ -625,15 +908,245 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -887,26 +950,30 @@
 +					OUString sOldPrinterName(mpPrinter->GetName());
 +					if (sNewPrinterName != sOldPrinterName)
 +					{
-+						USHORT i = 0;
-+						USHORT nCount = Printer::GetQueueCount();
-+						if (nCount)
++						for (int i = 0; i < 2; ++i)
 +						{
-+							for (i = 0; i < nCount; ++i)
++	                        if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
++	                        {
++	                            Printer aTempPrinter(*pInfo);
++	                            mpPrinter->SetPrinterProps(&aTempPrinter);
++								break;
++	                        }
++							else
 +							{
-+								const QueueInfo& rInfo = Printer::GetQueueInfo(i, false);
-+								if (OUString(rInfo.GetPrinterName()) == sNewPrinterName)
++								if (!i)
++								{
++                                    psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++									rManager.stopsearch();
++								    rManager.startsearch();
++									rManager.checkPrintersChanged(true);
++								}
++								else
 +								{
-+									Printer aTempPrinter(rInfo);
-+									mpPrinter->SetPrinterProps(&aTempPrinter);
-+									break;
++									fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", 
++										rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
 +								}
 +							}
 +						}
-+						if (i == nCount)
-+						{
-+							fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", 
-+								rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
-+						}
 +					}
 +					gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
 +
@@ -955,7 +1022,7 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -646,4 +1155,3 @@
+@@ -648,4 +1161,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- openoffice.org.spec	28 Jan 2007 14:57:45 -0000	1.921
+++ openoffice.org.spec	29 Jan 2007 13:42:26 -0000	1.922
@@ -154,6 +154,7 @@
 Patch86: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
 Patch87: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
 Patch88: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
+Patch89: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1042,6 +1043,7 @@
 %patch86 -p1 -b .ooo73481.svx.longnotint32.patch
 %patch87 -p1 -b .ooo73863.vcl.imcommit.patch
 %patch88 -p1 -b .ooo71039.svx.purevirtual.patch
+%patch89 -p1 -b .ooo73974.bridges.doublereturn.patch
 
 tar xzf %{SOURCE1}
 
@@ -2567,11 +2569,14 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jan 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.11
+* Mon Jan 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.11
 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
 - Resolves: rhbz#224230 mark sofficerc as config file
 - Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
 - Resolves: rhbz#224532 openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
+- Resolves: rhbz#225097 library path problems for extensions
+- Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+- Resolves: rhbz#225143 detect newly added printers
 
 * Mon Dec 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.10
 - Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch 




More information about the fedora-cvs-commits mailing list