Diff
Modified: trunk/ChangeLog (165737 => 165738)
--- trunk/ChangeLog 2014-03-17 16:40:27 UTC (rev 165737)
+++ trunk/ChangeLog 2014-03-17 16:42:54 UTC (rev 165738)
@@ -1,5 +1,16 @@
2014-03-17 Martin Robinson <[email protected]>
+ [GTK][CMake] Credential storage is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=130149
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsGTK.cmake: Add an ENABLE_CREDENTIAL_STORAGE option to the configuration
+ and look libsecret when it's enabled.
+ * Source/cmakeconfig.h.cmake: Expose the ENABLE_CREDENTIAL_STORAGE option to the build.
+
+2014-03-17 Martin Robinson <[email protected]>
+
[GTK][CMake] Ensure that HAVE_GTK_UNIX_PRINTING is defined when appropriate
https://bugs.webkit.org/show_bug.cgi?id=130155
Modified: trunk/Source/WebCore/ChangeLog (165737 => 165738)
--- trunk/Source/WebCore/ChangeLog 2014-03-17 16:40:27 UTC (rev 165737)
+++ trunk/Source/WebCore/ChangeLog 2014-03-17 16:42:54 UTC (rev 165738)
@@ -1,3 +1,12 @@
+2014-03-17 Martin Robinson <[email protected]>
+
+ [GTK][CMake] Credential storage is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=130149
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Add the libsecret include directories and link line to the build.
+
2014-03-17 Zan Dobersek <[email protected]>
Unreviewed.
Modified: trunk/Source/WebCore/PlatformGTK.cmake (165737 => 165738)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-03-17 16:40:27 UTC (rev 165737)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-03-17 16:42:54 UTC (rev 165738)
@@ -304,6 +304,7 @@
${HARFBUZZ_LIBRARIES}
${ICU_LIBRARIES}
${JPEG_LIBRARIES}
+ ${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
@@ -329,6 +330,7 @@
${GUDEV_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
+ ${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
Added: trunk/Source/cmake/FindLibsecret.cmake (0 => 165738)
--- trunk/Source/cmake/FindLibsecret.cmake (rev 0)
+++ trunk/Source/cmake/FindLibsecret.cmake 2014-03-17 16:42:54 UTC (rev 165738)
@@ -0,0 +1,49 @@
+# - Try to find libsecret
+# Once done, this will define
+#
+# LIBSECRET_FOUND - system has libsecret
+# LIBSECRET_INCLUDE_DIRS - the libsecret include directories
+# LIBSECRET_LIBRARIES - link these to use libsecret
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
+# Copyright (C) 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(LIBSECRET libsecret-1)
+
+set(VERSION_OK TRUE)
+if (LIBSECRET_VERSION)
+ if (LIBSECRET_FIND_VERSION_EXACT)
+ if (NOT("${LIBSECRET_FIND_VERSION}" VERSION_EQUAL "${LIBSECRET_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${LIBSECRET_VERSION}" VERSION_LESS "${LIBSECRET_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSECRET DEFAULT_MSG LIBSECRET_INCLUDE_DIRS LIBSECRET_LIBRARIES VERSION_OK)
Modified: trunk/Source/cmake/OptionsGTK.cmake (165737 => 165738)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-17 16:40:27 UTC (rev 165737)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-17 16:42:54 UTC (rev 165738)
@@ -26,6 +26,7 @@
set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
set(USE_GTK2 OFF CACHE BOOL "Whether or not to use GTK+ 2. WebKit2 only supports GTK+ 3.")
+set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
# FIXME: We want to expose fewer options to downstream, but for now everything is public.
WEBKIT_OPTION_BEGIN()
@@ -219,6 +220,11 @@
set(HAVE_GTK_UNIX_PRINTING)
endif ()
+if (ENABLE_CREDENTIAL_STORAGE)
+ find_package(Libsecret)
+ set(ENABLE_CREDENTIAL_STORAGE 1)
+endif ()
+
# We don't use find_package for GLX because it is part of -lGL, unlike EGL.
find_package(OpenGL)
check_include_files("GL/glx.h" GLX_FOUND)
Modified: trunk/Source/cmakeconfig.h.cmake (165737 => 165738)
--- trunk/Source/cmakeconfig.h.cmake 2014-03-17 16:40:27 UTC (rev 165737)
+++ trunk/Source/cmakeconfig.h.cmake 2014-03-17 16:42:54 UTC (rev 165738)
@@ -12,6 +12,7 @@
#cmakedefine01 ENABLE_CANVAS_PROXY
#cmakedefine01 ENABLE_CHANNEL_MESSAGING
#cmakedefine01 ENABLE_CONTEXT_MENUS
+#cmakedefine01 ENABLE_CREDENTIAL_STORAGE
#cmakedefine01 ENABLE_CSP_NEXT
#cmakedefine01 ENABLE_CSS3_TEXT
#cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
