rebuild for icu 4.4
This commit is contained in:
Caolan McNamara
parent
3e37b25421
commit
d5a4e5eeae
141
webkit-1.1.22-icu44.patch
Normal file
141
webkit-1.1.22-icu44.patch
Normal file
@ -0,0 +1,141 @@
|
|||||||
|
2010-03-22 Darin Adler <darin@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@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;
|
||||||
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
Name: webkitgtk
|
Name: webkitgtk
|
||||||
Version: 1.1.22
|
Version: 1.1.22
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: GTK+ Web content engine library
|
Summary: GTK+ Web content engine library
|
||||||
|
|
||||||
Provides: WebKit-gtk = %{version}-%{release}
|
Provides: WebKit-gtk = %{version}-%{release}
|
||||||
@ -58,6 +58,8 @@ Patch0: webkit-1.1.22-sparc.patch
|
|||||||
## bug. :)
|
## bug. :)
|
||||||
#Patch1: webkit-1.1.13-no-execmem.patch
|
#Patch1: webkit-1.1.13-no-execmem.patch
|
||||||
Patch2: webkit-1.1.14-nspluginwrapper.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: bison
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
@ -120,6 +122,7 @@ LICENSE, README, and AUTHORS files.
|
|||||||
%patch0 -p1 -b .sparc
|
%patch0 -p1 -b .sparc
|
||||||
# %patch1 -p1 -b .no-execmem
|
# %patch1 -p1 -b .no-execmem
|
||||||
%patch2 -p1 -b .nspluginwrapper
|
%patch2 -p1 -b .nspluginwrapper
|
||||||
|
%patch3 -p2 -b .icu44
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
|
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
|
%changelog
|
||||||
|
* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> 1.1.22-3
|
||||||
|
- rebuild for icu 4.4
|
||||||
|
|
||||||
* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.1.22-2
|
* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.1.22-2
|
||||||
- apply upstream fix for sparc
|
- apply upstream fix for sparc
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user