[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2020-12-19 Thread Felix Yan via arch-commits 
Date: Saturday, December 19, 2020 @ 11:36:45
  Author: felixonmars
Revision: 404621

upgpkg: qt5-webkit 5.212.0alpha4-9: icu 68.2 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 11:34:23 UTC (rev 404620)
+++ PKGBUILD2020-12-19 11:36:45 UTC (rev 404621)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=8
+pkgrel=9
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD icu68.patch)

2020-12-19 Thread Evangelos Foutras via arch-commits 
Date: Saturday, December 19, 2020 @ 10:50:32
  Author: foutrelis
Revision: 404610

Fix build with ICU 68 (patch from FreeBSD)

Added:
  qt5-webkit/trunk/icu68.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

-+
 PKGBUILD|8 ++
 icu68.patch |  170 ++
 2 files changed, 176 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 10:47:54 UTC (rev 404609)
+++ PKGBUILD2020-12-19 10:50:32 UTC (rev 404610)
@@ -11,6 +11,7 @@
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
 
source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;
+ icu68.patch
  
qt5-webkit-python-3.9.patch::"https://github.com/qtwebkit/qtwebkit/commit/78360c01.patch;
  
qt5-webkit-bison-3.7.patch::"https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch;)
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen woff2)
@@ -17,12 +18,15 @@
 makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
 sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
+'0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0'
 '9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128'
 'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0')
 
 prepare() {
-  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-python-3.9.patch # Fix build 
with python 3.9
-  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build 
with bison 3.7
+  cd qtwebkit-$_pkgver
+  patch -p0 -i ../icu68.patch # Fix build with ICU 68.x
+  patch -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9
+  patch -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7
 }
 
 build() {

Added: icu68.patch
===
--- icu68.patch (rev 0)
+++ icu68.patch 2020-12-19 10:50:32 UTC (rev 404610)
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared 
identifier 'TRUE'
+ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of 
undeclared identifier 'TRUE'
+isAccessible = TRUE;
+   ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of 
undeclared identifier 'FALSE'
+isAccessible = FALSE;
+   ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of 
undeclared identifier 'TRUE'
+isAccessible = TRUE;
+   ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of 
undeclared identifier 'FALSE'
+isAccessible = FALSE;
+   ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of 
undeclared identifier 'TRUE'
+return TRUE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of 
undeclared identifier 'FALSE'
+return FALSE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of 
undeclared identifier 'TRUE'
+return TRUE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of 
undeclared identifier 'FALSE'
+return FALSE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of 
undeclared identifier 'TRUE'
+return TRUE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of 
undeclared identifier 'FALSE'
+return FALSE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of 
undeclared identifier 'TRUE'
+return TRUE;
+   ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of 
undeclared identifier 'FALSE'
+return FALSE;
+   ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of 
undeclared identifier 'TRUE'
+return TRUE;
+   ^
+
+--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2020-05-01 Thread Evangelos Foutras via arch-commits 
Date: Friday, May 1, 2020 @ 18:26:31
  Author: foutrelis
Revision: 382101

upgpkg: qt5-webkit 5.212.0alpha4-5: icu 67.1 / Qt 5.15 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-01 18:01:38 UTC (rev 382100)
+++ PKGBUILD2020-05-01 18:26:31 UTC (rev 382101)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2020-04-27 Thread Evangelos Foutras via arch-commits 
Date: Monday, April 27, 2020 @ 11:26:57
  Author: foutrelis
Revision: 381709

icu 67.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 11:05:46 UTC (rev 381708)
+++ PKGBUILD2020-04-27 11:26:57 UTC (rev 381709)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2020-03-19 Thread Antonio Rojas via arch-commits 
Date: Thursday, March 19, 2020 @ 14:16:47
  Author: arojas
Revision: 377920

Qt 5.15 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-19 13:44:14 UTC (rev 377919)
+++ PKGBUILD2020-03-19 14:16:47 UTC (rev 377920)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD icu65.patch)

2020-03-10 Thread Antonio Rojas via arch-commits 
Date: Tuesday, March 10, 2020 @ 07:20:03
  Author: arojas
Revision: 377253

Update to 5.212.0alpha4

Modified:
  qt5-webkit/trunk/PKGBUILD
Deleted:
  qt5-webkit/trunk/icu65.patch

-+
 PKGBUILD|   13 +
 icu65.patch |   37 -
 2 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-10 00:12:19 UTC (rev 377252)
