Thu Jan 12 13:27:01 UTC 2006

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.ooo51718.rpath.patch 
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 
	openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 
	openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch 
	openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch 
Removed Files:
	openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch 
Log Message:
try and get rid of -mtune

openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch:
 framework/source/helper/statusindicatorfactory.cxx |    2 ++
 framework/source/loadenv/loadenv.cxx               |    3 ++-
 framework/source/services/frame.cxx                |    2 ++
 source/helper/statusindicatorfactory.cxx           |    0 
 source/loadenv/loadenv.cxx                         |    0 
 source/services/frame.cxx                          |    0 
 6 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch ---
Index: source/helper/statusindicatorfactory.cxx
===================================================================
RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 statusindicatorfactory.cxx
--- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx	23 Sep 2005 15:41:23 -0000	1.21
+++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx	4 Jan 2006 21:41:06 -0000
@@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make
 
     if (xParentWindow.is())
         xParentWindow->setVisible(sal_True);
+#if 0
     css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
     if (xParentWindowTop.is())
         xParentWindowTop->toFront();
+#endif
 }
 
 //-----------------------------------------------
Index: source/loadenv/loadenv.cxx
===================================================================
RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 loadenv.cxx
--- openoffice.org.orig/framework/source/loadenv/loadenv.cxx	11 Nov 2005 12:06:12 -0000	1.21
+++ openoffice.org/framework/source/loadenv/loadenv.cxx	4 Jan 2006 21:41:08 -0000
@@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl
 
     if (xWindow.is())
         xWindow->setVisible(sal_True);
-
+#if 0
     if (xTopWindow.is())
         xTopWindow->toFront();
