public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libreoffice] rawhide: Update to 26.8.0.1
@ 2026-07-19 9:11 Mattia Verga
0 siblings, 0 replies; only message in thread
From: Mattia Verga @ 2026-07-19 9:11 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/libreoffice
Branch : rawhide
Commit : d3e1518b2d2986747c8644a1aefa81c029878d28
Author : Mattia Verga <mattia.verga@proton.me>
Date : 2026-07-18T10:22:00+02:00
Stats : +31/-108 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/libreoffice/c/d3e1518b2d2986747c8644a1aefa81c029878d28?branch=rawhide
Log:
Update to 26.8.0.1
---
diff --git a/.gitignore b/.gitignore
index de462cf..4a6b8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -368,3 +368,9 @@
/libreoffice-help-26.8.0.0.beta1.tar.xz.asc
/libreoffice-translations-26.8.0.0.beta1.tar.xz
/libreoffice-translations-26.8.0.0.beta1.tar.xz.asc
+/libreoffice-26.8.0.1.tar.xz
+/libreoffice-26.8.0.1.tar.xz.asc
+/libreoffice-help-26.8.0.1.tar.xz
+/libreoffice-help-26.8.0.1.tar.xz.asc
+/libreoffice-translations-26.8.0.1.tar.xz
+/libreoffice-translations-26.8.0.1.tar.xz.asc
diff --git a/fix_box2d_3.patch b/fix_box2d_3.patch
new file mode 100644
index 0000000..a106b76
--- /dev/null
+++ b/fix_box2d_3.patch
@@ -0,0 +1,14 @@
+diff -U 3 -dHrN a/configure b/configure
+--- a/configure 2026-07-13 12:52:24.000000000 +0200
++++ b/configure 2026-07-18 09:40:31.395684399 +0200
+@@ -43108,6 +43108,10 @@
+ BOX2D_VERSION=`$PKG_CONFIG --modversion box2d 2>/dev/null`
+ BOX2D_MAJOR=`echo $BOX2D_VERSION | cut -d"." -f1`
+ BOX2D_MINOR=`echo $BOX2D_VERSION | cut -d"." -f2`
++ if test "$BOX2D_MAJOR" -eq "3"; then
++ _BOX2D_LIB=box2d
++ printf "%s\n" "#define BOX2D_HEADER <box2d/box2d.h>" >>confdefs.h
++ fi
+ if test "$BOX2D_MAJOR" -eq "2"; then
+ if test "$BOX2D_MINOR" -eq "4"; then
+ _BOX2D_LIB=box2d
diff --git a/fix_external_box2d_discovery.patch b/fix_external_box2d_discovery.patch
deleted file mode 100644
index ae0968c..0000000
--- a/fix_external_box2d_discovery.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -U 3 -dHrN a/configure b/configure
---- a/configure 2026-05-27 23:20:27.000000000 +0200
-+++ b/configure 2026-06-13 09:54:51.029896221 +0200
-@@ -41810,28 +41810,44 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-- BOX2D_VERSION=`$PKG_CONFIG --modversion box2d 2>/dev/null`
-- BOX2D_MAJOR=`echo $BOX2D_VERSION | cut -d"." -f1`
-- BOX2D_MINOR=`echo $BOX2D_VERSION | cut -d"." -f2`
-- if test "$BOX2D_MAJOR" -eq "2"; then
-- if test "$BOX2D_MINOR" -eq "4"; then
-- _BOX2D_LIB=box2d
-- printf "%s\n" "#define BOX2D_HEADER <box2d/box2d.h>" >>confdefs.h
--
-- else
-- # fail this. there's no other alternative to check when we are here.
-- ac_fn_cxx_check_header_compile "$LINENO" "Box2D/Box2D.h" "ac_cv_header_Box2D_Box2D_h" "$ac_includes_default"
--if test "x$ac_cv_header_Box2D_Box2D_h" = xyes
-+ ac_fn_cxx_check_header_compile "$LINENO" "box2d/types.h" "ac_cv_header_box2d_types_h" "$ac_includes_default"
-+if test "x$ac_cv_header_box2d_types_h" = xyes
- then :
--
--else $as_nop
-- as_fn_error $? "box2d headers not found." "$LINENO" 5
-+ BOX2D_MAJOR=3
-+ BOX2D_MINOR=1
-+ BOX2D_T_FOUND='TRUE'
-+ _BOX2D_LIB=box2d
-+ printf "%s\n" "#define BOX2D_HEADER <box2d/box2d.h>" >>confdefs.h
-+else
-+ BOX2D_T_FOUND='FALSE'
-+ ac_fn_cxx_check_header_compile "$LINENO" "box2d/box2d.h" "ac_cv_header_box2d_box2d_h" "$ac_includes_default"
-+ if test "x$ac_cv_header_box2d_box2d_h" = xyes
-+ then :
-+ BOX2D_H_FOUND='TRUE'
-+ BOX2D_MAJOR=2
-+ else $as_nop
-+ BOX2D_H_FOUND='FALSE'
-+ fi
- fi
-
-- _BOX2D_LIB=Box2D
-- printf "%s\n" "#define BOX2D_HEADER <Box2D/Box2D.h>" >>confdefs.h
-+ if test "$BOX2D_T_FOUND" = "FALSE"; then # not >=3.0
-+ if test "$BOX2D_H_FOUND" = "TRUE"; then # 2.4.0+
-+ _BOX2D_LIB=box2d
-+ BOX2D_MINOR=4
-+ printf "%s\n" "#define BOX2D_HEADER <box2d/box2d.h>" >>confdefs.h
-+ else
-+ # fail this. there's no other alternative to check when we are here.
-+ BOX2D_MINOR=3
-+ ac_fn_cxx_check_header_compile "$LINENO" "Box2D/Box2D.h" "ac_cv_header_Box2D_Box2D_h" "$ac_includes_default"
-+ if test "x$ac_cv_header_Box2D_Box2D_h" = xyes
-+ then :
-
-+ else $as_nop
-+ as_fn_error $? "box2d headers not found." "$LINENO" 5
- fi
-+ _BOX2D_LIB=Box2D
-+ printf "%s\n" "#define BOX2D_HEADER <Box2D/Box2D.h>" >>confdefs.h
-+ fi
- fi
- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$_BOX2D_LIB""_main" | $as_tr_sh`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -l$_BOX2D_LIB" >&5
-diff -U 3 -dHrN a/configure.ac b/configure.ac
---- a/configure.ac 2026-05-27 22:57:18.000000000 +0200
-+++ b/configure.ac 2026-06-06 13:40:31.302081606 +0200
-@@ -12236,14 +12236,23 @@
- AC_MSG_RESULT([external])
- SYSTEM_BOX2D=TRUE
- AC_LANG_PUSH([C++])
-- BOX2D_VERSION=`$PKG_CONFIG --modversion box2d 2>/dev/null`
-- BOX2D_MAJOR=`echo $BOX2D_VERSION | cut -d"." -f1`
-- BOX2D_MINOR=`echo $BOX2D_VERSION | cut -d"." -f2`
-- if test "$BOX2D_MAJOR" -eq "2"; then
-- if test "$BOX2D_MINOR" -eq "4"; then
-+ AC_CHECK_HEADER(box2d/types.h, [BOX2D_TYPES_FOUND='TRUE'],
-+ [BOX2D_TYPES_FOUND='FALSE'])
-+ if test "$BOX2D_TYPES_FOUND" = "TRUE"; then # >=3.0
-+ BOX2D_MAJOR=3
-+ BOX2D_MINOR=1
-+ _BOX2D_LIB=box2d
-+ AC_DEFINE(BOX2D_HEADER,<box2d/box2d.h>)
-+ else
-+ BOX2D_MAJOR=2
-+ AC_CHECK_HEADER(box2d/box2d.h, [BOX2D_H_FOUND='TRUE'],
-+ [BOX2D_H_FOUND='FALSE'])
-+ if test "$BOX2D_H_FOUND" = "TRUE"; then # 2.4.0+
-+ BOX2D_MINOR=4
- _BOX2D_LIB=box2d
- AC_DEFINE(BOX2D_HEADER,<box2d/box2d.h>)
- else
-+ BOX2D_MINOR=3
- # fail this. there's no other alternative to check when we are here.
- AC_CHECK_HEADER([Box2D/Box2D.h], [],
- [AC_MSG_ERROR(box2d headers not found.)])
diff --git a/libreoffice.spec b/libreoffice.spec
index 305c83f..cf5a87e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,13 +1,13 @@
# download path contains version without the last (fourth) digit
%global libo_version 26.8.0
# This is the last (fourth) digit of LO version
-%global libo_min_version 0
+%global libo_min_version 1
# Set this to 1 if this is a prerelease build
-%global prerelease 1
+%global prerelease 0
# 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.
-%global libo_prerelease .beta1
+%global libo_prerelease %{nil}
# Should contain any suffix of release tarball name, e.g., -buildfix1.
%global libo_buildfix %{nil}
%global libo_python python3
@@ -326,8 +326,8 @@ 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
-# Backport patch from upstream to fix Box2D check
-Patch14: fix_external_box2d_discovery.patch
+# Patch for Box2D 3.x
+Patch14: fix_box2d_3.patch
# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
Patch501: kahansum_test_fix_for_aarc64_s390x.patch
diff --git a/sources b/sources
index 4e35ecb..f175d7f 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-26.8.0.0.beta1.tar.xz) = 0371b9746d9b62146e16d8dfe3241caa4c9e119a9f12e85be91f538992236075d77f2d90fd58ecb5d8fcfa7bd3981ad9dbdba18d1440ce7620e0f459f83a49c3
-SHA512 (libreoffice-26.8.0.0.beta1.tar.xz.asc) = 97ffb903324ab94ce76bdd343eabd1e3423507fa58976445c30c033fbea7752ecb0e631a983a1f2821b6e9dd042eb5a48156729ccffe04a80a5e804b4829d502
-SHA512 (libreoffice-help-26.8.0.0.beta1.tar.xz) = e51d65e40e3ce5167c1c4abe82ac1bda78a8560a65d3ccbc0c71ef6ae294693e65689491c0e994c798c07f67496182960ae6e660f2b4b4cae59ccf3c1b97eff2
-SHA512 (libreoffice-help-26.8.0.0.beta1.tar.xz.asc) = 2d680c118b5e1b5cf9dc712a08274a8529c9adb9b19c8500228ca859d92b73acb5b3e219a606b9b11cc0d9e27a7a092808cd1208b0e353d5991012ea21f259bf
-SHA512 (libreoffice-translations-26.8.0.0.beta1.tar.xz) = dbfbf191303c9d257761cbf5bb13b59c0b765f7975c416819af415ac0e11e544802b42747e918f9753eaba6a6b4b3f5740c78b2e3953ffeb501bab89025003cf
-SHA512 (libreoffice-translations-26.8.0.0.beta1.tar.xz.asc) = 8062081c3e8dc746cde3f354916d43a30e6edebc80e6dd6f3166a1ec2086322c9f8c13875bfc31dff46da4ea0e791ac08ec92a6509793f0b7a22245d047abf50
+SHA512 (libreoffice-26.8.0.1.tar.xz) = ea5644d2d5ccb6f50cb6cf8e852116d2f8834b7f785e85bf7c48ec2b16cfea62f5a1b844684af2d92ed28dd1bb9edd9c543c6182c82beb1f9d2c4fc9bba93040
+SHA512 (libreoffice-26.8.0.1.tar.xz.asc) = 31539446794782070e107f0d552f9625e589a33de32c51758d2467a2479b13330bd692c73961a85296ffc28b6569343724cee849b4a8149b5f2ea799cd1dacaa
+SHA512 (libreoffice-help-26.8.0.1.tar.xz) = 1442348b719009aaf9266ded70b9ba67bee515fcc3e2bd07c183e1cc59a91677c6e6a6215492eea5c1e1e292d7446398ef63794dfac9ae1e4983273a0c3ba2e1
+SHA512 (libreoffice-help-26.8.0.1.tar.xz.asc) = c33644775ec5879281967892ee50a1a29ab05c773ec9b91717a7709f19e2f7633a55a4e12ea7c030882179d6d57d3571b782e50f200da34b7e116e409df2c1fc
+SHA512 (libreoffice-translations-26.8.0.1.tar.xz) = 109363dd14ee0bc251d50e7b13f1b19f5a6a4d9d4e1e3978345d1f00a392911f1b7b17ea1a6bc8512f62edef660c6b94c96146cd3a6406c6b553a43af802557e
+SHA512 (libreoffice-translations-26.8.0.1.tar.xz.asc) = 782d78c514de79ac5a8623947c3abb71ea06a3cfeda85e482d151e41d50a7964561a2d1a8bb27be5dc133f4379a1e80590f5b5105873f32aed0b06651dbc5404
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-19 9:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-19 9:11 [rpms/libreoffice] rawhide: Update to 26.8.0.1 Mattia Verga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox