ooo-build r13110 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 21:08:57 2008
New Revision: 13110
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13110&view=rev

Log:
m22-ify vcl-linking-randr


Added:
   trunk/patches/dev300/vcl-linking-randr-m21.diff
      - copied unchanged from r13108, /trunk/patches/dev300/vcl-linking-randr.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/vcl-linking-randr.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 21:08:57 2008
@@ -2381,7 +2381,14 @@
 [ Fixes ]
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
+
+[ Fixes <= dev300-m21 ]
+vcl-linking-randr-m21.diff, i#89718, n#398244, thorsten
+
+[ Fixes >= dev300-m22 ]
 vcl-linking-randr.diff, i#89718, n#398244, thorsten
+
+[ Fixes ]
 vcl-png-import-fix.diff, n#397128, i#90913, thorsten
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
 slideshow-animated-bmp-fix.diff, i#73914, jlcheng

Modified: trunk/patches/dev300/vcl-linking-randr.diff
==============================================================================
--- trunk/patches/dev300/vcl-linking-randr.diff	(original)
+++ trunk/patches/dev300/vcl-linking-randr.diff	Mon Jul  7 21:08:57 2008
@@ -1,16 +1,6 @@
- config_office/configure.in          |   57 ++++++++++++-------
- config_office/set_soenv.in          |    3 +
- vcl/unx/source/app/makefile.mk      |    5 +-
- vcl/unx/source/app/randrwrapper.cxx |  107 ++++++++++++++++++++++++++++++++++-
- vcl/unx/source/app/saldisp.cxx      |    6 +-
- vcl/util/makefile.mk                |   21 +++++++
- 6 files changed, 169 insertions(+), 30 deletions(-)
-
-diff --git a/config_office/configure.in b/config_office/configure.in
-index 8b8e6cf..232ffc3 100644
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -272,8 +272,12 @@ AC_ARG_ENABLE(xrender-link,
+--- ./config_office/configure.in.randr~	2008-07-07 22:59:53.422096394 +0200
++++ ./config_office/configure.in	2008-07-07 23:01:37.984851576 +0200
+@@ -269,8 +269,12 @@ AC_ARG_ENABLE(xrender-link,
  [  --enable-xrender-link   link with libXrender instead of dynamically open it
  ],,)
  AC_ARG_ENABLE(randr,
@@ -24,7 +14,7 @@
  AC_ARG_WITH(myspell-dicts,
  [  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
                            installation set, for people building for specific
-@@ -1167,18 +1171,6 @@ else
+@@ -1191,18 +1195,6 @@ else
  fi
  AC_SUBST(ENABLE_FONTCONFIG)
  
@@ -43,7 +33,7 @@
  
  dnl ===================================================================
  dnl Disable legacy binary file formats filters
-@@ -2004,14 +1996,6 @@ if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
+@@ -1982,14 +1974,6 @@ if test "$test_cups" = "yes" -a "$ENABLE
  fi
  
  dnl ===================================================================
@@ -58,7 +48,7 @@
  dnl Check if PAM/pam_appl.h is available on Linux or FreeBSD
  dnl ===================================================================
  if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
-@@ -4564,6 +4548,37 @@ AC_SUBST(SYSTEM_XRENDER_HEADERS)
+@@ -4614,6 +4598,37 @@ AC_SUBST(SYSTEM_XRENDER_HEADERS)
  AC_SUBST(XRENDER_LINK)
  
  dnl ===================================================================
@@ -96,11 +86,9 @@
  dnl Check for system Mesa
  dnl ===================================================================
  AC_MSG_CHECKING([which Mesa headers to use])
-diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
-index 0ff9874..2ee36f5 100644
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
-@@ -1966,6 +1966,9 @@ ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
+--- ./config_office/set_soenv.in.randr~	2008-07-07 22:59:53.425096356 +0200
++++ ./config_office/set_soenv.in	2008-07-07 23:01:37.987846160 +0200
+@@ -1964,6 +1964,9 @@ ToFile( "FREETYPE_LIBS",     "@FREETYPE_
  ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
  ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
  ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
@@ -110,10 +98,8 @@
  ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
  ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
  ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
-diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
-index 8520ea2..0a24c44 100644
---- vcl/unx/source/app/makefile.mk
-+++ vcl/unx/source/app/makefile.mk
+--- ./vcl/unx/source/app/makefile.mk.randr~	2008-05-14 11:51:43.000000000 +0200
++++ ./vcl/unx/source/app/makefile.mk	2008-07-07 23:01:37.988847544 +0200
 @@ -79,8 +79,11 @@ EXCEPTIONSFILES=\
  
  
@@ -127,10 +113,8 @@
  .ENDIF
  .ENDIF
  
-diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/source/app/randrwrapper.cxx
-index 9b9b347..5cb510e 100644
---- vcl/unx/source/app/randrwrapper.cxx
-+++ vcl/unx/source/app/randrwrapper.cxx
+--- ./vcl/unx/source/app/randrwrapper.cxx.randr~	2008-06-25 16:36:16.000000000 +0200
++++ ./vcl/unx/source/app/randrwrapper.cxx	2008-07-07 23:04:15.639870370 +0200
 @@ -40,6 +40,9 @@
  
  namespace
@@ -180,7 +164,7 @@
                 ;
  }
  
-@@ -144,6 +153,7 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) :
+@@ -144,6 +153,7 @@ RandRWrapper::RandRWrapper( Display* pDi
          m_pXRRSizes( NULL ),
          m_pXRRConfigSizes( NULL ),
          m_pXRRConfigCurrentConfiguration( NULL ),
@@ -194,7 +178,7 @@
  
 -#endif
 +# else
- 
++
 +class RandRWrapper
 +{
 +    bool m_bValid;
@@ -250,7 +234,7 @@
 +        return m_bValid ? ::XRRRootToScreen( dpy, root ) : -1;
 +    }
 +};
-+
+ 
 +RandRWrapper::RandRWrapper( Display* pDisplay ) :
 +    m_bValid( true )
 +{
@@ -283,31 +267,29 @@
  #include "saldisp.hxx"
  
  void SalDisplay::InitRandR( XLIB_Window aRoot ) const
-@@ -200,6 +295,9 @@ void SalDisplay::DeInitRandR()
- {
+@@ -202,6 +297,9 @@ void SalDisplay::DeInitRandR()
      #ifdef USE_RANDR
-     RandRWrapper::releaseWrapper();
+     if( m_bUseRandRWrapper )
+         RandRWrapper::releaseWrapper();
 +#if OSL_DEBUG_LEVEL > 1
 +    fprintf( stderr, "SalDisplay::DeInitRandR()\n" );
-+#endif    
++#endif
      #endif
  }
  
-@@ -207,7 +305,8 @@ int SalDisplay::processRandREvent( XEvent* pEvent )
+@@ -209,7 +307,8 @@ int SalDisplay::processRandREvent( XEven
  {
      int nRet = 0;
      #ifdef USE_RANDR
--    if( pWrapper )
+-    if( m_bUseRandRWrapper && pWrapper )
 +    XConfigureEvent* pCnfEvent=(XConfigureEvent*)pEvent;
-+    if( pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 )
++    if( m_bUseRandRWrapper && pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 )
      {
          nRet = pWrapper->XRRUpdateConfiguration( pEvent );
          if( nRet == 1 && pEvent->type != ConfigureNotify) // this should then be a XRRScreenChangeNotifyEvent
-diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
-index fe852d8..2960711 100644
---- vcl/unx/source/app/saldisp.cxx
-+++ vcl/unx/source/app/saldisp.cxx
-@@ -556,6 +556,9 @@ SalDisplay::~SalDisplay( )
+--- ./vcl/unx/source/app/saldisp.cxx.randr~	2008-07-07 22:59:22.882845455 +0200
++++ ./vcl/unx/source/app/saldisp.cxx	2008-07-07 23:01:37.993846574 +0200
+@@ -557,6 +557,9 @@ SalDisplay::~SalDisplay( )
  #endif
          pDisp_ = NULL;
      }
@@ -317,7 +299,7 @@
  }
  
  void SalDisplay::doDestruct()
-@@ -682,9 +685,6 @@ SalX11Display::~SalX11Display()
+@@ -683,9 +686,6 @@ SalX11Display::~SalX11Display()
  		XCloseDisplay( pDisp_ );
  		pDisp_ = NULL;
  	}
@@ -327,10 +309,8 @@
  }
  
  void SalDisplay::initScreen( int nScreen ) const
-diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
-index a3452d3..e97908d 100644
---- vcl/util/makefile.mk
-+++ vcl/util/makefile.mk
+--- ./vcl/util/makefile.mk.randr~	2008-07-07 22:59:22.893845666 +0200
++++ ./vcl/util/makefile.mk	2008-07-07 23:01:37.995846339 +0200
 @@ -301,12 +301,18 @@ SHL2STDLIBS+=`pkg-config --libs xrender`
  
  .IF "$(GUIBASE)"=="unx"