[rpms/libreoffice] f44: Merge branch 'rawhide' into f44

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

From: Gwyn Ciesla <gwync@protonmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/libreoffice] f44: Merge branch 'rawhide' into f44
Date: Mon, 08 Jun 2026 20:47:49 GMT	[thread overview]
Message-ID: <178095166975.1.8038142176738129831.rpms-libreoffice-f51b5cc736ed@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/libreoffice
Branch : f44
Commit : f51b5cc736edb75559922f918f311610c387b7da
Author : Gwyn Ciesla <gwync@protonmail.com>
Date   : 2026-06-08T15:45:26-05:00
Stats  : +34/-40 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/libreoffice/c/f51b5cc736edb75559922f918f311610c387b7da?branch=f44

Log:
Merge branch 'rawhide' into f44

---
diff --git a/.gitignore b/.gitignore
index f2fc000..01a78dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -332,3 +332,27 @@
 /libreoffice-help-26.2.2.2.tar.xz.asc
 /libreoffice-translations-26.2.2.2.tar.xz
 /libreoffice-translations-26.2.2.2.tar.xz.asc
+/libreoffice-26.2.3.1.tar.xz
+/libreoffice-26.2.3.1.tar.xz.asc
+/libreoffice-help-26.2.3.1.tar.xz
+/libreoffice-help-26.2.3.1.tar.xz.asc
+/libreoffice-translations-26.2.3.1.tar.xz
+/libreoffice-translations-26.2.3.1.tar.xz.asc
+/libreoffice-26.2.3.2.tar.xz
+/libreoffice-26.2.3.2.tar.xz.asc
+/libreoffice-help-26.2.3.2.tar.xz
+/libreoffice-help-26.2.3.2.tar.xz.asc
+/libreoffice-translations-26.2.3.2.tar.xz
+/libreoffice-translations-26.2.3.2.tar.xz.asc
+/libreoffice-26.2.4.1.tar.xz
+/libreoffice-26.2.4.1.tar.xz.asc
+/libreoffice-help-26.2.4.1.tar.xz
+/libreoffice-help-26.2.4.1.tar.xz.asc
+/libreoffice-translations-26.2.4.1.tar.xz
+/libreoffice-translations-26.2.4.1.tar.xz.asc
+/libreoffice-26.2.4.2.tar.xz
+/libreoffice-26.2.4.2.tar.xz.asc
+/libreoffice-help-26.2.4.2.tar.xz
+/libreoffice-help-26.2.4.2.tar.xz.asc
+/libreoffice-translations-26.2.4.2.tar.xz
+/libreoffice-translations-26.2.4.2.tar.xz.asc