+++ PKGBUILD2020-03-10 07:20:03 UTC (rev 377253)
@@ -3,24 +3,21 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_pkgver=5.212.0-alpha3
+_pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=9
+pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;
-icu65.patch)
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;)
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen woff2)
-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
+makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17'
-'2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd')
+sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6')
 
 prepare() {
   mkdir -p build
-  patch -Np1 -d qtwebkit-$_pkgver 
-Date: Tue, 8 Oct 2019 01:20:22 +0300
-Subject: [PATCH] Import QtWebKit commit
- 5e53102492e5ce85bda2657468f1369a0173c2ce
-
-Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628
-Reviewed-by: Konstantin Tokarev 
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f..19355f16601 100644
 a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* 
characters, unsigned length)
- 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;
- }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& 
qualifiedName, String& prefix, S
- 
- for (unsigned i = 0; i < length;) {
- UChar32 c;
--U16_NEXT(qualifiedName, i, length, c)
-+U16_NEXT(qualifiedName, i, length, c);
- if (c == ':') {
- if (sawColon) {
- ec = NAMESPACE_ERR;

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-11-17 Thread Antonio Rojas via arch-commits 
Date: Sunday, November 17, 2019 @ 21:35:51
  Author: arojas
Revision: 368997

Qt 5.14 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-17 18:23:17 UTC (rev 368996)
+++ PKGBUILD2019-11-17 21:35:51 UTC (rev 368997)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha3
 pkgver=${_pkgver/-/}
-pkgrel=6
+pkgrel=7
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-11-11 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, November 12, 2019 @ 01:08:32
  Author: foutrelis
Revision: 367822

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 00:54:11 UTC (rev 367821)
+++ PKGBUILD2019-11-12 01:08:32 UTC (rev 367822)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha3
 pkgver=${_pkgver/-/}
-pkgrel=5
+pkgrel=6
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD icu65.patch)

2019-11-11 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, November 12, 2019 @ 00:40:04
  Author: foutrelis
Revision: 367819

Fix build with ICU 65

Added:
  qt5-webkit/trunk/icu65.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

-+
 PKGBUILD|7 +--
 icu65.patch |   37 +
 2 files changed, 42 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 00:26:36 UTC (rev 367818)
+++ PKGBUILD2019-11-12 00:40:04 UTC (rev 367819)
@@ -10,14 +10,17 @@
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;)
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;
+icu65.patch)
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen woff2)
 makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17')
+sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17'
+'2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd')
 
 prepare() {
   mkdir -p build
+  patch -Np1 -d qtwebkit-$_pkgver 
+Date: Tue, 8 Oct 2019 01:20:22 +0300
+Subject: [PATCH] Import QtWebKit commit
+ 5e53102492e5ce85bda2657468f1369a0173c2ce
+
+Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628
+Reviewed-by: Konstantin Tokarev 
+
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 1bca2d0a66f..19355f16601 100644
+--- a/Source/WebCore/dom/Document.cpp
 b/Source/WebCore/dom/Document.cpp
+@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* 
characters, unsigned length)
+ 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;
+ }
+@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& 
qualifiedName, String& prefix, S
+ 
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+-U16_NEXT(qualifiedName, i, length, c)
++U16_NEXT(qualifiedName, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-07-01 Thread Antonio Rojas via arch-commits 
Date: Monday, July 1, 2019 @ 20:16:01
  Author: arojas
Revision: 357217

Disable asserts (FS#63056)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-01 20:05:40 UTC (rev 357216)
+++ PKGBUILD2019-07-01 20:16:01 UTC (rev 357217)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha3
 pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -25,6 +25,7 @@
 
   cmake ../qtwebkit-$_pkgver \
 -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
 -DPORT=Qt \
 -DENABLE_TOOLS=OFF
   make

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-07-01 Thread Antonio Rojas via arch-commits 
Date: Monday, July 1, 2019 @ 08:52:05
  Author: arojas
Revision: 357193

Updated tarball (FS#63050)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-01 07:50:38 UTC (rev 357192)
+++ PKGBUILD2019-07-01 08:52:05 UTC (rev 357193)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha3
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -14,7 +14,7 @@
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen woff2)
 makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('35b9af61546b5ced8e15160d873781a201f8e4207c3da511b034147f3c4b433c')
+sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17')
 
 prepare() {
   mkdir -p build
@@ -23,7 +23,7 @@
 build() {
   cd build
 
-  cmake .. \
+  cmake ../qtwebkit-$_pkgver \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DPORT=Qt \
 -DENABLE_TOOLS=OFF

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-06-29 Thread Antonio Rojas via arch-commits 
Date: Saturday, June 29, 2019 @ 19:07:01
  Author: arojas
Revision: 357062

Update to 5.212.0-alpha3

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |   30 +++---
 1 file changed, 7 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-29 14:20:44 UTC (rev 357061)
+++ PKGBUILD2019-06-29 19:07:01 UTC (rev 357062)
@@ -3,28 +3,19 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_commit=186f5bff1071d2bc1a1bdd9f70045cf5fadcb04d
-pkgver=5.212.0alpha2+212+g186f5bff107
+_pkgver=5.212.0-alpha3
+pkgver=${_pkgver/-/}
 pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen)
-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools git)
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz;)
+depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite 
gst-plugins-base hyphen woff2)
+makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-conflicts=(qt5-webkit-ng)
-replaces=(qt5-webkit-ng)
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=(git+https://github.com/annulen/webkit#commit=$_commit)
-#source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;)
-sha256sums=('SKIP')
+sha256sums=('35b9af61546b5ced8e15160d873781a201f8e4207c3da511b034147f3c4b433c')
 
-pkgver() {
-  cd webkit
-  git describe --tags | sed -e 's/-/+/g' -e 's/+alpha/alpha/' -e 
's/qtwebkit+//' -e 's/v//'
-}
-
 prepare() {
   mkdir -p build
 }
@@ -32,9 +23,8 @@
 build() {
   cd build
 
-  cmake ../webkit \
+  cmake .. \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release \
 -DPORT=Qt \
 -DENABLE_TOOLS=OFF
   make
@@ -46,10 +36,4 @@
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-
-# Fix pkgconfig files
-  sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
-  sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
-  sed -e '/Name/a Description: Qt WebKit module' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
-  sed -e '/Name/a Description: Qt WebKitWidgets module' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
 }

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-06-22 Thread Antonio Rojas via arch-commits 
Date: Saturday, June 22, 2019 @ 09:34:17
  Author: arojas
Revision: 356769

Bump commit

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-22 09:32:17 UTC (rev 356768)
+++ PKGBUILD2019-06-22 09:34:17 UTC (rev 356769)
@@ -3,9 +3,9 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_commit=95401fe3908e0b4eebc9447e678298d768617bc7
-pkgver=5.212.0alpha2+156+g95401fe3908
-pkgrel=5
+_commit=186f5bff1071d2bc1a1bdd9f70045cf5fadcb04d
+pkgver=5.212.0alpha2+212+g186f5bff107
+pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-05-21 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 21, 2019 @ 21:41:49
  Author: arojas
Revision: 353742

Qt 5.13 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-21 21:29:55 UTC (rev 353741)
+++ PKGBUILD2019-05-21 21:41:49 UTC (rev 353742)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _commit=95401fe3908e0b4eebc9447e678298d768617bc7
 pkgver=5.212.0alpha2+156+g95401fe3908
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-05-21 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 21, 2019 @ 16:03:32
  Author: arojas
Revision: 353731

Fix pkgver

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-21 15:14:18 UTC (rev 353730)
+++ PKGBUILD2019-05-21 16:03:32 UTC (rev 353731)
@@ -4,7 +4,7 @@
 
 pkgname=qt5-webkit
 _commit=95401fe3908e0b4eebc9447e678298d768617bc7
-pkgver=qtwebkit+5.212.0alpha2+156+g95401fe3908
+pkgver=5.212.0alpha2+156+g95401fe3908
 pkgrel=1
 arch=(x86_64)
 url='https://www.qt.io'
@@ -22,7 +22,7 @@
 
 pkgver() {
   cd webkit
-  git describe --tags | sed -e 's/-/+/g' -e 's/+alpha/alpha/' -e 's/v//'
+  git describe --tags | sed -e 's/-/+/g' -e 's/+alpha/alpha/' -e 
's/qtwebkit+//' -e 's/v//'
 }
 
 prepare() {

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-04-20 Thread Antonio Rojas via arch-commits 
Date: Saturday, April 20, 2019 @ 23:22:39
  Author: arojas
Revision: 351838

Qt 5.13 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-20 22:52:15 UTC (rev 351837)
+++ PKGBUILD2019-04-20 23:22:39 UTC (rev 351838)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=28
+pkgrel=29
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-04-05 Thread Evangelos Foutras via arch-commits 
Date: Saturday, April 6, 2019 @ 05:58:43
  Author: foutrelis
Revision: 350208

Qt 5.13 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-06 05:42:47 UTC (rev 350207)
+++ PKGBUILD2019-04-06 05:58:43 UTC (rev 350208)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=26
+pkgrel=27
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits 
Date: Friday, April 5, 2019 @ 13:11:18
  Author: felixonmars
Revision: 349935

icu 64.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 13:11:05 UTC (rev 349934)
+++ PKGBUILD2019-04-05 13:11:18 UTC (rev 349935)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=25
+pkgrel=26
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-03-22 Thread Antonio Rojas via arch-commits 
Date: Friday, March 22, 2019 @ 19:33:17
  Author: arojas
Revision: 348873

Qt 5.13 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-22 19:24:48 UTC (rev 348872)
+++ PKGBUILD2019-03-22 19:33:17 UTC (rev 348873)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=24
+pkgrel=25
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2019-02-01 Thread Antonio Rojas via arch-commits 
Date: Saturday, February 2, 2019 @ 04:43:31
  Author: arojas
Revision: 345060

Qt 5.12.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-01 23:26:28 UTC (rev 345059)
+++ PKGBUILD2019-02-02 04:43:31 UTC (rev 345060)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=22
+pkgrel=23
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-12-06 Thread Antonio Rojas via arch-commits 
Date: Thursday, December 6, 2018 @ 09:52:37
  Author: arojas
Revision: 341110

Remove from qt group

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-06 08:03:49 UTC (rev 341109)
+++ PKGBUILD2018-12-06 09:52:37 UTC (rev 341110)
@@ -15,7 +15,6 @@
 optdepends=('gst-plugins-good: Webm codec support')
 conflicts=(qt5-webkit-ng)
 replaces=(qt5-webkit-ng)
-groups=(qt qt5)
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 
source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;
 qt5-webkit-gcc7.patch

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-11-16 Thread Antonio Rojas via arch-commits 
Date: Friday, November 16, 2018 @ 23:22:21
  Author: arojas
Revision: 339798

Qt 5.12 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-16 21:15:37 UTC (rev 339797)
+++ PKGBUILD2018-11-16 23:22:21 UTC (rev 339798)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=21
+pkgrel=22
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-10-22 Thread Evangelos Foutras via arch-commits 
Date: Monday, October 22, 2018 @ 22:14:56
  Author: foutrelis
Revision: 337097

icu 63.1 / poppler 0.70.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 22:05:59 UTC (rev 337096)
+++ PKGBUILD2018-10-22 22:14:56 UTC (rev 337097)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=20
+pkgrel=21
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-08-06 Thread Felix Yan via arch-commits 
Date: Monday, August 6, 2018 @ 19:06:13
  Author: felixonmars
Revision: 331030

icu 62.1 / poppler 0.67.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 18:19:12 UTC (rev 331029)
+++ PKGBUILD2018-08-06 19:06:13 UTC (rev 331030)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=18
+pkgrel=19
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, March 28, 2018 @ 04:55:09
  Author: foutrelis
Revision: 320528

icu 61.1 / Qt 5.11 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 04:51:04 UTC (rev 320527)
+++ PKGBUILD2018-03-28 04:55:09 UTC (rev 320528)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=14
+pkgrel=15
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, March 28, 2018 @ 04:15:10
  Author: foutrelis
Revision: 320481

icu 61.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-28 02:43:46 UTC (rev 320480)
+++ PKGBUILD2018-03-28 04:15:10 UTC (rev 320481)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=13
+pkgrel=14
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-03-23 Thread Antonio Rojas via arch-commits 
Date: Friday, March 23, 2018 @ 22:52:40
  Author: arojas
Revision: 319880

Qt 5.11 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-23 21:30:53 UTC (rev 319879)
+++ PKGBUILD2018-03-23 22:52:40 UTC (rev 319880)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=12
+pkgrel=13
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2018-02-13 Thread Antonio Rojas via arch-commits 
Date: Tuesday, February 13, 2018 @ 17:04:02
  Author: arojas
Revision: 316805

Qt 5.10.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-13 16:32:28 UTC (rev 316804)
+++ PKGBUILD2018-02-13 17:04:02 UTC (rev 316805)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=11
+pkgrel=12
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-12-07 Thread Antonio Rojas via arch-commits 
Date: Thursday, December 7, 2017 @ 21:02:54
  Author: arojas
Revision: 311790

Qt 5.10 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-07 19:47:20 UTC (rev 311789)
+++ PKGBUILD2017-12-07 21:02:54 UTC (rev 311790)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=10
+pkgrel=11
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-11-22 Thread Antonio Rojas 
Date: Wednesday, November 22, 2017 @ 18:17:12
  Author: arojas
Revision: 310677

Qt 5.9.3 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-22 17:16:38 UTC (rev 310676)
+++ PKGBUILD2017-11-22 18:17:12 UTC (rev 310677)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=9
+pkgrel=10
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -22,12 +22,14 @@
 qt5-webkit-gcc7.patch
 qt5-webkit-null-pointer-dereference.patch
 
qt5-webkit-trojita-1.patch::"https://github.com/annulen/webkit/commit/6faf1121.patch;
-
qt5-webkit-trojita-2.patch::"https://github.com/annulen/webkit/commit/76420459.patch;)
+
qt5-webkit-trojita-2.patch::"https://github.com/annulen/webkit/commit/76420459.patch;
+
qt5-webkit-cmake3.10.patch::"https://github.com/annulen/webkit/commit/f51554bf.patch;)
 sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
 'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720'
 '510e1f78c2bcd76909703a097dbc1d5c9c6ce4cd94883c26138f09cc10121f43'
 'bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae'
-'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3')
+'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3'
+'b4e6c85fcb062e7cc141b0e34977bcc4f9c8677c773fc4b310151b85f51e7189')
 
 prepare() {
   mkdir -p build
@@ -40,6 +42,8 @@
   patch -p1 -i ../qt5-webkit-trojita-2.patch
 # Fix null point dereference (Fedora) 
https://github.com/annulen/webkit/issues/573
   patch -p1 -i ../qt5-webkit-null-pointer-dereference.patch
+# Fix build with cmake 3.10
+  patch -p1 -i ../qt5-webkit-cmake3.10.patch
 }
 
 build() {

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-11-17 Thread Antonio Rojas 
Date: Friday, November 17, 2017 @ 15:13:47
  Author: arojas
Revision: 310081

Qt 5.10 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-17 14:53:05 UTC (rev 310080)
+++ PKGBUILD2017-11-17 15:13:47 UTC (rev 310081)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=8
+pkgrel=9
 arch=(x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-11-12 Thread Evangelos Foutras 
Date: Sunday, November 12, 2017 @ 20:06:47
  Author: foutrelis
Revision: 309673

icu 60.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 19:56:39 UTC (rev 309672)
+++ PKGBUILD2017-11-12 20:06:47 UTC (rev 309673)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-10-26 Thread Antonio Rojas 
Date: Thursday, October 26, 2017 @ 18:53:31
  Author: arojas
Revision: 308514

Backport fixes for trojita layout

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-26 18:45:47 UTC (rev 308513)
+++ PKGBUILD2017-10-26 18:53:31 UTC (rev 308514)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -18,9 +18,14 @@
 replaces=(qt5-webkit-ng)
 groups=(qt qt5)
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;
 qt5-webkit-gcc7.patch)
+source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;
+qt5-webkit-gcc7.patch
+
qt5-webkit-trojita-1.patch::"https://github.com/annulen/webkit/commit/6faf1121.patch;
+
qt5-webkit-trojita-2.patch::"https://github.com/annulen/webkit/commit/76420459.patch;)
 sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
-'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720')
+'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720'
+'bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae'
+'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3')
 
 prepare() {
   mkdir -p build
@@ -28,6 +33,9 @@
 # Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407
   cd qtwebkit-$_qtver
   patch -p1 -i ../qt5-webkit-gcc7.patch
+# Fix layout issues in trojita https://github.com/annulen/webkit/issues/511
+  patch -p1 -i ../qt5-webkit-trojita-1.patch
+  patch -p1 -i ../qt5-webkit-trojita-2.patch
 }
 
 build() {

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-10-07 Thread Antonio Rojas 
Date: Saturday, October 7, 2017 @ 09:43:36
  Author: arojas
Revision: 307106

Qt 5.9.2 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-07 06:56:12 UTC (rev 307105)
+++ PKGBUILD2017-10-07 09:43:36 UTC (rev 307106)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-gcc7.patch)

