external/skia/UnpackedTarball_skia.mk | 1 +
external/skia/missing-include.patch.1 | 11 +++++++++++
include/vcl/mnemonic.hxx | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 071c044352d24bb0c8cad0d239c8b1fc644c1823
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Aug 6 22:49:41 2020 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Aug 7 10:06:33 2020 +0200
Fix Skia build using VS 2019 v.16.7.0 with --disable-pch
No idea if updated VS makes a difference, or some recent Skia update...
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:11:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkPath.h:13:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/private/SkPathRef.h(113,41):
error: implicit instantiation of undefined template
'std::tuple<SkPoint *, float *>'
std::tuple<SkPoint*, SkScalar*> growForVerbsInPath(const SkPathRef&
path) {
^
C:/PROGRA~2/MICROS~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include\utility(126,7):
note: template is declared here
class tuple;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:11:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkPath.h:13:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/private/SkPathRef.h(114,30):
error: implicit instantiation of undefined template
'std::tuple<SkPoint *, float *>'
return fPathRef->growForVerbsInPath(path);
^
C:/PROGRA~2/MICROS~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include\utility(126,7):
note: template is declared here
class tuple;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkPath.h(1543,65):
error: implicit instantiation of undefined template 'std::tuple<SkPathVerb,
const
SkPoint *, const float *>'
std::tuple<SkPathVerb, const SkPoint*, const SkScalar*> operator*()
const {
^
C:/PROGRA~2/MICROS~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include\utility(126,7):
note: template is declared here
class tuple;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkPath.h(1550,20):
error: implicit instantiation of undefined template 'std::tuple<SkPathVerb,
const
SkPoint *, const float *>'
return {verb, fPoints + backset, fWeights};
^
C:/PROGRA~2/MICROS~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include\utility(126,7):
note: template is declared here
class tuple;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/src/core/SkBitmapDevice.cpp:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkPath.h(1625,68):
error: implicit instantiation of undefined template 'std::tuple<SkPathVerb,
const
SkPoint *, const float *>'
return (fIter != fEnd) ? static_cast<Verb>(std::get<0>(*fIter))
: kDone_Verb;
^
C:/PROGRA~2/MICROS~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include\utility(126,7):
note: template is declared here
class tuple;
^
5 errors generated.
make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:351:
C:/lo/src/build/workdir/GenCxxObject/UnpackedTarball/skia/src/core/SkBitmapDevice.o]
Error 1
Change-Id: Ica85829cf61d86e486cf4b2a730f50e06e3fb337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100271
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index 23e864e3f206..f95d0d5f7118 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -39,6 +39,7 @@ skia_patches := \
fix-windows-dwrite.patch.1 \
public-make-from-backend-texture.patch.1 \
c++20.patch.0 \
+ missing-include.patch.1 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/missing-include.patch.1
b/external/skia/missing-include.patch.1
new file mode 100644
index 000000000000..91bc4d977416
--- /dev/null
+++ b/external/skia/missing-include.patch.1
@@ -0,0 +1,11 @@
+diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h
+--- a/include/private/SkPathRef.h
++++ b/include/private/SkPathRef.h
+@@ -21,6 +21,7 @@
+
+ #include <atomic>
+ #include <limits>
++#include <tuple>
+
+ class SkRBuffer;
+ class SkWBuffer;
commit d5f66e070ca27f054f9cd2ebe3427146b6c2ac3a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 6 17:12:21 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 7 10:06:13 2020 +0200
add SAL_WARN_UNUSED_RESULT to MnemonicGenerator::CreateMnemonic
Change-Id: I159826406806166991adffb31ec04dc83d6d7504
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index 9d144c24fd90..0d62a95eb053 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -63,7 +63,7 @@ public:
MnemonicGenerator(sal_Unicode cMnemonic =
MNEMONIC_CHAR);
void RegisterMnemonic( const OUString& rKey );
- OUString CreateMnemonic( const OUString& rKey );
+ SAL_WARN_UNUSED_RESULT OUString CreateMnemonic(const OUString& rKey);
css::uno::Reference< css::i18n::XCharacterClassification > const &
GetCharClass();
// returns a string where all '~'-characters and CJK mnemonics of the form
(~A) are completely removed
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
