pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox gtk2 is still required from gtk3 option. F...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71bb26b9ce79
branches:  trunk
changeset: 359931:71bb26b9ce79
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Mar 20 13:39:33 2017 +0000

description:
gtk2 is still required from gtk3 option. Fix configure

diffstat:

 www/firefox/options.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r ea5987788ac9 -r 71bb26b9ce79 www/firefox/options.mk
--- a/www/firefox/options.mk    Mon Mar 20 13:39:30 2017 +0000
+++ b/www/firefox/options.mk    Mon Mar 20 13:39:33 2017 +0000
@@ -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 @@
 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 @@
 # 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



Home | Main Index | Thread Index | Old Index