Skip to content

Commit d711f89

Browse files
committed
libreoffice: update to 25.8.0.4.
1 parent 3e97eac commit d711f89

12 files changed

Lines changed: 94 additions & 72 deletions

srcpkgs/libreoffice-i18n-ab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libreoffice

srcpkgs/libreoffice-i18n-hy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libreoffice

srcpkgs/libreoffice-i18n-sat-Olck

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libreoffice

srcpkgs/libreoffice-i18n-tl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libreoffice

srcpkgs/libreoffice/patches/001-build-option-java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/cui/source/options/optjava.cxx
22
+++ b/cui/source/options/optjava.cxx
3-
@@ -974,6 +974,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
3+
@@ -980,6 +980,7 @@ OUString SvxJavaClassPathDlg::GetClassPa
44
#if HAVE_FEATURE_JAVA
55
void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
66
{
77
+#if HAVE_FEATURE_JAVA
88
if ( m_sOldPath.isEmpty() )
99
m_sOldPath = _rPath;
1010
m_xPathList->clear();
11-
@@ -999,6 +1000,7 @@ void SvxJavaClassPathDlg::SetClassPath(
11+
@@ -1005,6 +1006,7 @@ void SvxJavaClassPathDlg::SetClassPath(
1212
m_xPathList->select(0);
1313
}
1414
SelectHdl_Impl(*m_xPathList);

srcpkgs/libreoffice/patches/003-musl-java.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/configure.ac
22
+++ b/configure.ac
3-
@@ -9421,7 +9421,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
3+
@@ -9408,7 +9408,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
44
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
55
;;
66

@@ -9,7 +9,7 @@
99
JAVAINC="-I$JAVA_HOME/include"
1010
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
1111
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
12-
@@ -15751,7 +15751,7 @@ else
12+
@@ -15872,7 +15872,7 @@ else
1313

1414
case "$host_os" in
1515

@@ -20,7 +20,7 @@
2020
fi
2121
--- a/configure
2222
+++ b/configure
23-
@@ -23873,7 +23873,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
23+
@@ -23856,7 +23856,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
2424
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
2525
;;
2626

@@ -29,7 +29,7 @@
2929
JAVAINC="-I$JAVA_HOME/include"
3030
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
3131
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
32-
@@ -49566,7 +49566,7 @@ else
32+
@@ -51122,7 +51122,7 @@ else
3333

3434
case "$host_os" in
3535

srcpkgs/libreoffice/patches/006-cross-flag.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description: Perhaps cleanup a bit and submit to upstream
55
environment during build.
66
--- a/configure.ac
77
+++ b/configure.ac
8-
@@ -6051,11 +6051,13 @@
8+
@@ -6120,11 +6120,13 @@ if test "$cross_compiling" = "yes"; then
99
cp configure CONF-FOR-BUILD
1010
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
1111
(
@@ -20,7 +20,7 @@ Description: Perhaps cleanup a bit and submit to upstream
2020
unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
2121
if test -n "$CC_FOR_BUILD"; then
2222
export CC="$CC_FOR_BUILD"
23-
@@ -6065,6 +6067,12 @@
23+
@@ -6134,6 +6136,12 @@ if test "$cross_compiling" = "yes"; then
2424
export CXX="$CXX_FOR_BUILD"
2525
CXX_BASE=`first_arg_basename "$CXX"`
2626
fi

srcpkgs/libreoffice/patches/007-cross-python.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Upstream: no
22
Description: In VoidLinux, we always have same version of python in build and host
33
--- a/configure.ac
44
+++ b/configure.ac
5-
@@ -10316,8 +10316,6 @@ if test "$build_os" != "cygwin" -a "$ena
6-
else
7-
# This allows a lack of system python with no error, we use internal one in that case.
8-
AM_PATH_PYTHON([3.3],, [:])
5+
@@ -10355,8 +10355,6 @@ if test "$build_os" != "cygwin" -a "$ena
6+
# harfbuzz is built using meson, and current meson requires at least python 3.7
7+
AM_PATH_PYTHON([3.7],, [:])
8+
fi
99
- # Clean PYTHON_VERSION checked below if cross-compiling
1010
- PYTHON_VERSION=""
1111
if test "$PYTHON" != ":"; then

srcpkgs/libreoffice/patches/008-zxing.patch

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description: we should always check for full path
55
Perhap we should changes the file hierarchy of zxing-cpp project instead?
66
--- a/configure.ac
77
+++ b/configure.ac
8-
@@ -11777,35 +11777,16 @@ else
8+
@@ -11865,35 +11865,16 @@ else
99
SYSTEM_ZXING=TRUE
1010
ZXING_CFLAGS=
1111
AC_LANG_PUSH([C++])
@@ -46,7 +46,7 @@ Description: we should always check for full path
4646
FilterLibs "${ZXING_LIBS}"
4747
ZXING_LIBS="${filteredlibs}"
4848
else
49-
@@ -11822,8 +11803,8 @@ else
49+
@@ -11910,8 +11891,8 @@ else
5050
save_CXXFLAGS=$CXXFLAGS
5151
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
5252
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -59,16 +59,21 @@ Description: we should always check for full path
5959
matrix.set(0, 0, true);
6060
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
6161
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
62-
@@ -19,7 +19,7 @@
62+
@@ -19,10 +19,10 @@
6363
#include <vcl/svapp.hxx>
6464

6565
#if ENABLE_ZXING
66+
-#if __has_include(<Version.h>)
67+
-#include <Version.h>
68+
+#if __has_include(<ZXing/Version.h>)
69+
+#include <ZXing/Version.h>
70+
#else
6671
-#include <ZXVersion.h>
6772
+#include <ZXing/ZXVersion.h>
73+
#endif
6874
#include <rtl/strbuf.hxx>
6975

70-
#ifdef __GNUC__
71-
@@ -27,20 +27,20 @@
76+
@@ -31,20 +31,20 @@
7277
#pragma GCC diagnostic ignored "-Wshadow"
7378
#endif
7479

srcpkgs/libreoffice/patches/010-gpgmepp.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Description: we should always use full path
3737
using namespace ::com::sun::star;
3838
--- a/configure.ac
3939
+++ b/configure.ac
40-
@@ -13184,7 +13184,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
40+
@@ -13301,7 +13301,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
4141
SYSTEM_GPGMEPP=TRUE
4242

4343
# C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way

0 commit comments

Comments
 (0)