summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authoroaken-source <oaken-source@parabola.nu>2019-11-16 19:23:04 +0100
committeroaken-source <oaken-source@parabola.nu>2019-11-16 19:23:04 +0100
commitb39a37bac27bd816cdf0b1d574cf00073ded362a (patch)
tree17b9f658affe0ca4a361e29b2cec1cca1d774e25 /pcr
parent093be93ae43c43afc479c34c9b51ccd1845c75d5 (diff)
downloadabslibre-b39a37bac27bd816cdf0b1d574cf00073ded362a.tar.gz
abslibre-b39a37bac27bd816cdf0b1d574cf00073ded362a.tar.bz2
abslibre-b39a37bac27bd816cdf0b1d574cf00073ded362a.zip
pcr/phantomjs: patched and rebuild for icu65
Diffstat (limited to 'pcr')
-rw-r--r--pcr/phantomjs/PKGBUILD12
-rw-r--r--pcr/phantomjs/icu65.patch73
2 files changed, 80 insertions, 5 deletions
diff --git a/pcr/phantomjs/PKGBUILD b/pcr/phantomjs/PKGBUILD
index 15fa43d63..3de8b5e56 100644
--- a/pcr/phantomjs/PKGBUILD
+++ b/pcr/phantomjs/PKGBUILD
@@ -7,24 +7,25 @@
pkgname=phantomjs
pkgver=2.1.1
-pkgrel=15
+pkgrel=16
pkgdesc='Headless WebKit with JavaScript API'
url='http://www.phantomjs.org/'
license=('BSD' 'LGPL' 'MIT')
arch=('i686' 'x86_64')
-depends=('icu' 'libjpeg-turbo' 'libpng' 'fontconfig' 'gperf' 'ruby' 'python2' 'openssl-1.0')
-depends+=('icu>=64' 'icu<65')
+depends=('icu' 'libjpeg-turbo' 'libpng' 'fontconfig' 'gperf' 'ruby' 'python2' 'openssl-1.0' 'mariadb-libs' 'libfbclient')
+depends+=('icu>=65' 'icu<66')
makedepends=('git')
_qtbase_commit=b5cc0083a5766e773885e8dd624c51a967c17de0
_qtwebkit_commit=e7b74331d695bfa8b77e39cdc50fc2d84a49a22a
source=("$pkgname-$pkgver.tar.gz"::"https://github.com/ariya/phantomjs/archive/$pkgver.tar.gz"
"$pkgname-qtbase-$_qtbase_commit.tar.gz"::"https://github.com/Vitallium/qtbase/archive/$_qtbase_commit.tar.gz"
"$pkgname-qtwebkit-$_qtwebkit_commit.tar.gz"::"https://github.com/Vitallium/qtwebkit/archive/$_qtwebkit_commit.tar.gz"
- icu59.patch)
+ icu59.patch icu65.patch)
sha512sums=('07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec'
'bdbe5fe69a5b0348632cfc9cd21c49c7334c34ecf9a603e3f94d3f456e6327b3036c00a05d37f064d49788ae062adfcf25f2258083d3099f7ee1ce6d3ed813e8'
'232f7060509a6615a2cd4fe71f22b32cf4b25f32a46d4dc3fa9e22d8c396c90389aabb63d43c76005bb779820f5d5555dbeb0d30054e1780619e0efd1807b272'
- 'e349a14c5d32e5627f28be6ebd20104370ec6b7f086f670e7f19b484b38839220cfeb49178765f38d918d05fb889bbc990f8a3809db6d9e1cbde0af5b9dd923b')
+ 'e349a14c5d32e5627f28be6ebd20104370ec6b7f086f670e7f19b484b38839220cfeb49178765f38d918d05fb889bbc990f8a3809db6d9e1cbde0af5b9dd923b'
+ '7a64eed9a95609bee0cdd61ef0293f4e64c3202a79063b13487c1f1475eb1cddb7cf06c8594130dd010b4e056a18831fddd8a45ffb58df458d52b791660067b1')
prepare() {
cd $pkgname-$pkgver
@@ -37,6 +38,7 @@ prepare() {
mkdir src/qt/qt{base,webkit}/.git
patch -Np1 -d src/qt/qtwebkit <../icu59.patch
+ patch -Np1 -d src/qt/qtwebkit <../icu65.patch
mkdir "$srcdir/python2-path"
ln -s /usr/bin/python2 "$srcdir/python2-path/python"
}
diff --git a/pcr/phantomjs/icu65.patch b/pcr/phantomjs/icu65.patch
new file mode 100644
index 000000000..7fb02a9af
--- /dev/null
+++ b/pcr/phantomjs/icu65.patch
@@ -0,0 +1,73 @@
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/dom/Document.cpp 2019-11-16 16:07:23.611871473 +0100
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/dom/Document.cpp 2019-11-16 16:16:00.372740867 +0100
+@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UC
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const
+ const UChar* s = qualifiedName.characters();
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(s, i, length, c)
++ U16_NEXT(s, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-11-16 16:07:23.705204909 +0100
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-11-16 16:15:32.855982739 +0100
+@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacte
+ {
+ UChar32 c;
+ for (int i = 0; i < length; ) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!containsCharacter(c))
+ return false;
+ }
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2019-11-16 16:07:23.738538279 +0100
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2019-11-16 16:15:08.872567444 +0100
+@@ -175,7 +175,7 @@ static BOOL allCharactersInIDNScriptWhit
+ int32_t i = 0;
+ while (i < length) {
+ UChar32 c;
+- U16_NEXT(buffer, i, length, c)
++ U16_NEXT(buffer, i, length, c);
+ UErrorCode error = U_ZERO_ERROR;
+ UScriptCode script = uscript_getScript(c, &error);
+ if (error != U_ZERO_ERROR) {
+@@ -746,13 +746,13 @@ static CFStringRef createStringWithEscap
+ CFIndex i = 0;
+ while (i < length) {
+ UChar32 c;
+- U16_NEXT(sourceBuffer, i, length, c)
++ U16_NEXT(sourceBuffer, i, length, c);
+
+ if (isLookalikeCharacter(c)) {
+ uint8_t utf8Buffer[4];
+ CFIndex offset = 0;
+ UBool failure = false;
+- U8_APPEND(utf8Buffer, offset, 4, c, failure)
++ U8_APPEND(utf8Buffer, offset, 4, c, failure);
+ ASSERT(!failure);
+
+ for (CFIndex j = 0; j < offset; ++j) {
+@@ -764,7 +764,7 @@ static CFStringRef createStringWithEscap
+ UChar utf16Buffer[2];
+ CFIndex offset = 0;
+ UBool failure = false;
+- U16_APPEND(utf16Buffer, offset, 2, c, failure)
++ U16_APPEND(utf16Buffer, offset, 2, c, failure);
+ ASSERT(!failure);
+ for (CFIndex j = 0; j < offset; ++j)
+ outBuffer.append(utf16Buffer[j]);