From owner-svn-ports-head@freebsd.org Thu Nov 26 12:13:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17206A39A0F; Thu, 26 Nov 2015 12:13:52 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B455C1975; Thu, 26 Nov 2015 12:13:51 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQCDopQ097864; Thu, 26 Nov 2015 12:13:50 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQCDoum097863; Thu, 26 Nov 2015 12:13:50 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201511261213.tAQCDoum097863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 26 Nov 2015 12:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402440 - head/www/webkit2-gtk3/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2015 12:13:52 -0000 Author: rakuco Date: Thu Nov 26 12:13:50 2015 New Revision: 402440 URL: https://svnweb.freebsd.org/changeset/ports/402440 Log: Add upstream commit to fix the build with CMake 3.4.0. In preparation for PR 204629, import an upstream SVN commit that explicitly includes the CheckIncludeFiles module. No need to bump PORTREVISION. Approved by: gnome@ (kwm) Added: head/www/webkit2-gtk3/files/patch-bug150117 (contents, props changed) Added: head/www/webkit2-gtk3/files/patch-bug150117 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit2-gtk3/files/patch-bug150117 Thu Nov 26 12:13:50 2015 (r402440) @@ -0,0 +1,39 @@ +Fixes the build with CMake 3.4.0. + +------------------------------------------------------------------------ +r191042 | commit-queue@webkit.org | 2015-10-14 12:57:49 +0200 (Wed, 14 Oct 2015) | 12 lines + +[GTK][EFL] Fix build with cmake 3.4 +https://bugs.webkit.org/show_bug.cgi?id=150117 + +Explicitely include the CheckIncludeFiles module before using +the CHECK_INCLUDE_FILES command. + +Patch by Tomas Popela on 2015-10-14 +Reviewed by Žan Doberšek. + +* Source/cmake/FindOpenGL.cmake: +* Source/cmake/FindWebP.cmake: +* Source/cmake/OptionsEfl.cmake: +------------------------------------------------------------------------ + +Index: /trunk/Source/cmake/FindOpenGL.cmake +=================================================================== +--- Source/cmake/FindOpenGL.cmake (revision 191041) ++++ Source/cmake/FindOpenGL.cmake (revision 191042) +@@ -60,4 +60,5 @@ + CMAKE_PUSH_CHECK_STATE() + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS}) ++ include(CheckIncludeFiles) + check_include_files("GL/glx.h" GLX_FOUND) + CMAKE_POP_CHECK_STATE() +Index: /trunk/Source/cmake/FindWebP.cmake +=================================================================== +--- Source/cmake/FindWebP.cmake (revision 191041) ++++ Source/cmake/FindWebP.cmake (revision 191042) +@@ -36,4 +36,5 @@ + # Older installations of libwebp do not install a pkgconfig file, so we fall + # back to a manual search for a libwebp header file. ++ include(CheckIncludeFiles) + check_include_files("webp/decode.h" WEBP_FOUND_HEADER) + if (WEBP_FOUND_HEADER)