2017-07-02 Thread Antonio Rojas 
Date: Sunday, July 2, 2017 @ 10:17:40
  Author: arojas
Revision: 299540

Add patch for segfaults with GCC7

Added:
  qt5-webkit/trunk/qt5-webkit-gcc7.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

---+
 PKGBUILD  |   11 ---
 qt5-webkit-gcc7.patch |   34 ++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-02 09:22:08 UTC (rev 299539)
+++ PKGBUILD2017-07-02 10:17:40 UTC (rev 299540)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -18,11 +18,16 @@
 replaces=(qt5-webkit-ng)
 groups=(qt qt5)
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;)
-sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a')
+source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz;
 qt5-webkit-gcc7.patch)
+sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
+'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720')
 
 prepare() {
   mkdir -p build
+
+# Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407
+  cd qtwebkit-$_qtver
+  patch -p1 -i ../qt5-webkit-gcc7.patch
 }
 
 build() {

Added: qt5-webkit-gcc7.patch
===
--- qt5-webkit-gcc7.patch   (rev 0)
+++ qt5-webkit-gcc7.patch   2017-07-02 10:17:40 UTC (rev 299540)
@@ -0,0 +1,34 @@
+diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 
webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h
+--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h  2017-02-20 
17:20:15.0 +0100
 webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 
13:13:57.801527350 +0200
+@@ -581,29 +581,7 @@
+ // FIXME: Does this really belong in StringImpl?
+ template  static void copyChars(T* destination, const T* 
source, unsigned numCharacters)
+ {
+-if (numCharacters == 1) {
+-*destination = *source;
+-return;
+-}
+-
+-if (numCharacters <= s_copyCharsInlineCutOff) {
+-unsigned i = 0;
+-#if (CPU(X86) || CPU(X86_64))
+-const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T);
+-
+-if (numCharacters > charsPerInt) {
+-unsigned stopCount = numCharacters & ~(charsPerInt - 1);
+-
+-const uint32_t* srcCharacters = reinterpret_cast(source);
+-uint32_t* destCharacters = 
reinterpret_cast(destination);
+-for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j)
+-destCharacters[j] = srcCharacters[j];
+-}
+-#endif
+-for (; i < numCharacters; ++i)
+-destination[i] = source[i];
+-} else
+-memcpy(destination, source, numCharacters * sizeof(T));
++memcpy(destination, source, numCharacters * sizeof(T));
+ }
+ 
+ ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* 
source, unsigned numCharacters)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-07-01 Thread Antonio Rojas 
Date: Saturday, July 1, 2017 @ 21:31:29
  Author: arojas
