Unreviewed. Fix the build after r214338.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Mar 2017 08:26:05 +0000 (08:26 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Mar 2017 08:26:05 +0000 (08:26 +0000)
Add missing files I forgot to git add again.

* xdgmime/CMakeLists.txt: Added.
* xdgmime/README: Added.
* xdgmime/README.webkit: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@214339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ChangeLog
Source/ThirdParty/xdgmime/CMakeLists.txt [new file with mode: 0644]
Source/ThirdParty/xdgmime/README [new file with mode: 0644]
Source/ThirdParty/xdgmime/README.webkit [new file with mode: 0644]

index 8622315472036c45d580c4efbc26d459027c7d24..ee49b412ee2bfbf6324d85828d96ef8745247550 100644 (file)
@@ -1,3 +1,13 @@
+2017-03-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix the build after r214338.
+
+        Add missing files I forgot to git add again.
+
+        * xdgmime/CMakeLists.txt: Added.
+        * xdgmime/README: Added.
+        * xdgmime/README.webkit: Added.
+
 2017-03-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Add MIMETypeRegistry implementation using xdgmime and remove the GTK+ one
diff --git a/Source/ThirdParty/xdgmime/CMakeLists.txt b/Source/ThirdParty/xdgmime/CMakeLists.txt
new file mode 100644 (file)
index 0000000..030ec9a
--- /dev/null
@@ -0,0 +1,26 @@
+set(XDGMIME_DIR "${THIRDPARTY_DIR}/xdgmime")
+
+set(XDGMIME_INCLUDE_DIRECTORIES
+    "${XDGMIME_DIR}/src"
+    "${CMAKE_BINARY_DIR}"
+)
+
+set(XDGMIME_SOURCES
+    ${XDGMIME_DIR}/src/xdgmimealias.c
+    ${XDGMIME_DIR}/src/xdgmime.c
+    ${XDGMIME_DIR}/src/xdgmimeicon.c
+    ${XDGMIME_DIR}/src/xdgmimeint.c
+    ${XDGMIME_DIR}/src/xdgmimemagic.c
+    ${XDGMIME_DIR}/src/xdgmimeparent.c
+    ${XDGMIME_DIR}/src/xdgmimecache.c
+    ${XDGMIME_DIR}/src/xdgmimeglob.c
+)
+
+include_directories("${XDGMIME_INCLUDE_DIRECTORIES}")
+add_definitions(-DXDG_PREFIX=_wk_xdg)
+add_library(xdgmime STATIC ${XDGMIME_SOURCES})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(xdgmime)
+
+if (COMPILER_IS_GCC_OR_CLANG)
+    ADD_TARGET_PROPERTIES(xdgmime COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
+endif ()
diff --git a/Source/ThirdParty/xdgmime/README b/Source/ThirdParty/xdgmime/README
new file mode 100644 (file)
index 0000000..e7f3f68
--- /dev/null
@@ -0,0 +1,8 @@
+This module is a simple module that parses the proposed MIME spec listed
+at http://freedesktop.org/.  It is currently targetted at version 0.12.
+There are no formal releases planned for this module, and it is not
+intended to be installed at this time.  Rather, it is meant to be used
+by other libraries or applications to add support for the MIME system.
+
+It is dual-licensed under the terms of the GNU Lesser General Public
+License, and the Academic Free License, version 2.0.
diff --git a/Source/ThirdParty/xdgmime/README.webkit b/Source/ThirdParty/xdgmime/README.webkit
new file mode 100644 (file)
index 0000000..8b494ed
--- /dev/null
@@ -0,0 +1,18 @@
+This xdgmime from
+https://cgit.freedesktop.org/xdg/xdgmime/
+
+xdgmime is the reference implementation of the Freedesktop.org MIME specification:
+https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/
+
+Current version is based on revision f69fd2528ec0ebdbe48983ad3eabd002de7ba2bd
+cloned from git://anongit.freedesktop.org/xdg/xdgmime.
+
+Changes for the WebKit project:
+
+ - Add xdg_mime_get_simple_globs
+ - s/^#include <config.h>/#include "cmakeconfig.h"/g
+
+Changes included from GLib sources:
+
+ - 2542b6f60492fadfb21f2c4a29976c3494c7e6c5 xdgmime: Handle EINTR in open()
+ - 83d34f630939aa13539e03895bef87da738c4127 Don't forget to free resources in an early return