diff options
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 4 | ||||
| -rw-r--r-- | editors/libreoffice/Makefile.common | 4 | ||||
| -rw-r--r-- | editors/libreoffice/distinfo | 10 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx | 17 |
4 files changed, 26 insertions, 9 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 55db5949c9ce..d68fe3abaca4 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 .include "${.CURDIR}/Makefile.common" @@ -61,7 +61,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libpagemaker-0.0.so:print/libpagemaker \ libassuan.so:security/libassuan \ libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp \ + libgpgmepp.so:security/gpgmepp \ libargon2.so:security/libargon2 \ libgpg-error.so:security/libgpg-error \ libnss3.so:security/nss \ diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index c715003f1565..d609007d14cf 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -7,8 +7,8 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual DISTVERSION= ${LOVERSION}.${RCVER} -LOVERSION= 25.2.3 -RCVER= 2 +LOVERSION= 25.2.4 +RCVER= 3 #PRERELEASE= yes #DEVRELEASE= yes diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index d168ff139eca..cde7b5cc776d 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1746229750 -SHA256 (libreoffice/libreoffice-25.2.3.2.tar.xz) = ea54461e527df0d9af0afe8a8aa533cd58fcfceae87b67e18399f81586c2dadf -SIZE (libreoffice/libreoffice-25.2.3.2.tar.xz) = 281913700 -SHA256 (libreoffice/libreoffice-help-25.2.3.2.tar.xz) = 27c2d24270eb17e8aff8770aee1885d5e548a82d70697b72f7705be2f73233b2 -SIZE (libreoffice/libreoffice-help-25.2.3.2.tar.xz) = 60055176 +TIMESTAMP = 1750806059 +SHA256 (libreoffice/libreoffice-25.2.4.3.tar.xz) = 01e1985f66c60da0e5cd9d1bb3773b7b46e9a920e318f35c6702d28e78e1c14f +SIZE (libreoffice/libreoffice-25.2.4.3.tar.xz) = 282218988 +SHA256 (libreoffice/libreoffice-help-25.2.4.3.tar.xz) = 5f3bbca9fc96284b6ee78a31f9719c6b9930dd884ec5394b71af9e99b05e0bea +SIZE (libreoffice/libreoffice-help-25.2.4.3.tar.xz) = 60055984 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 diff --git a/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx b/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx new file mode 100644 index 000000000000..eaa1a925ec1d --- /dev/null +++ b/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx @@ -0,0 +1,17 @@ +--- avmedia/source/qt6/QtPlayer.cxx.orig 2025-05-20 08:25:45 UTC ++++ avmedia/source/qt6/QtPlayer.cxx +@@ -41,6 +41,14 @@ using namespace ::com::sun::star; + + using namespace ::com::sun::star; + ++namespace ++{ ++inline OUString toOUString(const QString& s) ++{ ++ return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length()); ++} ++} ++ + namespace avmedia::qt + { + QtPlayer::QtPlayer() |