rpms/libreoffice
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove requirement for java-lucene in favour of clucene [release 6.4.3.2-2mamba;Thu May 07 2020]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 05:34:51 +01:00
parent 326af7c904
commit 88e2b0301b
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libreoffice-6.4.3.2-libpoppler-0.87.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e9c2a407c279..16ad04bf660a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
if (!(pAction && pAction->getKind() == actionURI))
return;
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
#else
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();

21
libreoffice.spec
View File

@ -29,7 +29,7 @@
Name: libreoffice
Version: 6.4.3.2
Release: 1mamba
Release: 2mamba
Summary: Free Office Suite
Group: Graphical Desktop/Applications/Office
Vendor: openmamba
@ -65,6 +65,7 @@ Patch42: libreoffice-6.0.5.1-upstream-glm.patch
Patch43: libreoffice-6.1.2.1-boost-1.69.patch
Patch44: libreoffice-6.4.0.3-libpoppler-0.84.0.patch
Patch45: libreoffice-6.4.3.2-build-workaround-fix-deleteTestDirectory-failed-assert.patch
Patch46: libreoffice-6.4.3.2-libpoppler-0.87.patch
License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain
## AUTOBUILDREQ-BEGIN
BuildRequires: firebird-devel
@ -272,8 +273,8 @@ BuildRequires: jakarta-commons-logging == 1.1.1
BuildRequires: java-hsqldb1 < 1.8.1
%endif
BuildRequires: java-bsh2 >= 2.0b4
BuildRequires: java-lucene
BuildRequires: java-lucene-contrib
#BuildRequires: java-lucene
#BuildRequires: java-lucene-contrib
#BuildRequires: java-junit48
BuildRequires: postgresql-jdbc
%if %with_system_saxon9
@ -334,8 +335,8 @@ Requires: dejavu-fonts-ttf
Requires: liberation-fonts-ttf
Requires: hunspell-en
Requires: hyphen-en
Requires: java-lucene
Requires: java-lucene-contrib
#Requires: java-lucene
#Requires: java-lucene-contrib
Requires: libreofficei18n
%if %with_system_saxon9
Requires: java-saxon9 == 9.1.0.7
@ -696,6 +697,7 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
##%patch43 -p1
#%patch44 -p1
%patch45 -p1
%patch46 -p1
touch scripting/source/pyprov/delzip
#touch scripting/util/provider/beanshell/delzip
@ -780,11 +782,15 @@ export JAVA_HOME=%{java_home}
--enable-gio \
--enable-evolution2 \
--enable-dbus \
--enable-qt5 \
--enable-kf5 \
--with-system-libs \
--with-system-headers \
--with-system-mythes \
--with-system-dicts \
--with-external-dict-dir=%{_datadir}/myspell \
--with-external-hyph-dir=%{_datadir}/hyphen \
--with-external-thes-dir=%{_datadir}/mythes \
--without-myspell-dicts \
--without-fonts \
--with-lang=ALL \
@ -805,10 +811,10 @@ export JAVA_HOME=%{java_home}
--with-system-libwpd \
--with-system-libwpg \
--with-system-libwps \
--enable-kf5 \
PYTHON=%{__python3} \
--with-system-boost \
--with-system-cairo \
--with-system-clucene \
--with-system-curl \
--with-system-expat \
--with-system-icu \
@ -2820,6 +2826,9 @@ This package contains additional Zulu translations and resources for LibreOffice
%endif
%changelog
* Thu May 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.3.2-2mamba
- remove requirement for java-lucene in favour of clucene
* Fri Apr 17 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.3.2-1mamba
- update to 6.4.3.2