From patchwork Sun Feb 2 19:08:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1232425 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=divNml1o; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489gV24ybCz9s3x for ; Mon, 3 Feb 2020 06:08:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BD3E878B8; Sun, 2 Feb 2020 19:08:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mTcFeMipBmMS; Sun, 2 Feb 2020 19:08:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 06B1486C66; Sun, 2 Feb 2020 19:08:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7BF7C1BF334 for ; Sun, 2 Feb 2020 19:08:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7651486110 for ; Sun, 2 Feb 2020 19:08:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c8MZzT7z+ma7 for ; Sun, 2 Feb 2020 19:08:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8EF77860FF for ; Sun, 2 Feb 2020 19:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1580670506; bh=AtyGwN8548RWD7oWKhe+o4zaeLrhCSPZQpkZTUUtHGg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=divNml1oZ2DA5lbDcm0AAg7RSfPh39hauOEpTYIEG4+W4AiJ3X1V/q3XpHDt1dzcp 1xisppjtNZF2778e/rhpK+TpIQ2uptobKvBDL+1qlqNs4BhDgLYgUA5RIcwK8sxEAW enmSjhem1JyOHAUQRKuyDDQ2N7DIgE1ShkYnfCjk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.183]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MYNJq-1j2GUq0ZBy-00VOD6; Sun, 02 Feb 2020 20:08:26 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sun, 2 Feb 2020 20:08:23 +0100 Message-Id: <20200202190824.9856-1-ps.report@gmx.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:AtngfY+/GXRuW8lguDY4r6q8A5QrAgcBGnt7q3pd9wwrNZVTMZ9 r1blIdw1EEthn/YkfNQr4E1GJCsp0ByJJFH3nnr8CdHBElemi2Y068RYD1wp6A+aalvJM6f L+DyQppnc6wnD2Xrve8fuwhPKRgnf4C626UDwylgsi2YGgMguZgDMxlbA5cyyALnx2PJ8Oq GLknD4rhKcpuUBOdhyQfw== X-UI-Out-Filterresults: notjunk:1; V03:K0:Sz/QFGyZuEM=:oSUxbnPV+q5tE/g7nEhiL6 G4KZMu6+I4bE+v+q6weCH1iJ897mGcAdfBb0Rmz6jhIrl8IN6RPn0Qa/D44AVfnsD09XJXyZO YHHYaEy4MDBubhAedLyJYiGP/RpulVtNxfOiUAMSLWslnv/B6lZO+tAXhB1guYT6hxpBi1c+6 HeMZ8MZ5r0EdL1sumDf9ZZ+J+lDPJZ1/uOFxhLDT7L/iAT/SD8NnojSPsH5lQ5PLwSyQmsUJ+ VxoKPOHXUpfFeZVa0MP+TTCQobxlWixPXFZb7P2kRCCDe3KC2UAtxGCupQDgaFwniePSc+ow+ vGqe8nqC/22Nffvx6ZyPdXiiTqvvJr/c7E2BXk6q5h90wIiav+RPRQ4lP2MvrUSUD8y2sDRWS 0HLfwisxqz5ii/XOcKN5NFG0BSKSlSYF3MLELboway9/rxy2LZnO//gH7o0ND7Fbx8Hr0FGQA xkQ4Gdi+RmqYYQri2r6VP3/vr1KH0DS2ofllnTCtJjwG4jEfPdZJi0s01zB7+qi7bZqDzZU/j zQbC/BhjC8t6e4sqw9NUTQ7uXU+C6PHCqmmOK1YOUnLFve7WZ1+6LSc+YgacDKf3P6ycAoKBQ L9iQsjMAbbcSMmGizeX6E3jXN7e3Rr0lROEj9GZw8joirAil1k2jBW2684zh4TULvU/0rdVI8 sL0Y/NK2dTyVeKoVqiSAjhoelhMw9YxIVwUq+WH+wMicsMrisL+/N17pYHWA9l8RWry6TOgo0 /wRntLUOmNnIw6oNCYhzkQdAkIprlHI0iBr3/zM02zXtQBQCpMeh1dPjG0VrAFjua+2ml/Tpq eDgNnsaZZaDquu2E2H85YzPELO2Szclnvw2Jc3rVi9ZmmmWYZr/40ZzatEQgMt2LY0xYY68LX PQEfeBx1qDiM58p9bhcuKjyFUPGMUzfOtTLK2XP/P8WWS9VJldVkezjzQGwpjO3nYsuz+gcf/ QYcn+xec89f2E+r+W/ObcK1N1uYAvpkb9U+MotSZi1IzIO3N/CtBjQIn4UIHy9PCOOAAqjQx8 ZPAzYB2Ms9scAEn66UdJnZomMph+lRhoO7YOEBc+OeVIE95DW69TrxDRXzrASJVclma40Yj0E tVyrfo8LvXcsBMJmQba2gHlmzvWU6S+jOOywBLNqmP1AJJDrCr2YwVJInZeBFoPkE1hPDodLJ Yy7aFjxHXljC65TyAQMvCqgPmq0NMxz859b5p2y7SDThXftL8exIBcL4IYMpLttvhvS81R9y6 iDU+V9V8Y0yq4t9t0 Subject: [Buildroot] [PATCH v1 1/2] package/qt5webkit: convert patch to git format and re-number X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Corjon , Andrea Simeoni , =?utf-8?q?Ga=C3=ABl_Portay?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Convert patch 0005-Fix-installation-of-class-headers.patch to git format and re-number it to 0004-Fix-installation-of-class-headers.patch. Signed-off-by: Peter Seiderer --- ...4-Fix-installation-of-class-headers.patch} | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) rename package/qt5/qt5webkit/5.9.1/{0005-Fix-installation-of-class-headers.patch => 0004-Fix-installation-of-class-headers.patch} (85%) diff --git a/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch similarity index 85% rename from package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch rename to package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch index abddfe5d14..92aab57111 100644 --- a/package/qt5/qt5webkit/5.9.1/0005-Fix-installation-of-class-headers.patch +++ b/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch @@ -1,4 +1,10 @@ -Fix installation of class headers +From 7d763d441fd4fa78553a818ee75ac477eb6dbcbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= +Date: Sun, 2 Feb 2020 10:48:50 +0100 +Subject: [PATCH] Fix installation of class headers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Since Qt 5.11 (see commit [1]), the key word HEADER_CLASSES has been removed. It has been replaced by a new variable GENERATED_HEADER_FILES. @@ -9,9 +15,17 @@ HEADER_FILES. [1]: https://github.com/qt/qtbase/commit/9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 Signed-off-by: Gaƫl PORTAY -diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri ---- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri 2018-06-29 09:21:06.395038976 -0400 -+++ qtwebkit-opensource-src-5.9.1/include/QtWebKit/headers.pri 2018-06-29 17:37:52.500020060 -0400 +[Converted to git formated patch] +Signed-off-by: Peter Seiderer +--- + include/QtWebKit/headers.pri | 3 +-- + include/QtWebKitWidgets/headers.pri | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/include/QtWebKit/headers.pri b/include/QtWebKit/headers.pri +index 6775f3a6..3a5c14cd 100644 +--- a/include/QtWebKit/headers.pri ++++ b/include/QtWebKit/headers.pri @@ -1,5 +1,4 @@ -SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit -SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion @@ -19,9 +33,10 @@ diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKit/headers.pri qtweb SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h SYNCQT.INJECTED_PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = -diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri ---- qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pri 2018-06-29 09:21:06.391705602 -0400 -+++ qtwebkit-opensource-src-5.9.1/include/QtWebKitWidgets/headers.pri 2018-06-29 17:38:47.660648435 -0400 +diff --git a/include/QtWebKitWidgets/headers.pri b/include/QtWebKitWidgets/headers.pri +index 9d386e29..2b8b095c 100644 +--- a/include/QtWebKitWidgets/headers.pri ++++ b/include/QtWebKitWidgets/headers.pri @@ -1,5 +1,4 @@ -SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets -SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion @@ -29,3 +44,6 @@ diff -Nurd qtwebkit-opensource-src-5.9.1.orig/include/QtWebKitWidgets/headers.pr SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h SYNCQT.INJECTED_PRIVATE_HEADER_FILES = SYNCQT.QPA_HEADER_FILES = +-- +2.25.0 +