dilfridge 15/02/08 22:42:18
Added: libreoffice-4.4.0.3-telepathy-build-fix.patch
libreoffice-4.3.5.2-DPI.patch
Log:
Version bump (without keywords so far); update live ebuilds to git-r3.eclass;
backport DPI patch for bug 523822 to the 4.3 branch. Thanks to Andreas
Sturmlechner.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
EBE6A336BE19039C!)
Revision Changes Path
1.1
app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch?rev=1.1&content-type=text/plain
Index: libreoffice-4.4.0.3-telepathy-build-fix.patch
===================================================================
>From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
From: David Tardon <[email protected]>
Date: Sun, 11 Jan 2015 13:08:37 +0100
Subject: OSL_ENSURE was not declared in this scope
Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 86986fc..df4a63f 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer
user_data, GObject *
void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel*
pChannel )
{
- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have
channel");
+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have
channel");
if (mpChannel)
g_object_unref( mpChannel);
if (mpAccount)
@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
{
INFO_LOGGER( "TeleConference::offerTube");
- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
if (!mpChannel)
return false;
@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
{
INFO_LOGGER( "TeleConference::setTube");
- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already
tubed");
pImpl->mpTube = pTube;
--
cgit v0.10.2
1.1 app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch?rev=1.1&content-type=text/plain
Index: libreoffice-4.3.5.2-DPI.patch
===================================================================
>From 1964870db4ad1e4334e8fc5050795469dc1fb05e Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <[email protected]>
Date: Tue, 9 Sep 2014 21:34:45 +0200
Subject: [PATCH] Fallback DPI detection on X11
When the Xft.dpi setting is not found, and if only one screen is
available, fall back to detecting the screen DPI from the reported
resolution and monitor size.
Change-Id: I1481d94b5dc4072c1f8da4659a221dfc7971080b
Reviewed-on: https://gerrit.libreoffice.org/11377
Reviewed-by: Chris Sherlock <[email protected]>
Tested-by: Chris Sherlock <[email protected]>
---
vcl/unx/generic/app/saldisp.cxx | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 7c97a24..ee6aad7 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -569,7 +569,25 @@ void SalDisplay::Init()
}
if( bExactResolution == false )
{
- aResolution_ = Pair( 96, 96 );
+ /* if Xft.dpi is not set, try and find the DPI from the
+ * reported screen sizes and resolution. If there are multiple
+ * screens, just fall back to the default 96x96
+ */
+ long xDPI = 96;
+ long yDPI = 96;
+ if (m_aScreens.size() == 1) {
+ xDPI = (long)round(DisplayWidth(pDisp_,
0)*25.4/DisplayWidthMM(pDisp_, 0));
+ yDPI = (long)round(DisplayHeight(pDisp_,
0)*25.4/DisplayHeightMM(pDisp_, 0));
+ // if either is invalid set it equal to the other
+ if (!sal_ValidDPI(xDPI) && sal_ValidDPI(yDPI))
+ xDPI = yDPI;
+ if (!sal_ValidDPI(yDPI) && sal_ValidDPI(xDPI))
+ yDPI = xDPI;
+ // if both are invalid, reset them to the default
+ if (!sal_ValidDPI(xDPI) && !sal_ValidDPI(yDPI))
+ xDPI = yDPI = 96;
+ }
+ aResolution_ = Pair( xDPI, yDPI );
}
nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4;
--
2.3.0
