forked from pool/libreoffice
Accepting request 1162937 from LibreOffice:Factory
24.2.2 release OBS-URL: https://build.opensuse.org/request/show/1162937 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=288
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
a27e28b4c1
@ -1,174 +0,0 @@
|
||||
From 23b6064d830de573a50dcbc480c54b58dcf99e5a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||
Date: Fri, 1 Mar 2024 13:36:42 +0100
|
||||
Subject: [PATCH] Allow building with Java 8
|
||||
|
||||
Change-Id: Ib1af1a98993aabb8a03f4ef19d8da4d9a71fdbc0
|
||||
---
|
||||
config_host.mk.in | 1 +
|
||||
configure.ac | 20 +++++++++++++++-----
|
||||
ridljar/Jar_libreoffice.mk | 6 +++---
|
||||
ridljar/Jar_unoloader.mk | 8 ++++----
|
||||
solenv/gbuild/JavaClassSet.mk | 6 +++---
|
||||
5 files changed, 26 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/config_host.mk.in b/config_host.mk.in
|
||||
index 04745d508fc3..00dc7aa1f898 100644
|
||||
--- a/config_host.mk.in
|
||||
+++ b/config_host.mk.in
|
||||
@@ -483,6 +483,7 @@ export MERGELIBS_MORE=@MERGELIBS_MORE@
|
||||
export ML_EXE=@ML_EXE@
|
||||
export MOC5=@MOC5@
|
||||
export MOC6=@MOC6@
|
||||
+MODULAR_JAVA=@MODULAR_JAVA@
|
||||
export MPL_SUBSET=@MPL_SUBSET@
|
||||
export MSGFMT=@MSGFMT@
|
||||
export MSGUNIQ=@MSGUNIQ@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index dd4ed7107aa8..b218120773d1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2570,7 +2570,7 @@ AC_ARG_WITH(linker-hash-style,
|
||||
|
||||
AC_ARG_WITH(jdk-home,
|
||||
AS_HELP_STRING([--with-jdk-home=<absolute path to JDK home>],
|
||||
- [If you have installed JDK 17 or later on your system please supply the
|
||||
+ [If you have installed JDK 8 or later on your system please supply the
|
||||
path here. Note that this is not the location of the java command but the
|
||||
location of the entire distribution. In case of cross-compiling, this
|
||||
is the JDK of the host os. Use --with-build-platform-configure-options
|
||||
@@ -8647,7 +8647,7 @@ if test "$ENABLE_JAVA" != ""; then
|
||||
fi
|
||||
|
||||
if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f "$with_jdk_home/bin/java.exe"; then
|
||||
- AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17])
|
||||
+ AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 8])
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -8712,6 +8712,7 @@ dnl ===================================================================
|
||||
# Whether all the complexity here actually is needed any more or not, no idea.
|
||||
|
||||
JDK_SECURITYMANAGER_DISALLOWED=
|
||||
+MODULAR_JAVA=
|
||||
if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
||||
_gij_longver=0
|
||||
AC_MSG_CHECKING([the installed JDK])
|
||||
@@ -8732,8 +8733,8 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
||||
_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
|
||||
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
|
||||
|
||||
- if test "$_jdk_ver" -lt 170000; then
|
||||
- AC_MSG_ERROR([JDK is too old, you need at least 17 ($_jdk_ver < 170000)])
|
||||
+ if test "$_jdk_ver" -lt 10800; then
|
||||
+ AC_MSG_ERROR([JDK is too old, you need at least 8 ($_jdk_ver < 10800)])
|
||||
fi
|
||||
dnl TODO: Presumably, the Security Manager will not merely be disallowed, but be
|
||||
dnl completely removed in some Java version > 18 (see
|
||||
@@ -8748,13 +8749,21 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
||||
fi
|
||||
AC_MSG_RESULT([found $JAVA_HOME (JDK $_jdk)])
|
||||
|
||||
+ dnl Check whether the build Java supports modules
|
||||
+ if test "$_jdk_ver" -ge 90000; then
|
||||
+ MODULAR_JAVA=TRUE
|
||||
+ else
|
||||
+ AC_MSG_WARN([Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)])
|
||||
+ add_warning "Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)"
|
||||
+ fi
|
||||
+
|
||||
# set to limit VM usage for JunitTests
|
||||
JAVAIFLAGS=-Xmx64M
|
||||
# set to limit VM usage for javac
|
||||
JAVACFLAGS=-J-Xmx128M
|
||||
fi
|
||||
else
|
||||
- AC_MSG_ERROR([Java not found. You need at least JDK 17])
|
||||
+ AC_MSG_ERROR([Java not found. You need at least JDK 8])
|
||||
fi
|
||||
else
|
||||
if test -z "$ENABLE_JAVA"; then
|
||||
@@ -9058,6 +9067,7 @@ AC_SUBST(JDK_FOR_BUILD)
|
||||
AC_SUBST(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD)
|
||||
AC_SUBST(JAVA_SOURCE_VER)
|
||||
AC_SUBST(JAVA_TARGET_VER)
|
||||
+AC_SUBST(MODULAR_JAVA)
|
||||
|
||||
|
||||
dnl ===================================================================
|
||||
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk
|
||||
index 76a56eedc078..77397bc246ee 100644
|
||||
--- a/ridljar/Jar_libreoffice.mk
|
||||
+++ b/ridljar/Jar_libreoffice.mk
|
||||
@@ -36,12 +36,12 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \
|
||||
$(eval $(call gb_Jar_add_packagedirs,libreoffice,\
|
||||
$(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
|
||||
$(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
|
||||
- $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \
|
||||
+ $(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \
|
||||
))
|
||||
|
||||
-$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\
|
||||
+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\
|
||||
ridljar/source/libreoffice/module-info \
|
||||
-))
|
||||
+)))
|
||||
|
||||
$(eval $(call gb_Jar_add_sourcefiles,libreoffice,\
|
||||
ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \
|
||||
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk
|
||||
index 2acf20b5b289..b7fcbc105dc1 100644
|
||||
--- a/ridljar/Jar_unoloader.mk
|
||||
+++ b/ridljar/Jar_unoloader.mk
|
||||
@@ -14,13 +14,13 @@ $(eval $(call gb_Jar_set_packageroot,unoloader,com))
|
||||
$(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest))
|
||||
|
||||
# the module-info.class is manually added here since it's not in "com" dir
|
||||
-$(eval $(call gb_Jar_add_packagedirs,unoloader,\
|
||||
+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_packagedirs,unoloader,\
|
||||
$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \
|
||||
-))
|
||||
+)))
|
||||
|
||||
-$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\
|
||||
+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\
|
||||
ridljar/source/unoloader/module-info \
|
||||
-))
|
||||
+)))
|
||||
|
||||
$(eval $(call gb_Jar_add_sourcefiles,unoloader,\
|
||||
ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \
|
||||
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
|
||||
index 84fbcc13c32d..8acf120dd615 100644
|
||||
--- a/solenv/gbuild/JavaClassSet.mk
|
||||
+++ b/solenv/gbuild/JavaClassSet.mk
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
gb_JavaClassSet_JAVACCOMMAND = $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVACFLAGS) \
|
||||
-encoding utf8 \
|
||||
- --release $(1) \
|
||||
+ $(if $(MODULAR_JAVA),--release $(1),-source $(1) -target $(1)) \
|
||||
-Xlint:-options \
|
||||
-Xlint:unchecked
|
||||
|
||||
@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\
|
||||
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
||||
@$$RESPONSEFILE &&) \
|
||||
rm -f $$RESPONSEFILE &&) \
|
||||
- $(if $(T_MODULENAME),\
|
||||
+ $(if $(MODULAR_JAVA),$(if $(T_MODULENAME),\
|
||||
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\
|
||||
$(T_JAVA9FILES)) && \
|
||||
$(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
|
||||
@@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\
|
||||
$(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \
|
||||
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
||||
@$$RESPONSEFILE &&) \
|
||||
- rm -f $$RESPONSEFILE &&) \
|
||||
+ rm -f $$RESPONSEFILE &&)) \
|
||||
touch $(1))
|
||||
|
||||
endef
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
|
||||
size 1817377
|
||||
BIN
gpgme-1.23.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
gpgme-1.23.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8
|
||||
size 280349652
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/MACgkQ9DSh76/u
|
||||
rqNtGg/8DSbKvnTtt4A4hUZrIY5PISmBTo/DIYN7JgUkAQBxDMJrUWt0Y9Tz5c4c
|
||||
eyZ69YoZd9WGbHejEbdMUt1eqSyEM16aVuNXC+HjXEXlJBKRYRsRc4hLl6hk4vVt
|
||||
rYcwFZlpUz+VgItgzTMBpoT8rAfIcAgnmzc2jfPweJy3HQFVWcK/na4x40zbihe2
|
||||
5UJugEjrgXxbAwAuvtl2YnnUe2SfbpW503Cjsnhv0KU8cn3unVfy/OBtzIUvkVMW
|
||||
obY1ZYduHXZGO4kz9utwHytkDAYX21ExzMieIp8XlWKezHkSdNYIrKTVsBLYbmF8
|
||||
6V44MI+nd+aqGF0yVPfhUhwjs5/N7bBcDsrj9gvKd1+g7j0+afgUoYWYJRn+K2Is
|
||||
k5Xdarxita64DidZ6qNMBSiSHnxhGuiIGQ+gfs12+oS+rIWxNGknRzxlDTEZps5h
|
||||
zOaEGPu3FnKUEOMdOG+TkrWYlBO61yIVXV4HrW7WLv0l5cuGvno9L3AdTlPJisP4
|
||||
AYNIUIJ3XVa5yLFlvvXjZ4thSUxGD/NOCHMAiT9ia5Ih2JRAn55UUDISb9Yqv/dE
|
||||
gVOAaajF+iGg4FWZsTln2kdyWd4RYPJe3CgOLirjw3SxSxGmr6WIBRs42vkzhcGb
|
||||
cXlV69ZVTd2SPDmMPQAq8YIG9bG5kulsnOpd0rYnaSHBX8UWCUA=
|
||||
=MtQd
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libreoffice-24.2.2.2.tar.xz
Normal file
3
libreoffice-24.2.2.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e
|
||||
size 280611816
|
||||
16
libreoffice-24.2.2.2.tar.xz.asc
Normal file
16
libreoffice-24.2.2.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmX930MACgkQ9DSh76/u
|
||||
rqM1HxAAtS/yjNjTrs8gcveKrVUpitzogrnBc/Ak4prkmdTu+bCBvX3W8+kkYhPs
|
||||
56kRd2pUXmtmmmc+G6VegIJqELTC/0sXGYe5aqJqsSPHyqGtax0kQ4HBkB1oS+HB
|
||||
0ju4+NheqrtlxZa15qFw10RYCl5hjJt76HYWcBb/wx5jVmz5QvDJHQCGkjhHcQKB
|
||||
yUOW6gCn/URDsd4rHSBavmiRpQFHLJTjYWyyOWrzDaDedBvxk1ECwooQGrq9sZEx
|
||||
ofO2tmpBvhElSoExNB9Usl88eq8eFlw7xqCS987czwBLIbqp5imYeepjy7ULKb6Y
|
||||
DcS7hPECGvmOb3KGdUcdHjsJONd/V3UXXUcWViC/CLHh/bwo2d4F+EkNR+jis3HF
|
||||
n1MPtc/1SNTHffxQpfuXpv2PdyiwB1FvWBd/D7h4mHfQ0zgptG9X9WAKobwhgE4x
|
||||
peik2irInHFdRam4se8pAjRPBwQbRprbqmy1GnATeSZ4oBmBh/tI0SLuOlzcqy30
|
||||
rss6CAgcX8u3gpPTA22hLce5CqXOcN7P2s32mIbnVoZJoAXVDCFE4ZLfuVLaAPt0
|
||||
G9Z8TzJkI0s5LmZDBpvRSDf91uJOiNOSQi9AxyoE91x5QBL3y/x2xKGbL6DTFA7w
|
||||
yASjQTjnzG/uQTl11Mz6x34GMuNIz8deSjtWOSrM5C0C6m7RA0Q=
|
||||
=accS
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74
|
||||
size 167070728
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/4ACgkQ9DSh76/u
|
||||
rqORDQ/9EG1XL99NVfK4w5xQtRu8WiSWdxijB9/6sAOcUxBBSHHP3Sqtq83cJJqm
|
||||
MH/0ap83DW7QMkUBPFccswn8OYmbr4HWAFneQMrHoQ3K1EpFV8lLuIwv38I/L0qP
|
||||
YqLn08qvrGm/NJXytWwLZ0R5W82IaruhVtRTTllGZG19F85HgS+6vo7YBdO/YOGR
|
||||
FmiyzQeRBUhgFagsuvo4spC2kvezsmnQbAxSgVP2gwk7vqmjfuexEewX0GOTUSGH
|
||||
XOcSglb5dNuzmsIxeEj2KluydQoF36S49dD9Yk2lAjhou8dDmDimV3EeRdzssHJH
|
||||
cR7vnQPR+Kj+FEI/dg1Yi93oiZDBoOkGMmGB+4BbTSu0yZfkPmIBFgYK8Gt1Zbum
|
||||
mL2B+5Kb5xl2JZxOmd7+vqc5V9MNxHYwPIb7+DqXLakxEoGFV1IrZiDGw5WBisBf
|
||||
fmDIxWB/AQnKe8VeHuuRYE6dSbYPQM6XkMpsWIvIEpg3YZR1m+JNNE8bcuPpRoM6
|
||||
ck6q6eTgEig2m1cyIbUIvUEybdf54A61iQ9xSfkYv0gaXbwV1XxoN6VvNR+KhOI6
|
||||
zhJoMhqeBeoe+d13CefL9B3rOpMpUAWjSew8iKSAFv3h354Ixv07Nlmid9zp+7TW
|
||||
UPBsSJ+PH2DB/wJRGxq4ZMqsScY74QApySC35a1+kLE3sS64Ku8=
|
||||
=+KS1
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libreoffice-help-24.2.2.2.tar.xz
Normal file
3
libreoffice-help-24.2.2.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e4ca31ec501c3c59e6c7aa4cc1279185675b088b2d042f17a7e6b0a8304ce025
|
||||
size 167069856
|
||||
16
libreoffice-help-24.2.2.2.tar.xz.asc
Normal file
16
libreoffice-help-24.2.2.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmX930sACgkQ9DSh76/u
|
||||
rqOtqA/+LK301wrj4Wg4ERf/HN3VSodqgDnbdF6DvX+grpdAY77xuopG3caHVTgo
|
||||
E3IWIhkfd3/YWA+f3ketYRWE4c89B06j5H7t06P1hMJh3BstoddXHPVk/y9aQAQS
|
||||
6KS4prWtsd8WAXJEmohAFdEiCNXsuHZiHbzdpzl16wM0YSIGNB9dholQS1z/psc+
|
||||
hILWu0gBYeDD4EjPpdTfFNzzsrybKJZUjdndbyd5qkNn0jwsh+APbw2hJYOISBCi
|
||||
EO2jFYO/3rL9OQdkJSh9jyWU73ZewwsrwK6yDd5GwXsG9C71503VIUq+Q9j0GJ9u
|
||||
/FDZgt7zFa4YFvF51u5FKs5GY6ne19vEmJ+pd5+wGFc+GD2Iq1PYVK0vGWklnTbv
|
||||
wHyrMyVT/crVIhGO2C0ea+kOBdcdlC81hwahutBMX187Js7orDCWCKN55O6bgS/O
|
||||
fc863auzh4fXRJGD7lXw6/6/rHRTPcNxWdBdw6CflV+xQiLIvMWS+LPA8yL/tPnT
|
||||
tAza5s4lM5EqbpX3QjBMLXfXgqz9gLZytKMPCd8IY688DZ1I3p2N6qbFvpU15/dK
|
||||
Aw7LLli3FpVZyadwycvAsmW3KBuZiOyAUYm/Du+1l/kAvWbmPAsMhxjyMVv7Ov/5
|
||||
8xE+C6VbmAc4kuqPaQATl0YLm9qV4Pik7nrLLGo2DRGyzazO74U=
|
||||
=lDHm
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9
|
||||
size 220528884
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/8ACgkQ9DSh76/u
|
||||
rqMpuA//Z1YXzLBaRMKTDgroIYUSb3MPy2qBm4NJ8ds1ZkkzkV4R0r4OSo0l3YrN
|
||||
CaFTBWBVyJTExcSvAbUU4RuL7CRr5+ywFlM4BVkNNHU5YdCIzo62//wj1bzljc4Z
|
||||
UGzvnnE85p9Jgk8ZLiNtd7KDEuhGQJ6RcwCDtx1nnvTsXMdUHrsEOn+gQsM44yoy
|
||||
LAGP/AsbAXJDkzB1WIH98WAjykMjasFzQX7FN4KkyRaq9fPDJYP2RE4x9ziAYZ6q
|
||||
dzLZjj4WX7OCjUw53QzoKbIxeefh4SUadrGhUJKd5ApLfL7cecohVrUIvmoYHxC6
|
||||
IIHYa96MnVBq4SPKbOR6i5D3A6f/yZk4Wsvo1Gk2QtdsvrjkSV66kcRGpzIEK7G9
|
||||
aoHnNSMsjdRtGtzoZ6Cc0K81M9ccOsjjGmJrTk6RCZC0jw7PAgjI68alqwe8ezCD
|
||||
yTKqUbmyitwPwV45M1V0LcXW0wwsVLAWlCBQ1pEy+APHKyZslfyC/6D5CGlQmIQZ
|
||||
Q/KE6jsNPK+dFyWGIfRGhOjQjG2ph/TReiGxa1gj2bktH05EOhJEaY/Z9slFTVNg
|
||||
EK0nbVhUui9F/SeAA/K7rxDL3EPc4fWnJt5zuLIVtQxO4QtA3N3T/52ZhLigB9zV
|
||||
79CtVvYZ0NwBl/OmeFJAMIGf9U6AYWAqUME55pLTfcE6JrE9+7E=
|
||||
=uN5R
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libreoffice-translations-24.2.2.2.tar.xz
Normal file
3
libreoffice-translations-24.2.2.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:925016b4172c1dcfb2774cdb0376df949241e369375399b9875b154e65f319b2
|
||||
size 220659976
|
||||
16
libreoffice-translations-24.2.2.2.tar.xz.asc
Normal file
16
libreoffice-translations-24.2.2.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmX9300ACgkQ9DSh76/u
|
||||
rqOGGQ/7BbyCWZ7w+UTr8AETwvVOtZFIG85K3L/z8DZXSv/UMd5Gry11oShsP46p
|
||||
+PCC7o5mXQQeviInmCoZvQikggrx0+sErrluaMDXkBawun5EmCJBkju7SvHuSUuk
|
||||
5pfHtQoSjM+EroFxgU5+HZ0DgSRf803QeJYigExFpeAyFhN30I1GjJdI7go5jjvk
|
||||
5iL+znHygiXKjC7ROVChB0whPR7eODIQSMh3b/7CSnGIpxeqzImybfiE2K2N1mfc
|
||||
et4aAIPEVYib1HGdhp0da5NFccD3Uixc+VwiuDi34xYPSHdrR1fjVNhzHvU/xbdR
|
||||
7GaI6xoyWaA6aG+sLgLq58EF1zyh1tPAF1aPSidPkHZN0jN2BsSiDn8xaSE8M6F2
|
||||
z6SxMRNgnrtpYMRlQllx7vM2VzTT5QH4QBPZeeA4V4bOnKRZlnbaW+plLhwcnvai
|
||||
3YR6z8PjxHRMgX/zrJXU6h9RZJw2K+y9QC2j6GcRTr5vi+V0Mfr/0drY2itGOkO+
|
||||
6qi/X0/QW+F0v1dY3KwntELKVp+LEymh+rtXS0o0wFSzw6ne/dsLBSgK+WU4JOqq
|
||||
aTzlaPvrc3h4ABzUL3zkqBoY4r2wikX8bny6jnEgxkVJHJ4RP2VR+BZjNZDIrUP2
|
||||
RU26JUt4yd103LauwgqNamt52gQS+GyHhE0RpT6yD6gBJnyY1EY=
|
||||
=oD+d
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 11:28:55 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to 24.2.2.2 (24.2.2 final):
|
||||
https://wiki.documentfoundation.org/Releases/24.2.2/RC1 and
|
||||
https://wiki.documentfoundation.org/Releases/24.2.2/RC2
|
||||
- Fixes large file support detection, as needed on i586
|
||||
(boo#1219035). This allows building with autoconf 2.72
|
||||
- Removed patch:
|
||||
* 0001-Allow-building-with-Java-8.patch
|
||||
+ integrated upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 2 19:41:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -17,11 +17,8 @@
|
||||
|
||||
|
||||
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
|
||||
# extensions
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url https://dev-www.libreoffice.org/src/
|
||||
#%%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.4.0
|
||||
%define tarball_url https://dev-builds.libreoffice.org/pre-releases/src/
|
||||
# LTO needs newer toolchain stack only
|
||||
%if 0%{?suse_version} >= 1500
|
||||
@ -55,7 +52,7 @@
|
||||
%global with_gcc 12
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 24.2.1.2
|
||||
Version: 24.2.2.2
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: LGPL-3.0-or-later AND MPL-2.0+
|
||||
@ -74,7 +71,7 @@ Source98: %{name}.keyring
|
||||
Source99: %{name}-rpmlintrc
|
||||
Source100: %{name}.changes
|
||||
# prebuilt extensions
|
||||
Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt
|
||||
Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
|
||||
# used extensions sources
|
||||
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
|
||||
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
|
||||
@ -117,8 +114,6 @@ Patch11: fix_webp_on_sle12_sp5.patch
|
||||
Patch14: use-fixmath-shared-library.patch
|
||||
# PATCH-FIX-SUSE Fix make distro-pack-install
|
||||
Patch15: fix-sdk-idl.patch
|
||||
# Patch submitted upstream to allow building with any Java >= 8
|
||||
Patch100: 0001-Allow-building-with-Java-8.patch
|
||||
# try to save space by using hardlinks
|
||||
Patch990: install-with-hardlinks.diff
|
||||
# save time by relying on rpm check rather than doing stupid find+grep
|
||||
@ -329,13 +324,8 @@ BuildRequires: libmariadb-devel
|
||||
BuildRequires: pkgconfig(icu-i18n)
|
||||
BuildRequires: pkgconfig(libopenjp2)
|
||||
%endif
|
||||
%if 0%{?with_gcc:1}
|
||||
BuildRequires: gcc%{with_gcc}
|
||||
BuildRequires: gcc%{with_gcc}-c++
|
||||
%else
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
BuildRequires: gcc%{?with_gcc}
|
||||
BuildRequires: gcc%{?with_gcc}-c++
|
||||
BuildRequires: java-devel >= 1.8
|
||||
%if 0%{?suse_version}
|
||||
# needed by python3_sitelib
|
||||
@ -344,10 +334,10 @@ BuildRequires: python-rpm-macros
|
||||
%if %{with system_gpgme}
|
||||
BuildRequires: libgpgmepp-devel >= 1.14
|
||||
%else
|
||||
Source1000: %{external_url}/gpgme-1.20.0.tar.bz2
|
||||
Source1000: %{external_url}/gpgme-1.23.2.tar.bz2
|
||||
Source1001: %{external_url}/libgpg-error-1.47.tar.bz2
|
||||
Source1002: %{external_url}/libassuan-2.5.6.tar.bz2
|
||||
Provides: bundled(gpgme) = 1.20.0
|
||||
Provides: bundled(gpgme) = 1.23.2
|
||||
Provides: bundled(libassuan) = 2.5.6
|
||||
Provides: bundled(libgpg-error) = 1.47
|
||||
%endif
|
||||
@ -1033,7 +1023,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
||||
%patch -P 3
|
||||
%patch -P 6 -p1
|
||||
%patch -P 9 -p1
|
||||
%patch -P 100 -p1
|
||||
%if 0%{?suse_version} < 1500
|
||||
%patch -P 10 -p1
|
||||
%patch -P 11 -p1
|
||||
@ -1097,7 +1086,7 @@ CFLAGS="$ARCH_FLAGS"
|
||||
CXXFLAGS="-std=c++20 $ARCH_FLAGS"
|
||||
export ARCH_FLAGS CFLAGS CXXFLAGS
|
||||
|
||||
%if 0%{?with_gcc:1}
|
||||
%if 0%{?with_gcc}
|
||||
export CC=gcc-%{with_gcc}
|
||||
export CXX=g++-%{with_gcc}
|
||||
%endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user