rpms/webkitgtk/devel webkit-1.1.22-icu44.patch, NONE, 1.1 webkitgtk.spec, 1.33, 1.34
Caolan McNamara
caolanm at fedoraproject.org
Fri Apr 2 14:22:05 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22206
Modified Files:
webkitgtk.spec
Added Files:
webkit-1.1.22-icu44.patch
Log Message:
rebuild for icu 4.4
webkit-1.1.22-icu44.patch:
TextBreakIteratorICU.cpp | 85 +++++++++++++++++++++++------------------------
1 file changed, 42 insertions(+), 43 deletions(-)
--- NEW FILE webkit-1.1.22-icu44.patch ---
2010-03-22 Darin Adler <darin at apple.com>
Reviewed by Dan Bernstein.
TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type in ICU 4.4
https://bugs.webkit.org/show_bug.cgi?id=36381
* platform/text/TextBreakIteratorICU.cpp:
(WebCore::setUpIterator): Use reinterpret_cast instead of static_cast or relying
on conversion to void*.
(WebCore::textBreakFirst): Ditto.
(WebCore::textBreakLast): Ditto.
(WebCore::textBreakNext): Ditto.
(WebCore::textBreakPrevious): Ditto.
(WebCore::textBreakPreceding): Ditto.
(WebCore::textBreakFollowing): Ditto.
(WebCore::textBreakCurrent): Ditto.
(WebCore::isTextBreak): Ditto.
(WebCore::setUpIteratorWithRules): Ditto.
2010-03-22 Eric Carlson <eric.carlson at apple.com>
Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
===================================================================
--- /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
+++ /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
@@ -25,5 +25,4 @@
#include "PlatformString.h"
#include "TextBreakIteratorInternalICU.h"
-
#include <unicode/ubrk.h>
#include <wtf/Assertions.h>
@@ -39,5 +38,5 @@
if (!createdIterator) {
UErrorCode openStatus = U_ZERO_ERROR;
- iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
@@ -47,5 +46,5 @@
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
@@ -86,42 +85,42 @@
}
-int textBreakFirst(TextBreakIterator* bi)
-{
- return ubrk_first(bi);
-}
-
-int textBreakLast(TextBreakIterator* bi)
-{
- return ubrk_last(bi);
-}
-
-int textBreakNext(TextBreakIterator* bi)
-{
- return ubrk_next(bi);
-}
-
-int textBreakPrevious(TextBreakIterator* bi)
-{
- return ubrk_previous(bi);
-}
-
-int textBreakPreceding(TextBreakIterator* bi, int pos)
-{
- return ubrk_preceding(bi, pos);
-}
-
-int textBreakFollowing(TextBreakIterator* bi, int pos)
-{
- return ubrk_following(bi, pos);
-}
-
-int textBreakCurrent(TextBreakIterator* bi)
-{
- return ubrk_current(bi);
-}
-
-bool isTextBreak(TextBreakIterator* bi, int pos)
-{
- return ubrk_isBoundary(bi, pos);
+int textBreakFirst(TextBreakIterator* iterator)
+{
+ return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakLast(TextBreakIterator* iterator)
+{
+ return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakNext(TextBreakIterator* iterator)
+{
+ return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakPrevious(TextBreakIterator* iterator)
+{
+ return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakPreceding(TextBreakIterator* iterator, int pos)
+{
+ return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
+}
+
+int textBreakFollowing(TextBreakIterator* iterator, int pos)
+{
+ return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
+}
+
+int textBreakCurrent(TextBreakIterator* iterator)
+{
+ return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+bool isTextBreak(TextBreakIterator* iterator, int position)
+{
+ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
}
@@ -137,5 +136,5 @@
UErrorCode openStatus = U_ZERO_ERROR;
String rules(breakRules);
- iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
@@ -145,5 +144,5 @@
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- webkitgtk.spec 23 Mar 2010 12:20:03 -0000 1.33
+++ webkitgtk.spec 2 Apr 2010 14:22:04 -0000 1.34
@@ -35,7 +35,7 @@
Name: webkitgtk
Version: 1.1.22
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@@ -58,6 +58,8 @@ Patch0: webkit-1.1.22-sparc.patch
## bug. :)
#Patch1: webkit-1.1.13-no-execmem.patch
Patch2: webkit-1.1.14-nspluginwrapper.patch
+# https://bugs.webkit.org/show_bug.cgi?id=36381
+Patch3: webkit-1.1.22-icu44.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -120,6 +122,7 @@ LICENSE, README, and AUTHORS files.
%patch0 -p1 -b .sparc
# %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
+%patch3 -p2 -b .icu44
%build
CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
@@ -199,6 +202,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> 1.1.22-3
+- rebuild for icu 4.4
+
* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.22-2
- apply upstream fix for sparc
More information about the scm-commits
mailing list