From d286e40808fdbfb60d778d74c99555e517af728b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: May 02 2024 20:42:00 +0000 Subject: Merge branch 'rawhide' into f40 --- diff --git a/.gitignore b/.gitignore index d9e3cf3..508014f 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,15 @@ /libreoffice-help-24.2.2.1.tar.xz.asc /libreoffice-translations-24.2.2.1.tar.xz /libreoffice-translations-24.2.2.1.tar.xz.asc +/libreoffice-24.2.3.1.tar.xz +/libreoffice-24.2.3.1.tar.xz.asc +/libreoffice-help-24.2.3.1.tar.xz +/libreoffice-help-24.2.3.1.tar.xz.asc +/libreoffice-translations-24.2.3.1.tar.xz +/libreoffice-translations-24.2.3.1.tar.xz.asc +/libreoffice-24.2.3.2.tar.xz +/libreoffice-24.2.3.2.tar.xz.asc +/libreoffice-help-24.2.3.2.tar.xz +/libreoffice-help-24.2.3.2.tar.xz.asc +/libreoffice-translations-24.2.3.2.tar.xz +/libreoffice-translations-24.2.3.2.tar.xz.asc diff --git a/86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch b/86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch deleted file mode 100644 index 69a581a..0000000 --- a/86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b Mon Sep 17 00:00:00 2001 -From: Michael Weghorn -Date: Wed, 13 Mar 2024 12:27:12 +0100 -Subject: [PATCH] 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 ---- - vcl/qt5/QtInstance.cxx | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx -index 6b3bd0cc301ae..2801601115ecd 100644 ---- a/vcl/qt5/QtInstance.cxx -+++ b/vcl/qt5/QtInstance.cxx -@@ -740,6 +740,11 @@ std::unique_ptr 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) diff --git a/libreoffice.spec b/libreoffice.spec index 861186a..7a9a93f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 24.2.2 +%global libo_version 24.2.3 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -81,7 +81,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 +Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -329,8 +329,6 @@ Patch11: lo-7.6-ppc64le-tests.patch # https://bugs.gentoo.org/917618 # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch -# Patch for kf6 scaling. -Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html Patch501: kahansum_test_fix_for_aarc64_s390x.patch @@ -741,7 +739,7 @@ A plug-in for LibreOffice that enables integration into the KDE Frameworks 6. %package -n libreofficekit Summary: A library providing access to LibreOffice functionality -License: MPLv2.0 +License: MPL-2.0 %description -n libreofficekit LibreOfficeKit can be used to access LibreOffice functionality @@ -753,7 +751,7 @@ experimental tiled rendering API). %package -n libreofficekit-devel Summary: Development files for libreofficekit Requires: libreofficekit%{?_isa} = %{epoch}:%{version}-%{release} -License: MPLv2.0 +License: MPL-2.0 %description -n libreofficekit-devel The libreofficekit-devel package contains libraries and header files for @@ -1128,6 +1126,9 @@ sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk #see rhbz#2072615 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff +# Failing on multiple arches +sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk + %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` diff --git a/sources b/sources index 4ea32cd..16f3eae 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (libreoffice-24.2.2.1.tar.xz) = 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5 -SHA512 (libreoffice-24.2.2.1.tar.xz.asc) = 9ee0fa55e88ca2b61c7b6493fcc5585b5206d8b14c857867f76a7735cc497727cdcd2b42a11962c33685ed03ee41cc9844bbb353d0b894873632c7482d66a628 -SHA512 (libreoffice-help-24.2.2.1.tar.xz) = 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3 -SHA512 (libreoffice-help-24.2.2.1.tar.xz.asc) = 5ceff92d27b10075bfdb9bbab5b0fa6b671b05fee18772d7a5051532112e5678fb787907006b3900c44435b2c7476d5884dc7fbbfe61b8ed82ec98a31eef8660 -SHA512 (libreoffice-translations-24.2.2.1.tar.xz) = 307335239b60b19bf28df465aaf70fe89aa7635f1688508e988b1f3409c0a397ea47b634c626f2e39d086f7f82c2c499f95107ef9b19908871bf18a909672005 -SHA512 (libreoffice-translations-24.2.2.1.tar.xz.asc) = 7a04f5a89f4d7203f5a123c5f04b857f3abe5478dd8d081bb3fa82cf423f5067d5b33447b0e5b2d28216359fcfd1a67b953d83ff265c67ac5b958a73374f58f2 +SHA512 (libreoffice-24.2.3.2.tar.xz) = c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b +SHA512 (libreoffice-24.2.3.2.tar.xz.asc) = 8c8e2609dfc3168266fcce268406a50e7511f1de0f100c2fc94ba7fe399708c584ef95ecb3e44b928269a8e2535ba3433b2f36192fd334444108ea73d1b2316b +SHA512 (libreoffice-help-24.2.3.2.tar.xz) = 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877 +SHA512 (libreoffice-help-24.2.3.2.tar.xz.asc) = 9d70a5fb66cb5e278781b0d29ee3a39b1835fe84e38a2e494d0b8d0d8191b1ba3174d5df82b5284314da4d1f9e93411020d404b51b32465316ac4acc9ebae2b7 +SHA512 (libreoffice-translations-24.2.3.2.tar.xz) = c5f22392fe4ec86203fe0181b829937997202d775cf4add8ea5ee95e66b29d0047d02c8758dc8d2b97d636f3a19d0c2b9d4399a0de019ba07318530382a8c904 +SHA512 (libreoffice-translations-24.2.3.2.tar.xz.asc) = e03eca6f578b365294e22442d2157eae12c3434e32ee1fda01491a2ffb2cbfc4f205e78f82966baafa10db94995ca66854300dae41907263ad83fc1e19780efa SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a