From 9d2efa51f2b2d96111be6ec450caa3a7ada91821 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 18 Jan 2020 10:31:01 +0200 Subject: [PATCH] falkon/qtwebengine: Fix media --- testing/falkon/depends | 2 +- testing/{qt5-qtwebengine => qt5-webengine}/build | 3 +-- testing/{qt5-qtwebengine => qt5-webengine}/checksums | 0 testing/{qt5-qtwebengine => qt5-webengine}/depends | 0 ...-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | 0 .../patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch | 0 ...-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 0 ...-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 0 .../0013-chromium-musl-include-fcntl.h-for-loff_t.patch | 0 ...-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | 0 .../0015-chromium-musl-linux-glibc-make-the-distinction.patch | 0 ...-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 0 ...-chromium-musl-Use-correct-member-name-__si_fields-fr.patch | 0 ...-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | 0 .../0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch | 0 .../0020-chromium-musl-Adjust-default-pthread-stack-size.patch | 0 ...-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | 0 ...-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | 0 .../patches/0023-chromium-musl-pread-pwrite.patch | 0 .../patches/0030-chromium-musl-execinfo.patch | 0 .../patches/0031-chromium-musl-portable-msghdr.patch | 0 .../patches/0032-chromium-musl-sandbox.patch | 0 testing/{qt5-qtwebengine => qt5-webengine}/sources | 0 testing/{qt5-qtwebengine => qt5-webengine}/version | 0 24 files changed, 2 insertions(+), 3 deletions(-) rename testing/{qt5-qtwebengine => qt5-webengine}/build (94%) rename testing/{qt5-qtwebengine => qt5-webengine}/checksums (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/depends (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0023-chromium-musl-pread-pwrite.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0030-chromium-musl-execinfo.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0031-chromium-musl-portable-msghdr.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/patches/0032-chromium-musl-sandbox.patch (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/sources (100%) rename testing/{qt5-qtwebengine => qt5-webengine}/version (100%) diff --git a/testing/falkon/depends b/testing/falkon/depends index adf73625..9e3110ea 100644 --- a/testing/falkon/depends +++ b/testing/falkon/depends @@ -1,6 +1,6 @@ cmake make extra-cmake-modules make -qt5-qtwebengine +qt5-webengine qt5-svg qt5-webchannel qt5-x11extras diff --git a/testing/qt5-qtwebengine/build b/testing/qt5-webengine/build similarity index 94% rename from testing/qt5-qtwebengine/build rename to testing/qt5-webengine/build index b598ffc7..b2bf92a6 100755 --- a/testing/qt5-qtwebengine/build +++ b/testing/qt5-webengine/build @@ -42,8 +42,7 @@ qmake QMAKE_CXXFLAGS=-DQT_NO_ACCESSIBILITY -- \ -feature-webengine-system-ffmpeg \ -feature-webengine-proprietary-codecs \ -no-feature-webengine-system-icu \ - -no-feature-webengine-system-glib \ - -no-feature-webengine-webrtc + -no-feature-webengine-system-glib make make install INSTALL_ROOT="$1" diff --git a/testing/qt5-qtwebengine/checksums b/testing/qt5-webengine/checksums similarity index 100% rename from testing/qt5-qtwebengine/checksums rename to testing/qt5-webengine/checksums diff --git a/testing/qt5-qtwebengine/depends b/testing/qt5-webengine/depends similarity index 100% rename from testing/qt5-qtwebengine/depends rename to testing/qt5-webengine/depends diff --git a/testing/qt5-qtwebengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/testing/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch rename to testing/qt5-webengine/patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch diff --git a/testing/qt5-qtwebengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/testing/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch rename to testing/qt5-webengine/patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch diff --git a/testing/qt5-qtwebengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/testing/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch rename to testing/qt5-webengine/patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch diff --git a/testing/qt5-qtwebengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/testing/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch rename to testing/qt5-webengine/patches/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch diff --git a/testing/qt5-qtwebengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch b/testing/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch rename to testing/qt5-webengine/patches/0013-chromium-musl-include-fcntl.h-for-loff_t.patch diff --git a/testing/qt5-qtwebengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/testing/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch rename to testing/qt5-webengine/patches/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch diff --git a/testing/qt5-qtwebengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/testing/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch rename to testing/qt5-webengine/patches/0015-chromium-musl-linux-glibc-make-the-distinction.patch diff --git a/testing/qt5-qtwebengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/testing/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch rename to testing/qt5-webengine/patches/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch diff --git a/testing/qt5-qtwebengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/testing/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch rename to testing/qt5-webengine/patches/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch diff --git a/testing/qt5-qtwebengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/testing/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch rename to testing/qt5-webengine/patches/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch diff --git a/testing/qt5-qtwebengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/testing/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch rename to testing/qt5-webengine/patches/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch diff --git a/testing/qt5-qtwebengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/testing/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch rename to testing/qt5-webengine/patches/0020-chromium-musl-Adjust-default-pthread-stack-size.patch diff --git a/testing/qt5-qtwebengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/testing/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch rename to testing/qt5-webengine/patches/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch diff --git a/testing/qt5-qtwebengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/testing/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch rename to testing/qt5-webengine/patches/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch diff --git a/testing/qt5-qtwebengine/patches/0023-chromium-musl-pread-pwrite.patch b/testing/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0023-chromium-musl-pread-pwrite.patch rename to testing/qt5-webengine/patches/0023-chromium-musl-pread-pwrite.patch diff --git a/testing/qt5-qtwebengine/patches/0030-chromium-musl-execinfo.patch b/testing/qt5-webengine/patches/0030-chromium-musl-execinfo.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0030-chromium-musl-execinfo.patch rename to testing/qt5-webengine/patches/0030-chromium-musl-execinfo.patch diff --git a/testing/qt5-qtwebengine/patches/0031-chromium-musl-portable-msghdr.patch b/testing/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0031-chromium-musl-portable-msghdr.patch rename to testing/qt5-webengine/patches/0031-chromium-musl-portable-msghdr.patch diff --git a/testing/qt5-qtwebengine/patches/0032-chromium-musl-sandbox.patch b/testing/qt5-webengine/patches/0032-chromium-musl-sandbox.patch similarity index 100% rename from testing/qt5-qtwebengine/patches/0032-chromium-musl-sandbox.patch rename to testing/qt5-webengine/patches/0032-chromium-musl-sandbox.patch diff --git a/testing/qt5-qtwebengine/sources b/testing/qt5-webengine/sources similarity index 100% rename from testing/qt5-qtwebengine/sources rename to testing/qt5-webengine/sources diff --git a/testing/qt5-qtwebengine/version b/testing/qt5-webengine/version similarity index 100% rename from testing/qt5-qtwebengine/version rename to testing/qt5-webengine/version