rpms/libreoffice
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 25.2.4.3-1mamba;Tue Jun 10 2025]

Browse Source
This commit is contained in:
Automatic Build System
2025-06-12 22:16:38 +02:00
parent 7d7bb0cea9
commit 2ee27c6f80
2 changed files with 4 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
libreoffice-25.2.4.1-upstream-consolidate-toOUString.patch
View File

@ -1,84 +0,0 @@
From d023035acf83ee1b61dfc03333bfc6e612bb58f6 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Fri, 11 Apr 2025 17:19:20 +0200
Subject: [PATCH] qt: Consolidate to one toOUString helper
Instead of having one for vcl in vcl/inc/qt5/QtTools.hxx
and one in avmedia/source/qt6/QtFrameGrabber.cxx,
move the existing implementation to
include/vcl/qt/QtUtils.hxx and use it everywhere.
Change-Id: I8576ab0fe2fd12bb25ae262e59acb8412ef8be0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184057
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
avmedia/source/qt6/QtFrameGrabber.cxx | 6 +-----
include/vcl/qt/QtUtils.hxx | 6 ++++++
vcl/inc/qt5/QtTools.hxx | 7 +------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/avmedia/source/qt6/QtFrameGrabber.cxx b/avmedia/source/qt6/QtFrameGrabber.cxx
index a9cf99fadc7f8..b82b02005d9ab 100644
--- a/avmedia/source/qt6/QtFrameGrabber.cxx
+++ b/avmedia/source/qt6/QtFrameGrabber.cxx
@@ -14,6 +14,7 @@
#include <vcl/filter/PngImageReader.hxx>
#include <vcl/graph.hxx>
#include <vcl/image.hxx>
+#include <vcl/qt/QtUtils.hxx>
#include <vcl/scheduler.hxx>
#include "QtFrameGrabber.hxx"
@@ -23,11 +24,6 @@ using namespace ::com::sun::star;
namespace
{
-inline OUString toOUString(const QString& s)
-{
- return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
-}
-
uno::Reference<css::graphic::XGraphic> toXGraphic(const QImage& rImage)
{
QByteArray aData;
diff --git a/include/vcl/qt/QtUtils.hxx b/include/vcl/qt/QtUtils.hxx
index 87f21d96315cb..3ab5f19f02cb0 100644
--- a/include/vcl/qt/QtUtils.hxx
+++ b/include/vcl/qt/QtUtils.hxx
@@ -31,6 +31,12 @@ inline QString toQString(const OUString& rStr)
return QString::fromUtf16(rStr.getStr(), rStr.getLength());
}
+inline OUString toOUString(const QString& s)
+{
+ // QString stores UTF16, just like OUString
+ return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
+}
+
inline QPixmap toQPixmap(const BitmapEx& rBitmapEx)
{
SvMemoryStream aMemoryStream;
--- libreoffice-25.2.4.1/vcl/inc/qt5/QtTools.hxx.orig 2025-05-25 18:38:24.112233968 +0200
+++ libreoffice-25.2.4.1/vcl/inc/qt5/QtTools.hxx 2025-05-25 18:38:59.945311942 +0200
@@ -34,6 +34,7 @@
#include <tools/gen.hxx>
#include <vcl/bitmap/BitmapTypes.hxx>
#include <vcl/vclenum.hxx>
+#include <vcl/qt/QtUtils.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
@@ -43,12 +44,6 @@
class Image;
class QImage;
-inline OUString toOUString(const QString& s)
-{
- // QString stores UTF16, just like OUString
- return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
-}
-
inline QRect toQRect(const tools::Rectangle& rRect)
{
return QRect(rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight());

7
libreoffice.spec
View File

@ -19,7 +19,7 @@
%define langpacks 1
Name: libreoffice
Version: 25.2.4.2
Version: 25.2.4.3
Release: 1mamba
Summary: Free Office Suite
Group: Graphical Desktop/Applications/Office
@ -52,7 +52,6 @@ Source37: https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b
Source38: https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz
Source39: https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz
Source40: https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz
Patch0: libreoffice-25.2.4.1-upstream-consolidate-toOUString.patch
License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -519,7 +518,6 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
%setup -q -b 2 -b 3 -b4 -a5
#% setup -q -c -T -D
#:<< ____EOF
%patch 0 -p1
touch scripting/source/pyprov/delzip
#touch scripting/util/provider/beanshell/delzip
@ -973,6 +971,9 @@ This package contains %{langname} translations and resources for LibreOffice.\
%langpack -l zu -n Zulu -F -H -Y
%changelog
* Tue Jun 10 2025 Automatic Build System <autodist@openmamba.org> 25.2.4.3-1mamba
- automatic version update by autodist
* Tue Jun 03 2025 Automatic Build System <autodist@openmamba.org> 25.2.4.2-1mamba
- automatic version update by autodist