Revision: 299524

Qt 5.9.1 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-01 20:29:46 UTC (rev 299523)
+++ PKGBUILD2017-07-01 21:31:29 UTC (rev 299524)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-06-25 Thread Antonio Rojas 
Date: Sunday, June 25, 2017 @ 13:30:22
  Author: arojas
Revision: 299215

Fix pkgconfig files (FS#54577)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-25 10:14:32 UTC (rev 299214)
+++ PKGBUILD2017-06-25 13:30:22 UTC (rev 299215)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -42,4 +42,10 @@
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+
+# Fix pkgconfig files
+  sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
+  sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
+  sed -e '/Name/a Description: Qt WebKit module' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
+  sed -e '/Name/a Description: Qt WebKitWidgets module' -i 
"$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
 }

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-06-16 Thread Antonio Rojas 
Date: Friday, June 16, 2017 @ 11:11:27
  Author: arojas
Revision: 298890

Rebuild with GCC6 (FS#54428)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-16 08:38:21 UTC (rev 298889)
+++ PKGBUILD2017-06-16 11:11:27 UTC (rev 298890)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-04-26 Thread Evangelos Foutras 
Date: Thursday, April 27, 2017 @ 01:48:25
  Author: foutrelis
Revision: 294865

libwebp 0.6.0 / poppler 0.54.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-27 01:08:39 UTC (rev 294864)
+++ PKGBUILD2017-04-27 01:48:25 UTC (rev 294865)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-04-26 Thread Evangelos Foutras 
Date: Wednesday, April 26, 2017 @ 14:44:27
  Author: foutrelis
Revision: 294761

icu 59.1 / hunspell 1.6.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 14:43:38 UTC (rev 294760)
+++ PKGBUILD2017-04-26 14:44:27 UTC (rev 294761)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-icu59.patch)

2017-04-26 Thread Antonio Rojas 
Date: Wednesday, April 26, 2017 @ 12:25:34
  Author: arojas
Revision: 294748

Fix patch

Modified:
  qt5-webkit/trunk/PKGBUILD
  qt5-webkit/trunk/qt5-webkit-icu59.patch

+
 PKGBUILD   |2 +-
 qt5-webkit-icu59.patch |   37 -
 2 files changed, 37 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 12:21:41 UTC (rev 294747)
+++ PKGBUILD2017-04-26 12:25:34 UTC (rev 294748)
@@ -19,7 +19,7 @@
 
source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz;
 qt5-webkit-icu59.patch)
 md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
