[libreoffice] Resolves: rhbz#906137 slide show inverts outputs

[Caolán McNamara]

commit e6d62efdeeb4fa2554f1fee80e8f8a7dc23d141b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 15 11:13:18 2013 +0000

    Resolves: rhbz#906137 slide show inverts outputs

 ...es-rhbz-906137-slide-show-inverts-outputs.patch |   64 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 70 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch b/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch
new file mode 100644
index 0000000..2d15fb8
--- /dev/null
+++ b/0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch
@@ -0,0 +1,64 @@
+From ff252b6e2b7d4f5399dafffcea745486745bdeaf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Fri, 15 Mar 2013 10:38:06 +0000
+Subject: [PATCH] Resolves: rhbz#906137 slide show inverts outputs
+
+we go to some effort to determine the right value of ret
+and then throw it away and return 0
+
+regression since 4a7e3482912c90b73d6e12c82bcd9ce31975e3f1
+
+Change-Id: I652cfbe44fdab6560c1c8dc8fe25d6211b5357cb
+(cherry picked from commit 67aae198f80195e77bd62e7675a372312075b126)
+---
+ vcl/unx/gtk/app/gtksys.cxx | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
+index b7996c1..48bc239 100644
+--- a/vcl/unx/gtk/app/gtksys.cxx
++++ b/vcl/unx/gtk/app/gtksys.cxx
+@@ -18,7 +18,6 @@
+  */
+ 
+ #include <string.h>
+-#include <gmodule.h>
+ #include <gtk/gtk.h>
+ #include <unx/gtk/gtkinst.hxx>
+ #include <unx/gtk/gtksys.hxx>
+@@ -179,14 +178,14 @@ namespace {
+ static int _fallback_get_primary_monitor (GdkScreen *pScreen)
+ {
+     // Use monitor name as primacy heuristic
+-    int ret = -1;
+     int max = gdk_screen_get_n_monitors (pScreen);
+-    for (int i = 0; i < max && ret < 0; i++)
++    for (int i = 0; i < max; ++i)
+     {
+         char *name = gdk_screen_get_monitor_plug_name (pScreen, i);
+-        if (name && !g_ascii_strncasecmp (name, "LVDS", 4))
+-            ret = i;
++        bool bLaptop = (name && !g_ascii_strncasecmp (name, "LVDS", 4));
+         g_free (name);
++        if (bLaptop)
++            return i;
+     }
+     return 0;
+ }
+@@ -201,11 +200,8 @@ static int _get_primary_monitor (GdkScreen *pScreen)
+     // Perhaps we have a newer gtk+ with this symbol:
+     if (!get_fn)
+     {
+-        GModule *module = g_module_open (NULL, (GModuleFlags) 0);
+-        if (!g_module_symbol (module, "gdk_screen_get_primary_monitor",
+-                              (gpointer *)&get_fn))
+-            get_fn = NULL;
+-        g_module_close (module);
++        get_fn = (int(*)(GdkScreen*))osl_getAsciiFunctionSymbol(NULL,
++            "gdk_screen_get_primary_monitor");
+     }
+ #if GTK_CHECK_VERSION(2,14,0)
+     if (!get_fn)
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index cde29e5..1a74daf 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -250,6 +250,7 @@ Patch20: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
 Patch21: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
 Patch22: 0001-Resolves-rhbz-920697-i110881-rhbz-623191-presentatio.patch
 Patch23: 0001-rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch
+Patch24: 0001-Resolves-rhbz-906137-slide-show-inverts-outputs.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1001,6 +1002,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch21 -p1 -b .rhbz-902884-check-for-GetSelectedMasterPage-.patch
 %patch22 -p1 -b .rhbz-920697-i110881-rhbz-623191-presentatio.patch
 %patch23 -p1 -b .rhbz-895690-Make-GIO-UCP-less-brittle-so-saving-docs.patch
+%patch24 -p1 -b .rhbz-906137-slide-show-inverts-outputs.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2073,6 +2075,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Mar 15 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.0.2.1-2
+- Resolves: rhbz#906137 slide show inverts outputs
+
 * Fri Mar 15 2013 David Tardon <dtardon at redhat.com> - 1:4.0.2.1-1
 - 4.0.2 rc1
 - Resolves: rhbz#921716 Build Breton language pack