<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/031f7825a2c7c9e7e52cd8367def7967db7ffa4c">https://github.com/macports/macports-ports/commit/031f7825a2c7c9e7e52cd8367def7967db7ffa4c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 031f7825a2c qtwebkit ports: fix patch phase
</span>031f7825a2c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 031f7825a2c7c9e7e52cd8367def7967db7ffa4c
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Aug 28 00:12:07 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qtwebkit ports: fix patch phase
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/phantomjs-qt/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt511/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt513/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt55/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt56/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt57/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt58/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
aqua/qt59/files/patch-qtwebkit_fix_page_shift.diff | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/files/patch-qtwebkit_fix_page_shift.diff b/aqua/phantomjs-qt/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt511/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt513/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt55/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt56/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt57/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt58/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/files/patch-qtwebkit_fix_page_shift.diff b/aqua/qt59/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 113b9df3175..5bd6d9e9483 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/files/patch-qtwebkit_fix_page_shift.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,8 +374,8 @@ Index: trunk/Source/WTF/wtf/FastMalloc.cpp
</span> {
+ ASSERT(kPageShift && kNumClasses && kPageSize);
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordRegionsContainingPointers = m_typeMask & MALLOC_PTR_REGION_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool recordAllocations = m_typeMask & MALLOC_PTR_IN_USE_RANGE_TYPE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(m_typeMask & (MALLOC_PTR_IN_USE_RANGE_TYPE | MALLOC_PTR_REGION_RANGE_TYPE))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_coalescedSpans.clear();
</span> @@ -4887,4 +4937,5 @@
int visit(void* ptr)
{
</pre><pre style='margin:0'>
</pre>