mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-25 03:23:01 +00:00
37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
|
diff -urN libreoffice-6.4.4.2/configure libreoffice-6.4.4.2-patched/configure
|
||
|
|
--- libreoffice-6.4.4.2/configure 2020-05-13 14:54:07.000000000 +0300
|
||
|
|
+++ libreoffice-6.4.4.2-patched/configure 2020-06-03 10:31:23.389348663 +0300
|
||
|
|
@@ -33808,7 +33808,7 @@
|
||
|
|
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
|
|
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||
|
|
|
||
|
|
- ac_fn_cxx_check_header_compile "$LINENO" "qrcodegen/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include <stdexcept>
|
||
|
|
+ ac_fn_cxx_check_header_compile "$LINENO" "qrcodegencpp/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include <stdexcept>
|
||
|
|
"
|
||
|
|
if test "x$ac_cv_header_qrcodegen_QrCode_hpp" = xyes; then :
|
||
|
|
|
||
|
|
diff -urN libreoffice-6.4.4.2/configure.ac libreoffice-6.4.4.2-patched/configure.ac
|
||
|
|
--- libreoffice-6.4.4.2/configure.ac 2020-05-13 14:19:20.000000000 +0300
|
||
|
|
+++ libreoffice-6.4.4.2-patched/configure.ac 2020-06-03 10:31:54.056016909 +0300
|
||
|
|
@@ -10066,7 +10066,7 @@
|
||
|
|
AC_MSG_RESULT([external])
|
||
|
|
SYSTEM_QRCODEGEN=TRUE
|
||
|
|
AC_LANG_PUSH([C++])
|
||
|
|
- AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
|
||
|
|
+ AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [],
|
||
|
|
[AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
|
||
|
|
AC_CHECK_LIB([qrcodegencpp], [main], [:],
|
||
|
|
[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
|
||
|
|
diff -urN libreoffice-6.4.4.2/cui/source/dialogs/QrCodeGenDialog.cxx libreoffice-6.4.4.2-patched/cui/source/dialogs/QrCodeGenDialog.cxx
|
||
|
|
--- libreoffice-6.4.4.2/cui/source/dialogs/QrCodeGenDialog.cxx 2020-05-13 14:19:20.000000000 +0300
|
||
|
|
+++ libreoffice-6.4.4.2-patched/cui/source/dialogs/QrCodeGenDialog.cxx 2020-06-03 10:35:25.766027804 +0300
|
||
|
|
@@ -17,7 +17,7 @@
|
||
|
|
#include <sal/log.hxx>
|
||
|
|
|
||
|
|
#if defined(SYSTEM_QRCODEGEN)
|
||
|
|
-#include <qrcodegen/QrCode.hpp>
|
||
|
|
+#include <qrcodegencpp/QrCode.hpp>
|
||
|
|
#else
|
||
|
|
#include <QrCode.hpp>
|
||
|
|
#endif
|