Title: [186861] trunk/Source/WebKit2
- Revision
- 186861
- Author
- [email protected]
- Date
- 2015-07-15 14:46:07 -0700 (Wed, 15 Jul 2015)
Log Message
[GTK] Rename PACKAGE_LOCALE_DIR to LOCALEDIR
https://bugs.webkit.org/show_bug.cgi?id=146975
Reviewed by Martin Robinson.
* PlatformGTK.cmake:
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_class_init):
* WebProcess/gtk/WebProcessMainGtk.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186860 => 186861)
--- trunk/Source/WebKit2/ChangeLog 2015-07-15 21:41:08 UTC (rev 186860)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-15 21:46:07 UTC (rev 186861)
@@ -1,5 +1,17 @@
2015-07-15 Michael Catanzaro <[email protected]>
+ [GTK] Rename PACKAGE_LOCALE_DIR to LOCALEDIR
+ https://bugs.webkit.org/show_bug.cgi?id=146975
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake:
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkit_web_context_class_init):
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+
+2015-07-15 Michael Catanzaro <[email protected]>
+
[GTK] Rename LIBEXECDIR to PKGLIBEXECDIR
https://bugs.webkit.org/show_bug.cgi?id=140070
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (186860 => 186861)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-15 21:41:08 UTC (rev 186860)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-07-15 21:46:07 UTC (rev 186861)
@@ -16,7 +16,7 @@
add_definitions(-DBUILDING_WEBKIT)
add_definitions(-DWEBKIT2_COMPILATION)
add_definitions(-DPKGLIBEXECDIR="${LIBEXEC_INSTALL_DIR}")
-add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
+add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
set(WebKit2_USE_PREFIX_HEADER ON)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (186860 => 186861)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-07-15 21:41:08 UTC (rev 186860)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-07-15 21:46:07 UTC (rev 186861)
@@ -339,7 +339,7 @@
{
GObjectClass* gObjectClass = G_OBJECT_CLASS(webContextClass);
- bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
gObjectClass->get_property = webkitWebContextGetProperty;
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (186860 => 186861)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2015-07-15 21:41:08 UTC (rev 186860)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2015-07-15 21:46:07 UTC (rev 186861)
@@ -56,7 +56,7 @@
#endif
gtk_init(nullptr, nullptr);
- bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
SoupNetworkSession::defaultSession().setSSLPolicy(SoupNetworkSession::SSLUseSystemCAFile);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
