<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191882] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191882">191882</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-02 02:22:57 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix EFL jhbuild module build on Ubuntu 15.10
https://bugs.webkit.org/show_bug.cgi?id=150621
Reviewed by Gyuyoung Kim.
* efl/jhbuild.modules:
* efl/patches/efl-remove-XPrint.patch: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolseflpatcheseflremoveXPrintpatch">trunk/Tools/efl/patches/efl-remove-XPrint.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191881 => 191882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-02 09:33:28 UTC (rev 191881)
+++ trunk/Tools/ChangeLog 2015-11-02 10:22:57 UTC (rev 191882)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-02 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix EFL jhbuild module build on Ubuntu 15.10
+ https://bugs.webkit.org/show_bug.cgi?id=150621
+
+ Reviewed by Gyuyoung Kim.
+
+ * efl/jhbuild.modules:
+ * efl/patches/efl-remove-XPrint.patch: Added.
+
</ins><span class="cx"> 2015-11-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLIB] Remove delete on destroy GMainLoopSources
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (191881 => 191882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules 2015-11-02 09:33:28 UTC (rev 191881)
+++ trunk/Tools/efl/jhbuild.modules 2015-11-02 10:22:57 UTC (rev 191882)
</span><span class="lines">@@ -220,6 +220,7 @@
</span><span class="cx"> repo="download.enlightenment.org"
</span><span class="cx"> hash="sha256:2552e364e83b8b747ba6f6fcca699a025751a65407055faa9a2afce29d12b6f4">
</span><span class="cx"> <patch file="ecore_remove_warnings.patch" strip="1"/>
</span><ins>+ <patch file="efl-remove-XPrint.patch" strip="1"/>
</ins><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolseflpatcheseflremoveXPrintpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/efl/patches/efl-remove-XPrint.patch (0 => 191882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/efl-remove-XPrint.patch (rev 0)
+++ trunk/Tools/efl/patches/efl-remove-XPrint.patch 2015-11-02 10:22:57 UTC (rev 191882)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+--- a/configure
++++ b/configure
+@@ -50873,74 +50873,6 @@
+
+
+
+-
+-
+- SAVE_CFLAGS=$CFLAGS
+- CFLAGS="$CFLAGS $ECORE_X_XLIB_cflags"
+- ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Print.h" "ac_cv_header_X11_extensions_Print_h" " #include <X11/Xlib.h>
+-
+-"
+-if test "x$ac_cv_header_X11_extensions_Print_h" = xyes; then :
+-
+- SAVE_LIBS=$LIBS
+- LIBS="$LIBS $ECORE_X_XLIB_libs"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpQueryScreens in -lXp" >&5
+-$as_echo_n "checking for XpQueryScreens in -lXp... " >&6; }
+-if ${ac_cv_lib_Xp_XpQueryScreens+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lXp $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char XpQueryScreens ();
+-int
+-main ()
+-{
+-return XpQueryScreens ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_Xp_XpQueryScreens=yes
+-else
+- ac_cv_lib_Xp_XpQueryScreens=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpQueryScreens" >&5
+-$as_echo "$ac_cv_lib_Xp_XpQueryScreens" >&6; }
+-if test "x$ac_cv_lib_Xp_XpQueryScreens" = xyes; then :
+-
+-$as_echo "#define ECORE_XPRINT 1" >>confdefs.h
+-
+-else
+- as_fn_error $? "Missing support for X extension: Xprint" "$LINENO" 5
+-fi
+-
+- LIBS=$SAVE_LIBS
+-
+-else
+- as_fn_error $? "Missing X11/extensions/Print.h" "$LINENO" 5
+-fi
+-
+-
+- CFLAGS=$SAVE_CFLAGS
+-
+-ECORE_X_LIBS="${ECORE_X_LIBS} -lXp"
+-
+-
+-
+
+
+ SAVE_CFLAGS=$CFLAGS
</ins></span></pre>
</div>
</div>
</body>
</html>