[arch-commits] Commit in libwebkit/trunk (PKGBUILD icu-4.4.patch)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Jul 17 09:53:02 UTC 2010
Date: Saturday, July 17, 2010 @ 05:53:02
Author: andyrtr
Revision: 85665
upgpkg: libwebkit 1.2.3-1
new version 1.2.3
Modified:
libwebkit/trunk/PKGBUILD
Deleted:
libwebkit/trunk/icu-4.4.patch
---------------+
PKGBUILD | 11 +---
icu-4.4.patch | 141 --------------------------------------------------------
2 files changed, 4 insertions(+), 148 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-17 09:12:57 UTC (rev 85664)
+++ PKGBUILD 2010-07-17 09:53:02 UTC (rev 85665)
@@ -2,7 +2,7 @@
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
pkgname=libwebkit
-pkgver=1.2.2
+pkgver=1.2.3
pkgrel=1
pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
arch=('i686' 'x86_64')
@@ -14,14 +14,11 @@
conflicts=('webkitgtk-svn')
replaces=('webkitgtk-svn')
options=('!libtool')
-source=("http://webkitgtk.org/webkit-${pkgver}.tar.gz"
- 'icu-4.4.patch')
-md5sums=('40338001324a38b977c163291e8816d3'
- 'ea289da2a03857e946cb835fd9e95097')
+source=("http://webkitgtk.org/webkit-${pkgver}.tar.gz")
+md5sums=('0ab5c478a6f5b74a1ae96bf13a456662')
build() {
cd "${srcdir}/webkit-${pkgver}"
- patch -p2 -i $srcdir/icu-4.4.patch
./configure --prefix=/usr \
--enable-video --enable-introspection \
--with-font-backend=freetype --enable-gtk-doc \
@@ -31,6 +28,6 @@
package() {
cd "${srcdir}/webkit-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
install -Dm644 WebKit/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
Deleted: icu-4.4.patch
===================================================================
--- icu-4.4.patch 2010-07-17 09:12:57 UTC (rev 85664)
+++ icu-4.4.patch 2010-07-17 09:53:02 UTC (rev 85665)
@@ -1,141 +0,0 @@
-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;
More information about the arch-commits
mailing list