Hi,

so 41 is now in, time to move on to 42b1 and enable gtk3 by default -
running fine here on amd64.

You'll need the attached mozilla.port.mk diff to be able to build it
(and as you can see there, thunderbird beta will also move to gtk3)

I'm *not* planning on adding a 'gtk2' flavor, unless there's strong
support for this, and some reasoning that makes sense.

As usual:
http://cgit.rhaalovely.net/mozilla-firefox/?h=beta
git clone -b beta http://git.rhaalovely.net/git/mozilla-firefox

No packages yet since i havent built against the latest glib/gtk that
was recently commited...

And as always, would appreciate feedback :)

Landry
Index: mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
retrieving revision 1.78
diff -u -r1.78 mozilla.port.mk
--- mozilla.port.mk     24 Sep 2015 20:18:12 -0000      1.78
+++ mozilla.port.mk     25 Sep 2015 09:37:19 -0000
@@ -101,9 +101,9 @@
                --disable-dbus
 
 FLAVORS +=     debug
-.if ${PKGPATH} == "www/mozilla-firefox"
-FLAVORS += gtk3
-.endif
+#.if ${PKGPATH} == "www/mozilla-firefox"
+#FLAVORS += gtk3
+#.endif
 FLAVOR ?=
 
 .if ${FLAVOR:Mdebug}
@@ -114,10 +114,11 @@
 INSTALL_STRIP =
 .endif
 
-.if ${FLAVOR:Mgtk3}
+.if ${PKGPATH} == "www/mozilla-firefox" \
+       || (${MOZILLA_PROJECT} == "thunderbird" && ${MOZILLA_BRANCH} == "beta")
 # https://bugzilla.mozilla.org/show_bug.cgi?id=983843
 CONFIGURE_ARGS +=      --with-system-cairo
-CONFIGURE_ARGS +=      --enable-default-toolkit=cairo-gtk3
+#CONFIGURE_ARGS +=     --enable-default-toolkit=cairo-gtk3
 MODMOZ_LIB_DEPENDS +=  x11/gtk+3
 MODMOZ_WANTLIB +=      cairo-gobject gdk-3 gtk-3 pixman-1 pthread-stubs
 .else
@@ -131,8 +132,9 @@
 # from browser/config/mozconfig
 CONFIGURE_ARGS +=--enable-application=${MOZILLA_CODENAME}
 
-.if ${MOZILLA_PROJECT} == "firefox" || \
-       ${MOZILLA_PROJECT} == "xulrunner"
+.if ${MOZILLA_PROJECT} == "firefox" || (${MOZILLA_PROJECT} == "thunderbird" && 
${MOZILLA_BRANCH} == "beta")
+WRKDIST ?=     ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}
+.elif ${MOZILLA_PROJECT} == "xulrunner"
 WRKDIST ?=     ${WRKDIR}/mozilla-${MOZILLA_BRANCH}
 .else
 WRKDIST ?=     ${WRKDIR}/comm-${MOZILLA_BRANCH}

Reply via email to