[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/, profiles/

2021-10-05 Thread Jakov Smolić 
commit: 782ad581f563b874a309931cd4ed49d95533df09
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Oct  5 06:51:37 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Oct  5 07:36:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782ad581

dev-qt/qtwebkit: treeclean

Bug: https://bugs.gentoo.org/684580
Signed-off-by: Jakov Smolić  gentoo.org>

 dev-qt/qtwebkit/Manifest   |   1 -
 .../qtwebkit-5.212.0_pre20200309-bison-3.7.patch   |  46 ---
 .../qtwebkit-5.212.0_pre20200309-glib-2.68.patch   |  28 
 .../qtwebkit-5.212.0_pre20200309-icu-68.patch  | 120 
 .../qtwebkit-5.212.0_pre20200309-python-3.9.patch  |  27 
 dev-qt/qtwebkit/metadata.xml   |  26 
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild | 153 -
 profiles/package.mask  |   6 -
 8 files changed, 407 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
deleted file mode 100644
index 7080d4f542b..000
--- a/dev-qt/qtwebkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 
72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0
 SHA512 
33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
deleted file mode 100644
index de3bbcfc3ef..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev 
-Date: Tue, 4 Aug 2020 21:04:06 +0300
-Subject: [PATCH] Let Bison generate the header directly, to fix build with
- Bison 3.7
-
-Starting with Bison 3.7, the generated C++ file #include's the header
-by default, instead of duplicating it. So we should not delete it.
-
-Remove the code to add #ifdef guards to the header, since Bison adds
-them itself since version 2.6.3.

- Source/WebCore/css/makegrammar.pl | 21 +
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/Source/WebCore/css/makegrammar.pl 
b/Source/WebCore/css/makegrammar.pl
-index 5d63b08102eb..9435701c7061 100644
 a/Source/WebCore/css/makegrammar.pl
-+++ b/Source/WebCore/css/makegrammar.pl
-@@ -73,25 +73,6 @@
- }
- 
- my $fileBase = File::Spec->join($outputDir, $filename);
--my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, 
"-o", "$fileBase.cpp");
-+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, 
$grammarFilePath, "-o", "$fileBase.cpp");
- push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in 
bison >= 3.0 on Windows where it puts backslashes into #line directives.
- system(@bisonCommand) == 0 or die;
--
--open HEADER, ">$fileBase.h" or die;
--print HEADER << "EOF";
--#ifndef CSSGRAMMAR_H
--#define CSSGRAMMAR_H
--EOF
--
--open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
--while () {
--print HEADER;
--}
--close HPP;
--
--print HEADER "#endif\n";
--close HEADER;
--
--unlink("$fileBase.cpp.h");
--unlink("$fileBase.hpp");
--

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
deleted file mode 100644
index f377a311362..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/qtwebkit/qtwebkit/pull/1058
-
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt 
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.

- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
 a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include 
- #include 
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
deleted file mode 100644
index 7de72ea61af..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
+++ /dev/null
@@ -1,120 +0,0 @@
 a/Source/WebCore/platform/text/icu/UTextProvider.h
-+++

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2021-04-18 Thread Matt Turner 
commit: 25a7998633134fa5ed93cfa880e3fad27156e09f
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Apr 19 03:33:08 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Apr 19 03:33:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a79986

dev-qt/qtwebkit: Fix build with glib-2.68

Closes: https://bugs.gentoo.org/59
Signed-off-by: Matt Turner  gentoo.org>

 .../qtwebkit-5.212.0_pre20200309-glib-2.68.patch   | 28 ++
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild |  1 +
 2 files changed, 29 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
new file mode 100644
index 000..f377a311362
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-glib-2.68.patch
@@ -0,0 +1,28 @@
+https://github.com/qtwebkit/qtwebkit/pull/1058
+
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
 b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include 
+ #include 
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index 26d118790a7..f2e91b79caf 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499
"${FILESDIR}/${P}-icu-68.patch" # bug 753260
"${FILESDIR}/${P}-python-3.9.patch" # bug 766303
+   "${FILESDIR}/${P}-glib-2.68.patch" # bug 59
 )
 
 _check_reqs() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2021-04-06 Thread Andreas Sturmlechner 
