diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-04-12 05:39:47 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-04-12 05:39:47 +0800 |
| commit | 527c1314b26434ecf329afad2e565bfdf66ec071 (patch) | |
| tree | a1137142d0aeb1fc05f2a3a1c07a31d1f9951dd3 | |
| parent | 056142d8c36be63566b36cbc7e2e389f75a97e49 (diff) | |
| download | freebsd-ports-gnome-527c1314b26434ecf329afad2e565bfdf66ec071.tar.gz freebsd-ports-gnome-527c1314b26434ecf329afad2e565bfdf66ec071.tar.zst freebsd-ports-gnome-527c1314b26434ecf329afad2e565bfdf66ec071.zip | |
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)
| -rw-r--r-- | Mk/bsd.gecko.mk | 6 | ||||
| -rw-r--r-- | www/firefox/Makefile | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 7b50bc2703f5..378b0dd7b730 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -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} diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c85b529f4a67..3dc65c7270c4 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -45,14 +45,11 @@ MOZ_OPTIONS= --enable-application=browser \ --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} |