Attachment 359486 Details for Bug 193575 – patch

[patch] patch

0001-patch.patch (text/plain), 3.19 KB, created by Philippe Normand on 2019-01-18 07:53:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2019-01-18 07:53:57 PST

Size: 3.19 KB

patch

obsolete

>From 465f381df853686a3cfeffceed5fccc6dd5f7370 Mon Sep 17 00:00:00 2001
>From: Philippe Normand <pnormand@igalia.com>
>Date: Fri, 18 Jan 2019 15:53:34 +0000
>Subject: [PATCH] patch
>
>---
> Tools/ChangeLog                      | 13 ++++++++
> Tools/Scripts/run-qt-wpe-minibrowser | 46 +++++++++++++---------------
> 2 files changed, 35 insertions(+), 24 deletions(-)
>
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ff6434e77e4..43f3c75037d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-18  Philippe Normand  <pnormand@igalia.com>
>+
>+        [WPE] run-qt-wpe-minibrowser needlessly expects a --wpe argument
>+        https://bugs.webkit.org/show_bug.cgi?id=193575
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Allow the script to run without explicit port argument because
>+        it's specific to the WPE port anyway.
>+
>+        * Scripts/run-qt-wpe-minibrowser: Manually insert --wpe in argv
>+        and simplify the rest of the code accordingly.
>+
> 2019-01-18  Philippe Normand  <pnormand@igalia.com>
> 
>         [Flatpak] Missing KeyboardInterrupt exception handler
>diff --git a/Tools/Scripts/run-qt-wpe-minibrowser b/Tools/Scripts/run-qt-wpe-minibrowser
>index 28e6c7f1728..aeacb483c2f 100755
>--- a/Tools/Scripts/run-qt-wpe-minibrowser
>+++ b/Tools/Scripts/run-qt-wpe-minibrowser
>@@ -25,36 +25,34 @@ use FindBin;
> use lib $FindBin::Bin;
> use webkitdirs;
> 
>+setConfiguration();
>+
>+if (!inFlatpakSandbox()) {
>+    push @ARGV, "--wpe";
>+}
>+
> my $launcherName;
> my $libPath;
> my $launcherPath;
> my @jhbuildWrapper;
>+my $configuration = passedConfiguration();
>+my $productDir = productDir();
> 
>-prohibitUnknownPort();
>-setConfiguration();
>-
>-if (isWPE()) {
>-    my $configuration = passedConfiguration();
>-    my $productDir = productDir();
>-    my $libPath;
>-    $libPath = "/app/webkit/WebKitBuild/$configuration/lib/qml" if $configuration;
>-    $ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
>-    runInFlatpakIfAvailable("/app/webkit/Tools/Scripts/run-qt-wpe-minibrowser");
>+$libPath = "/app/webkit/WebKitBuild/$configuration/lib/qml" if $configuration;
>+$ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
>+runInFlatpakIfAvailable("/app/webkit/Tools/Scripts/run-qt-wpe-minibrowser");
> 
>-    # Check to see that all the frameworks are built.
>-    checkFrameworks();
>+# Check to see that all the frameworks are built.
>+checkFrameworks();
> 
>-    if (!inFlatpakSandbox()) {
>-       $libPath = "$productDir/lib/qml" if $productDir;
>-       $ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
>-    }
>+if (!inFlatpakSandbox()) {
>+    $libPath = "$productDir/lib/qml" if $productDir;
>+    $ENV{"QML2_IMPORT_PATH"} = "$libPath" if $libPath;
>+}
> 
>-    $launcherPath = catdir($productDir, "bin", "qt-wpe-mini-browser");
>-    die "Can't find $launcherPath" unless -x $launcherPath;
>-    @jhbuildWrapper = wrapperPrefixIfNeeded();
>+$launcherPath = catdir($productDir, "bin", "qt-wpe-mini-browser");
>+die "Can't find $launcherPath" unless -x $launcherPath;
>+@jhbuildWrapper = wrapperPrefixIfNeeded();
> 
>-    print "Starting MiniBrowser.\n";
>-    exec @jhbuildWrapper, $launcherPath, @ARGV or die;
>-} else {
>-    die "Unsupported platform."
>-}
>+print "Starting MiniBrowser.\n";
>+exec @jhbuildWrapper, $launcherPath, @ARGV or die;
>-- 
>2.20.1
>

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193575: 359486