[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69dd4ce13a34b046b4fe649548e5bb119b5cef6b
Author: Sam James
AuthorDate: Fri Jan 13 15:09:59 2023 +
Commit: Stephan Bergmann
CommitDate: Tue Jan 31 08:09:12 2023 +
configure.ac: Fix build with --with-system-zxing and < Clang 16
Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16
onwards).
This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
The new version of libzxing requires C++ 17, per its release notes. Adapt
the configure check accordingly to pass -std=c++17 when checking for its
headers and save accordingly if successful.
(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
for our compiler, despite its name.)
Bug: https://bugs.gentoo.org/890324
Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
Signed-off-by: Sam James
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145479
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146372
diff --git a/configure.ac b/configure.ac
index e626c925f49b..e40051e2c616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11178,7 +11178,7 @@ else
continue
fi
dnl TODO: White space in $i would cause problems:
-CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
+CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing;
break],
[unset ac_cv_header_MultiFormatWriter_h], [#include
])
done
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d532040f3e9f11e4f364e0313e426cdb708e6568
Author: Sam James
AuthorDate: Fri Jan 13 15:09:59 2023 +
Commit: Stephan Bergmann
CommitDate: Sat Jan 14 11:55:29 2023 +
configure.ac: Fix build with --with-system-zxing and < Clang 16
Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16
onwards).
This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
The new version of libzxing requires C++ 17, per its release notes. Adapt
the configure check accordingly to pass -std=c++17 when checking for its
headers and save accordingly if successful.
(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
for our compiler, despite its name.)
Bug: https://bugs.gentoo.org/890324
Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
Signed-off-by: Sam James
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145479
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/configure.ac b/configure.ac
index 56119241c743..47b6702df669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11187,7 +11187,7 @@ else
continue
fi
dnl TODO: White space in $i would cause problems:
-CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
+CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing;
break],
[unset ac_cv_header_MultiFormatWriter_h], [#include
])
done
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 7352d8968988ae42948354de9a63d214c03ac6ce Author: Sam James AuthorDate: Fri Sep 2 04:31:18 2022 +0100 Commit: Michael Stahl CommitDate: Thu Sep 15 18:13:06 2022 +0200 Fix build with Poppler 22.09.0 With Poppler 22.09.0, LO fails to build with: ``` /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments state->getLineDash(, , ); ~~ ^~~ /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here const std::vector (double *start) ^ 1 error generated. ``` Poppler changed the getLineDash interface: ``` -void getLineDash(double **dash, int *length, double *start) +const std::vector (double *start) ``` Signed-off-by: Sam James Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit b7d63694985bbb1cf86eb71769feadb28ce68c17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139835 (cherry picked from commit 89d2ecd6bc71fc6e581cff595b18ae67a13d8b11) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140009 Tested-by: Michael Stahl diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 85cd88d50162..d621aabc8204 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -661,8 +661,15 @@ void PDFOutDev::updateLineDash(GfxState *state) return; assert(state); -double* dashArray; int arrayLen; double startOffset; +int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) +const std::vector = state->getLineDash(); +const double* dashArray = dash.data(); +arrayLen = dash.size(); +#else +double* dashArray; state->getLineDash(, , ); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray )
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 89d2ecd6bc71fc6e581cff595b18ae67a13d8b11 Author: Sam James AuthorDate: Fri Sep 2 04:31:18 2022 +0100 Commit: Michael Stahl CommitDate: Tue Sep 13 14:11:59 2022 +0200 Fix build with Poppler 22.09.0 With Poppler 22.09.0, LO fails to build with: ``` /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments state->getLineDash(, , ); ~~ ^~~ /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here const std::vector (double *start) ^ 1 error generated. ``` Poppler changed the getLineDash interface: ``` -void getLineDash(double **dash, int *length, double *start) +const std::vector (double *start) ``` Signed-off-by: Sam James Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit b7d63694985bbb1cf86eb71769feadb28ce68c17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139835 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index f12478cb2f4d..3ad139b65fa3 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -678,8 +678,15 @@ void PDFOutDev::updateLineDash(GfxState *state) return; assert(state); -double* dashArray; int arrayLen; double startOffset; +int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) +const std::vector = state->getLineDash(); +const double* dashArray = dash.data(); +arrayLen = dash.size(); +#else +double* dashArray; state->getLineDash(, , ); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray )
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 89742b554f567f2567f365d28816e87d690ff78e Author: Sam James AuthorDate: Fri Sep 2 04:31:18 2022 +0100 Commit: Michael Stahl CommitDate: Tue Sep 13 14:11:52 2022 +0200 Fix build with Poppler 22.09.0 With Poppler 22.09.0, LO fails to build with: ``` /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments state->getLineDash(, , ); ~~ ^~~ /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here const std::vector (double *start) ^ 1 error generated. ``` Poppler changed the getLineDash interface: ``` -void getLineDash(double **dash, int *length, double *start) +const std::vector (double *start) ``` Signed-off-by: Sam James Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 2c14c5885dae8c6e23e7bdde36a749c9febf62ac) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139834 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index f12478cb2f4d..3ad139b65fa3 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -678,8 +678,15 @@ void PDFOutDev::updateLineDash(GfxState *state) return; assert(state); -double* dashArray; int arrayLen; double startOffset; +int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) +const std::vector = state->getLineDash(); +const double* dashArray = dash.data(); +arrayLen = dash.size(); +#else +double* dashArray; state->getLineDash(, , ); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray )
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit b7d63694985bbb1cf86eb71769feadb28ce68c17 Author: Sam James AuthorDate: Fri Sep 2 04:31:18 2022 +0100 Commit: Michael Stahl CommitDate: Tue Sep 13 12:32:58 2022 +0200 Fix build with Poppler 22.09.0 With Poppler 22.09.0, LO fails to build with: ``` /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments state->getLineDash(, , ); ~~ ^~~ /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here const std::vector (double *start) ^ 1 error generated. ``` Poppler changed the getLineDash interface: ``` -void getLineDash(double **dash, int *length, double *start) +const std::vector (double *start) ``` Signed-off-by: Sam James Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index f12478cb2f4d..3ad139b65fa3 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -678,8 +678,15 @@ void PDFOutDev::updateLineDash(GfxState *state) return; assert(state); -double* dashArray; int arrayLen; double startOffset; +int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) +const std::vector = state->getLineDash(); +const double* dashArray = dash.data(); +arrayLen = dash.size(); +#else +double* dashArray; state->getLineDash(, , ); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray )
