diff options
| author | Christoph Willing <chris.willing@linux.com> | 2024-11-18 09:08:00 +1100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-11-23 10:50:52 +0700 |
| commit | dcddf83315d34fbb91123777467ccfa05d05163f (patch) | |
| tree | 907e5f5c913b41473d17636d505169f02fd5fb9c | |
| parent | 44cc1db20ad67160762c8aa80e1e4f8ea81e0798 (diff) | |
office/LibreOffice: Fix for poppler in -current
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 5 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index fff6e563fd085..c43989180f9d4 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -203,6 +203,9 @@ extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ] & extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] && extnlpsolver="" +# Workaround for -current 20241116 (poppler version is too recent) +if pkg-config --atleast-version 24.11.0 poppler ; then poppler="--without-system-poppler" ; else poppler="--with-system-poppler" ; fi + ./configure \ CFLAGS="$SLKCFLAGS" \ @@ -262,7 +265,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --with-system-nss \ --with-system-openldap \ --with-system-openssl \ - --with-system-poppler \ --with-system-sane \ --with-system-zlib \ $coinmp \ @@ -291,6 +293,7 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & $libzmf \ $lpsolve \ $mythes \ + $poppler \ $postgresql \ $valgrind \ $ucpp \ diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index 2f8a1cb8f7502..2c43707f97b07 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -4,7 +4,7 @@ HOMEPAGE="https://www.libreoffice.org" DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.8.3/libreoffice-24.8.3.2.tar.xz \ https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.8.3.2-srcs.tar.xz" MD5SUM="ff89c67ce6a49c966abbb2ac3ae8e26c \ - 4fa91669e33cf9a43ae130a84a0dd8aa" + 7e338d79880189d177742e795d24827c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf" |