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

latest version

Browse Source
f41
Caolán McNamara 2 years ago
parent 8b14c030ad
commit d7a0f31432
4 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File

14
.gitignore vendored
Unescape View File

@ -4,10 +4,10 @@
/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
/libreoffice-multiliblauncher.sh
/dtoa-20180411.tgz
/dragonbox-1.1.0.tar.gz
/libreoffice-7.4.3.2.tar.xz
/libreoffice-7.4.3.2.tar.xz.asc
/libreoffice-help-7.4.3.2.tar.xz
/libreoffice-help-7.4.3.2.tar.xz.asc
/libreoffice-translations-7.4.3.2.tar.xz
/libreoffice-translations-7.4.3.2.tar.xz.asc
/dragonbox-1.1.3.tar.gz
/libreoffice-7.4.4.2.tar.xz
/libreoffice-7.4.4.2.tar.xz.asc
/libreoffice-help-7.4.4.2.tar.xz
/libreoffice-help-7.4.4.2.tar.xz.asc
/libreoffice-translations-7.4.4.2.tar.xz
/libreoffice-translations-7.4.4.2.tar.xz.asc

26
0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch
Unescape View File

@ -0,0 +1,26 @@
From 623ea5c4d2871aba2e3e5114ad7d58d6f910a2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 12 Jan 2023 20:55:27 +0000
Subject: [PATCH] Related: tdf#151898 fix gtk4 build in 7-4
Change-Id: I71b59b7d2eac406817c79bf6911736ad4510771c
---
vcl/unx/gtk3/gtkinst.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8ba640992b9a..b697b0b50a3c 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -5114,7 +5114,7 @@ namespace
void picture_set_from_xgraphic(GtkPicture* pPicture, const css::uno::Reference<css::graphic::XGraphic>& rPicture)
{
- if (auto xTempFile = getImageFile(rPicture, false))
+ if (auto xTempFile = getImageFile(rPicture))
gtk_picture_set_filename(pPicture, OUStringToOString(xTempFile->GetFileName(), osl_getThreadTextEncoding()).getStr());
else
gtk_picture_set_pixbuf(pPicture, nullptr);
--
2.39.0

10
libreoffice.spec
Unescape View File

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
%global libo_version 7.4.3
%global libo_version 7.4.4
# 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.
@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 4%{?libo_prerelease}%{?dist}
Release: 1%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@ -80,7 +80,7 @@ Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c31
Source8: libreoffice-multiliblauncher.sh
Source9: %{external_url}/dtoa-20180411.tgz
Source10: %{external_url}/dragonbox-1.1.0.tar.gz
Source10: %{external_url}/dragonbox-1.1.3.tar.gz
Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
#backwards compatability.
@ -263,6 +263,7 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch4: 0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@ -2266,6 +2267,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Thu Jan 12 2023 Caolán McNamara <caolanm@redhat.com> - 1:7.4.4.2-1
- 7.4.4 release
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 1:7.4.3.2-4
- Rebuild for ICU 72

14
sources
Unescape View File

@ -3,11 +3,11 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6f
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dragonbox-1.1.0.tar.gz) = 4d7cb2e0314ffda8e51600f6cbb953bf1dff9ea46d5c45a08cb0ca45ac386e8bb8b73588cd35b1a1261439a31f46447e59e2980ac6f710dec007c0c575e368e7
SHA512 (dragonbox-1.1.3.tar.gz) = 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
SHA512 (libreoffice-7.4.3.2.tar.xz) = 979d893b89048ff8600b4a89b55a77ee071b5ff472ff73728a70efe282c00a43d9b1432c7364a2f019efa082fdf0ab49ab540596e4957c76439e1860c2706039
SHA512 (libreoffice-7.4.3.2.tar.xz.asc) = 7180d04b16c468187817897ddce3cdf96eac8fa0ce4b366b303286364a0a85bcaeb12591de5391194e48adde7a3f0fb12340306fc4108cd135e261e455e26fb9
SHA512 (libreoffice-help-7.4.3.2.tar.xz) = d1b3021d3c1a6014e5c8c8f2de35da53e11a018f9a3fa9e91e7eb6052379a7970626f90a07a347744a904b26c70aadea6ada099cd9729e746f66710be87770ec
SHA512 (libreoffice-help-7.4.3.2.tar.xz.asc) = fe53618a4911d0b9b6d10064a3cb9a44569ce549f75bcdf4a9deacaa916649d7638c5c332e253cbdb8e2e6b247f4be67b47f2e041995e2ce22325e558e7aea52
SHA512 (libreoffice-translations-7.4.3.2.tar.xz) = 1c7f41b1f0243f8a52f6be0a026f9793fc71a9f284f723c798b3a3dd8c9e3ab55c70d13d9d9d8563e2a70e7c42c1b242b8c979b7211075afdb4e0c971bb46d7e
SHA512 (libreoffice-translations-7.4.3.2.tar.xz.asc) = eff9bf2d49d85166bde9c1d4c9b314c7f1408f29b455e4e2f3e57773fd9ca9947a49b82794103bbdb781d8b8df1de95f382570d387dea310366a5dad70de692b
SHA512 (libreoffice-7.4.4.2.tar.xz) = 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
SHA512 (libreoffice-7.4.4.2.tar.xz.asc) = 3ecb0654765589ff05b45632c0a07af20f58c867d3cad14e6a7200c8464d2bfe98ca923e73254a9f059f901cb7e9b65afed4eba33e733bebad69fd0ca1e27ac3
SHA512 (libreoffice-help-7.4.4.2.tar.xz) = 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
SHA512 (libreoffice-help-7.4.4.2.tar.xz.asc) = a0ebfb0b4a1f2b241d75e99e136b89e7a9d124ee96e1b8a270f0f500fc23e494e9ba9fcf870a733941b79f40f01a89d312d103dc75cf4379bff26cfe3d47210d
SHA512 (libreoffice-translations-7.4.4.2.tar.xz) = fe5f8c4238d38b9bf63310744821656eec6b70959b775f53f28aa5e680348970d32fbf9287de5780c4f8cf2145b3ce0e699048b2ec6e868e26902d763cbfcf5c
SHA512 (libreoffice-translations-7.4.4.2.tar.xz.asc) = 633dbe4b92de8974452316a887d30d76ca099c4d205becec79ee71126db1cd096c5764af28727477702da4570aecaf8e627f69c3337854b03c81590242d39696

Write Preview
Loading…
Cancel
Save