wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-22 00:57:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

libreoffice: update to 25.2.2.2.

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2025-04-01 18:56:55 +07:00
parent d3490ba1ab
commit f059133116
8 changed files with 18 additions and 41 deletions

2
srcpkgs/libreoffice/patches/002-libjvm-path-musl.patch
View file

@ -11,5 +11,5 @@
+ "/lib/native_threads",
+ "/lib",
};
*size = SAL_N_ELEMENTS(ar);
*size = std::size(ar);
return ar;

8
srcpkgs/libreoffice/patches/003-musl-java.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -9139,7 +9139,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
@@ -9421,7 +9421,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
@ -9,7 +9,7 @@
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
@@ -15386,7 +15386,7 @@ else
@@ -15751,7 +15751,7 @@ else
case "$host_os" in
@ -20,7 +20,7 @@
fi
--- a/configure
+++ b/configure
@@ -23269,7 +23269,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
@@ -23873,7 +23873,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
@ -29,7 +29,7 @@
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
@@ -48847,7 +48847,7 @@ else
@@ -49566,7 +49566,7 @@ else
case "$host_os" in

4
srcpkgs/libreoffice/patches/006-cross-flag.patch
View file

@ -5,7 +5,7 @@ Description: Perhaps cleanup a bit and submit to upstream
environment during build.
--- a/configure.ac
+++ b/configure.ac
@@ -5836,10 +5836,11 @@ if test "$cross_compiling" = "yes"; then
@@ -6046,10 +6046,11 @@ if test "$cross_compiling" = "yes"; then
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
(
unset COM USING_X11 OS CPUNAME
@ -18,7 +18,7 @@ Description: Perhaps cleanup a bit and submit to upstream
unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
if test -n "$CC_FOR_BUILD"; then
export CC="$CC_FOR_BUILD"
@@ -5849,6 +5850,12 @@ if test "$cross_compiling" = "yes"; then
@@ -6059,6 +6060,12 @@ if test "$cross_compiling" = "yes"; then
export CXX="$CXX_FOR_BUILD"
CXX_BASE=`first_arg_basename "$CXX"`
fi

2
srcpkgs/libreoffice/patches/007-cross-python.patch
View file

@ -2,7 +2,7 @@ Upstream: no
Description: In VoidLinux, we always have same version of python in build and host
--- a/configure.ac
+++ b/configure.ac
@@ -10034,8 +10034,6 @@ if test "$build_os" != "cygwin" -a "$ena
@@ -10316,8 +10316,6 @@ if test "$build_os" != "cygwin" -a "$ena
else
# This allows a lack of system python with no error, we use internal one in that case.
AM_PATH_PYTHON([3.3],, [:])

4
srcpkgs/libreoffice/patches/008-zxing.patch
View file

@ -5,7 +5,7 @@ Description: we should always check for full path
Perhap we should changes the file hierarchy of zxing-cpp project instead?
--- a/configure.ac
+++ b/configure.ac
@@ -11483,35 +11483,16 @@ else
@@ -11777,35 +11777,16 @@ else
SYSTEM_ZXING=TRUE
ZXING_CFLAGS=
AC_LANG_PUSH([C++])
@ -46,7 +46,7 @@ Description: we should always check for full path
FilterLibs "${ZXING_LIBS}"
ZXING_LIBS="${filteredlibs}"
else
@@ -11528,8 +11509,8 @@ else
@@ -11822,8 +11803,8 @@ else
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([

8
srcpkgs/libreoffice/patches/010-gpgmepp.patch
View file

@ -20,7 +20,7 @@ Description: we should always use full path
using ::com::sun::star::uno::Sequence;
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -59,10 +59,10 @@
@@ -60,10 +60,10 @@
#include <o3tl/string_view.hxx>
#if HAVE_FEATURE_GPGME
@ -37,7 +37,7 @@ Description: we should always use full path
using namespace ::com::sun::star;
--- a/configure.ac
+++ b/configure.ac
@@ -12890,7 +12890,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
@@ -13184,7 +13184,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
SYSTEM_GPGMEPP=TRUE
# C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@ -48,9 +48,9 @@ Description: we should always use full path
[AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
@@ -16,8 +16,8 @@
#include <officecfg/Office/Common.hxx>
@@ -17,8 +17,8 @@
#include <svl/sigstruct.hxx>
#include <svl/cryptosign.hxx>
-#include <context.h>
-#include <data.h>

16
srcpkgs/libreoffice/patches/100-poppler-25.02.diff
View file

@ -1,16 +0,0 @@
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index ebed120..9b63559 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -110,7 +110,11 @@
/* Get data directory location */
#ifdef SYSTEM_POPPLER
+#if POPPLER_CHECK_VERSION(25, 0, 2)
+ const std::string datadir = "";
+#else
const char* datadir = nullptr;
+#endif
#else
/* Creates an absolute path to the poppler_data directory, by taking the path
* to the xpdfimport executable (provided in argv[0], and concatenating a

15
srcpkgs/libreoffice/template
View file

@ -1,6 +1,6 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=25.2.1.2
version=25.2.2.2
revision=1
build_style=meta
build_helper="gir"
@ -96,9 +96,9 @@ distfiles="
${_addurl}/Java-WebSocket-1.6.0.tar.gz
${_addurl}/zxcvbn-c-2.5.tar.gz
"
checksum="8001ae2477c504c558194ea31c159afa7174781fa6ec72ceee7df2fc2fd5b75d
ae710f11de6a4c3eb9c5a31c401a18afeda39d6f1dfb4ac594daf68f225cd064
89bdc0ca5526f5e5bce6449139cfc4fd4a1415649652776aee91cbb64510cc4b
checksum="01a14580c15a5b14153fa46c28e90307f6683e0d0326727a4ad13e9545dfe6ac
5a7c9fcc43afad674c3883f90c46f5e4fde728801a0d19e37e518bdc488a5f9e
a74b05873778a47961c2fc44f85b300ab820c9b333e1be921ca6cbac6fef5430
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
@ -377,13 +377,6 @@ post_patch() {
-e "s|.1.gz|.1|g"
chmod +x bin/unpack-sources
case "$XBPS_TARGET_MACHINE" in
i686*) # Don't run broken tests
vsed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
vsed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
;;
esac
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
vsed -i "s/bootstrap: check-if-root compilerplugins/bootstrap: compilerplugins/" Makefile.in
fi