archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/libreoffice-fresh to 24.2.2-1

Browse source
This commit is contained in:
Kevin Mihelich 2024-03-29 00:16:40 +00:00
parent 07f1e425bd
commit ab22fc22dc
4 changed files with 17 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
extra/libreoffice-fresh/.SRCINFO
View file

@ -1,6 +1,6 @@
pkgbase = libreoffice-fresh
pkgver = 24.2.1
pkgrel = 5
pkgver = 24.2.2
pkgrel = 1
url = https://www.libreoffice.org/
arch = x86_64
license = MPL-2.0
@ -123,12 +123,12 @@ pkgbase = libreoffice-fresh
noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
options = !lto
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-24.2.1.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-help-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-help-24.2.1.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-translations-24.2.1.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-translations-24.2.1.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-24.2.2.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-24.2.2.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-help-24.2.2.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-help-24.2.2.2.tar.xz.asc
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-translations-24.2.2.2.tar.xz
source = https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-translations-24.2.2.2.tar.xz.asc
source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -152,17 +152,15 @@ pkgbase = libreoffice-fresh
source = make-pyuno-work-with-system-wide-module-install.diff
source = 623ea5c.diff
source = libreoffice-7.5.8.2-icu-74-compatibility.patch
source = kf6_buildfix.diff
source = ForceQt_HighDpiScaleFactorRoundingPolicy_Round.diff
source = soffice-template.desktop.in
source = libreoffice-fresh.sh
source = libreoffice-fresh.csh
validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
sha256sums = 3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8
sha256sums = c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e
sha256sums = SKIP
sha256sums = 6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74
sha256sums = e4ca31ec501c3c59e6c7aa4cc1279185675b088b2d042f17a7e6b0a8304ce025
sha256sums = SKIP
sha256sums = bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9
sha256sums = 925016b4172c1dcfb2774cdb0376df949241e369375399b9875b154e65f319b2
sha256sums = SKIP
sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@ -187,8 +185,6 @@ pkgbase = libreoffice-fresh
sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
sha256sums = f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef
sha256sums = c69bd89feeb033f8d4a3950718cdc04a4f7601f556732dac3f050ac39a3c25cb
sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
sha256sums = 9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f
sha256sums = 512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb

62
extra/libreoffice-fresh/ForceQt_HighDpiScaleFactorRoundingPolicy_Round.diff
View file

@ -1,62 +0,0 @@
From 7989a04cee3b614d493a5acbd1ff0363596efc00 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed, 13 Mar 2024 12:27:12 +0100
Subject: tdf#159915 qt: Force Qt::HighDpiScaleFactorRoundingPolicy::Round
For now, force `Qt::HighDpiScaleFactorRoundingPolicy::Round`
for the HighDPI-scale factor rounding policy [1], which is the default
for Qt 5, while Qt 6 defaults to `Qt::HighDpiScaleFactorRoundingPolicy::PassThrough`
(see [2]), which resulted in broken rendering (e.g. "Help" -> "About"
dialog not showing the whole content) when fractional display scaling like 150 %
is configured in the KDE Plasma display settings (in contrast to manually setting the
`QT_SCALE_FACTOR=1.5` env variable to apply scaling, which was working
fine).
Quoting from [3]:
> The two principal options are whether fractional scale factors should be
> rounded to an integer or not. Keeping the scale factor as-is will make
> the user interface size match the OS setting exactly, but may cause
> painting errors, for example with the Windows style.
Manually setting the env variable `QT_SCALE_FACTOR_ROUNDING_POLICY="Round"`
has the same effect (and can be used with LO versions not yet
containing this fix).
(There might be a way to adjust the way that scaling happens
to make other policies work, but for now, just hard-code to
the policy that is known to work.)
[1] https://doc.qt.io/qt-6/qt.html#HighDpiScaleFactorRoundingPolicy-enum
[2] https://doc.qt.io/qt-6/highdpi.html#environment-variable-reference
[3] https://doc.qt.io/qt-6/qguiapplication.html#setHighDpiScaleFactorRoundingPolicy
Change-Id: I8eb6911d4dd5faf00912b8f15a58e0bdace1995a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164768
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 07688e864c913e005dcae366cf10702404a73d80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164744
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
vcl/qt5/QtInstance.cxx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 4880c1bdec55..f87cdef9348e 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -708,6 +708,11 @@ std::unique_ptr<QApplication> QtInstance::CreateQApplication(int& nArgc, char**
// for scaled icons in the native menus
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
+ // force Qt::HighDpiScaleFactorRoundingPolicy::Round, which is the Qt 5 default
+ // policy and prevents incorrect rendering with the Qt 6 default policy
+ // Qt::HighDpiScaleFactorRoundingPolicy::PassThrough (tdf#159915)
+ QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
+ Qt::HighDpiScaleFactorRoundingPolicy::Round);
FreeableCStr session_manager;
if (getenv("SESSION_MANAGER") != nullptr)
--
cgit v1.2.3

