From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q21Xt-0006d9-JV for garchives@archives.gentoo.org; Tue, 22 Mar 2011 13:22:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EB521C028; Tue, 22 Mar 2011 13:22:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BFC9A1C028 for ; Tue, 22 Mar 2011 13:22:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F241F1B4050 for ; Tue, 22 Mar 2011 13:22:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 63AA38006A for ; Tue, 22 Mar 2011 13:22:40 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <221108b698e93702d5a851ff311a858a24b9477a.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v1.patch net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v2.patch net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 221108b698e93702d5a851ff311a858a24b9477a Date: Tue, 22 Mar 2011 13:22:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e7c1fe01c461609d8691b229c181005a commit: 221108b698e93702d5a851ff311a858a24b9477a Author: Priit Laes plaes org> AuthorDate: Tue Mar 22 13:22:08 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Mar 22 13:22:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D221108b6 net-libs/webkit-gtk: Bump to 1.3.13 --- .../files/webkit-gtk-1.3.12-utf-decode-v1.patch | 392 --------------= ------ .../files/webkit-gtk-1.3.12-utf-decode-v2.patch | 44 --- ...2-r200.ebuild =3D> webkit-gtk-1.3.13-r200.ebuild} | 3 - ...k-1.3.12-r1.ebuild =3D> webkit-gtk-1.3.13.ebuild} | 3 - 4 files changed, 0 insertions(+), 442 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v1.pa= tch b/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v1.patch deleted file mode 100644 index ea1a961..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v1.patch +++ /dev/null @@ -1,392 +0,0 @@ -commit a4853e0b12ad2305ba7c3593a08f7f366dee5eaf -Author: darin@apple.com -Date: Wed Feb 23 20:00:25 2011 +0000 - - 2011-02-23 Darin Adler - =20 - Reviewed by Alexey Proskuryakov. - =20 - REGRESSION (new UTF-8 decoder): Reproducible crash on alltom= mac.se - https://bugs.webkit.org/show_bug.cgi?id=3D54862 - =20 - Correct handling of end of buffer partial sequence in UTF-8 = and UTF-16 decoders when flushing with zero length - https://bugs.webkit.org/show_bug.cgi?id=3D54444 - =20 - No new tests at this time. I will add some tests later, but = since multiple - people are hitting this I wanted to get it in as quickly as = possible. - =20 - * platform/text/TextCodecUTF16.cpp: - (WebCore::TextCodecUTF16::decode): Tweaked coding style quit= e a bit. - Removed special case for zero length now that main code hand= les it - correctly. Used words instead of abbreviations for local var= iable names. - Added error handling for a trailing byte. - =20 - * platform/text/TextCodecUTF8.cpp: - (WebCore::TextCodecUTF8::consumePartialSequenceByte): Added.= Helper function - to make the handleError and handlePartialSequence functions = clearer. - (WebCore::TextCodecUTF8::handleError): Added. Helper functio= n to make the - handlePartialSequence clearer. - (WebCore::TextCodecUTF8::handlePartialSequence): Added. Fact= ored out code for - the partial sequence case. Making this a separate function p= robably helps make - the fast case a little faster. This new version handles more= cases correctly, - which is what fixes the crashes we were seeing. In particula= r, it no longer - assumes that the partial sequence is truly partial, because = there are cases - where we end up handling complete sequences here, such as wh= en a complete - sequence is inside a malformed partial sequence. - (WebCore::TextCodecUTF8::decode): Removed partial sequence c= ode and made this - call handlePartialSequence instead. Could be streamlined if = we double checked - that passing a reference to "destination" and "source" doesn= 't harm code - generation too much, so perhaps someone can do that research= on a few compilers - later and clean this up. Removed special case for zero lengt= h now that the - main code handles that correctly. - =20 - * platform/text/TextCodecUTF8.h: Added declarations for new = functions. - Made partial sequence buffer large enough to hold a whole se= quence so we can - use it to complete and decode a sequence in place. - =20 - =20 - git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79466 268f= 45cc-cd09-0410-ab3c-d52691b4dbfc - -diff --git a/Source/WebCore/platform/text/TextCodecUTF16.cpp b/Source/We= bCore/platform/text/TextCodecUTF16.cpp -index 4ceed23..f5dd59c 100644 ---- a/Source/WebCore/platform/text/TextCodecUTF16.cpp -+++ b/Source/WebCore/platform/text/TextCodecUTF16.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2004, 2006, 2008, 2010 Apple Inc. All rights reserved. -+ * Copyright (C) 2004, 2006, 2008, 2010, 2011 Apple Inc. All rights res= erved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -27,10 +27,12 @@ - #include "TextCodecUTF16.h" -=20 - #include "PlatformString.h" -+#include - #include - #include --#include -+#include -=20 -+using namespace WTF::Unicode; - using namespace std; -=20 - namespace WebCore { -@@ -52,12 +54,12 @@ void TextCodecUTF16::registerEncodingNames(EncodingN= ameRegistrar registrar) -=20 - static PassOwnPtr newStreamingTextDecoderUTF16LE(const TextE= ncoding&, const void*) - { -- return new TextCodecUTF16(true); -+ return adoptPtr(new TextCodecUTF16(true)); - } -=20 - static PassOwnPtr newStreamingTextDecoderUTF16BE(const TextE= ncoding&, const void*) - { -- return new TextCodecUTF16(false); -+ return adoptPtr(new TextCodecUTF16(false)); - } -=20 - void TextCodecUTF16::registerCodecs(TextCodecRegistrar registrar) -@@ -66,53 +68,56 @@ void TextCodecUTF16::registerCodecs(TextCodecRegistr= ar registrar) - registrar("UTF-16BE", newStreamingTextDecoderUTF16BE, 0); - } -=20 --String TextCodecUTF16::decode(const char* bytes, size_t length, bool, b= ool, bool&) -+String TextCodecUTF16::decode(const char* bytes, size_t length, bool fl= ush, bool stopOnError, bool& sawError) - { -- if (!length) -- return String(); -- -- // FIXME: This should generate an error if there is an unpaired sur= rogate. -+ // FIXME: This should buffer surrogates, not just single bytes, -+ // and should generate an error if there is an unpaired surrogate. -=20 -- const unsigned char* p =3D reinterpret_cast(b= ytes); -+ const uint8_t* source =3D reinterpret_cast(bytes); - size_t numBytes =3D length + m_haveBufferedByte; -- size_t numChars =3D numBytes / 2; -- -- StringBuffer buffer(numChars); -- UChar* q =3D buffer.characters(); -- -- if (m_haveBufferedByte) { -- UChar c; -- if (m_littleEndian) -- c =3D m_bufferedByte | (p[0] << 8); -- else -- c =3D (m_bufferedByte << 8) | p[0]; -- *q++ =3D c; -- m_haveBufferedByte =3D false; -- p +=3D 1; -- numChars -=3D 1; -- } -- -- if (m_littleEndian) { -- for (size_t i =3D 0; i < numChars; ++i) { -- UChar c =3D p[0] | (p[1] << 8); -- p +=3D 2; -- *q++ =3D c; -+ size_t numCharacters =3D numBytes / 2; -+ -+ StringBuffer buffer(numCharacters + (flush && (numBytes & 1))); -+ UChar* destination =3D buffer.characters(); -+ -+ if (length) { -+ if (m_haveBufferedByte) { -+ UChar character; -+ if (m_littleEndian) -+ *destination++ =3D m_bufferedByte | (source[0] << 8); -+ else -+ *destination++ =3D (m_bufferedByte << 8) | source[0]; -+ m_haveBufferedByte =3D false; -+ ++source; -+ --numCharacters; - } -- } else { -- for (size_t i =3D 0; i < numChars; ++i) { -- UChar c =3D (p[0] << 8) | p[1]; -- p +=3D 2; -- *q++ =3D c; -+ -+ if (m_littleEndian) { -+ for (size_t i =3D 0; i < numCharacters; ++i) { -+ *destination++ =3D source[0] | (source[1] << 8); -+ source +=3D 2; -+ } -+ } else { -+ for (size_t i =3D 0; i < numCharacters; ++i) { -+ *destination++ =3D (source[0] << 8) | source[1]; -+ source +=3D 2; -+ } - } - } -=20 - if (numBytes & 1) { -- ASSERT(!m_haveBufferedByte); -- m_haveBufferedByte =3D true; -- m_bufferedByte =3D p[0]; -+ if (flush) { -+ sawError =3D true; -+ if (!stopOnError) -+ *destination++ =3D replacementCharacter; -+ } else { -+ ASSERT(!m_haveBufferedByte); -+ m_haveBufferedByte =3D true; -+ m_bufferedByte =3D source[0]; -+ } - } -- -- buffer.shrink(q - buffer.characters()); -+ =20 -+ buffer.shrink(destination - buffer.characters()); -=20 - return String::adopt(buffer); - } -@@ -134,15 +139,15 @@ CString TextCodecUTF16::encode(const UChar* charac= ters, size_t length, Unencodab - // null characters inside it. Perhaps the result of encode should n= ot be a CString. - if (m_littleEndian) { - for (size_t i =3D 0; i < length; ++i) { -- UChar c =3D characters[i]; -- bytes[i * 2] =3D c; -- bytes[i * 2 + 1] =3D c >> 8; -+ UChar character =3D characters[i]; -+ bytes[i * 2] =3D character; -+ bytes[i * 2 + 1] =3D character >> 8; - } - } else { - for (size_t i =3D 0; i < length; ++i) { -- UChar c =3D characters[i]; -- bytes[i * 2] =3D c >> 8; -- bytes[i * 2 + 1] =3D c; -+ UChar character =3D characters[i]; -+ bytes[i * 2] =3D character >> 8; -+ bytes[i * 2 + 1] =3D character; - } - } -=20 -diff --git a/Source/WebCore/platform/text/TextCodecUTF8.cpp b/Source/Web= Core/platform/text/TextCodecUTF8.cpp -index 2466e8c..29426ad 100644 ---- a/Source/WebCore/platform/text/TextCodecUTF8.cpp -+++ b/Source/WebCore/platform/text/TextCodecUTF8.cpp -@@ -150,11 +150,71 @@ static inline UChar* appendCharacter(UChar* destin= ation, int character) - return destination; - } -=20 --String TextCodecUTF8::decode(const char* bytes, size_t length, bool flu= sh, bool stopOnError, bool& sawError) -+void TextCodecUTF8::consumePartialSequenceByte() - { -- if (!length) -- return String(); -+ --m_partialSequenceSize; -+ memmove(m_partialSequence, m_partialSequence + 1, m_partialSequence= Size); -+} -=20 -+void TextCodecUTF8::handleError(UChar*& destination, bool stopOnError, = bool& sawError) -+{ -+ sawError =3D true; -+ if (stopOnError) -+ return; -+ // Each error generates a replacement character and consumes one by= te. -+ *destination++ =3D replacementCharacter; -+ consumePartialSequenceByte(); -+} -+ -+void TextCodecUTF8::handlePartialSequence(UChar*& destination, const ui= nt8_t*& source, const uint8_t* end, bool flush, bool stopOnError, bool& s= awError) -+{ -+ ASSERT(m_partialSequenceSize); -+ do { -+ if (isASCII(m_partialSequence[0])) { -+ *destination++ =3D m_partialSequence[0]; -+ consumePartialSequenceByte(); -+ continue; -+ } -+ int count =3D nonASCIISequenceLength(m_partialSequence[0]); -+ if (!count) { -+ handleError(destination, stopOnError, sawError); -+ if (stopOnError) -+ return; -+ continue; -+ } -+ if (count > m_partialSequenceSize) { -+ if (count - m_partialSequenceSize > end - source) { -+ if (!flush) { -+ // The new data is not enough to complete the seque= nce, so -+ // add it to the existing partial sequence. -+ memcpy(m_partialSequence + m_partialSequenceSize, s= ource, end - source); -+ m_partialSequenceSize +=3D end - source; -+ return; -+ } -+ // An incomplete partial sequence at the end is an erro= r. -+ handleError(destination, stopOnError, sawError); -+ if (stopOnError) -+ return; -+ continue; -+ } -+ memcpy(m_partialSequence + m_partialSequenceSize, source, c= ount - m_partialSequenceSize); -+ source +=3D count - m_partialSequenceSize; -+ m_partialSequenceSize =3D count; -+ } -+ int character =3D decodeNonASCIISequence(m_partialSequence, cou= nt); -+ if (character =3D=3D nonCharacter) { -+ handleError(destination, stopOnError, sawError); -+ if (stopOnError) -+ return; -+ continue; -+ } -+ m_partialSequenceSize -=3D count; -+ destination =3D appendCharacter(destination, character); -+ } while (m_partialSequenceSize); -+} -+ -+String TextCodecUTF8::decode(const char* bytes, size_t length, bool flu= sh, bool stopOnError, bool& sawError) -+{ - // Each input byte might turn into a character. - // That includes all bytes in the partial-sequence buffer because - // each byte in an invalid sequence will turn into a replacement ch= aracter. -@@ -166,52 +226,19 @@ String TextCodecUTF8::decode(const char* bytes, si= ze_t length, bool flush, bool - UChar* destination =3D buffer.characters(); -=20 - do { -- while (m_partialSequenceSize) { -- int count =3D nonASCIISequenceLength(m_partialSequence[0]); -- ASSERT(count > m_partialSequenceSize); -- ASSERT(count >=3D 2); -- ASSERT(count <=3D 4); -- if (count - m_partialSequenceSize > end - source) { -- if (!flush) { -- // We have an incomplete partial sequence, so put i= t all in the partial -- // sequence buffer, and break out of this loop so w= e can exit the function. -- memcpy(m_partialSequence + m_partialSequenceSize, s= ource, end - source); -- m_partialSequenceSize +=3D end - source; -- source =3D end; -- break; -- } -- // We have an incomplete partial sequence at the end of= the buffer. -- // That is an error. -- sawError =3D true; -- if (stopOnError) { -- source =3D end; -- break; -- } -- // Each error consumes one byte and generates one repla= cement character. -- --m_partialSequenceSize; -- memmove(m_partialSequence, m_partialSequence + 1, m_par= tialSequenceSize); -- *destination++ =3D replacementCharacter; -- continue; -+ if (m_partialSequenceSize) { -+ // Explicitly copy destination and source to avoid taking a= pointer to them, -+ // which may harm code generation. -+ UChar* destinationForHandlePartialSequence =3D destination; -+ const uint8_t* sourceForHandlePartialSequence =3D source; -+ handlePartialSequence(destinationForHandlePartialSequence, = sourceForHandlePartialSequence, end, flush, stopOnError, sawError); -+ destination =3D destinationForHandlePartialSequence; -+ source =3D sourceForHandlePartialSequence; -+ if (m_partialSequenceSize) { -+ ASSERT(stopOnError); -+ ASSERT(sawError); -+ break; - } -- uint8_t completeSequence[U8_MAX_LENGTH]; -- memcpy(completeSequence, m_partialSequence, m_partialSequen= ceSize); -- memcpy(completeSequence + m_partialSequenceSize, source, co= unt - m_partialSequenceSize); -- source +=3D count - m_partialSequenceSize; -- int character =3D decodeNonASCIISequence(completeSequence, = count); -- if (character =3D=3D nonCharacter) { -- sawError =3D true; -- if (stopOnError) { -- source =3D end; -- break; -- } -- // Each error consumes one byte and generates one repla= cement character. -- memcpy(m_partialSequence, completeSequence + 1, count -= 1); -- m_partialSequenceSize =3D count - 1; -- *destination++ =3D replacementCharacter; -- continue; -- } -- m_partialSequenceSize =3D 0; -- destination =3D appendCharacter(destination, character); - } -=20 - while (source < end) { -@@ -239,10 +266,8 @@ String TextCodecUTF8::decode(const char* bytes, siz= e_t length, bool flush, bool - if (!count) - character =3D nonCharacter; - else { -- ASSERT(count >=3D 2); -- ASSERT(count <=3D 4); - if (count > end - source) { -- ASSERT(end - source <=3D static_cast(siz= eof(m_partialSequence))); -+ ASSERT(end - source < static_cast(sizeof= (m_partialSequence))); - ASSERT(!m_partialSequenceSize); - m_partialSequenceSize =3D end - source; - memcpy(m_partialSequence, source, m_partialSequence= Size); -@@ -255,9 +280,9 @@ String TextCodecUTF8::decode(const char* bytes, size= _t length, bool flush, bool - sawError =3D true; - if (stopOnError) - break; -- // Each error consumes one byte and generates one repla= cement character. -- ++source; -+ // Each error generates a replacement character and con= sumes one byte. - *destination++ =3D replacementCharacter; -+ ++source; - continue; - } - source +=3D count; -diff --git a/Source/WebCore/platform/text/TextCodecUTF8.h b/Source/WebCo= re/platform/text/TextCodecUTF8.h -index 2bbb31e..39fd753 100644 ---- a/Source/WebCore/platform/text/TextCodecUTF8.h -+++ b/Source/WebCore/platform/text/TextCodecUTF8.h -@@ -42,8 +42,12 @@ private: - virtual String decode(const char*, size_t length, bool flush, bool = stopOnError, bool& sawError); - virtual CString encode(const UChar*, size_t length, UnencodableHand= ling); -=20 -+ void handlePartialSequence(UChar*& destination, const uint8_t*& sou= rce, const uint8_t* end, bool flush, bool stopOnError, bool& sawError); -+ void handleError(UChar*& destination, bool stopOnError, bool& sawEr= ror); -+ void consumePartialSequenceByte(); -+ - int m_partialSequenceSize; -- char m_partialSequence[U8_MAX_LENGTH - 1]; -+ uint8_t m_partialSequence[U8_MAX_LENGTH]; - =20 - }; -=20 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v2.pa= tch b/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v2.patch deleted file mode 100644 index 7fb9a46..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.3.12-utf-decode-v2.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 3f28cee7ffa83df4510b234af13c223714b9324c -Author: darin@apple.com -Date: Fri Feb 25 02:20:42 2011 +0000 - - 2011-02-24 Darin Adler - =20 - Reviewed by Alexey Proskuryakov. - =20 - REGRESSION (r79466): http/tests/incremental/slow-utf8-html.p= l flaky due to incorrect assertions - https://bugs.webkit.org/show_bug.cgi?id=3D55135 - =20 - * platform/text/TextCodecUTF8.cpp: - (WebCore::TextCodecUTF8::decode): Removed incorrect assertio= ns. - =20 - =20 - git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79655 268f= 45cc-cd09-0410-ab3c-d52691b4dbfc - -diff --git a/Source/WebCore/platform/text/TextCodecUTF8.cpp b/Source/Web= Core/platform/text/TextCodecUTF8.cpp -index 29426ad..5f82092 100644 ---- a/Source/WebCore/platform/text/TextCodecUTF8.cpp -+++ b/Source/WebCore/platform/text/TextCodecUTF8.cpp -@@ -227,18 +227,16 @@ String TextCodecUTF8::decode(const char* bytes, si= ze_t length, bool flush, bool -=20 - do { - if (m_partialSequenceSize) { -- // Explicitly copy destination and source to avoid taking a= pointer to them, -- // which may harm code generation. -+ // Explicitly copy destination and source pointers to avoid= taking pointers to the -+ // local variables, which may harm code generation by disab= ling some optimizations -+ // in some compilers. - UChar* destinationForHandlePartialSequence =3D destination; - const uint8_t* sourceForHandlePartialSequence =3D source; - handlePartialSequence(destinationForHandlePartialSequence, = sourceForHandlePartialSequence, end, flush, stopOnError, sawError); - destination =3D destinationForHandlePartialSequence; - source =3D sourceForHandlePartialSequence; -- if (m_partialSequenceSize) { -- ASSERT(stopOnError); -- ASSERT(sawError); -+ if (m_partialSequenceSize) - break; -- } - } -=20 - while (source < end) { diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild b/net-libs= /webkit-gtk/webkit-gtk-1.3.13-r200.ebuild similarity index 97% rename from net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild index ab64243..59a9b40 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.3.13-r200.ebuild @@ -58,9 +58,6 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=3D19775 use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch =20 - epatch "${FILESDIR}/${P}-utf-decode-v1.patch" - epatch "${FILESDIR}/${P}-utf-decode-v2.patch" - # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=3D28727 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild b/net-libs/w= ebkit-gtk/webkit-gtk-1.3.13.ebuild similarity index 97% rename from net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild index 5a0d593..a59f6f8 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.3.13.ebuild @@ -59,9 +59,6 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=3D19775 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch =20 - epatch "${FILESDIR}/${P}-utf-decode-v1.patch" - epatch "${FILESDIR}/${P}-utf-decode-v2.patch" - # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=3D28727 use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch