rpms/openoffice.org/devel openoffice.org.spec, 1.2280, 1.2281 workspace.gtk3.patch, 1.6, 1.7

Caolan McNamara caolanm at fedoraproject.org
Tue Jul 13 15:19:52 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26179

Modified Files:
	openoffice.org.spec workspace.gtk3.patch 
Log Message:
GdkRegion -> cairo_region_t


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2280
retrieving revision 1.2281
diff -u -p -r1.2280 -r1.2281
--- openoffice.org.spec	13 Jul 2010 14:00:57 -0000	1.2280
+++ openoffice.org.spec	13 Jul 2010 15:19:50 -0000	1.2281
@@ -1783,7 +1783,6 @@ mv ../unxlng*.pro/OpenOffice/installed/i
 chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{oooinstdir}
 #provide an owner for these dir
 mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/extensions
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions
 %if %{langpacks}
 dmake ooolanguagepack
 rm -rf ../unxlngx6.pro/OpenOffice_languagepack/installed/install/log
@@ -1825,12 +1824,12 @@ mv ../unxlng*.pro/OpenOffice_SDK/install
 cd ../../
 
 # unpack report-builder extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/report-builder.oxt
-unzip solver/%{OFFICEUPD}/unxlng*/bin/report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/report-builder.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/report-builder.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/report-builder.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/report-builder.oxt
 
 # unpack wiki-publisher extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
-unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/wiki-publisher.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/extensions/wiki-publisher.oxt
 
 # unpack presentation-minimizer extension
 install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presentation-minimizer.oxt
@@ -1850,20 +1849,20 @@ chmod -x $RPM_BUILD_ROOT%{baseinstdir}/e
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
-mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
-mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
+mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
-mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
-mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
+mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
-mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
-mv pythonscript.py $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip
+mv pythonscript.py $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip
 popd
 #set timestamp so it'll be the same on all archs for multilib
-touch -r solenv/inc/minor.mk $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip/pythonscript.py
+touch -r solenv/inc/minor.mk $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip/pythonscript.py
 
 # remove force-agrement to extensions licences
-find $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions $RPM_BUILD_ROOT/%{baseinstdir}/extensions -name description.xml -exec sh -c 'xsltproc --novalid --nonet -o {}.tmp %{SOURCE8} {} && mv -f {}.tmp {}' \;
+find $RPM_BUILD_ROOT/%{baseinstdir}/extensions -name description.xml -exec sh -c 'xsltproc --novalid --nonet -o {}.tmp %{SOURCE8} {} && mv -f {}.tmp {}' \;
 
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{sdkinstdir}
@@ -2555,8 +2554,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files core
 %defattr(-,root,root,-)
-%dir %{_datadir}/openoffice.org
-%dir %{_datadir}/openoffice.org/extensions
 %dir %{baseinstdir}
 %dir %{baseinstdir}/share
 %dir %{baseinstdir}/share/uno_packages
@@ -3181,8 +3178,8 @@ update-desktop-database %{_datadir}/appl
 
 %files report-builder
 %defattr(-,root,root,-)
-%docdir %{_datadir}/openoffice.org/extensions/report-builder.oxt/help
-%{_datadir}/openoffice.org/extensions/report-builder.oxt
+%docdir %{baseinstdir}/extensions/report-builder.oxt/help
+%{baseinstdir}/extensions/report-builder.oxt
 
 %pre report-builder
 # deregister old < 3.3. extension
@@ -3191,7 +3188,7 @@ unopkg remove --shared com.sun.reportdes
 %files bsh
 %defattr(-,root,root,-)
 %{basisinstdir}/share/Scripts/beanshell
-%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
+%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
 
 %pre bsh
 # deregister old < 3.3 extension
@@ -3201,7 +3198,7 @@ unopkg remove --shared org.openoffice.le
 %defattr(-,root,root,-)
 %{basisinstdir}/program/classes/js.jar
 %{basisinstdir}/share/Scripts/javascript
-%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
+%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
 
 %pre rhino
 # deregister old 3.3 extension
@@ -3209,8 +3206,8 @@ unopkg remove --shared org.openoffice.le
 
 %files wiki-publisher
 %defattr(-,root,root,-)
