diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 12 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch | 80 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.4.5.2.ebuild (renamed from app-office/libreoffice/libreoffice-4.4.3.2.ebuild) | 15 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.4.9999.ebuild | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-5.0.0.5.ebuild (renamed from app-office/libreoffice/libreoffice-5.0.0.4.ebuild) | 5 |
5 files changed, 110 insertions, 9 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a33bf559ceab..149fcbee0db7 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.642 2015/07/25 21:28:22 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.643 2015/08/04 20:49:29 dilfridge Exp $ + +*libreoffice-4.4.5.2 (04 Aug 2015) +*libreoffice-5.0.0.5 (04 Aug 2015) + + 04 Aug 2015; Andreas K. Huettel <dilfridge@gentoo.org> + +files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch, + +libreoffice-4.4.5.2.ebuild, +libreoffice-5.0.0.5.ebuild, + -libreoffice-4.4.3.2.ebuild, -libreoffice-5.0.0.4.ebuild, + libreoffice-4.4.9999.ebuild: + Version bump; remove old *libreoffice-5.0.0.4 (25 Jul 2015) diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch new file mode 100644 index 000000000000..f4ee9859c2b3 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch @@ -0,0 +1,80 @@ +From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001 +From: Jan-Marek Glogowski <glogow@fbihome.de> +Date: Thu, 30 Jul 2015 18:10:03 +0200 +Subject: tdf#92903 KDE4: fix listbox regression from 92115 + +So at least in case of the CTRL_LISTBOX, getNativeControlRegion is +called for a type and part unsupported by IsNativeControlSupported. + +For whatever reason, this results in broken listboxes drawn in +Base's "Table Design" dialog, when selecting "field type", which +draws the listbox on top of the cell. + +To make it worse, it seems the listbox is actually drawn to a +smaller space then the actual requirement. Appearently it seems to +use the content rect, instead of the bounding rect. + +So in addition to fixing the drawing, this patch increases the +listbox bounding rect, which looks too large in normal dialogs, but +makes the Base's listbox better readable. + +Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0 +Reviewed-on: https://gerrit.libreoffice.org/17438 +Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> +Tested-by: Katarina Behrens <Katarina.Behrens@cib.de> + +diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx +index 3e79e1e..eeb741f 100644 +--- a/vcl/unx/kde4/KDESalGraphics.cxx ++++ b/vcl/unx/kde4/KDESalGraphics.cxx +@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par + return true; + + case CTRL_LISTBOX: +- return (part == PART_ENTIRE_CONTROL +- || part == PART_SUB_EDIT +- || part == PART_WINDOW +- || part == PART_BUTTON_DOWN); ++ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE); + + case CTRL_SPINBOX: + return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE); +@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, + const OUString&, + Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) + { +- bool nativeSupport = IsNativeControlSupported( type, part ); +- if( ! nativeSupport ) { +- assert( ! nativeSupport && "drawNativeControl called without native support!" ); +- return false; +- } +- + bool retVal = false; + + QRect boundingRect = region2QRect( controlRegion ); +@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, + int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; + contentRect.adjust(-size,-size,size,size); + } ++ else { ++ int hmargin = QApplication::style()->pixelMetric( ++ QStyle::PM_FocusFrameHMargin, &styleOption); ++ int vmargin = QApplication::style()->pixelMetric( ++ QStyle::PM_FocusFrameVMargin, &styleOption); ++ boundingRect.translate( -hmargin, -vmargin ); ++ boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin ); ++ } + retVal = true; + break; + } +@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, + + contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin ); + contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin ); +- boundingRect = contentRect; + + retVal = true; + break; +-- +cgit v0.10.2 + diff --git a/app-office/libreoffice/libreoffice-4.4.3.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild index 237c3f06f36f..ba027453effc 100644 --- a/app-office/libreoffice/libreoffice-4.4.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.3.2.ebuild,v 1.6 2015/06/21 19:10:14 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.5.2.ebuild,v 1.1 2015/08/04 20:49:29 dilfridge Exp $ EAPI=5 @@ -90,7 +90,7 @@ unset lo_xt LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" ${PYTHON_DEPS} @@ -245,11 +245,16 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" - # from master branch + # from 5.0 branch + "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch" - "${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch" - "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 + "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch" + "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch" + "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch" + + # from master branch + "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch" ) REQUIRED_USE=" diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild index 4a4eb1383a7c..6de14ddfc8a3 100644 --- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.16 2015/07/12 20:54:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.17 2015/08/04 20:49:29 dilfridge Exp $ EAPI=5 @@ -245,13 +245,16 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" - # from master branch + # from 5.0 branch "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch" "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch" "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch" "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch" + + # from master branch + "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch" ) REQUIRED_USE=" diff --git a/app-office/libreoffice/libreoffice-5.0.0.4.ebuild b/app-office/libreoffice/libreoffice-5.0.0.5.ebuild index be4386652516..742034279e6c 100644 --- a/app-office/libreoffice/libreoffice-5.0.0.4.ebuild +++ b/app-office/libreoffice/libreoffice-5.0.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-5.0.0.4.ebuild,v 1.1 2015/07/25 21:28:22 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-5.0.0.5.ebuild,v 1.1 2015/08/04 20:49:29 dilfridge Exp $ EAPI=5 @@ -246,6 +246,9 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" + + # from master branch + "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch" ) REQUIRED_USE=" |