22
extra/libreoffice-fresh/PKGBUILD
View file

@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=24.2.1.2
pkgver=24.2.1
pkgrel=5
_LOver=24.2.2.2
pkgver=24.2.2
pkgrel=1
arch=('x86_64')
license=('MPL-2.0' 'LGPL-3.0-or-later')
url="https://www.libreoffice.org/"
@ -73,8 +73,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
make-pyuno-work-with-system-wide-module-install.diff
623ea5c.diff
libreoffice-7.5.8.2-icu-74-compatibility.patch
kf6_buildfix.diff
ForceQt_HighDpiScaleFactorRoundingPolicy_Round.diff
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@ -99,11 +97,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8'
sha256sums=('c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e'
'SKIP'
'6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74'
'e4ca31ec501c3c59e6c7aa4cc1279185675b088b2d042f17a7e6b0a8304ce025'
'SKIP'
'bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9'
'925016b4172c1dcfb2774cdb0376df949241e369375399b9875b154e65f319b2'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@ -128,8 +126,6 @@ sha256sums=('3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
'f7905962a634ab4ab5c5e591c1816e6baf3f66db91adfeee25c631b6939110ef'
'c69bd89feeb033f8d4a3950718cdc04a4f7601f556732dac3f050ac39a3c25cb'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'9fb33dbc3ffeb6af2ea7341b58242142d4eca903584c21c5f4b44ff27fbf5b5f'
'512355b5ef646791089da8c2b35cf8b019673c0c8a58685962af3b5d9eb5d6bb')
@ -155,12 +151,6 @@ prepare() {
# fix build with icu 74
patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
# fix KF& build - https://gerrit.libreoffice.org/c/core/+/163237
patch -Np1 -i "${srcdir}"/kf6_buildfix.diff
# fix KF6 fractional scaling #2; https://gerrit.libreoffice.org/c/core/+/164744
patch -Np1 -i "${srcdir}"/ForceQt_HighDpiScaleFactorRoundingPolicy_Round.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in

36
extra/libreoffice-fresh/kf6_buildfix.diff
View file

@ -1,36 +0,0 @@
From e42b2827b5d392479791632877fc00b6add0307d Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Mon, 12 Feb 2024 10:38:03 +0100
Subject: kf6: Add missing include path to fix build
Many thanks to Andreas Sturmlechner for pointing
this out on #libreoffice-dev on 2024-02-12:
> [10:27] <asturm> michaelweghorn: I also had to apply a trivial
> openmandriva patch to get it to build in the first place,
> https://github.com/gentoo/gentoo/blob/master/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch
Change-Id: If86220e258336d84ffc30fd5da0f5d99dda59aff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163237
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e6c35380e91d..6440f1f734dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13499,7 +13499,7 @@ then
AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".])
fi
- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
--
cgit v1.2.3