Fix EFL jhbuild module build on Ubuntu 15.10
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 10:22:57 +0000 (10:22 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 10:22:57 +0000 (10:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150621

Reviewed by Gyuyoung Kim.

* efl/jhbuild.modules:
* efl/patches/efl-remove-XPrint.patch: Added.

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

Tools/ChangeLog
Tools/efl/jhbuild.modules
Tools/efl/patches/efl-remove-XPrint.patch [new file with mode: 0644]

index a71db77fa6e06c7460162790ab16cb2c177072bd..feb4bd6570f0f3f7cfeac722dc2dcd3ab2e4e8aa 100644 (file)
@@ -1,3 +1,13 @@
+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.
+
 2015-11-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GLIB] Remove delete on destroy GMainLoopSources
index c3e2238e6f638e733d705bdeb3c815fb8acf0a89..a2d27802a97c946758850566e5a0ec3728b0e984 100644 (file)
             repo="download.enlightenment.org"
             hash="sha256:2552e364e83b8b747ba6f6fcca699a025751a65407055faa9a2afce29d12b6f4">
       <patch file="ecore_remove_warnings.patch" strip="1"/>
+      <patch file="efl-remove-XPrint.patch" strip="1"/>
     </branch>
   </autotools>
 
diff --git a/Tools/efl/patches/efl-remove-XPrint.patch b/Tools/efl/patches/efl-remove-XPrint.patch
new file mode 100644 (file)
index 0000000..037a5d7
--- /dev/null
@@ -0,0 +1,77 @@
+--- 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