-%docdir %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt/license
-%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
+%docdir %{baseinstdir}/extensions/wiki-publisher.oxt/license
+%{baseinstdir}/extensions/wiki-publisher.oxt
 
 %pre wiki-publisher
 # deregister old 3.3 extension
@@ -3613,7 +3610,7 @@ update-desktop-database %{_datadir}/appl
 %{basisinstdir}/share/Scripts/python
 %{python_sitearch}/uno.py*
 %{python_sitearch}/unohelper.py*
-%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+%{baseinstdir}/extensions/ScriptProviderForPython.zip
 %{basisinstdir}/share/registry/pyuno.xcd
 
 %pre pyuno

workspace.gtk3.patch:
 configure.in                              |    6 
 source/appl/makefile.mk                   |    2 
 source/appl/shutdowniconunx.cxx           |   22 
 source/eggtrayicon-impl.h                 |    2 
 source/eggtrayicon.c                      |   57 
 source/makefile.mk                        |    2 
 source/nsplugin/source/makefile.mk        |    2 
 source/ooo/makefile.mk                    |    4 
 source/plugin/unx/npnapi.cxx              |    5 
 source/plugin/util/makefile.pmk           |    2 
 source/unx/gnome/SalGtkFilePicker.cxx     |    6 
 source/unx/gnome/SalGtkPicker.cxx         |    4 
 source/unx/gnome/makefile.mk              |    6 
 unx/gtk/a11y/makefile.mk                  |    2 
 unx/gtk/app/gtkdata.cxx                   |   32 
 unx/gtk/app/makefile.mk                   |    2 
 unx/gtk/gdi/makefile.mk                   |    4 
 unx/gtk/gdi/salnativewidgets-gtk.cxx      | 2316 +++++++++++++++---------------
 unx/gtk/window/gtkframe.cxx               |  109 -
 unx/gtk/window/gtkobject.cxx              |   17 
 unx/gtk/window/makefile.mk                |    2 
 unx/inc/plugins/gtk/gtkdata.hxx           |   35 
 unx/inc/plugins/gtk/gtkgdi.hxx            |   16 
 unx/inc/saldisp.hxx                       |    4 
 unx/source/app/saldisp.cxx                |   21 
 unx/source/app/salsys.cxx                 |    2 
 util/makefile.mk                          |    4 
 vcl/unx/inc/plugins/gtk/gtkframe.hxx.foo  |    2 
 vcl/unx/inc/plugins/gtk/gtkobject.hxx.foo |    2 
 29 files changed, 1471 insertions(+), 1219 deletions(-)

Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- workspace.gtk3.patch	13 Jul 2010 10:16:54 -0000	1.6
+++ workspace.gtk3.patch	13 Jul 2010 15:19:52 -0000	1.7
@@ -52,7 +52,13 @@
  using namespace com::sun::star;
  
  int GtkSalFrame::m_nFloats = 0;
-@@ -433,7 +441,7 @@
+@@ -428,12 +436,12 @@
+ 	getDisplay()->deregisterFrame( this );
+     
+     if( m_pRegion )
+-        gdk_region_destroy( m_pRegion );
++        cairo_region_destroy( m_pRegion );
+ 
      if( m_hBackgroundPixmap )
      {
          XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
@@ -313,6 +319,15 @@
      if( bWasVisible )
          Show( FALSE );
      
+@@ -2407,7 +2416,7 @@
+         m_pIMHandler = NULL;
+     }
+     if( m_pRegion )
+-        gdk_region_destroy( m_pRegion );
++        cairo_region_destroy( m_pRegion );
+     if( m_pFixedContainer )
+         gtk_widget_destroy( GTK_WIDGET(m_pFixedContainer) );
+     if( m_pWindow )
 @@ -2435,7 +2444,7 @@
      {
          if( m_aGraphics[i].bInUse )
@@ -322,7 +337,7 @@
              m_aGraphics[i].pGraphics->SetWindow( m_pWindow );
          }
      }
