| 1 |
dilfridge 15/02/08 22:42:18 |
| 2 |
|
| 3 |
Added: libreoffice-4.4.0.3-telepathy-build-fix.patch |
| 4 |
libreoffice-4.3.5.2-DPI.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
|
| 8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: libreoffice-4.4.0.3-telepathy-build-fix.patch |
| 17 |
=================================================================== |
| 18 |
From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001 |
| 19 |
From: David Tardon <dtardon@××××××.com> |
| 20 |
Date: Sun, 11 Jan 2015 13:08:37 +0100 |
| 21 |
Subject: OSL_ENSURE was not declared in this scope |
| 22 |
|
| 23 |
Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99 |
| 24 |
|
| 25 |
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx |
| 26 |
index 86986fc..df4a63f 100644 |
| 27 |
--- a/tubes/source/conference.cxx |
| 28 |
+++ b/tubes/source/conference.cxx |
| 29 |
@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject * |
| 30 |
|
| 31 |
void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel ) |
| 32 |
{ |
| 33 |
- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel"); |
| 34 |
+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel"); |
| 35 |
if (mpChannel) |
| 36 |
g_object_unref( mpChannel); |
| 37 |
if (mpAccount) |
| 38 |
@@ -297,7 +297,7 @@ bool TeleConference::offerTube() |
| 39 |
{ |
| 40 |
INFO_LOGGER( "TeleConference::offerTube"); |
| 41 |
|
| 42 |
- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel"); |
| 43 |
+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel"); |
| 44 |
if (!mpChannel) |
| 45 |
return false; |
| 46 |
|
| 47 |
@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube) |
| 48 |
{ |
| 49 |
INFO_LOGGER( "TeleConference::setTube"); |
| 50 |
|
| 51 |
- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed"); |
| 52 |
+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed"); |
| 53 |
|
| 54 |
pImpl->mpTube = pTube; |
| 55 |
|
| 56 |
-- |
| 57 |
cgit v0.10.2 |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch |
| 62 |
|
| 63 |
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 |
| 64 |
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 |
| 65 |
|
| 66 |
Index: libreoffice-4.3.5.2-DPI.patch |
| 67 |
=================================================================== |
| 68 |
From 1964870db4ad1e4334e8fc5050795469dc1fb05e Mon Sep 17 00:00:00 2001 |
| 69 |
From: Giuseppe Bilotta <giuseppe.bilotta@×××××.com> |
| 70 |
Date: Tue, 9 Sep 2014 21:34:45 +0200 |
| 71 |
Subject: [PATCH] Fallback DPI detection on X11 |
| 72 |
|
| 73 |
When the Xft.dpi setting is not found, and if only one screen is |
| 74 |
available, fall back to detecting the screen DPI from the reported |
| 75 |
resolution and monitor size. |
| 76 |
|
| 77 |
Change-Id: I1481d94b5dc4072c1f8da4659a221dfc7971080b |
| 78 |
Reviewed-on: https://gerrit.libreoffice.org/11377 |
| 79 |
Reviewed-by: Chris Sherlock <chris.sherlock79@×××××.com> |
| 80 |
Tested-by: Chris Sherlock <chris.sherlock79@×××××.com> |
| 81 |
--- |
| 82 |
vcl/unx/generic/app/saldisp.cxx | 20 +++++++++++++++++++- |
| 83 |
1 file changed, 19 insertions(+), 1 deletion(-) |
| 84 |
|
| 85 |
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx |
| 86 |
index 7c97a24..ee6aad7 100644 |
| 87 |
--- a/vcl/unx/generic/app/saldisp.cxx |
| 88 |
+++ b/vcl/unx/generic/app/saldisp.cxx |
| 89 |
@@ -569,7 +569,25 @@ void SalDisplay::Init() |
| 90 |
} |
| 91 |
if( bExactResolution == false ) |
| 92 |
{ |
| 93 |
- aResolution_ = Pair( 96, 96 ); |
| 94 |
+ /* if Xft.dpi is not set, try and find the DPI from the |
| 95 |
+ * reported screen sizes and resolution. If there are multiple |
| 96 |
+ * screens, just fall back to the default 96x96 |
| 97 |
+ */ |
| 98 |
+ long xDPI = 96; |
| 99 |
+ long yDPI = 96; |
| 100 |
+ if (m_aScreens.size() == 1) { |
| 101 |
+ xDPI = (long)round(DisplayWidth(pDisp_, 0)*25.4/DisplayWidthMM(pDisp_, 0)); |
| 102 |
+ yDPI = (long)round(DisplayHeight(pDisp_, 0)*25.4/DisplayHeightMM(pDisp_, 0)); |
| 103 |
+ // if either is invalid set it equal to the other |
| 104 |
+ if (!sal_ValidDPI(xDPI) && sal_ValidDPI(yDPI)) |
| 105 |
+ xDPI = yDPI; |
| 106 |
+ if (!sal_ValidDPI(yDPI) && sal_ValidDPI(xDPI)) |
| 107 |
+ yDPI = xDPI; |
| 108 |
+ // if both are invalid, reset them to the default |
| 109 |
+ if (!sal_ValidDPI(xDPI) && !sal_ValidDPI(yDPI)) |
| 110 |
+ xDPI = yDPI = 96; |
| 111 |
+ } |
| 112 |
+ aResolution_ = Pair( xDPI, yDPI ); |
| 113 |
} |
| 114 |
|
| 115 |
nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4; |
| 116 |
-- |
| 117 |
2.3.0 |
Archives