[libreoffice] 01/02: backport "Add VCL backend being used to About dialog" patch from master

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit c92c3838641009789b315e76d9ddef637646314a
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 3 07:53:08 2016 +0100

    backport "Add VCL backend being used to About dialog" patch from master
---
 changelog                              |  3 ++
 patches/series                         |  1 +
 patches/show-vcl-backend-in-about.diff | 61 ++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/changelog b/changelog
index ce8b352..8394de0 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ libreoffice (1:5.2.4~rc1~git20161025-1) UNRELEASED; urgency=medium
       (closes: #834622)
     - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 
+  * debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
+    master
+
  -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 
 libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
diff --git a/patches/series b/patches/series
index 7be9f73..18dbe29 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ debian-branding.diff
 no-packagekit-per-default.diff
 sparc64.diff
 startcenter-grey-out-not-installed.diff
+show-vcl-backend-in-about.diff
diff --git a/patches/show-vcl-backend-in-about.diff b/patches/show-vcl-backend-in-about.diff
new file mode 100644
index 0000000..0bddcbc
--- /dev/null
+++ b/patches/show-vcl-backend-in-about.diff
@@ -0,0 +1,61 @@
+From 6b5b773488a4ab77b5c18d82e663e68692f14b33 Mon Sep 17 00:00:00 2001
+From: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
+Date: Thu, 13 Oct 2016 15:52:32 -0400
+Subject: tdf#103185 - Add VCL backend being used to About dialog
+
+The VCL backend is now shown on the About dialog.
+
+Change-Id: Ib4e6b33e9c2b3ec2fca229fed8f4533227a67ac6
+Reviewed-on: https://gerrit.libreoffice.org/29798
+Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
+Tested-by: Yousuf Philips <philipz85 at hotmail.com>
+Tested-by: Jenkins <ci at libreoffice.org>
+Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
+
+diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
+index efb3490..891fe57 100644
+--- a/vcl/inc/svids.hrc
++++ b/vcl/inc/svids.hrc
+@@ -179,6 +179,7 @@
+ #define SV_APP_UIRENDER                             10802
+ #define SV_APP_GL                                   10803
+ #define SV_APP_DEFAULT                              10804
++#define SV_APP_VCLBACKEND                           10805
+ 
+ #define SV_ICON_SIZE48_START                        20000
+ #define SV_ICON_SIZE32_START                        21000
+diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
+index 33e6fe8..61e0072 100644
+--- a/vcl/source/app/svapp.cxx
++++ b/vcl/source/app/svapp.cxx
+@@ -1211,6 +1211,13 @@ OUString Application::GetHWOSConfInfo()
+         aDetails.append( VclResId(SV_APP_DEFAULT).toString() );
+     aDetails.append( "; " );
+ 
++#ifdef LINUX
++    // Only linux has different backends, so don't show blank for others.
++    aDetails.append( VclResId(SV_APP_VCLBACKEND).toString() );
++    aDetails.append( GetToolkitName() );
++    aDetails.append( "; " );
++#endif
++
+     return aDetails.makeStringAndClear();
+ }
+ 
+diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
+index 91d9df1..b36686d 100644
+--- a/vcl/source/src/app.src
++++ b/vcl/source/src/app.src
+@@ -34,4 +34,9 @@ String SV_APP_DEFAULT
+     Text [ en-US ] = "default";
+ };
+ 
++String SV_APP_VCLBACKEND
++{
++    Text [ en-US ] = "VCL: ";
++};
++
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+-- 
+cgit v0.10.2
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git