Date: Fri, 5 Sep 2014 13:18:15 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1686 - in branches/firefox32: Mk Mk/Uses www/libxul www/libxul/files Message-ID: <201409051318.s85DIFxD072659@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Sep 5 13:18:15 2014
New Revision: 1686
Log:
temporarily downgrade libxul to esr24 to unbreak build
Added:
branches/firefox32/www/libxul/files/patch-bug1046224
- copied unchanged from r1685, branches/firefox32/www/firefox-esr/files/patch-bug1046224
Replaced:
branches/firefox32/www/libxul/
- copied from r1641, trunk/www/libxul/
Modified:
branches/firefox32/Mk/Uses/gecko.mk
branches/firefox32/Mk/bsd.gecko.mk
branches/firefox32/www/libxul/Makefile
branches/firefox32/www/libxul/distinfo
Modified: branches/firefox32/Mk/Uses/gecko.mk
==============================================================================
--- branches/firefox32/Mk/Uses/gecko.mk Fri Sep 5 03:22:39 2014 (r1685)
+++ branches/firefox32/Mk/Uses/gecko.mk Fri Sep 5 13:18:15 2014 (r1686)
@@ -33,8 +33,8 @@
XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl
XPIDL_INCL?= `${GECKO_CONFIG} --idlflags`
-BUILD_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul
-RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul
+RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul
.elif ${_GECKO_ARGS:Mfirefox}
Modified: branches/firefox32/Mk/bsd.gecko.mk
==============================================================================
--- branches/firefox32/Mk/bsd.gecko.mk Fri Sep 5 03:22:39 2014 (r1685)
+++ branches/firefox32/Mk/bsd.gecko.mk Fri Sep 5 13:18:15 2014 (r1686)
@@ -254,7 +254,11 @@
USE_MOZILLA+= -cairo # ports/169343
USE_DISPLAY=yes # install
USE_GNOME+= pango
+. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey"
USE_QT5+= qmake_build buildtools_build gui network quick printsupport
+. else
+USE_QT4+= qmake_build moc_build rcc_build gui network opengl
+. endif
MOZ_EXPORT+= HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}"
.elif ${MOZ_TOOLKIT:Mcairo-gtk3}
USE_GNOME+= gtk30
@@ -283,8 +287,13 @@
.endif
.if ${PORT_OPTIONS:MGSTREAMER}
+. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey"
USE_GSTREAMER1?=good libav
MOZ_OPTIONS+= --enable-gstreamer=1.0
+. else
+USE_GSTREAMER?= good ffmpeg
+MOZ_OPTIONS+= --enable-gstreamer
+. endif
.else
MOZ_OPTIONS+= --disable-gstreamer
.endif
Modified: branches/firefox32/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Tue Jul 29 09:52:10 2014 (r1641)
+++ branches/firefox32/www/libxul/Makefile Fri Sep 5 13:18:15 2014 (r1686)
@@ -1,8 +1,8 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 339634 2014-01-13 21:00:02Z rene $
+# $FreeBSD: head/www/libxul/Makefile 363978 2014-08-04 09:11:25Z bapt $
PORTNAME= libxul
-DISTVERSION= 24.7.0
+DISTVERSION= 24.8.0
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build1/source/
@@ -30,7 +30,6 @@
CONFLICTS= libxul-1.9.*
USE_AUTOTOOLS= autoconf213:env
-USE_PYTHON_BUILD=2
WANT_GNOME= yes
USE_QT4= # empty
QT_NONSTANDARD= yes
Modified: branches/firefox32/www/libxul/distinfo
==============================================================================
--- trunk/www/libxul/distinfo Tue Jul 29 09:52:10 2014 (r1641)
+++ branches/firefox32/www/libxul/distinfo Fri Sep 5 13:18:15 2014 (r1686)
@@ -1,2 +1,2 @@
-SHA256 (firefox-24.7.0esr.source.tar.bz2) = 079b6021f153ba11658cefe41d467e25357cd78e84d3d66c6abcfecb5a00121f
-SIZE (firefox-24.7.0esr.source.tar.bz2) = 119967111
+SHA256 (firefox-24.8.0esr.source.tar.bz2) = d1247f58f898f2dcc0f21572ac0df6d27a3ed6b0a4c92f6d10ad377ac021c006
+SIZE (firefox-24.8.0esr.source.tar.bz2) = 119635865
Copied: branches/firefox32/www/libxul/files/patch-bug1046224 (from r1685, branches/firefox32/www/firefox-esr/files/patch-bug1046224)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox32/www/libxul/files/patch-bug1046224 Fri Sep 5 13:18:15 2014 (r1686, copy of r1685, branches/firefox32/www/firefox-esr/files/patch-bug1046224)
@@ -0,0 +1,26 @@
+diff --git configure.in configure.in
+index 1853029..559bd45 100644
+--- configure.in
++++ configure.in
+@@ -2651,7 +2651,7 @@ if test "$ac_cv_sockaddr_sa_len" = true ; then
+ AC_DEFINE(HAVE_SA_LEN)
+ fi
+
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+ [ --enable-dtrace build with dtrace support if available (default=no)],
+ [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
+diff --git js/src/configure.in js/src/configure.in
+index 134dfd3..682c1fb 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2153,7 +2153,7 @@ dnl Quota support
+ MOZ_CHECK_HEADERS(sys/quota.h)
+ MOZ_CHECK_HEADERS(linux/quota.h)
+
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+ [ --enable-dtrace build with dtrace support if available (default=no)],
+ [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409051318.s85DIFxD072659>