From owner-svn-ports-head@freebsd.org Tue Apr 11 21:39:48 2017 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 9D3A6D3A44D; Tue, 11 Apr 2017 21:39:48 +0000 (UTC) (envelope-from jbeich@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 56F62311; Tue, 11 Apr 2017 21:39:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3BLdlmP057798; Tue, 11 Apr 2017 21:39:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3BLdlHb057796; Tue, 11 Apr 2017 21:39:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201704112139.v3BLdlHb057796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 11 Apr 2017 21:39:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438318 - in head: Mk www/firefox 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.23 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: Tue, 11 Apr 2017 21:39:48 -0000 Author: jbeich Date: Tue Apr 11 21:39:47 2017 New Revision: 438318 URL: https://svnweb.freebsd.org/changeset/ports/438318 Log: www/firefox: drop broken GTK2 option following upstream https://www.mail-archive.com/dev-platform@lists.mozilla.org/msg20523.html PR: 218569 Reported by: Walter Schwarzenfeld, Jakub Lach Submitted by: rezny (based on) MFH: 2017Q2 (r436907 followup) Modified: head/Mk/bsd.gecko.mk (contents, props changed) head/www/firefox/Makefile (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Apr 11 21:36:08 2017 (r438317) +++ head/Mk/bsd.gecko.mk Tue Apr 11 21:39:47 2017 (r438318) @@ -249,7 +249,7 @@ BUILD_DEPENDS+= ${-${dep}_BUILD_DEPENDS} # Standard options MOZ_CHROME?= omni -MOZ_TOOLKIT?= cairo-gtk2 +MOZ_TOOLKIT?= cairo-gtk3 MOZ_CHANNEL?= ${PKGNAMESUFFIX:Urelease:S/^-//} MOZ_OPTIONS+= \ --enable-chrome-format=${MOZ_CHROME} \ @@ -278,8 +278,8 @@ MOZ_OPTIONS+= --with-system-zlib \ # please get your own set of keys. MOZ_EXPORT+= MOZ_GOOGLE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 -.if ${PORT_OPTIONS:MGTK3} -MOZ_TOOLKIT= cairo-gtk3 +.if ${PORT_OPTIONS:MGTK2} +MOZ_TOOLKIT= cairo-gtk2 .endif .if ${MOZ_TOOLKIT:Mcairo-gtk3} Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Apr 11 21:36:08 2017 (r438317) +++ head/www/firefox/Makefile Tue Apr 11 21:39:47 2017 (r438318) @@ -45,14 +45,11 @@ MOZ_OPTIONS= --enable-application=browse --enable-official-branding OPTIONS_DEFINE= RUST -OPTIONS_DEFAULT= BUNDLED_CAIRO GTK3 +OPTIONS_DEFAULT= BUNDLED_CAIRO # XXX lang/rust and devel/cargo currently build only on these platforms OPTIONS_DEFAULT_amd64= RUST OPTIONS_DEFAULT_i386= RUST -OPTIONS_SINGLE+= TOOLKIT -OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 - .include "${.CURDIR}/../../www/firefox/Makefile.options" WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}