commit: c57fa9aac2b976ed3302c7c54310ccde0e7673e6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  6 19:59:51 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  6 21:33:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57fa9aa

dev-qt/qtwebkit: Fix build with python-3.9

Thanks-to: Francesco Riosa  gmail.com>
Closes: https://bugs.gentoo.org/766303
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebkit-5.212.0_pre20200309-python-3.9.patch  | 27 ++
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git 
a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
new file mode 100644
index 000..a3b677b779b
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-python-3.9.patch
@@ -0,0 +1,27 @@
+From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev 
+Date: Wed, 3 Jun 2020 15:01:42 +0300
+Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to
+ json.load()
+
+In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument
+is not supported.
+
+Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9
+---
+ Source/JavaScriptCore/generate-bytecode-files | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/generate-bytecode-files 
b/Source/JavaScriptCore/generate-bytecode-files
+index c5dab429c7b0..af3431275ecf 100644
+--- a/Source/JavaScriptCore/generate-bytecode-files
 b/Source/JavaScriptCore/generate-bytecode-files
+@@ -163,7 +163,7 @@ if __name__ == "__main__":
+ initBytecodesFile = openOrExit(initASMFileName, "w")
+ 
+ try:
+-bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
++bytecodeSections = json.load(bytecodeFile)
+ except:
+ print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, 
sys.exc_info()))
+ 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index d6744c8a405..62ebc6f09e8 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,6 +86,7 @@ CHECKREQS_DISK_BUILD="16G" # bug 417307
 PATCHES=(
"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499
"${FILESDIR}/${P}-icu-68.patch" # bug 753260
+   "${FILESDIR}/${P}-python-3.9.patch" # bug 766303
 )
 
 _check_reqs() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2020-08-18 Thread Andreas Sturmlechner 
commit: 69e618c88a9134f754264efc11aa0b1fdc028b88
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 18 13:56:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 18 17:48:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e618c8

dev-qt/qtwebkit: Fix build with sys-devel/bison-3.7

Closes: https://bugs.gentoo.org/736499
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebkit-5.212.0_pre20200309-bison-3.7.patch   | 46 ++
 .../qtwebkit-5.212.0_pre20200309-r1.ebuild |  2 +
 2 files changed, 48 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