diff --git a/libreoffice-stdint.patch b/libreoffice-stdint.patch
deleted file mode 100644
index 9401802..0000000
--- a/libreoffice-stdint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- libreoffice-26.2.0.1/include/vcl/filter/PDFiumLibrary.hxx~	2026-01-14 20:09:52.814590776 +0000
-+++ libreoffice-26.2.0.1/include/vcl/filter/PDFiumLibrary.hxx	2026-01-14 20:10:07.285630397 +0000
-@@ -11,6 +11,7 @@
- #pragma once
- 
- #include <memory>
-+#include <stdint.h>
- 
- #include <com/sun/star/util/DateTime.hpp>
- 
---- libreoffice-26.2.0.1/oox/inc/drawingml/textbodycontext.hxx~	2026-01-14 20:45:34.712221028 +0000
-+++ libreoffice-26.2.0.1/oox/inc/drawingml/textbodycontext.hxx	2026-01-14 20:45:38.434319255 +0000
-@@ -23,6 +23,7 @@
- #include <drawingml/textbody.hxx>
- #include <drawingml/textrun.hxx>
- #include <oox/core/contexthandler2.hxx>
-+#include <stdint.h>
- 
- namespace oox::drawingml {
- 
---- libreoffice-26.2.0.1/oox/inc/drawingml/textparagraphpropertiescontext.hxx~	2026-01-14 21:17:49.730802524 +0000
-+++ libreoffice-26.2.0.1/oox/inc/drawingml/textparagraphpropertiescontext.hxx	2026-01-14 21:17:51.924074095 +0000
-@@ -21,6 +21,7 @@
- #define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
- 
- #include <vector>
-+#include <stdint.h>
- 
- #include <com/sun/star/style/TabStop.hpp>
- #include <drawingml/textparagraphproperties.hxx>

diff --git a/libreoffice.spec b/libreoffice.spec
index 0b750cd..b2be891 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%global libo_version 26.2.2
+%global libo_version 26.2.4
 # This is the last (fourth) digit of LO version
 %global libo_min_version 2
 # Set this to 1 if this is a prerelease build
@@ -329,8 +329,6 @@ Patch12: cflags.patch
 # glyphs. This patch tries to adapt those tests for our needs instead of
 # fully excluding them from being run
 Patch13: fix_or_exclude-tests-with-missing-glyphs.patch
-# error: ‘uint8_t’ was not declared in this scope
-Patch14: libreoffice-stdint.patch
 # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
 Patch501: kahansum_test_fix_for_aarc64_s390x.patch
 
@@ -936,6 +934,8 @@ Rules for auto-correcting common %{langname} typing errors. \
 %langpack -l de -n German -F -H -Y -M -A -T -X
 %langpack -l dz -n Dzongkha -F -s ctl -T -X
 %langpack -l el -n Greek -F -H -Y -M -A -T -X
+%define langpack_lang British English
+%langpack -l en-GB -n %{langpack_lang} -F -h en -y en -m en -a en -T -X -g en_GB
 %langpack -l eo -n Esperanto -F -H -M -T -X
 %langpack -l es -n Spanish -F -H -Y -M -A -T -X
 %langpack -l et -n Estonian -F -H -Y -T -X

diff --git a/sources b/sources
index 126b5a2..8a9b29d 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-26.2.2.2.tar.xz) = 34009204eb4add0d5c025903683ae4d809849bc800bfd5138b08a4fac0220228d827ce0e057845e535eaf31a5090c5ef865bd3c15afef7b34dbead897d8fa118
-SHA512 (libreoffice-26.2.2.2.tar.xz.asc) = 89fbb0621c00477060ded5dee72bd7559a5eecc559300f1aa1e0ff281180ee9f3280da4a6c2bf7dd57e7494d061d736cadcbce79c8ee9775a4c2b82e44112b70
-SHA512 (libreoffice-help-26.2.2.2.tar.xz) = e3a4692356bb7153fca107c7308f1f875338197c2e75f05493365fa3209fac9848739d824ec18c1e4978ee5e0681f444ea1391dc755210ee3e3513fb794e0db6
-SHA512 (libreoffice-help-26.2.2.2.tar.xz.asc) = d0bd66ce8bf1e6164e759b02d94ac8e63c8f1c22671323c184848b89da21d18a66feafb1bf48d7ccbbea15672b6d54f00db197f64fa0641631a874f8d0679118
-SHA512 (libreoffice-translations-26.2.2.2.tar.xz) = e61da34ab7233b961a8f4201b677dc32b801af1add74563639cc9781fc3fb3536beaca888ca7301c597ecc6d6b072e029a31bb3502fabf0b9478b9fd3251bdcd
-SHA512 (libreoffice-translations-26.2.2.2.tar.xz.asc) = 2d1ac7ea21747be4ab65386443105f221498f55e90d6676bc50f5ead9fce79f48bf5da92ad42c5134c4ac01f6258fc3da6bbd76d3df330069293089ba063623d
+SHA512 (libreoffice-26.2.4.2.tar.xz) = 19ddeb7aed477f804f8e45c4a6955521b479a6038f52157eb9f93f757b821ddf3fee4b68d3551721d85d1875943e192ae58a61b893d6e09bc5e11a1695521f7e
+SHA512 (libreoffice-26.2.4.2.tar.xz.asc) = 7cba0b7df1cf2281c35203abdc93d3f1df6fbd661b486effd712f76cb960f37dda4ac47170f82dbf22f3c192fa7d0f69aeaf9f6f420e0cd26656d2518568b1a1
+SHA512 (libreoffice-help-26.2.4.2.tar.xz) = 99ffad0371df5ad58d2879003196cbfe9ebd02ef3e09b015b8a88247c0355916d06a874b1532fb124ddd8e4f17cd349b3eb69e6e2f9e04b0ce7f1fbf2a4af7ef
+SHA512 (libreoffice-help-26.2.4.2.tar.xz.asc) = c4bb95c3cfb103f2e831f74dac56b7c7a9d88633ec42617a7e681695b0741a42cd56fb1a436533119a66c7730fc8290a1aa2e6c2e73a55dc62de6aea13bbceba
+SHA512 (libreoffice-translations-26.2.4.2.tar.xz) = cca0a42cad5a53c7707e067bd182909c7311c052977513baae01ec9007b3fbdbe71bfd90b8c2b6abbf8ef641e0348ff16ac6ab4acf82ddccb9a3330114a2df88
+SHA512 (libreoffice-translations-26.2.4.2.tar.xz.asc) = d8c3201137a2f9b9fb5b143e616e2b879b9e189ceed09e1c9d18a784ef922ea9ab0d40429f58e68df6f362d711a1f3a9f9d8c354950406581babd8bfadcd4972
 SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a

diff --git a/libreoffice.spec b/libreoffice.spec
index f349b65..b2be891 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -3,7 +3,7 @@
 # This is the last (fourth) digit of LO version
 %global libo_min_version 2
 # Set this to 1 if this is a prerelease build
-%global prerelease 1
+%global prerelease %{nil}
 # 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.

                 reply	other threads:[~2026-06-08 20:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178095166975.1.8038142176738129831.rpms-libreoffice-f51b5cc736ed@fedoraproject.org \
    --to=gwync@protonmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox