commit: a415660df5c933f62e486d68180fe12ac15bb299 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 18:19:23 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 21 11:30:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a415660d
app-office/libreoffice: Update 6.2.3.2 patchset, restore keywords Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/Manifest | 1 + ...-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch | 82 ---------------------- app-office/libreoffice/libreoffice-6.2.3.2.ebuild | 8 +-- 3 files changed, 4 insertions(+), 87 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 2bedfe043ea..cc93fe02236 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125 +DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746 SHA512 0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903 DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch deleted file mode 100644 index 12f3ddc2958..00000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c3eeb421526f284419e90d2c4c4da5b0d7bbcc0e Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glo...@fbihome.de> -Date: Fri, 29 Mar 2019 02:58:59 +0100 -Subject: tdf#124292 Qt5 / KDE5 disable Qt's HiDPI scaling - -LO does its own layouting and also all the scaling, so disable -the automatic HiDPI scaling explicitly. Otherwise fonts will be -rendered in LoDPI and just scaled as an image, if UI scaling is -enabled in KDE, resulting in really blocky / ugly fonts. - -Change-Id: I38503ce27c1671e80d0749d21c6c6dcff1a808a6 -Reviewed-on: https://gerrit.libreoffice.org/69941 -Tested-by: Jenkins -Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de> -(cherry picked from commit b4698a2241ec26d796c66da3a814f7cc693785b6) -Reviewed-on: https://gerrit.libreoffice.org/69984 -Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> ---- - vcl/qt5/Qt5Graphics_GDI.cxx | 4 ++-- - vcl/qt5/Qt5Instance.cxx | 2 ++ - vcl/unx/kde5/KDE5SalGraphics.cxx | 4 ++-- - vcl/unx/kde5/KDE5SalInstance.cxx | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx -index 90baba3..851d222 100644 ---- a/vcl/qt5/Qt5Graphics_GDI.cxx -+++ b/vcl/qt5/Qt5Graphics_GDI.cxx -@@ -643,8 +643,8 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) - return; - - QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); -- rDPIX = pScreen->logicalDotsPerInchX(); -- rDPIY = pScreen->logicalDotsPerInchY(); -+ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5; -+ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5; - } - - sal_uInt16 Qt5Graphics::GetBitCount() const { return getFormatBits(m_pQImage->format()); } -diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx -index adbe70b..8de9fc7 100644 ---- a/vcl/qt5/Qt5Instance.cxx -+++ b/vcl/qt5/Qt5Instance.cxx -@@ -336,6 +336,8 @@ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance() - unsetenv("SESSION_MANAGER"); - } - -+ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling); -+ - int* pFakeArgc = new int; - *pFakeArgc = nFakeArgc; - pQApplication = new QApplication(*pFakeArgc, pFakeArgv); -diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx -index 290127d..0b4b428 100644 ---- a/vcl/unx/kde5/KDE5SalGraphics.cxx -+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx -@@ -78,8 +78,8 @@ void KDE5SalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) - return; - - QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); -- rDPIX = pScreen->logicalDotsPerInchX(); -- rDPIY = pScreen->logicalDotsPerInchY(); -+ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5; -+ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5; - } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx -index 401afbc..32998cd 100644 ---- a/vcl/unx/kde5/KDE5SalInstance.cxx -+++ b/vcl/unx/kde5/KDE5SalInstance.cxx -@@ -144,6 +144,8 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance() - unsetenv("SESSION_MANAGER"); - } - -+ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling); -+ - int* pFakeArgc = new int; - *pFakeArgc = nFakeArgc; - pQApplication = new QApplication(*pFakeArgc, pFakeArgv); --- -cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild index 64169aefb4d..cacdb7a6fb5 100644 --- a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild @@ -18,7 +18,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/"; BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" +PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg @@ -77,8 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="" -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" BDEPEND=" dev-util/intltool @@ -249,8 +248,7 @@ PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" # 6.2 stable branch - "${FILESDIR}/${PN}-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch" - # "${WORKDIR}"/${PATCHSET/.tar.xz/} + "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