-@@ -2465,7 +2474,7 @@
+@@ -2465,14 +2474,14 @@
  void GtkSalFrame::ResetClipRegion()
  {
      if( m_pWindow )
@@ -331,7 +346,24 @@
  }
  
  void GtkSalFrame::BeginSetClipRegion( ULONG )
-@@ -2492,7 +2501,7 @@
+ {
+     if( m_pRegion )
+-        gdk_region_destroy( m_pRegion );
+-    m_pRegion = gdk_region_new();
++        cairo_region_destroy( m_pRegion );
++    m_pRegion = cairo_region_create();
+ }
+ 
+ void GtkSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
+@@ -2485,14 +2494,14 @@
+         aRect.width		= nWidth;
+         aRect.height	= nHeight;
+         
+-        gdk_region_union_with_rect( m_pRegion, &aRect );
++        cairo_region_union_rectangle( m_pRegion, &aRect );
+     }
+ }
+ 
  void GtkSalFrame::EndSetClipRegion()
  {
      if( m_pWindow && m_pRegion )
@@ -4406,7 +4438,7 @@
 @@ -58,7 +59,7 @@
          SalDisplay* pDisp = GetX11SalData()->GetDisplay();
          m_aSystemData.nSize 		= sizeof( SystemChildData );
-         m_aSystemData.pDisplay		= pDisp->GetDisplay();
+         im_aSystemData.pDisplay		= pDisp->GetDisplay();
 -        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pSocket->window);
 +        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
          m_aSystemData.pSalFrame		= NULL;
@@ -4421,6 +4453,15 @@
          m_aSystemData.pShellWidget	= GTK_WIDGET(pParent->getWindow());
  
          g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
+@@ -83,7 +84,7 @@
+ GtkSalObject::~GtkSalObject()
+ {
+     if( m_pRegion )
+-        gdk_region_destroy( m_pRegion );
++        cairo_region_destroy( m_pRegion );
+     if( m_pSocket )
+     {
+         // remove socket from parent frame's fixed container
 @@ -101,7 +102,7 @@
  void GtkSalObject::ResetClipRegion()
  {
@@ -4430,7 +4471,25 @@
  }
  
  USHORT GtkSalObject::GetClipRegionType()
-@@ -130,7 +131,7 @@
+@@ -112,8 +113,8 @@
+ void GtkSalObject::BeginSetClipRegion( ULONG )
+ {
+     if( m_pRegion )
+-        gdk_region_destroy( m_pRegion );
+-    m_pRegion = gdk_region_new();
++        cairo_region_destroy( m_pRegion );
++    m_pRegion = cairo_region_create();
+ }
+ 
+ void GtkSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
+@@ -124,13 +125,13 @@
+     aRect.width		= nWidth;
+     aRect.height	= nHeight;
+     
+-    gdk_region_union_with_rect( m_pRegion, &aRect );
++    cairo_region_union_rectangle( m_pRegion, &aRect );
+ }
+ 
  void GtkSalObject::EndSetClipRegion()
  {
      if( m_pSocket )
@@ -4519,3 +4578,25 @@
      static GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
                                             GdkEvent* event,
                                             gpointer data );
+--- vcl.orig/unx/inc/plugins/gtk/gtkframe.hxx	2010-07-13 16:17:08.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx.foo	2010-07-13 16:16:56.000000000 +0100
+@@ -195,7 +195,7 @@
+     Size                            m_aMinSize;
+     Rectangle                       m_aRestorePosSize;    
+     
+-    GdkRegion*			    m_pRegion;
++    cairo_region_t*		    m_pRegion;
+ 
+     void Init( SalFrame* pParent, ULONG nStyle );
+     void Init( SystemParentData* pSysData );
+--- vcl.orig/unx/inc/plugins/gtk/gtkobject.hxx	2010-07-13 16:18:03.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkobject.hxx.foo	2010-07-13 16:17:47.000000000 +0100
+@@ -37,7 +37,7 @@
+ {
+ 	SystemChildData		m_aSystemData;
+     GtkWidget*			m_pSocket;
+-    GdkRegion*			m_pRegion;
++    cairo_region_t*		m_pRegion;
+ 
+     // signals
+     static gboolean		signalButton( GtkWidget*, GdkEventButton*, gpointer );



More information about the scm-commits mailing list