+#endif
 
 /* #i19976#
     We tried to prevent a toFront() call in case the user putted the
Index: source/services/frame.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/frame.cxx,v
retrieving revision 1.88
diff -u -p -u -r1.88 frame.cxx
--- openoffice.org.orig/framework/source/services/frame.cxx	11 Nov 2005 12:06:59 -0000	1.88
+++ openoffice.org/framework/source/services/frame.cxx	4 Jan 2006 21:41:09 -0000
@@ -1563,6 +1563,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
     if (bIsConnected && !bWasConnected)
         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED   );
 
+#if 0
     //_____________________________________________________________________________________________________
     // A new component window doesn't know anything about current active/focus states.
     // Set this information on it!
@@ -1573,6 +1574,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
     {
         xComponentWindow->setFocus();
     }
+#endif
 
     // If it was a new component window - we must resize it to fill out
     // our container window.

openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch:
 unx/gtk/gdi/salnativewidgets-gtk.cxx     |    0 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.18
diff -u -r1.18 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	1 Nov 2005 10:35:31 -0000	1.18
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	21 Dec 2005 15:31:52 -0000
@@ -1138,8 +1138,8 @@
 	// GTK enforces radio groups, so that if we don't have 2 buttons in the group,
 	// the single button will always be active.  So we have to have 2 buttons.
 	if (!isChecked)
-		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidgetSibling), TRUE );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidget), isChecked );
+		GTK_TOGGLE_BUTTON(gRadioWidgetSibling)->active = TRUE;
+	GTK_TOGGLE_BUTTON(gRadioWidget)->active = isChecked;
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {
@@ -1185,7 +1185,7 @@
 	// Set the shadow based on if checked or not so we get a checkmark.
 	shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
 	NWSetWidgetState( gCheckWidget, nState, stateType );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gCheckWidget), isChecked );
+	GTK_TOGGLE_BUTTON(gCheckWidget)->active = isChecked;
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
     {

openoffice.org-1.9.114.ooo51718.rpath.patch:
 makefile.mk |    7 +++++++
 1 files changed, 7 insertions(+)

Index: openoffice.org-1.9.114.ooo51718.rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.114.ooo51718.rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.114.ooo51718.rpath.patch	22 Dec 2005 08:18:42 -0000	1.3
+++ openoffice.org-1.9.114.ooo51718.rpath.patch	12 Jan 2006 13:26:56 -0000	1.4
@@ -19,23 +19,3 @@
  CONFIGURE_DIR=out
  #relative to CONFIGURE_DIR
  CONFIGURE_ACTION=..$/dist$/configure
-Index: source/xmerge/build.xml
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
-retrieving revision 1.2
-diff -u -r1.2 build.xml
---- openoffice.org.orig/xmerge/source/xmerge/build.xml	24 Oct 2005 17:57:33 -0000	1.2
-+++ openoffice.org/xmerge/source/xmerge/build.xml	22 Dec 2005 08:41:41 -0000
-@@ -58,9 +58,9 @@
-     <property file="../inc/antbuild.properties"/>
-         
-     <path id="classpath">
--        <pathelement location="${solar.jar}/parser.jar"/>
--        <pathelement location="${solar.jar}/jaxp.jar"/>
--        <pathelement location="${solar.jar}/xerces.jar"/>    
-+        <pathelement location="${solar.jar}/xml-apis.jar"/>
-+        <pathelement location="${solar.jar}/xerces.jar"/>
-+        <pathelement location="${solar.jar}/xalan.jar"/>    
-         <pathelement location="${solar.jar}/unoil.jar"/>
-         <pathelement location="${solar.jar}/ridl.jar"/>
-         <pathelement location="${solar.jar}/jurt.jar"/>

openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
 config_office/configure.in                       |   20 ++
 config_office/set_soenv.in                       |    1 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  220 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   13 +
 8 files changed, 222 insertions(+), 38 deletions(-)

Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	21 Dec 2005 18:59:50 -0000	1.6
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	12 Jan 2006 13:26:56 -0000	1.7
@@ -44,14 +44,14 @@
 diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
 --- openoffice.org.orig/config_office/set_soenv.in	2005-08-30 15:45:40.000000000 +0100
 +++ openoffice.org/config_office/set_soenv.in	2005-08-30 15:50:51.000000000 +0100
-@@ -1765,6 +1765,7 @@
- ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
+@@ -1767,6 +1767,7 @@
+ ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
+ ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
+ ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
++ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
  ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
  ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
-+ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
  ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
- ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
- ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
 Index: source/cxxhelp/provider/makefile.mk
 ===================================================================
 RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v

openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch:
 desktop/menus/writer.desktop       |    0 
 sysui/desktop/menus/writer.desktop |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch	4 Jan 2006 09:57:12 -0000	1.2
+++ openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch	12 Jan 2006 13:26:56 -0000	1.3
@@ -11,5 +11,5 @@
  Exec=openoffice -writer %U
 -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
 +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
- Name=%PRODUCTNAME Writer
+ Name=Word Processor
  Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.

openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch:
 unx/gtk/gdi/salnativewidgets-gtk.cxx     |    0 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   11 +++++++++++
 2 files changed, 11 insertions(+)

Index: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch	21 Dec 2005 17:26:30 -0000	1.1
+++ openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch	12 Jan 2006 13:26:56 -0000	1.2
@@ -2,10 +2,22 @@
 ===================================================================
 RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
 retrieving revision 1.18
-diff -u -p -u -r1.18 salnativewidgets-gtk.cxx
+diff -u -r1.18 salnativewidgets-gtk.cxx
 --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	1 Nov 2005 10:35:31 -0000	1.18
-+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	9 Dec 2005 13:15:13 -0000
-@@ -3262,6 +3267,12 @@ static void NWEnsureGTKCombo( void )
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	4 Jan 2006 17:21:19 -0000
+@@ -3229,6 +3229,11 @@
+ 	{
+ 		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) );
+ 		gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 );
++
++		//Setting non-editable means it doesn't blink, so there's no timeouts
++		//running around to nobble us
++		gtk_editable_set_editable(GTK_EDITABLE(gSpinButtonWidget), false);
++
+ 		NWAddWidgetToCacheWindow( gSpinButtonWidget );
+ 	}
+ }
+@@ -3262,6 +3267,12 @@
  	if ( !gComboWidget )
  	{
  		gComboWidget = gtk_combo_new();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- openoffice.org.spec	4 Jan 2006 09:48:41 -0000	1.234
+++ openoffice.org.spec	12 Jan 2006 13:26:56 -0000	1.235
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 %define build_fc5 0
 %define build_fc4 1
@@ -211,10 +211,11 @@
 Patch45: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch
 Patch46: workspace.systemagg.patch
 Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch48: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch
-Patch49: openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch
+Patch48: openoffice.org-2.0.1.ooo59537.config_office.nss.patch
+Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch
 Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
 Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -844,7 +845,7 @@
 %patch20 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
 %patch21 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-# %patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %patch23 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %patch24 -p1 -b .oooXXXXX.systemxalan.patch
 %else
@@ -863,7 +864,7 @@
 %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
+%patch37 -p1 -b .workspace.jaxpapi.patch
 %patch38 -p1 -b .workspace.cmcfixes22.patch
 %patch39 -p1 -b .workspace.cmcfixes23.patch
 %patch40 -p1 -b .ooo58663.vcl.missingglyph.patch
@@ -878,12 +879,11 @@
 %if %{build_fc4}
 %patch47 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
-%if %{build_fc5}
-%patch48 -p1 -b .oooXXXXX.config_office.nss.patch
-%endif
-%patch49 -p1 -b .oooXXXXX.vcl.animatedtheme.patch
+%patch48 -p1 -b .ooo59537.config_office.nss.patch
+%patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch
 %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -961,7 +961,7 @@
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in
-                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
+                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables|-mtune=pentium4) continue;;
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
@@ -974,7 +974,7 @@
 export TRUEJAVACOMPILER=$JAVACOMPILER
 export JAVACOMPILER=`pwd`/solenv/bin/gcj
 
-# rm -rf external/common/jaxp.jar external/common/parser.jar
+rm -rf external/common/jaxp.jar external/common/parser.jar
 
 %if ! %{internaljavabits}
 export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
@@ -3342,12 +3342,22 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jan 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5
+- spinbutton factory needs to be uneditable as well as combobox
+- add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb
+- rebuild without -mtune 
+
 * Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-4
 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779#
+
+* Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-3
+- gcc#25426# fixed
+    + reenabled workspace.jaxpapi.patch
+    + reenabled fasterhelpcontent2.patch
 - add openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch for rh#176259#
+- gcc#19870# still busted, accesser hack returns
 
 * Wed Dec 21 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-2
-- 2.0.1
 - add openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch for animated
   theme problem
 


--- openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch DELETED ---


