From ac07dc4b3e7945d9c1dfc0b639b011cb0b08c7ca Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 21 Feb 2025 03:03:57 +0300 Subject: [PATCH] import libreoffice-24.8.5.2-1.el10 --- .gitignore | 12 +++---- .libreoffice.metadata | 12 +++---- SOURCES/5d5de7f.diff | 73 ++++++++++++++++++++++++++++++++++++++++++ SPECS/libreoffice.spec | 17 +++++++--- 4 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 SOURCES/5d5de7f.diff diff --git a/.gitignore b/.gitignore index 50dc56d..4791fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,10 @@ SOURCES/Java-WebSocket-1.5.6.tar.gz SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/dtoa-20180411.tgz SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf -SOURCES/libreoffice-24.8.4.2.tar.xz -SOURCES/libreoffice-24.8.4.2.tar.xz.asc -SOURCES/libreoffice-help-24.8.4.2.tar.xz -SOURCES/libreoffice-help-24.8.4.2.tar.xz.asc +SOURCES/libreoffice-24.8.5.2.tar.xz +SOURCES/libreoffice-24.8.5.2.tar.xz.asc +SOURCES/libreoffice-help-24.8.5.2.tar.xz +SOURCES/libreoffice-help-24.8.5.2.tar.xz.asc SOURCES/libreoffice-multiliblauncher.sh -SOURCES/libreoffice-translations-24.8.4.2.tar.xz -SOURCES/libreoffice-translations-24.8.4.2.tar.xz.asc +SOURCES/libreoffice-translations-24.8.5.2.tar.xz +SOURCES/libreoffice-translations-24.8.5.2.tar.xz.asc diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 1c75136..a8a9821 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -4,10 +4,10 @@ ee561c270fa186bac51bb240d4ce2166f866795c SOURCES/Java-WebSocket-1.5.6.tar.gz 2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz dd55efd721df8a013709e27836bdf26623e5320e SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf -7d9d2ffb384c02ca8a2cb2bed022b8dff63153d8 SOURCES/libreoffice-24.8.4.2.tar.xz -8f2d5bcd48b91cbf157924761133feef55514077 SOURCES/libreoffice-24.8.4.2.tar.xz.asc -b20924f5568b24d7f57edcb32bec2f7e528b5f44 SOURCES/libreoffice-help-24.8.4.2.tar.xz -500d8e3575a5f23e4c85cd7bf163d36e990a228d SOURCES/libreoffice-help-24.8.4.2.tar.xz.asc +5db3cda93d033592df2855a7b2312e2e8e2dc659 SOURCES/libreoffice-24.8.5.2.tar.xz +d257c4b946b4b82e721f11eaff2ff1d52ad47e73 SOURCES/libreoffice-24.8.5.2.tar.xz.asc +d540bf75b24c72de3a608763898a67f2df3bce3b SOURCES/libreoffice-help-24.8.5.2.tar.xz +12e65c7fde2afc48fe535ee4e4082085046753c4 SOURCES/libreoffice-help-24.8.5.2.tar.xz.asc e88f07a06deb573fd1739e85149a5019b1906f71 SOURCES/libreoffice-multiliblauncher.sh -f1756c6d85714f271d7620f825b9def83dc90180 SOURCES/libreoffice-translations-24.8.4.2.tar.xz -69857f1befb396428cc4b8fa8beac3d3ba5aa28f SOURCES/libreoffice-translations-24.8.4.2.tar.xz.asc +af388eb8367b00d886cb753a2b47fcbd82ba7eb7 SOURCES/libreoffice-translations-24.8.5.2.tar.xz +005da3de8745a4701d8aee118a0cd36d3a3efed0 SOURCES/libreoffice-translations-24.8.5.2.tar.xz.asc diff --git a/SOURCES/5d5de7f.diff b/SOURCES/5d5de7f.diff new file mode 100644 index 0000000..52f1a13 --- /dev/null +++ b/SOURCES/5d5de7f.diff @@ -0,0 +1,73 @@ +From 5d5de7fc2b17f518e63044159f91c97930c9a9a3 Mon Sep 17 00:00:00 2001 +From: Michael Weghorn +Date: Fri, 14 Feb 2025 10:38:13 +0100 +Subject: [PATCH] tdf#165238 qt: Rely on Qt for "text/plain" and UTF-8 clipboard text + +QMimeData::text implements handling for the +"text/plain;charset=utf-8" and "text/plain" MIME types +(see [1]). + +Rely on that instead of implementing our own handling for +these MIME types. + +This fixes copying Greek characters from Firefox as plain +text into Writer with qt6 on Wayland (tdf#165238). + +This approach was already mentioned as an idea in + + commit 5b3227fac58dcbd588e2389e205679cd77842bac + Author: Michael Weghorn + Date: Wed Apr 6 13:51:59 2022 +0200 + + tdf#147285 qt: Prefer "text/plain;charset=utf-8" over "text/plain" + +> (An alternative solution to adding our own handling for +> "text/plain;charset=utf-8" and making assumptions for the +> encoding of "text/plain" data would be to let Qt handle +> this and just call `QMimeData::text()` for the +> `m_bProvideUTF16FromOtherEncoding=true` case +> in `QtTransferable::getTransferData`. +> Since qtbase commit 589a01ff6b1eacf81e74a5fc4801572135214f43 +> ("QMimeData: Prefer UTF-8 when multiple charsets are available", +> contained in Qt >= 5.13), that one handles MIME type +> "text/plain;charset=utf-8" in addition to "text/plain".) + +[1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/kernel/qmimedata.cpp?id=6c61d7b0f804ae5c048af95abef4d41ecc8862df#n383 + +Change-Id: Iee695f62e836f3a8776b719ca95afb8fbddea82f +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181660 +Tested-by: Jenkins +Reviewed-by: Michael Weghorn +(cherry picked from commit ec95d529b51e95b074adaafb9f113904fed636c7) +--- + +diff --git a/vcl/qt5/QtTransferable.cxx b/vcl/qt5/QtTransferable.cxx +index 16f2476..6d4f002 100644 +--- a/vcl/qt5/QtTransferable.cxx ++++ b/vcl/qt5/QtTransferable.cxx +@@ -131,23 +131,16 @@ + if (rFlavor.MimeType == "text/plain;charset=utf-16") + { + OUString aString; +- // use existing UTF-16 encoded text/plain or convert to UTF-16 as needed ++ // use existing UTF-16 encoded MIME data if present + if (m_pMimeData->hasFormat("text/plain;charset=utf-16")) + { + QByteArray aByteData(m_pMimeData->data(toQString(rFlavor.MimeType))); + aString = OUString(reinterpret_cast(aByteData.data()), + aByteData.size() / 2); + } +- else if (m_pMimeData->hasFormat("text/plain;charset=utf-8")) +- { +- QByteArray aByteData(m_pMimeData->data(QStringLiteral("text/plain;charset=utf-8"))); +- aString = OUString::fromUtf8(reinterpret_cast(aByteData.data())); +- } + else + { +- QByteArray aByteData(m_pMimeData->data(QStringLiteral("text/plain"))); +- aString = OUString(reinterpret_cast(aByteData.data()), aByteData.size(), +- osl_getThreadTextEncoding()); ++ aString = toOUString(m_pMimeData->text()); + } + aAny <<= aString; + } diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index d32eb80..675de3c 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -2,14 +2,14 @@ ## (rpmautospec version 0.7.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec # download path contains version without the last (fourth) digit -%global libo_version 24.8.4 +%global libo_version 24.8.5 # 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. @@ -337,6 +337,7 @@ Patch12: cflags.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 +Patch502: 5d5de7f.diff %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -1102,6 +1103,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch -P 501 -p1 %endif +%patch -P 502 -p1 + # Temporarily disable failing tests %ifarch ppc64le sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk @@ -2365,10 +2368,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Sun Dec 22 2024 MSVSphere Packaging Team - 1:24.8.4.2-2 +## START: Generated by rpmautospec +* Thu Feb 20 2025 Gwyn Ciesla - 1:24.8.5.2-1 +- 24.8.5.2 + +* Fri Feb 14 2025 Gwyn Ciesla - 1:24.8.4.2-3 +- Fix for 2345783/165238 + +* Sun Dec 22 2024 MSVSphere Packaging Team - 1:24.8.4.2-1 - Rebuilt for MSVSphere 10 -## START: Generated by rpmautospec * Thu Dec 19 2024 Gwyn Ciesla - 1:24.8.4.2-1 - 24.8.4.2