Date: Tue, 11 Apr 2017 21:39:47 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438318 - in head: Mk www/firefox Message-ID: <201704112139.v3BLdlHb057796@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <jakub_lach@mailplus.pl> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704112139.v3BLdlHb057796>