Date: Wed, 10 Oct 2012 16:18:43 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1069 - in trunk/www/firefox-nightly: . files Message-ID: <201210101618.q9AGIhor047345@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Oct 10 16:18:43 2012
New Revision: 1069
Log:
update Nightly
Added:
trunk/www/firefox-nightly/files/patch-bug798354
Modified:
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug722975
trunk/www/firefox-nightly/files/patch-bug732340
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Wed Oct 10 04:21:28 2012 (r1068)
+++ trunk/www/firefox-nightly/Makefile Wed Oct 10 16:18:43 2012 (r1069)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-PORTVERSION= 18.0.${HGREV:C/:.*//}
+PORTVERSION= 19.0.${HGREV:C/:.*//}
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= http://hg.mozilla.org/mozilla-central/archive/
@@ -51,12 +51,8 @@
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--enable-application=browser
-OPTIONS_DEFAULT=GIO GSTREAMER
OPTIONS_DEFINE= GSTREAMER PGO
-
-.if ${USE_MOZILLA:M-nss}
-OBJDIR_BUILD= yes
-.endif
+OPTIONS_DEFAULT=GIO GSTREAMER
.include "${.CURDIR}/../../www/firefox/Makefile.options"
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 10 04:21:28 2012 (r1068)
+++ trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 10 16:18:43 2012 (r1069)
@@ -1 +1 @@
-HGREV= 108704:4a7836f11aa7
+HGREV= 109786:ec10630b1a54
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Wed Oct 10 04:21:28 2012 (r1068)
+++ trunk/www/firefox-nightly/distinfo Wed Oct 10 16:18:43 2012 (r1069)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/4a7836f11aa7.tar.bz2) = 0b708abb61997c773b6168337cf67e28c41e64659971ceba19fb4dfa6de623a7
-SIZE (firefox-nightly/4a7836f11aa7.tar.bz2) = 92561724
+SHA256 (firefox-nightly/ec10630b1a54.tar.bz2) = 7aadb7b3569d86424a1ed78735356269dda07237467fe3c930aa01d7c9aa8355
+SIZE (firefox-nightly/ec10630b1a54.tar.bz2) = 94703770
Modified: trunk/www/firefox-nightly/files/patch-bug722975
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug722975 Wed Oct 10 04:21:28 2012 (r1068)
+++ trunk/www/firefox-nightly/files/patch-bug722975 Wed Oct 10 16:18:43 2012 (r1069)
@@ -7,13 +7,13 @@
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
--- gfx/thebes/gfxPlatform.cpp
+++ gfx/thebes/gfxPlatform.cpp
-@@ -484,21 +484,19 @@ gfxPlatform::CreateDrawTargetForSurface(
+@@ -502,21 +502,19 @@ struct SourceSurfaceUserData
+ BackendType mBackendType;
+ };
- cairo_user_data_key_t kSourceSurface;
-
- void SourceBufferDestroy(void *srcBuffer)
+ void SourceBufferDestroy(void *srcSurfUD)
{
- static_cast<SourceSurface*>(srcBuffer)->Release();
+ delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
}
-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -31,7 +31,7 @@
{
void *userData = aSurface->GetData(&kSourceSurface);
-@@ -588,24 +586,19 @@ gfxPlatform::GetSourceSurfaceForSurface(
+@@ -621,24 +619,19 @@ gfxPlatform::GetSourceSurfaceForSurface(
}
srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(),
@@ -53,9 +53,9 @@
+ SourceSnapshotDetached, imgSurface.get());
}
- srcBuffer->AddRef();
- aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
+ SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
+ srcSurfUD->mBackendType = aTarget->GetType();
+ srcSurfUD->mSrcSurface = srcBuffer;
+ aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy);
return srcBuffer;
- }
-
Modified: trunk/www/firefox-nightly/files/patch-bug732340
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug732340 Wed Oct 10 04:21:28 2012 (r1068)
+++ trunk/www/firefox-nightly/files/patch-bug732340 Wed Oct 10 16:18:43 2012 (r1069)
@@ -1,13 +1,14 @@
--- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400
+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400
-@@ -484,3 +484,10 @@ hb_ot_layout_position_finish (hb_font_t
+@@ -496,3 +497,11 @@ hb_ot_layout_position_finish (hb_font_t
{
- GPOS::position_finish (font, buffer, zero_width_attached_marks);
+ OT::GPOS::position_finish (font, buffer, zero_width_attached_marks);
}
+
+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++template int OT::SortedArrayOf<OT::Record<OT::LangSys> >::search<unsigned int>(unsigned int const &) const;
++template int OT::SortedArrayOf<OT::Record<OT::Script> >::search<unsigned int>(unsigned int const &) const;
++template int OT::SortedArrayOf<OT::IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
++template int OT::SortedArrayOf<OT::RangeRecord
++ >::search<unsigned int>(unsigned int const &) const;
+#endif
Added: trunk/www/firefox-nightly/files/patch-bug798354
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug798354 Wed Oct 10 16:18:43 2012 (r1069)
@@ -0,0 +1,15 @@
+--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
++++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
+ }
+
+ //------------------------------------------------------------------------------
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++sockaddr_un sizecheck;
++const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
++#else
+ const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
++#endif
+
+ // Creates a Fifo with the specified name ready to listen on.
+ bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210101618.q9AGIhor047345>