Hi,

another month, another round of betas, this time for 30.0. Note that the
next-next one will be 31.0 (obvious!) but also an ESR release, and
thunderbird will also see a release, so please test it too.

This time, and as a tech preview, some plumbing will be added to
mozilla.port.mk to allow building firefox against a gtk3 FLAVOR. While
this is not considered upstream ready for public use, lacks some
features wrt plugins, and still has some graphical bugs (see
https://bugzilla.mozilla.org/show_bug.cgi?id=983843 at least) basic
usage works fine so far here.

As usual, grab the port from here:
http://rhaalovely.net/cgit/mozilla-firefox/?h=beta
git clone -b beta http://rhaalovely.net/git/mozilla-firefox

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

(or git pull if you already have a clone)

- ppc is still broken as in 29, but a patch is in the works (see
https://bugzilla.mozilla.org/show_bug.cgi?id=961488).
- sparc64 build is broken but will be fixed in beta6 (see
https://bugzilla.mozilla.org/show_bug.cgi?id=1005449).
- i386 is untested as i still dont have a builder.
- amd64 Packages for ffx 30.0b5 are provided for both flavors:

$PKG_PATH=http://rhaalovely.net/stuff/amd64 sudo pkg_add firefox
Ambiguous: choose package for firefox
 a       0: <None>
         1: firefox-30.0beta5
         2: firefox-30.0beta5-gtk3

If you want to build the gtk3 flavor yourself, apply the attached
mozilla.port.mk diff, and build with FLAVOR=gtk3. If you try this and
encounter issues, get involved and file bugs UPSTREAM.

Landry
Index: mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
retrieving revision 1.69
diff -u -r1.69 mozilla.port.mk
--- mozilla.port.mk     29 Apr 2014 21:16:26 -0000      1.69
+++ mozilla.port.mk     18 May 2014 20:38:24 -0000
@@ -38,8 +38,7 @@
                        archivers/unzip \
                        archivers/zip>=2.3
 
-MODMOZ_LIB_DEPENDS =   x11/gtk+2 \
-                       textproc/hunspell \
+MODMOZ_LIB_DEPENDS =   textproc/hunspell \
                        devel/nspr>=4.10.3 \
                        security/nss>=3.16
 
@@ -51,10 +50,9 @@
 MODMOZ_BUILD_DEPENDS +=        devel/yasm
 .endif
 
-MODMOZ_WANTLIB +=      X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
-               Xinerama Xrandr Xrender Xt atk-1.0 c cairo \
-               fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 
\
-               gobject-2.0 gthread-2.0 gtk-x11-2.0 m \
+MODMOZ_WANTLIB +=      X11 Xext Xrender Xt atk-1.0 c cairo \
+               fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
+               gobject-2.0 gthread-2.0 m \
                nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
                plc4 plds4 pthread event kvm sqlite3>=27 \
                smime3 sndio nssutil3 ssl3 stdc++ z hunspell-1.3
@@ -100,6 +98,9 @@
                --disable-dbus
 
 FLAVORS +=     debug
+.if ${PKGPATH} == "www/mozilla-firefox"
+FLAVORS += gtk3
+.endif
 FLAVOR ?=
 
 .if ${FLAVOR:Mdebug}
@@ -108,6 +109,18 @@
                        --enable-debug-symbols=yes \
                        --disable-install-strip
 INSTALL_STRIP =
+.endif
+
+.if ${FLAVOR:Mgtk3}
+# https://bugzilla.mozilla.org/show_bug.cgi?id=983843
+CONFIGURE_ARGS +=      --with-system-cairo
+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
+MODMOZ_LIB_DEPENDS +=  x11/gtk+2
+MODMOZ_WANTLIB +=      Xcomposite Xcursor Xdamage Xfixes Xi Xinerama \
+                       Xrandr gdk-x11-2.0 gtk-x11-2.0
 .endif
 
 # from browser/config/mozconfig

Reply via email to