From owner-svn-ports-all@FreeBSD.ORG Mon Aug 18 19:07:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB274F3F; Mon, 18 Aug 2014 19:07:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A5BF139B6; Mon, 18 Aug 2014 19:07:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IJ7D0D038771; Mon, 18 Aug 2014 19:07:13 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7IJ7CrZ038764; Mon, 18 Aug 2014 19:07:12 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201408181907.s7IJ7CrZ038764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 18 Aug 2014 19:07:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365341 - in head/www/chromium: . 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 19:07:13 -0000 Author: rene Date: Mon Aug 18 19:07:11 2014 New Revision: 365341 URL: http://svnweb.freebsd.org/changeset/ports/365341 QAT: https://qat.redports.org/buildarchive/r365341/ Log: www/chromium: Enable build on FreeBSD < 10 and enable file chooser dialog [1]. - Spell out full path to /sbin/sysctl [2] - Build with OpenSSL from base to avoid a link conflict on FreeBSD < 10 - Fix build with libusb on FreeBSD < 10 [3] - Fix build with GCC 4.7 (for 8.4 / 9.1) - Bump PORTREVISION PR: 192742 [1] Submitted by: cmt@burggraben.net [1] Submitted by: J. R. Oldroyd [2] Submitted by: db@ [3] MFH: 2014Q3 Added: head/www/chromium/files/extra-patch-libusb-pc (contents, props changed) head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp (contents, props changed) head/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc (contents, props changed) Modified: head/www/chromium/Makefile head/www/chromium/files/chrome.in head/www/chromium/files/extra-patch-gcc head/www/chromium/files/patch-components__usb_service__usb_device_handle.cc Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Mon Aug 18 18:53:16 2014 (r365340) +++ head/www/chromium/Makefile Mon Aug 18 19:07:11 2014 (r365341) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 36.0.1985.143 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ - protoc:${PORTSDIR}/devel/protobuf \ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ @@ -43,6 +43,7 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ libminizip.so:${PORTSDIR}/archivers/minizip \ libnspr4.so:${PORTSDIR}/devel/nspr \ + libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ libre2.so:${PORTSDIR}/devel/re2 \ libsnappy.so:${PORTSDIR}/archivers/snappy \ @@ -63,8 +64,7 @@ CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt -USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes # simplify for pkg-config in configure phase +USE_OPENSSL= yes # must be from base to prevent a link failure against cups SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -166,6 +166,9 @@ GYP_DEFINES+= use_pulseaudio=0 GYP_DEFINES+= disable_sse2=1 .endif +.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc +.endif .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif @@ -188,13 +191,15 @@ CONFIGURE_ENV+= CC="${CC}" \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" -MAKE_ARGS+= -C out/${BUILDTYPE} .include +#XXX redefine MAKE_ARGS after bsd.port.pre.mk to avoid OPENSSL flags +# leaking in which confuses ninja +MAKE_ARGS= -C out/${BUILDTYPE} + .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} -CFLAGS+= -Wno-unknown-warning EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc .else GYP_DEFINES+= clang=1 Modified: head/www/chromium/files/chrome.in ============================================================================== --- head/www/chromium/files/chrome.in Mon Aug 18 18:53:16 2014 (r365340) +++ head/www/chromium/files/chrome.in Mon Aug 18 19:07:11 2014 (r365341) @@ -1,7 +1,7 @@ #!/bin/sh SYSCTL=kern.ipc.shm_allow_removed -if [ `sysctl -n $SYSCTL` = 0 ] ; then +if [ "`/sbin/sysctl -n $SYSCTL`" = 0 ] ; then cat << EOMSG For correct operation, shared memory support has to be enabled in Chromium by performing the following command as root : Modified: head/www/chromium/files/extra-patch-gcc ============================================================================== --- head/www/chromium/files/extra-patch-gcc Mon Aug 18 18:53:16 2014 (r365340) +++ head/www/chromium/files/extra-patch-gcc Mon Aug 18 19:07:11 2014 (r365341) @@ -86,3 +86,13 @@ #include "third_party/libjpeg_turbo/jpeglib.h" #else #include "third_party/libjpeg/jpeglib.h" +--- ui/gfx/codec/jpeg_codec.cc.orig 2014-08-12 21:02:29.000000000 +0200 ++++ ui/gfx/codec/jpeg_codec.cc 2014-08-17 19:32:18.000000000 +0200 +@@ -13,6 +13,7 @@ + + extern "C" { + #if defined(USE_SYSTEM_LIBJPEG) ++#include + #include + #elif defined(USE_LIBJPEG_TURBO) + #include "third_party/libjpeg_turbo/jpeglib.h" Added: head/www/chromium/files/extra-patch-libusb-pc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-libusb-pc Mon Aug 18 19:07:11 2014 (r365341) @@ -0,0 +1,20 @@ +--- build/linux/unbundle/libusb.gyp.orig 2014-08-12 21:02:52.000000000 +0200 ++++ build/linux/unbundle/libusb.gyp 2014-08-17 16:21:03.000000000 +0200 +@@ -18,14 +18,14 @@ + ], + 'direct_dependent_settings': { + 'cflags': [ +- 'CreateSelectFileDialog(listener, policy);