diff options
| author | ryoon <ryoon@pkgsrc.org> | 2017-03-20 13:39:33 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2017-03-20 13:39:33 +0000 |
| commit | ceabc75f3c08d980644f6252ea88db9e5fbb6f54 (patch) | |
| tree | 027b94cd1f1097b231ff8e4c4306701d96c104bc | |
| parent | 47946dab2b0c5ddcf2b0281c40ebfc5e18501410 (diff) | |
| download | pkgsrc-ceabc75f3c08d980644f6252ea88db9e5fbb6f54.tar.gz | |
gtk2 is still required from gtk3 option. Fix configure
| -rw-r--r-- | www/firefox/options.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/www/firefox/options.mk b/www/firefox/options.mk index d58f71a14d6..51d4766edea 100644 --- a/www/firefox/options.mk +++ b/www/firefox/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.39 2017/03/20 10:54:46 szptvlfn Exp $ +# $NetBSD: options.mk,v 1.40 2017/03/20 13:39:33 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -31,7 +31,6 @@ PKG_SUGGESTED_OPTIONS.Linux+= webrtc PLIST_VARS+= gtk3 .if !empty(PKG_OPTIONS:Mgtk2) CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 -# gtk2 needed even if --enable-default-toolkit=cairo-gtk3 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 .include "../../x11/gtk2/buildlink3.mk" .endif @@ -39,6 +38,9 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 # As of firefox-51 gtk2 is still pulled in implicitly .if !empty(PKG_OPTIONS:Mgtk3) CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 +# gtk2 needed even if --enable-default-toolkit=cairo-gtk3 +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 +.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" PLIST.gtk3= yes .endif |