- '245b9d4edeecba9bd09a10a8c8ecf4b2')
+ 'f6c74b0196a698cc1c5a34c695b22715')
 
 prepare() {
   mkdir -p build

Modified: qt5-webkit-icu59.patch
===
--- qt5-webkit-icu59.patch  2017-04-26 12:21:41 UTC (rev 294747)
+++ qt5-webkit-icu59.patch  2017-04-26 12:25:34 UTC (rev 294748)
@@ -1,4 +1,39 @@
 qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig 
2015-10-13 06:37:10.0 +0200
+diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
+index ead844f..e62cfd4 100644
+--- a/Source/WTF/wtf/Compiler.h
 b/Source/WTF/wtf/Compiler.h
+@@ -61,6 +61,7 @@
+ #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR 
__has_feature(has_trivial_destructor)
+ #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
+ #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 
__has_feature(cxx_reference_qualified_functions)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 
!defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
+ 
+ #endif
+ 
+@@ -142,6 +143,7 @@
+ #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 5, 0)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
+ #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 6, 0)
+diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
+index b9e46bc..876fa45 100644
+--- a/Source/WTF/wtf/TypeTraits.h
 b/Source/WTF/wtf/TypeTraits.h
+@@ -75,6 +75,10 @@ namespace WTF {
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+ template<> struct IsInteger{ static const bool value 
= true; };
+ #endif
++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
++template<> struct IsInteger   { static const bool value 
= true; };
++template<> struct IsInteger   { static const bool value 
= true; };
++#endif
+ 
+ template struct IsFloatingPoint { static const bool value 
= false; };
+ template<> struct IsFloatingPoint{ static const bool value 
= true; };
+---qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig  
2015-10-13 06:37:10.0 +0200
 +++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h  
2017-04-24 12:26:42.495345570 +0200
 @@ -32,6 +32,7 @@
  #include

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-icu59.patch)

2017-04-26 Thread Antonio Rojas 
Date: Wednesday, April 26, 2017 @ 10:28:50
  Author: arojas
Revision: 294741

Add patch from PLD to fix build with ICU 59

Added:
  qt5-webkit/trunk/qt5-webkit-icu59.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

+
 PKGBUILD   |   10 --
 qt5-webkit-icu59.patch |   38 ++
 2 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 09:59:42 UTC (rev 294740)
+++ PKGBUILD2017-04-26 10:28:50 UTC (rev 294741)
@@ -16,11 +16,17 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz;)
-md5sums=('60a6935aca4a7c553d0ec4646ceed3b4')
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz;
+qt5-webkit-icu59.patch)
+md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
+ '245b9d4edeecba9bd09a10a8c8ecf4b2')
 
 prepare() {
   mkdir -p build
+
+# Fix build with ICU 59 (PLD linux)
+  cd ${_pkgfqn}
+  patch -p1 -i ../qt5-webkit-icu59.patch
 }
 
 build() {

Added: qt5-webkit-icu59.patch
===
--- qt5-webkit-icu59.patch  (rev 0)
+++ qt5-webkit-icu59.patch  2017-04-26 10:28:50 UTC (rev 294741)
@@ -0,0 +1,38 @@
+--- qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig 
2015-10-13 06:37:10.0 +0200
 qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h  
2017-04-24 12:26:42.495345570 +0200
+@@ -32,6 +32,7 @@
+ #include 
+ #endif
+ #include  /* for size_t */
++#include 
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -43,7 +44,7 @@
+ @typedef JSChar
+ @abstract A Unicode character.
+ */
+-typedef unsigned short JSChar;
++typedef char16_t JSChar;
+ #else
+ typedef wchar_t JSChar;
+ #endif
+--- qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h.orig  
2015-10-13 06:37:12.0 +0200
 qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h   
2017-04-24 12:27:33.432011867 +0200
+@@ -31,6 +31,7 @@
+ #ifndef __cplusplus
+ #include 
+ #endif
++#include 
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -38,7 +39,7 @@
+ 
+ #if !defined(WIN32) && !defined(_WIN32) \
+ && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* 
RVCT */
+-typedef unsigned short WKChar;
++typedef char16_t WKChar;
+ #else
+ typedef wchar_t WKChar;
+ #endif

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2017-01-23 Thread Antonio Rojas 
Date: Monday, January 23, 2017 @ 11:52:31
  Author: arojas
Revision: 287199

Update to 5.8.0

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-23 11:48:11 UTC (rev 287198)
+++ PKGBUILD2017-01-23 11:52:31 UTC (rev 287199)
@@ -3,9 +3,9 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_qtver=5.7.1
+_qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -16,8 +16,8 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz;)
-md5sums=('4fa8f47383ce36d59dcc36d701ce93cd')
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}-final/qtwebkit-opensource-src-${pkgver}.tar.xz;)
+md5sums=('60a6935aca4a7c553d0ec4646ceed3b4')
 
 prepare() {
   mkdir -p build

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-12-05 Thread Antonio Rojas 
Date: Monday, December 5, 2016 @ 12:43:04
  Author: arojas
Revision: 282840

Build docs (FS#52046)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-05 10:23:27 UTC (rev 282839)
+++ PKGBUILD2016-12-05 12:43:04 UTC (rev 282840)
@@ -5,13 +5,13 @@
 pkgname=qt5-webkit
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
 depends=('qt5-location' 'qt5-sensors' 'qt5-webchannel' 'libwebp' 'libxslt' 
'libxcomposite' 'gst-plugins-base')
-makedepends=('ruby' 'gperf' 'python2')
+makedepends=('ruby' 'gperf' 'python2' 'qt5-doc' 'qt5-tools')
 optdepends=('gst-plugins-good: Webm codec support')
 conflicts=('qt')
 groups=('qt' 'qt5')
@@ -33,11 +33,12 @@
   export PATH="${srcdir}/bin:$PATH"
   qmake ../${_pkgfqn}
   make
+  make docs
 }
 
 package() {
   cd build
-  make INSTALL_ROOT="$pkgdir" install
+  make INSTALL_ROOT="$pkgdir" install install_docs
 
   # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
   find "$pkgdir/usr/lib" -type f -name '*.prl' \

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-11-28 Thread Evangelos Foutras 
Date: Monday, November 28, 2016 @ 13:06:38
  Author: foutrelis
Revision: 282165

icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-28 13:06:32 UTC (rev 282164)
+++ PKGBUILD2016-11-28 13:06:38 UTC (rev 282165)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-pthread.patch)

2016-06-12 Thread Antonio Rojas 
Date: Sunday, June 12, 2016 @ 16:52:16
  Author: arojas
Revision: 269397

Update to 5.6.1

Modified:
  qt5-webkit/trunk/PKGBUILD
Deleted:
  qt5-webkit/trunk/qt5-webkit-pthread.patch

--+
 PKGBUILD |   14 --
 qt5-webkit-pthread.patch |   32 
 2 files changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-12 14:49:17 UTC (rev 269396)
+++ PKGBUILD2016-06-12 14:52:16 UTC (rev 269397)
@@ -3,9 +3,9 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_qtver=5.6.0
+_qtver=5.6.1
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -16,10 +16,8 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz;
-qt5-webkit-pthread.patch)
-md5sums=('b68565d18db63ee4db998bb8e37608a5'
- 'f65286024f65ca87837171272fc8975d')
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz;)
+md5sums=('9ea7cb557375ba2fc7c62742c522d093')
 
 prepare() {
   mkdir -p build
@@ -27,10 +25,6 @@
 # Hack to force python2
   mkdir -p bin
   ln -s /usr/bin/python2 bin/python
-
-# Fix linking to pthread
-  cd ${_pkgfqn}
-  patch -p1 -i ../qt5-webkit-pthread.patch
 }
 
 build() {

Deleted: qt5-webkit-pthread.patch
===
--- qt5-webkit-pthread.patch2016-06-12 14:49:17 UTC (rev 269396)
+++ qt5-webkit-pthread.patch2016-06-12 14:52:16 UTC (rev 269397)
@@ -1,32 +0,0 @@
-From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen 
-Date: Mon, 22 Feb 2016 10:57:32 +0100
-Subject: [PATCH] Fix linking with libpthread
-
-WebKit use libpthread directly but is depending on other qt modules
-causing it to be linked against, which might break unless -lpthread
-is last. Instead just add it explicitly after the static libraries.
-
-Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
-Reviewed-by: Simon Hausmann 
-(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
-Reviewed-by: Allan Sandfeld Jensen 

- Tools/qmake/mkspecs/features/default_post.prf | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Tools/qmake/mkspecs/features/default_post.prf 
b/Tools/qmake/mkspecs/features/default_post.prf
-index 67276b7..39bb3f7 100644
 a/Tools/qmake/mkspecs/features/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/default_post.prf
-@@ -201,6 +201,7 @@ needToLink() {
- linkAgainstLibrary($$library, 
$$eval(WEBKIT.$${library_identifier}.root_source_dir))
- LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
- }
-+posix:!darwin: LIBS += -lpthread
- }
- 
- creating_module {
--- 
-2.7.1
-

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-04-09 Thread Antonio Rojas 
Date: Saturday, April 9, 2016 @ 10:45:18
  Author: arojas
Revision: 264246

New tarball (FS#48840)

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-09 08:04:50 UTC (rev 264245)
+++ PKGBUILD2016-04-09 08:45:18 UTC (rev 264246)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -18,7 +18,7 @@
 _pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
 
source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz;
 qt5-webkit-pthread.patch)
-md5sums=('eba1382587add1c9b1293a532e7dd161'
+md5sums=('b68565d18db63ee4db998bb8e37608a5'
  'f65286024f65ca87837171272fc8975d')
 
 prepare() {
@@ -31,9 +31,6 @@
 # Fix linking to pthread
   cd ${_pkgfqn}
   patch -p1 -i ../qt5-webkit-pthread.patch
-
-# Generate headers
-  syncqt.pl-qt5 -version 5.6.0 Source/sync.profile
 }
 
 build() {

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-04-03 Thread Evangelos Foutras 
Date: Sunday, April 3, 2016 @ 16:30:25
  Author: foutrelis
Revision: 263832

icu 57.1 / poppler 0.42.0 rebuild

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-03 13:54:17 UTC (rev 263831)
+++ PKGBUILD2016-04-03 14:30:25 UTC (rev 263832)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-03-19 Thread Antonio Rojas 
Date: Friday, March 18, 2016 @ 00:49:46
  Author: arojas
Revision: 262023

New tarball

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-17 20:08:47 UTC (rev 262022)
+++ PKGBUILD2016-03-17 23:49:46 UTC (rev 262023)
@@ -5,7 +5,7 @@
 pkgname=qt5-webkit
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -16,9 +16,9 @@
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${pkgver}-rc/submodules/${_pkgfqn}.tar.xz;
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz;
 qt5-webkit-pthread.patch)
-md5sums=('f93c15d465a12c4598851ab8319be90d'
+md5sums=('eba1382587add1c9b1293a532e7dd161'
  'f65286024f65ca87837171272fc8975d')
 
 prepare() {

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-03-19 Thread Antonio Rojas 
Date: Wednesday, March 16, 2016 @ 17:07:22
  Author: arojas
Revision: 261917

Repackage as 5.6.0

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-16 14:10:33 UTC (rev 261916)
+++ PKGBUILD2016-03-16 16:07:22 UTC (rev 261917)
@@ -3,9 +3,9 @@
 # Contributor: Andrea Scarpino 
 
 pkgname=qt5-webkit
-_qtver=5.6.0-rc
+_qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -15,8 +15,8 @@
 optdepends=('gst-plugins-good: Webm codec support')
 conflicts=('qt')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-5.6.0"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+_pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${pkgver}-rc/submodules/${_pkgfqn}.tar.xz;
 qt5-webkit-pthread.patch)
 md5sums=('f93c15d465a12c4598851ab8319be90d'
  'f65286024f65ca87837171272fc8975d')

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

2016-03-14 Thread Antonio Rojas 
Date: Monday, March 14, 2016 @ 20:38:29
  Author: arojas
Revision: 261464

Add missing dependencies

Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-14 19:14:38 UTC (rev 261463)
+++ PKGBUILD2016-03-14 19:38:29 UTC (rev 261464)
@@ -5,12 +5,12 @@
 pkgname=qt5-webkit
 _qtver=5.6.0-rc
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-depends=('qt5-declarative' 'libwebp' 'libxslt' 'libxcomposite' 
'gst-plugins-base')
+depends=('qt5-location' 'qt5-sensors' 'qt5-webchannel' 'libwebp' 'libxslt' 
'libxcomposite' 'gst-plugins-base')
 makedepends=('ruby' 'gperf' 'python2')
 optdepends=('gst-plugins-good: Webm codec support')
 conflicts=('qt')
@@ -19,8 +19,7 @@
 
source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
 qt5-webkit-pthread.patch)
 md5sums=('f93c15d465a12c4598851ab8319be90d'
- 'f65286024f65ca87837171272fc8975d'
- '5dfb7c8ed8fd289d337c43c29c2984e0')
+ 'f65286024f65ca87837171272fc8975d')
 
 prepare() {
   mkdir -p build

[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-pthread.patch)

2016-03-03 Thread Antonio Rojas 
Date: Thursday, March 3, 2016 @ 21:02:45
  Author: arojas
Revision: 260679

Fix build

Added:
  qt5-webkit/trunk/qt5-webkit-pthread.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 qt5-webkit-pthread.patch |   32 
 2 files changed, 48 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-03 18:54:46 UTC (rev 260678)
+++ PKGBUILD2016-03-03 20:02:45 UTC (rev 260679)
@@ -10,14 +10,17 @@
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-depends=('qt5-base' 'libwebp' 'libxslt' 'libxcomposite' 'gst-plugins-base')
-makedepends=('qt5-declarative' 'leveldb' 'ruby' 'gperf' 'python2')
-optdepends=('qt5-declarative: QML bindings' 'gst-plugins-good: Webm codec 
support')
+depends=('qt5-declarative' 'libwebp' 'libxslt' 'libxcomposite' 
'gst-plugins-base')
+makedepends=('ruby' 'gperf' 'python2')
+optdepends=('gst-plugins-good: Webm codec support')
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-5.6.0"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-md5sums=('f93c15d465a12c4598851ab8319be90d')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+qt5-webkit-pthread.patch)
+md5sums=('f93c15d465a12c4598851ab8319be90d'
+ 'f65286024f65ca87837171272fc8975d'
+ '5dfb7c8ed8fd289d337c43c29c2984e0')
 
 prepare() {
   mkdir -p build
@@ -25,10 +28,17 @@
 # Hack to force python2
   mkdir -p bin
   ln -s /usr/bin/python2 bin/python
+
+# Fix linking to pthread
+  cd ${_pkgfqn}
+  patch -p1 -i ../qt5-webkit-pthread.patch
+
+# Generate headers
+  syncqt.pl-qt5 -version 5.6.0 Source/sync.profile
 }
 
 build() {
-  cd build
+  cd build  
 
   export PATH="${srcdir}/bin:$PATH"
   qmake ../${_pkgfqn}

Added: qt5-webkit-pthread.patch
===
--- qt5-webkit-pthread.patch(rev 0)
+++ qt5-webkit-pthread.patch2016-03-03 20:02:45 UTC (rev 260679)
@@ -0,0 +1,32 @@
+From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Mon, 22 Feb 2016 10:57:32 +0100
+Subject: [PATCH] Fix linking with libpthread
+
+WebKit use libpthread directly but is depending on other qt modules
+causing it to be linked against, which might break unless -lpthread
+is last. Instead just add it explicitly after the static libraries.
+
+Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
+Reviewed-by: Simon Hausmann 
+(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
+Reviewed-by: Allan Sandfeld Jensen 
+---
+ Tools/qmake/mkspecs/features/default_post.prf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Tools/qmake/mkspecs/features/default_post.prf 
b/Tools/qmake/mkspecs/features/default_post.prf
+index 67276b7..39bb3f7 100644
+--- a/Tools/qmake/mkspecs/features/default_post.prf
 b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -201,6 +201,7 @@ needToLink() {
+ linkAgainstLibrary($$library, 
$$eval(WEBKIT.$${library_identifier}.root_source_dir))
+ LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+ }
++posix:!darwin: LIBS += -lpthread
+ }
+ 
+ creating_module {
+-- 
+2.7.1
+