commit 8e00f342556ad499bb46ed68696c1ab0e7f31e96 Author: Danny Rawlins <contact@romster.me> Date: Sun Oct 31 00:34:02 2021 +1100 qt6-3d: 6.2.0 -> 6.2.1 diff --git a/qt6-3d/.signature b/qt6-3d/.signature index 111345234..d510cf193 100644 --- a/qt6-3d/.signature +++ b/qt6-3d/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/e5WSa/hAy9tsosnZJa+TxjZORyX6+KIk8z9CjVzAJlK8rnfacDbUkX5uxhxTrMoUitoTy1dA1P/MHQu9ShoXQU= -SHA256 (Pkgfile) = 1ce40d04cb98d3e628cef4f6b7568b5d95a858f5151557ac010241d538793670 +RWSE3ohX2g5d/VS5l4ggKv/ApGitgiOTTbHRYTYMHBuf+xYnVxqfzsldzdQ5pSZnHBtBMNXM1+S91EcHpgf5eLxM37m8k0Cc2Q8= +SHA256 (Pkgfile) = 7ebbb35ef0fd20b8700f07f39fdce0e6a8876046d9c55f15c089ef5f277f411c SHA256 (.footprint) = 5e457a1f9b0fd41d8fef1fcde34b020af3d32d7d9fae2468b37aea6f6b0366f5 -SHA256 (qt3d-everywhere-src-6.2.0.tar.xz) = 304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6 +SHA256 (qt3d-everywhere-src-6.2.1.tar.xz) = 730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3 diff --git a/qt6-3d/Pkgfile b/qt6-3d/Pkgfile index 3ac449437..be86f4597 100644 --- a/qt6-3d/Pkgfile +++ b/qt6-3d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt6-declarative name=qt6-3d -version=6.2.0 +version=6.2.1 release=1 source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qt3d-everywhere-src-$version.tar.xz) diff --git a/qt6-base/qtbug-96392.patch b/qt6-base/qtbug-96392.patch deleted file mode 100644 index de08b0c0a..000000000 --- a/qt6-base/qtbug-96392.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5c7b3db32bf383afa00050370222f39e0f3083ca Mon Sep 17 00:00:00 2001 -From: Laszlo Agocs <laszlo.agocs@qt.io> -Date: Mon, 20 Sep 2021 11:16:09 +0200 -Subject: Cater for upstream changes in eglplatform.h - -EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing -code out there, including Qt: -https://github.com/KhronosGroup/EGL-Registry/pull/130 - -Fix this by defining USE_X11 whenever we do not define EGL_NO_X11. - -Fixes: QTBUG-96392 -Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0 -Reviewed-by: Andy Nichols <andy.nichols@qt.io> -(cherry picked from commit 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/gui/configure.cmake | 1 + - src/gui/opengl/platform/egl/qt_egl_p.h | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake -index ea6752806e..395902f792 100644 ---- a/src/gui/configure.cmake -+++ b/src/gui/configure.cmake -@@ -167,6 +167,7 @@ qt_config_compile_test(egl_x11 - // has to be disabled in plugins like xcb in this case since the native display, - // window and pixmap types will be different than what an X-based platform - // plugin would expect. -+#define USE_X11 - #include <EGL/egl.h> - #include <X11/Xlib.h> - -diff --git a/src/gui/opengl/platform/egl/qt_egl_p.h b/src/gui/opengl/platform/egl/qt_egl_p.h -index c33cc8aa21..5d4e2fd6d4 100644 ---- a/src/gui/opengl/platform/egl/qt_egl_p.h -+++ b/src/gui/opengl/platform/egl/qt_egl_p.h -@@ -65,7 +65,11 @@ - # if !defined(Q_OS_INTEGRITY) - # define WIN_INTERFACE_CUSTOM // NV - # endif // Q_OS_INTEGRITY --#endif // QT_EGL_NO_X11 -+#else // QT_EGL_NO_X11 -+// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130 -+// that needs USE_X11 to be defined. -+# define USE_X11 -+#endif - - #ifdef QT_EGL_WAYLAND - # define WAYLAND // NV --- -cgit v1.2.1 - diff --git a/qt6-webengine/chromium-harfbuzz-3.0.0.patch b/qt6-webengine/chromium-harfbuzz-3.0.0.patch deleted file mode 100644 index c7724336b..000000000 --- a/qt6-webengine/chromium-harfbuzz-3.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -# https://github.com/chromium/chromium/commit/b289f6f3fcbc - -diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc -index 8ff0540d9a..20a7d37474 100644 ---- a/components/paint_preview/common/subset_font.cc -+++ b/components/paint_preview/common/subset_font.cc -@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) { - hb_set_t* glyphs = - hb_subset_input_glyph_set(input.get()); // Owned by |input|. - usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); -- hb_subset_input_set_retain_gids(input.get(), true); -+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); - -- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get())); -+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get())); -+ if (!subset_face) -+ return nullptr; - HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); - if (!subset_blob) - return nullptr; diff --git a/qt6-webengine/skia-harfbuzz-3.0.0.patch b/qt6-webengine/skia-harfbuzz-3.0.0.patch deleted file mode 100644 index 859cc9021..000000000 --- a/qt6-webengine/skia-harfbuzz-3.0.0.patch +++ /dev/null @@ -1,100 +0,0 @@ -# Minimal diff for harfbuzz 3.0.0 support; based on: -# https://github.com/google/skia/commit/66684b17b382 -# https://github.com/google/skia/commit/51d83abcd24a - -diff --git a/gn/skia.gni b/gn/skia.gni -index d98fdc19ee..199335d5c4 100644 ---- a/gn/skia.gni -+++ b/gn/skia.gni -@@ -34,8 +34,6 @@ declare_args() { - skia_include_multiframe_procs = false - skia_lex = false - skia_libgifcodec_path = "third_party/externals/libgifcodec" -- skia_pdf_subset_harfbuzz = -- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz. - skia_qt_path = getenv("QT_PATH") - skia_skqp_global_error_tolerance = 0 - skia_tools_require_resources = false -@@ -99,6 +97,10 @@ declare_args() { - skia_use_libfuzzer_defaults = true - } - -+declare_args() { -+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz -+} -+ - declare_args() { - skia_compile_sksl_tests = skia_compile_processors - skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype -diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp -index 81c37eef3a..2340a7937b 100644 ---- a/src/pdf/SkPDFSubsetFont.cpp -+++ b/src/pdf/SkPDFSubsetFont.cpp -@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) { - blob.release()); - } - -+template<typename...> using void_t = void; -+template<typename T, typename = void> -+struct SkPDFHarfBuzzSubset { -+ // This is the HarfBuzz 3.0 interface. -+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of -+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported. -+ static HBFace Make(T input, hb_face_t* face) { -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/); -+ return HBFace(hb_subset_or_fail(face, input)); -+ } -+}; -+template<typename T> -+struct SkPDFHarfBuzzSubset<T, void_t< -+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>())) -+ >> -+{ -+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists. -+ // This code should be removed as soon as all users are migrated to the newer API. -+ static HBFace Make(T input, hb_face_t* face) { -+ hb_subset_input_set_retain_gids(input, true); -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_drop_hints(input, false); -+ return HBFace(hb_subset(face, input)); -+ } -+}; -+ - static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, - const SkPDFGlyphUse& glyphUsage, - int ttcIndex) { -@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, - hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); - glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); - -- hb_subset_input_set_retain_gids(input.get(), true); -- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -- // If it isn't known if a font is 'tricky', retain the hints. -- hb_subset_input_set_drop_hints(input.get(), false); -- HBFace subset(hb_subset(face.get(), input.get())); -+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get()); -+ if (!subset) { -+ return nullptr; -+ } - HBBlob result(hb_face_reference_blob(subset.get())); - return to_data(std::move(result)); - } -diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn -index 173830de62..4156607ef9 100644 ---- a/third_party/harfbuzz/BUILD.gn -+++ b/third_party/harfbuzz/BUILD.gn -@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) { - "harfbuzz", - "harfbuzz-icu", - ] -+ if (skia_pdf_subset_harfbuzz) { -+ libs += [ "harfbuzz-subset" ] -+ } - } - } else { - third_party("harfbuzz") {