Attachment 243958 Details for Bug 140070 – Patch

[patch] Patch

0007-GTK-Rename-LIBEXECDIR-to-PKGLIBEXECDIR.patch (text/plain), 2.82 KB, created by Michael Catanzaro on 2015-01-04 20:18:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2015-01-04 20:18:54 PST

Size: 2.82 KB

patch

obsolete

>From 1d8bbfaee271c6b06005fe1eabd2fec37d4951e3 Mon Sep 17 00:00:00 2001
>From: Michael Catanzaro <mcatanzaro@igalia.com>
>Date: Tue, 30 Dec 2014 19:11:48 -0600
>Subject: [PATCH 7/7] [GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
>
>The path that's currently stored in LIBEXECDIR is one level lower than
>the real LIBEXECDIR, which we are going to need. Introduce PKGLIBEXECDIR
>so that we can use LIBEXECDIR for the real LIBEXECDIR in the future.
>---
> Source/WebKit2/ChangeLog                               | 15 +++++++++++++++
> Source/WebKit2/PlatformGTK.cmake                       |  2 +-
> Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp |  2 +-
> 3 files changed, 17 insertions(+), 2 deletions(-)
>
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 9ac65d8..7f57a13 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,20 @@
> 2015-01-04  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>+        [GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
>+        https://bugs.webkit.org/show_bug.cgi?id=140070
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The path that's currently stored in LIBEXECDIR is one level lower than
>+        the real LIBEXECDIR, which we are going to need. Introduce PKGLIBEXECDIR
>+        so that we can use LIBEXECDIR for the real LIBEXECDIR in the future.
>+
>+        * PlatformGTK.cmake:
>+        * Shared/gtk/ProcessExecutablePathGtk.cpp:
>+        (WebKit::findWebKitProcess):
>+
>+2015-01-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>         [Linux] SeccompBrokerClient should cache arbitrary file descriptors
>         https://bugs.webkit.org/show_bug.cgi?id=140068
> 
>diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
>index 52bdc55..b002d7e 100644
>--- a/Source/WebKit2/PlatformGTK.cmake
>+++ b/Source/WebKit2/PlatformGTK.cmake
>@@ -8,7 +8,7 @@ configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
> configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
> 
> add_definitions(-DWEBKIT2_COMPILATION)
>-add_definitions(-DLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
>+add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
> add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
> add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
> 
>diff --git a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp b/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>index e757cc2..bf99fe1 100644
>--- a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>+++ b/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>@@ -59,7 +59,7 @@ static String findWebKitProcess(const char* processName)
>             return processPath;
>     }
> 
>-    return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName);
>+    return pathByAppendingComponent(filenameToString(PKGLIBEXECDIR), processName);
> }
> 
> String executablePathOfWebProcess()
>-- 
>2.1.0
>

Actions: View | Formatted Diff | Diff

Attachments on bug 140070: 243958