[SVN-Commit] r1474 - in trunk/www: firefox firefox-nightly seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Jan 31 08:44:11 2014
New Revision: 1474

Log:
temporarily disable system cairo over screen corruption with smoothScroll

The issue doesn't happen with cairo-1.12.16 or Xrender disabled via pref.

Reported by:	flo

Modified:
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Thu Jan 30 19:00:44 2014	(r1473)
+++ trunk/www/firefox-nightly/Makefile	Fri Jan 31 08:44:11 2014	(r1474)
@@ -16,12 +16,12 @@
 FETCH_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
 		nspr>=4.10.3:${PORTSDIR}/devel/nspr \
 		sqlite3>=3.8.2:${PORTSDIR}/databases/sqlite3 \
 		unzip:${PORTSDIR}/archivers/unzip
+#		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
 #		nss>=3.15.5:${PORTSDIR}/security/nss \
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
@@ -32,7 +32,7 @@
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-nss
+USE_MOZILLA=	-cairo -nss
 MOZILLA_NAME=	Firefox Nightly
 MOZILLA_SUFX=	-nightly
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Thu Jan 30 19:00:44 2014	(r1473)
+++ trunk/www/firefox/Makefile	Fri Jan 31 08:44:11 2014	(r1474)
@@ -16,9 +16,9 @@
 		nss>=3.15.4:${PORTSDIR}/security/nss \
 		sqlite3>=3.8.0.2:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+#		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
@@ -28,7 +28,7 @@
 USE_GECKO=	gecko
 CONFLICTS=	firefox-esr-24.* firefox-esr-17.* firefox-1[07].*
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-cairo
 MOZILLA_NAME=	Firefox
 
 WANT_GNOME=	yes

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Thu Jan 30 19:00:44 2014	(r1473)
+++ trunk/www/seamonkey/Makefile	Fri Jan 31 08:44:11 2014	(r1474)
@@ -18,6 +18,8 @@
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+#		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
+
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.6
@@ -43,7 +45,7 @@
 MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
 		--enable-application=suite
 
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-cairo
 MOZ_PKGCONFIG_FILES=
 
 NOT_FOR_ARCHS=	ia64