new file mode 100644
index 000..de3bbcfc3ef
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-bison-3.7.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev 
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl 
b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
 b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+ 
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, 
"-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, 
$grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in 
bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while () {
+-print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index dc07eb1bf74..f7f37face2c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${DEPEND}"
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
+PATCHES=( "${FILESDIR}/${P}-bison-3.7.patch" ) # bug 736499
+
 _check_reqs() {
if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq 
"-g*0"; then
einfo "Checking for sufficient disk space to build ${PN} with 
debugging flags"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2020-04-09 Thread Andreas Sturmlechner 
commit: 911e13a7113e7d0de720b536f3940fdbf30d13e1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  8 09:50:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:36:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911e13a7

dev-qt/qtwebkit: Drop 5.212.0_pre20190629-r1

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebkit/Manifest   |   1 -
 .../qtwebkit-5.212.0_pre20190629-icu-65.patch  |  55 
 .../qtwebkit-5.212.0_pre20190629-r1.ebuild | 144 -
 3 files changed, 200 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index f9c66a241ca..7080d4f542b 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,2 +1 @@
-DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 
1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d
 SHA512 
38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
 DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 
72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0
 SHA512 
33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
deleted file mode 100644
index 1891f73d5a4..000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001
-From: "commit-qu...@webkit.org"
- 
-Date: Fri, 4 Oct 2019 21:51:37 +
-Subject: [PATCH] Fix build with icu 65.1
- https://bugs.webkit.org/show_bug.cgi?id=202600
-
-Patch by Heiko Becker  on 2019-10-04
-Reviewed by Konstantin Tokarev.
-
-Source/WebCore:
-
-* dom/Document.cpp:
-(WebCore::isValidNameNonASCII):
-(WebCore::Document::parseQualifiedName):
-
-Source/WTF:
-
-* wtf/URLHelpers.cpp:
-(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
-
-Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 
268f45cc-cd09-0410-ab3c-d52691b4dbfc

- Source/WebCore/dom/Document.cpp |  6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f8..19355f166019 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;

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild
deleted file mode 100644
index 8d4967aaf3e..000
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous 
snapshot
-inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single 
toolchain-funcs
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-HOMEPAGE="https://www.qt.io/;
-SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz;
-
-LICENSE="BSD LGPL-2+"
-SLOT="5/5.212"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin 
opengl orientation +printsupport qml webp X"
-
-REQUIRED_USE="
-   nsplugin? ( X )
-   qml? ( opengl )
-   ?? ( gstreamer multimedia )
-"
-
-# Dependencies found at Source/cmake/OptionsQt.cmake
-QT_MIN_VER="5.9.1:5"
-BDEPEND="
-   ${PYTHON_DEPS}
-   ${RUBY_DEPS}
-   dev-lang/perl
-   dev-util/gperf
-   >=sys-devel/bison-2.4.3
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2018-07-03 Thread Andreas Sturmlechner 
commit: ea2ae777d028e584cd175b2d4081dea826c8f7d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul  3 06:06:37 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul  3 06:09:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2ae777

dev-qt/qtwebkit: 5.212.0_pre20180120 snapshot bump

Closes: https://bugs.gentoo.org/624404
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-qt/qtwebkit/Manifest   |   1 +
 .../qtwebkit-5.212.0_pre20180120-functional.patch  |  22 
 dev-qt/qtwebkit/metadata.xml   |   1 +
 .../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild   | 141 +
 4 files changed, 165 insertions(+)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 97b9f0eada0..36eb87329b0 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1 +1,2 @@
+DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B 
a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0
 SHA512 
582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B 
eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2
 SHA512 
79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5

diff --git 
a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
new file mode 100644
index 000..d8b5ba6cf31
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
@@ -0,0 +1,22 @@
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev 
+Date: Fri, 26 Jan 2018 20:50:07 +0300
+Subject: [PATCH] Add missing #include 
+
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h 
b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa6de8..9b9ebe429816 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
 b/Source/WebCore/dom/SlotAssignment.h
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 645be81df28..c7df499ff74 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -9,6 +9,7 @@
Enable physical position determination 
via dev-qt/qtpositioning
Use GLES 2.0 or later instead of full 
OpenGL
Enable HTML5 audio/video support via 
media-libs/gstreamer using SLOT 1.0
+   Enable hyphenation support via 
dev-libs/hyphen
Enable HTML5 audio/video support via 
dev-qt/qtmultimedia
Enable device orientation detection 
via dev-qt/qtsensors
Enable printing via 
dev-qt/qtprintsupport

diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
new file mode 100644
index 000..506e3879d34
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils 
ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/;
+SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD LGPL-2+"
+SLOT="5/5.212"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl 
orientation +printsupport qml webp X"
+
+REQUIRED_USE="
+   nsplugin? ( X )
+   qml? ( opengl )
+   ?? ( gstreamer multimedia )
+"
+
+QT_MIN_VER="5.9.1:5"
+# Dependencies found at Source/cmake/OptionsQt.cmake
+RDEPEND="
+   dev-db/sqlite:3
+   dev-libs/icu:=
+   dev-libs/libxml2:2
+   dev-libs/libxslt
+   >=dev-qt/qtcore-${QT_MIN_VER}
+   >=dev-qt/qtgui-${QT_MIN_VER}
+   >=dev-qt/qtnetwork-${QT_MIN_VER}
+   >=dev-qt/qtwidgets-${QT_MIN_VER}
+   media-libs/libpng:0=
+   virtual/jpeg:0
+   geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+   gstreamer? (
+   dev-libs/glib:2
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2018-01-06 Thread Mikle Kolyada 
commit: 893b23bb814213d1c0465d97d14c9cbf74f48fce
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jan  6 11:40:26 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jan  6 11:40:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893b23bb

dev-qt/qtwebkit: Drop obsolete qtwebkit:4 packages

Bug: https://bugs.gentoo.org/620684
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-qt/qtwebkit/Manifest   |   2 -
 dev-qt/qtwebkit/files/4.10.4-gcc5.patch|  35 --
 .../files/4.10.4-use-correct-icu-typedef.patch |  40 ---
 .../qtwebkit/files/4.8.2-javascriptcore-x32.patch  |  11 --
 dev-qt/qtwebkit/metadata.xml   |   2 -
 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild | 125 -
 dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild  |  69 
 7 files changed, 284 deletions(-)

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 6e0d43c0adb..373025ecb9d 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,2 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 
6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3
 SHA512 
f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
-DIST qtwebkit-2.3.4.tar.gz 51648808 BLAKE2B 
6f7f7fa5cc40389ffca7871ef1db6b448b324bf7d6c9cd09738ab561c1dc16409d2e0979cf1b5c8db9efc24fc49fc603fd940c2bc6a815d2a9ef263aa1223a86
 SHA512 
f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 
74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581
 SHA512 
538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B 
eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2
 SHA512 
79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5

diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch 
b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch
deleted file mode 100644
index 3a6b2a39c0e..000
--- a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Allan Sandfeld Jensen 
-Date: Fri, 6 Mar 2015 10:20:13 + (+0100)
-Subject: Fix g++ 5.0 build
-X-Git-Tag: v5.4.2~12
-X-Git-Url: 
https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=650c6ee8e76bb574d3a1bea09e2494992d8f070e;hp=f9966f351678351ee6b971d7b6b25a4987407e46
-
-Fix g++ 5.0 build
-
-A non-inline template needs to be explicitly instantiated if used
-outside the object where it is declared.
-
-Patch suggested by Khem Raj.
-
-Task-number: QTBUG-44829
-Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792
-Reviewed-by: Andras Becsi 

-
-diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp 
b/Source/JavaScriptCore/runtime/JSObject.cpp
-index 5637e20..bd55919 100644
 a/Source/JavaScriptCore/runtime/JSObject.cpp
-+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
-@@ -1909,6 +1909,11 @@ void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
- }
- }
- 
-+// Used in JSArray.cpp so we must instantiate explicit
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* 
exec, unsigned i, JSValue value);
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* 
exec, unsigned i, JSValue value);
-+template void 
JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState*
 exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, 
unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- VM& vm = exec->vm();
-

diff --git a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch 
b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
deleted file mode 100644
index 3e4816255fe..000
--- a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 916f8b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= 
-Date: Tue, 3 Sep 2013 16:59:35 +0200
-Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002
-
-This fixes the build failure of qtwebkit23 on my Gentoo machine.

- Source/WTF/wtf/unicode/qt4/UnicodeQt4.h |2 +-
- Source/WTF/wtf/unicode/wchar/UnicodeWchar.h |2 +-
- 2 files changed, 2 insertions(+), 2

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2016-05-04 Thread Davide Pesavento 
commit: 6df5012422e5b2b2877819e52c1eb9457cafc80c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu May  5 01:02:08 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu May  5 01:02:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df50124

dev-qt/qtwebkit: fix linking against libpthread

Gentoo-Bug: 581282

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch | 32 ++
 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild  |  1 +
 2 files changed, 33 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch 
b/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch
new file mode 100644
index 000..7fea802
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch
@@ -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.8.2
+

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild 
b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 58876f1..1ba763b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -67,6 +67,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+   "${FILESDIR}/${PN}-5.6.0-pthread.patch" # bug 581282
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

2016-01-20 Thread Davide Pesavento 
commit: e8d41fb70efef2831e02d7d95e938c7b4f67a5d8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jan 20 15:18:00 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Jan 20 15:28:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d41fb7

dev-qt/qtwebkit: use consistent patch names

Package-Manager: portage-2.2.27

 .../files/{qtwebkit-4.10.4-fix-gcc-5.patch => 4.10.4-gcc5.patch}| 0
 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch 
b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch
similarity index 100%
rename from dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch
rename to dev-qt/qtwebkit/files/4.10.4-gcc5.patch

diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild 
b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
index be52f6d..8badc2b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
@@ -57,8 +57,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}
 
 PATCHES=(
+   "${FILESDIR}/${PV}-gcc5.patch"
"${FILESDIR}/${PV}-use-correct-icu-typedef.patch"
-   "${FILESDIR}/${P}-fix-gcc-5.patch"
 )
 
 src_prepare() {