pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/seamonkey Add gtk3 (cairo-gtk3) option for seamonkey.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/356c1afc429e
branches:  trunk
changeset: 358386:356c1afc429e
user:      abs <abs%pkgsrc.org@localhost>
date:      Sat Feb 11 12:12:25 2017 +0000

description:
Add gtk3 (cairo-gtk3) option for seamonkey.
Default build is unchanged with gtk2 (cairo-gtk2)

diffstat:

 www/seamonkey/Makefile   |   5 +++--
 www/seamonkey/PLIST      |   4 +++-
 www/seamonkey/options.mk |  20 +++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diffs (86 lines):

diff -r 1cacc3e09d80 -r 356c1afc429e www/seamonkey/Makefile
--- a/www/seamonkey/Makefile    Sat Feb 11 12:12:02 2017 +0000
+++ b/www/seamonkey/Makefile    Sat Feb 11 12:12:25 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2017/02/06 13:56:06 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2017/02/11 12:12:25 abs Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
@@ -21,8 +21,9 @@
 NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey
 NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey-bin
 
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 .include "../../www/firefox/mozilla-common.mk"
-.include "options.mk"
 
 # Workaround to fix pixman.h detection
 CFLAGS+=       -I${BUILDLINK_PREFIX.pixman}/include/pixman-1
diff -r 1cacc3e09d80 -r 356c1afc429e www/seamonkey/PLIST
--- a/www/seamonkey/PLIST       Sat Feb 11 12:12:02 2017 +0000
+++ b/www/seamonkey/PLIST       Sat Feb 11 12:12:25 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2017/01/01 16:14:07 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.57 2017/02/11 12:12:25 abs Exp $
 bin/seamonkey
 lib/seamonkey/application.ini
 lib/seamonkey/blocklist.xml
@@ -4406,6 +4406,7 @@
 lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 lib/seamonkey/greprefs.js
+${PLIST.gtk3}lib/seamonkey/gtk2/libmozgtk.so
 lib/seamonkey/hyphenation/hyph_af.dic
 lib/seamonkey/hyphenation/hyph_bg.dic
 lib/seamonkey/hyphenation/hyph_ca.dic
@@ -4452,6 +4453,7 @@
 lib/seamonkey/libldap60.so
 lib/seamonkey/libldif60.so
 lib/seamonkey/liblgpllibs.so
+${PLIST.gtk3}lib/seamonkey/libmozgtk.so
 lib/seamonkey/libmozsqlite3.so
 lib/seamonkey/libprldap60.so
 lib/seamonkey/libxul.so
diff -r 1cacc3e09d80 -r 356c1afc429e www/seamonkey/options.mk
--- a/www/seamonkey/options.mk  Sat Feb 11 12:12:02 2017 +0000
+++ b/www/seamonkey/options.mk  Sat Feb 11 12:12:25 2017 +0000
@@ -1,11 +1,16 @@
-# $NetBSD: options.mk,v 1.34 2017/01/01 16:14:07 ryoon Exp $
+# $NetBSD: options.mk,v 1.35 2017/02/11 12:12:25 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.seamonkey
+
+PKG_OPTIONS_REQUIRED_GROUPS=   gtk
+PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
 PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc
 PKG_SUPPORTED_OPTIONS+=        mozilla-lightning webrtc mozilla-chatzilla pulseaudio
 
 PLIST_VARS+=   debug gnome jemalloc
 
+PKG_SUGGESTED_OPTIONS= gtk2
+
 PKG_SUGGESTED_OPTIONS.Linux+=  mozilla-jemalloc
 PKG_SUGGESTED_OPTIONS.SunOS+=  mozilla-jemalloc
 
@@ -22,6 +27,19 @@
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           gtk3
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST.gtk3=            no
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
+.include "../../x11/gtk3/buildlink3.mk"
+PLIST.gtk3=            yes
+.endif
+
 .if !empty(PKG_OPTIONS:Malsa)
 CONFIGURE_ARGS+=       --enable-alsa
 .include "../../audio/alsa-lib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index