[PATCH proposed for 3.5 only] Re: vcl module fails to compile (3.5 branch)

On 30/04/2012 15:01, Caolán McNamara wrote:
> On Sun, 2012-04-29 at 01:15 -0700, julien2412 wrote:
> FWIW I *think* we're still building the "universal" LibO on a 
> RHEL-4-alike baseline so we'd need some route to use the api that 
> exists on glib2-2.4.7 (!, ?) so we can't unconditionally use 
> g_source_get_time Either need some ifdefs or seeing as docs now claim 
> that g_source_get_current_time ignores source and is the same as 
> g_get_current_time and a quick peek at the code confirms this just use 
> that instead, i.e. 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=bb36072c92687a954a38aeca7fb9945f8e7cca13 
> I'd personally skip it for cherry-picking to 3-5 C. 
I finally succeeded in compiling 3.5 branch by using some pragmas. I 
just learn how to use them so perhaps it's not the best efficient way to 
use them.
I just wonder if the patch attached could be useful to push on 3.5 branch.

Any idea ?

Julien.

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 14cdbb5..88a77b7 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -216,6 +216,8 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
                         GEnumValue *pValue = g_enum_get_value( G_PARAM_SPEC_ENUM( 
g_object_class_find_property( G_OBJECT_GET_CLASS( pInfo ), "type" ) )->enum_class,
                                                                nType );
 
+                        #pragma GCC diagnostic push
+                        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                         if( !g_strcasecmp( pValue->value_nick, "video" ) ) {
                             GstStructure *pStructure;
                             GstPad *pPad;
@@ -228,6 +230,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
                                 DBG( "queried size: %d x %d", mnWidth, mnHeight );
                             }
                         }
+                        #pragma GCC diagnostic pop
                     }
 
 #if OSL_DEBUG_LEVEL > 2
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index af4f670..255e602 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -771,7 +771,10 @@ extern "C" {
 
     static void sal_gtk_timeout_defer( SalGtkTimeoutSource *pTSource )
     {
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         g_source_get_current_time( (GSource *) pTSource, &pTSource->aFireTime );
+        #pragma GCC diagnostic pop
         g_time_val_add( &pTSource->aFireTime, pTSource->pInstance->m_nTimeoutMS * 1000 );
     }
 
@@ -807,8 +810,10 @@ extern "C" {
         SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
 
         GTimeVal aTimeNow;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         g_source_get_current_time( pSource, &aTimeNow );
-
+        #pragma GCC diagnostic pop
         return sal_gtk_timeout_expired( pTSource, nTimeoutMS, &aTimeNow );
     }
 
@@ -817,7 +822,10 @@ extern "C" {
         SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
 
         GTimeVal aTimeNow;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         g_source_get_current_time( pSource, &aTimeNow );
+        #pragma GCC diagnostic pop
 
         return ( pTSource->aFireTime.tv_sec < aTimeNow.tv_sec ||
                  ( pTSource->aFireTime.tv_sec == aTimeNow.tv_sec &&
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 5588778..51fffdb 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1560,7 +1560,12 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, 
SalGtkFi
 
         gtk_image_set_from_pixbuf( GTK_IMAGE( preview ), pixbuf );
         if( pixbuf )
+        {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
             gdk_pixbuf_unref( pixbuf );
+            #pragma GCC diagnostic pop
+        }
 
     }