[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/, profiles/
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/
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/
commit: 29b55fe0a022cdb6ac449c918fe67ae1ba16e741 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 6 22:20:00 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 6 22:38:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b55fe0 dev-qt/qtwebkit: Actually add py39 to PYTHON_COMPAT Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62ebc6f09e8..26d118790a7 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -13,7 +13,7 @@ else KEYWORDS="amd64 arm arm64 ppc64 x86" S="${WORKDIR}/${MY_P}" fi -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) USE_RUBY="ruby25 ruby26 ruby27" inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/files/, dev-qt/qtwebkit/
commit: 335f29d266c5b169ff1e781f9851a3a203f3198c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 6 08:22:15 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 6 08:48:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335f29d2 dev-qt/qtwebkit: Fix build with ICU-68 Thanks-to: Lars Wendler gentoo.org> Closes: https://bugs.gentoo.org/753260 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwebkit-5.212.0_pre20200309-icu-68.patch | 120 + .../qtwebkit-5.212.0_pre20200309-r1.ebuild | 5 +- 2 files changed, 124 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..7de72ea61af --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch @@ -0,0 +1,120 @@ +--- a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +-isAccessible = TRUE; ++isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +-isAccessible = FALSE; ++isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +-isAccessible = TRUE; ++isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +-isAccessible = FALSE; ++isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +-return TRUE; ++return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +-return FALSE; ++return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +-return TRUE; ++return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +-return FALSE; ++return false; + } + } + +@@ -144,7 +144,7 @@ + + uText->nativeIndexingLimit = uText->chunkLength; + +-return TRUE; ++return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +-return FALSE; ++return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +-return TRUE; ++return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +-return FALSE; ++return false; + int64_t
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/
commit: 3de9ea67c699b9d6a2ab5e22136a00d92c0f35a2 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 19 13:27:24 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 19 13:27:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de9ea67 dev-qt/qtwebkit: dekeyword ppc The final binary overfows relocation offsets and does not work as-is. Let's dekeyword them following net-libs/webkit-gtk. Bug: https://bugs.gentoo.org/660356 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8147c145786..dc07eb1bf74 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/
commit: 3af5e0def413e5834bfb2cc3cecedbb1b3338e4f Author: Mart Raudsepp gentoo org> AuthorDate: Wed Apr 8 09:47:05 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Wed Apr 8 09:47:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af5e0de dev-qt/qtwebkit: arm64 stable (bug #716068) Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dbb734a3126..8147c145786 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86" + KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: ed446af9beae00ef158148abb64c36abd73b2934 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Apr 5 09:38:11 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Apr 5 09:38:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed446af9 dev-qt/qtwebkit: ppc64 stable wrt bug #716068 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 60ee8ed61e2..dbb734a3126 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 25cf227cae33eab3eed02f6bd57e6fe711451b95 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Apr 4 13:34:54 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Apr 4 13:34:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25cf227c dev-qt/qtwebkit: x86 stable wrt bug #716068 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 70da96422b2..60ee8ed61e2 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: a4bd6a4955775b93bf7a2ae2629d952edef12617 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Apr 4 13:27:55 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Apr 4 13:27:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bd6a49 dev-qt/qtwebkit: arm stable wrt bug #716068 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 358ac053f3d..70da96422b2 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 04336594bbd5a66ba7258cc8bdf2d05c4bbdd95a Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Apr 4 13:27:06 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Apr 4 13:27:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04336594 dev-qt/qtwebkit: amd64 stable wrt bug #716068 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6ad3b1f43a4..358ac053f3d 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = * ]]; then else MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}/${MY_P}" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 5d94558f7a7fc771a03c9f49d566c4cfa8cc9876 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Nov 23 09:48:45 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 3 20:05:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d94558f dev-qt/qtwebkit: rename USE=gles2 to USE=gles2-only Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebkit/metadata.xml| 1 - 0_pre20190629.ebuild => qtwebkit-5.212.0_pre20190629-r1.ebuild} | 6 +++--- 0_pre20200309.ebuild => qtwebkit-5.212.0_pre20200309-r1.ebuild} | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index 342794051c1..05f4bb98e37 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -7,7 +7,6 @@ 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 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild similarity index 94% rename from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild rename to dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild index 58d927f9baa..8d4967aaf3e 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar 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" +IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE=" nsplugin? ( X ) @@ -55,8 +55,8 @@ DEPEND=" hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] + >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=] + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=] ) orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild similarity index 94% rename from dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild rename to dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild index 406b871dda5..6ad3b1f43a4 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://www.qt.io/; LICENSE="BSD LGPL-2+" SLOT="5/5.212" -IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" +IUSE="geolocation gles2-only +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE=" nsplugin? ( X ) @@ -63,8 +63,8 @@ DEPEND=" hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] + >=dev-qt/qtgui-${QT_MIN_VER}[gles2-only=] + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2-only=] ) orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 46db89e77cf8676501abe2be42615d81b561e4ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 11 17:06:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 11 17:31:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46db89e7 dev-qt/qtwebkit: 5.212.0_pre20200309 (alpha4) version bump - Build with python3. - Unconditionally depend on media-libs/woff2 Closes: https://bugs.gentoo.org/698990 Closes: https://bugs.gentoo.org/704748 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebkit/Manifest | 1 + .../qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild | 146 + 2 files changed, 147 insertions(+) diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index eaf279d..f9c66a241ca 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1 +1,2 @@ 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/qtwebkit-5.212.0_pre20200309.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild new file mode 100644 index 000..406b871dda5 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = * ]]; then + EGIT_BRANCH="qtwebkit-5.212" + EGIT_REPO_URI="https://github.com/qtwebkit/qtwebkit.git; + inherit git-r3 +else + MY_P="${PN}-${PV/_pre20200309/-alpha4}" # present as upgrade over previous snapshot + SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz; + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}/${MY_P}" +fi +PYTHON_COMPAT=( python3_{6,7,8} ) +USE_RUBY="ruby25 ruby26 ruby27" +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/; + +LICENSE="BSD LGPL-2+" +SLOT="5/5.212" +IUSE="geolocation gles2 +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.12.3:5" +BDEPEND=" + ${PYTHON_DEPS} + ${RUBY_DEPS} + dev-lang/perl + dev-util/gperf + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig +" +DEPEND=" + dev-db/sqlite:3 + dev-libs/icu:= + dev-libs/libxml2 + 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= + media-libs/woff2 + virtual/jpeg:0 + geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + hyphen? ( dev-libs/hyphen ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) + opengl? ( + >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] + ) + orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) + qml? ( + >=dev-qt/qtdeclarative-${QT_MIN_VER} + >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] + ) + webp? ( media-libs/libwebp:= ) + X? ( + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + ) +" +RDEPEND="${DEPEND}" + +CHECKREQS_DISK_BUILD="16G" # bug 417307 + +_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" + check-reqs_$1 + fi +} + +pkg_pretend() { + _check_reqs pkg_pretend +} + +pkg_setup() { + _check_reqs pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + # Respect CC, otherwise
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 2d30a391b51d690dd535f0f27955681353c80c46 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Jan 14 19:27:06 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Jan 14 19:27:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d30a391 dev-qt/qtwebkit: fix newline Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index 7414f1309bf..58d927f9baa 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -141,4 +141,4 @@ src_install() { eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' fi -} \ No newline at end of file +}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: affaf49dbdd5a04ce166bb5ab1c90370e60b8751 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Jan 14 19:13:55 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Jan 14 19:14:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affaf49d dev-qt/qtwebkit: works with ruby27 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index fc9fd9ccaf8..7414f1309bf 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# 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" +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 @@ -120,7 +120,9 @@ src_configure() { -DENABLE_X11_TARGET=$(usex X) ) - if has_version "virtual/rubygems[ruby_targets_ruby26]"; then + if has_version "virtual/rubygems[ruby_targets_ruby27]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) + elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) @@ -139,4 +141,4 @@ src_install() { eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' fi -} +} \ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/
commit: 0c26ac28753383ed6b714d00651f56a97ae0ebf6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Dec 1 08:20:33 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Dec 1 18:42:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c26ac28 dev-qt/qtwebkit: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13818 Signed-off-by: Aaron Bauman gentoo.org> ...0180120-cmake-fix-pkgconfig_deps-spelling.patch | 97 -- ...twebkit-5.212.0_pre20180120-fix-pkgconfig.patch | 29 --- .../qtwebkit-5.212.0_pre20180120-functional.patch | 22 - ...webkit-5.212.0_pre20180120-js-build-error.patch | 34 4 files changed, 182 deletions(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch deleted file mode 100644 index a460cec609b..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001 -From: Andrew Webster -Date: Tue, 20 Mar 2018 09:08:00 -0400 -Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent - -It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left -Qt5WebKitWidgets with empty dependencies. Correcting to -PKGCONFIG_DEPS gives it the proper dependencies. - -Qt5WebKit was already working, but the spelling has also been -corrected to avoid confusion. - Source/WebKit/PlatformQt.cmake | 14 +++--- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 28976b611cd8..de3eabab1157 100644 a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -427,7 +427,7 @@ install( - COMPONENT Data - ) - --set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network") -+set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network") - set(WEBKIT_PRI_DEPS "core gui network") - set(WEBKIT_PRI_EXTRA_LIBS "") - set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private") -@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION) - set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}") - endif () - if (USE_QT_MULTIMEDIA) --set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia") -+set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia") - set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}") - endif () - --set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") -+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") - set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit") - set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private") - -@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT) - endif () - - if (USE_QT_MULTIMEDIA) --set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets") -+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets") - set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets") - endif () - - if (QT_STATIC_BUILD) --set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport") -+set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport") - set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport") - set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF) - append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) -@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD) - endif () - list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES) - foreach (LIB_NAME ${EXTRA_LIBS_NAMES}) --set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") -+set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") - set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}") - endforeach () - endif () -@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - BASE_NAME Qt5WebKit - DESCRIPTION "Qt WebKit module" - INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" --DEPS "${WEBKIT_PKGCONGIG_DEPS}" -+DEPS "${WEBKIT_PKGCONFIG_DEPS}" - FILENAME_VAR WebKit_PKGCONFIG_FILENAME - ) - set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") -From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001 -From: Andrew Webster -Date: Tue, 20 Mar 2018 10:33:59 -0400 -Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction - -
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: a1497d8ae044e812a945f8dca106479968b64192 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 30 13:24:30 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 30 13:25:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1497d8a dev-qt/qtwebkit: Drop 5.212.0_pre20180120 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebkit/Manifest | 1 - .../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 150 - 2 files changed, 151 deletions(-) diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index 1e6cb48c55f..eaf279d 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_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild deleted file mode 100644 index 5d0412d03ff..000 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 ruby26" - -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="mirror://gentoo/${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 ) -" - -# Dependencies found at Source/cmake/OptionsQt.cmake -QT_MIN_VER="5.9.1:5" -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - dev-libs/libxml2 - 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 - media-libs/gst-plugins-bad:1.0 - ) - hyphen? ( dev-libs/hyphen ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) - opengl? ( - >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] - ) - orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) - qml? ( - >=dev-qt/qtdeclarative-${QT_MIN_VER} - >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] - ) - webp? ( media-libs/libwebp:= ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - dev-lang/perl - dev-util/gperf - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" - -S=${WORKDIR}/${COMMIT} - -PATCHES=( - "${FILESDIR}/${P}-functional.patch" - "${FILESDIR}/${P}-fix-pkgconfig.patch" - "${FILESDIR}/${P}-cmake-fix-pkgconfig_deps-spelling.patch" - "${FILESDIR}/${P}-js-build-error.patch" -) - -CHECKREQS_DISK_BUILD="16G" # bug 417307 - -_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" - check-reqs_$1 - fi -} - -pkg_pretend() { - _check_reqs pkg_pretend -} - -pkg_setup() { - _check_reqs pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - # Respect CC, otherwise fails on prefix, bug #395875 - tc-export CC - - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - - local
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: cee1ac25da60d9670596b2741b6b0a4321400a79 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Nov 27 13:18:13 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Nov 27 13:18:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee1ac25 dev-qt/qtwebkit: arm stable wrt bug #700770 Package-Manager: Portage-2.3.79, Repoman-2.3.16 RepoMan-Options: --include-arches="arm" Signed-off-by: Mikle Kolyada gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index 4c6aad96628..196ec44e934 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 768f330346490f795f98ede980b549b20863753c Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Nov 23 12:43:05 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Nov 23 12:43:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768f3303 dev-qt/qtwebkit: x86 stable wrt bug #700770 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index 0d3882fcc27..4c6aad96628 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: e68445d822bc35e2990016522b72697393188a8b Author: Aaron Bauman gentoo org> AuthorDate: Tue Nov 12 14:57:55 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Nov 12 15:00:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68445d8 dev-qt/qtwebkit: arm64 stable (bug #691738) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.79, Repoman-2.3.18 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index bcf7027ae69..0d3882fcc27 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: e8bfdb22e96271b014eef1e73f9cef49bc76c4ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 22 19:46:14 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 23 23:32:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bfdb22 dev-qt/qtwebkit: Fix build against ICU-65 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwebkit-5.212.0_pre20190629-icu-65.patch | 55 ++ .../qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 + 2 files changed, 57 insertions(+) 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 new file mode 100644 index 000..1891f73d5a4 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch @@ -0,0 +1,55 @@ +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.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index 025efa83545..bcf7027ae69 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -77,6 +77,8 @@ S="${WORKDIR}/${MY_P}" CHECKREQS_DISK_BUILD="16G" # bug 417307 +PATCHES=( "${FILESDIR}/${P}-icu-65.patch" ) + _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/
commit: 3782ec02f6dcaf586d82c4c284fa7ff367a5d268 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 16:12:59 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 16:12:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3782ec02 dev-qt/qtwebkit: ppc64 stable wrt bug #691738 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Mikle Kolyada gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index 06de7768045..025efa83545 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 63dcd9ea6dd8a4399e097ec13059d7e17e94caf7 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 16:09:21 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 16:09:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63dcd9ea dev-qt/qtwebkit: amd64 stable wrt bug #691738 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Mikle Kolyada gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild index ce0302f95ae..06de7768045 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 999c06930e5bcb4c842756e56f3e2047315b9407 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 11 16:51:06 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 12 07:30:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999c0693 dev-qt/qtwebkit: 5.212.0_pre20190629 snapshot bump Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebkit/Manifest | 1 + .../qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 140 + 2 files changed, 141 insertions(+) diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index 2edec829aec..1e6cb48c55f 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1 +1,2 @@ +DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild new file mode 100644 index 000..ce0302f95ae --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby24 ruby25 ruby26" +MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot +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="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 +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 + sys-devel/flex + virtual/pkgconfig +" +DEPEND=" + dev-db/sqlite:3 + dev-libs/icu:= + dev-libs/libxml2 + 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-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + hyphen? ( dev-libs/hyphen ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) + opengl? ( + >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] + ) + orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) + qml? ( + >=dev-qt/qtdeclarative-${QT_MIN_VER} + >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] + ) + webp? ( media-libs/libwebp:= ) + X? ( + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +CHECKREQS_DISK_BUILD="16G" # bug 417307 + +_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" + check-reqs_$1 + fi +} + +pkg_pretend() { + _check_reqs pkg_pretend +} + +pkg_setup() { + _check_reqs pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + # Respect CC, otherwise fails on prefix, bug #395875 + tc-export CC + + # Multiple rendering bugs on youtube, github, etc without this, bug #547224 + append-flags $(test-flags -fno-strict-aliasing) + + local mycmakeargs=( + -DPORT=Qt + -DENABLE_API_TESTS=OFF + -DENABLE_TOOLS=OFF + -DENABLE_GEOLOCATION=$(usex
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 35b1b8dc8f48f9fedcc9d1a6eaf8c2cb8d20ebac Author: Aaron Bauman gentoo org> AuthorDate: Sat May 25 00:39:27 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sat May 25 00:39:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b1b8dc dev-qt/qtwebkit: arm64 stable Signed-off-by: Aaron Bauman gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index f288314ce87..5d0412d03ff 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 3a15c334484e5f17e988595c6bac3cd665efec5a Author: Anthony G. Basile gentoo org> AuthorDate: Fri Apr 26 17:36:41 2019 + Commit: Anthony G. Basile gentoo org> CommitDate: Fri Apr 26 17:36:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a15c334 dev-qt/qtwebkit: stable on arm Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 49f0ae2bc99..09a58197a99 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 8661ebebb868d061842495889307c22f10698921 Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Jan 14 09:07:20 2019 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Jan 14 09:07:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661ebeb dev-qt/qtwebkit: works with ruby26 Closes: https://bugs.gentoo.org/674572 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov gentoo.org> dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index d520d1f87ea..49f0ae2bc99 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da CMAKE_MAKEFILE_GENERATOR="ninja" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby23 ruby24 ruby25 ruby26" inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs @@ -125,7 +125,9 @@ src_configure() { -DENABLE_X11_TARGET=$(usex X) ) - if has_version "virtual/rubygems[ruby_targets_ruby25]"; then + if has_version "virtual/rubygems[ruby_targets_ruby26]"; then + mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) + elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: f85385e4bf45d1e5af44a1b494c914a9f2020887 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 14 23:56:54 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 15 23:12:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85385e4 dev-qt/qtwebkit: Fix pkgconfig Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> ...0180120-cmake-fix-pkgconfig_deps-spelling.patch | 97 ++ ...twebkit-5.212.0_pre20180120-fix-pkgconfig.patch | 29 +++ .../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 6 +- 3 files changed, 131 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch new file mode 100644 index 000..a460cec609b --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch @@ -0,0 +1,97 @@ +From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001 +From: Andrew Webster +Date: Tue, 20 Mar 2018 09:08:00 -0400 +Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent + +It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left +Qt5WebKitWidgets with empty dependencies. Correcting to +PKGCONFIG_DEPS gives it the proper dependencies. + +Qt5WebKit was already working, but the spelling has also been +corrected to avoid confusion. +--- + Source/WebKit/PlatformQt.cmake | 14 +++--- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +index 28976b611cd8..de3eabab1157 100644 +--- a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +@@ -427,7 +427,7 @@ install( + COMPONENT Data + ) + +-set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network") ++set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network") + set(WEBKIT_PRI_DEPS "core gui network") + set(WEBKIT_PRI_EXTRA_LIBS "") + set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private") +@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION) + set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}") + endif () + if (USE_QT_MULTIMEDIA) +-set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia") ++set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia") + set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}") + endif () + +-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") ++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit") + set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit") + set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private") + +@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT) + endif () + + if (USE_QT_MULTIMEDIA) +-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets") ++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets") + set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets") + endif () + + if (QT_STATIC_BUILD) +-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport") ++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport") + set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport") + set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF) + append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) +@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD) + endif () + list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES) + foreach (LIB_NAME ${EXTRA_LIBS_NAMES}) +-set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") ++set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}") + set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}") + endforeach () + endif () +@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + BASE_NAME Qt5WebKit + DESCRIPTION "Qt WebKit module" + INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" +-DEPS "${WEBKIT_PKGCONGIG_DEPS}" ++DEPS "${WEBKIT_PKGCONFIG_DEPS}" + FILENAME_VAR WebKit_PKGCONFIG_FILENAME + ) + set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") +From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001 +From: Andrew Webster +Date: Tue, 20 Mar 2018 10:33:59 -0400 +Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction + +--- + Source/WebKit/PlatformQt.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 1d579b1e892f271ef03140255d03d59b8369e877 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 19 19:54:04 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 19 20:23:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d579b1e dev-qt/qtwebkit: Fix build with !hyphen Closes: https://bugs.gentoo.org/666752 Reported-by: David Flogeras gmail.com> Thanks-to: Alexander Sergeyev gmail.com> Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 3896c99b459..cee7596f99c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -109,6 +109,7 @@ src_configure() { -DENABLE_TOOLS=OFF -DENABLE_GEOLOCATION=$(usex geolocation) -DUSE_GSTREAMER=$(usex gstreamer) + -DUSE_LIBHYPHEN=$(usex hyphen) -DENABLE_JIT=$(usex jit) -DUSE_QT_MULTIMEDIA=$(usex multimedia) -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 2e1ea0f0974597d58936620f77384becd0ea8a22 Author: Marty E. Plummer startmail com> AuthorDate: Mon Oct 15 18:38:33 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 19 08:49:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1ea0f0 dev-qt/qtwebkit: remove local webp use flag Signed-off-by: Marty E. Plummer startmail.com> Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Michał Górny gentoo.org> dev-qt/qtwebkit/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index f76a3bfaff3..342794051c1 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -14,7 +14,6 @@ Enable device orientation detection via dev-qt/qtsensors Enable printing via dev-qt/qtprintsupport Build QML/QtQuick bindings - Add support for WebP image format https://bugreports.qt.io/
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: 3fe93d9026dccc5e37dda80ac2dd088bf06d9b52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 24 16:49:31 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 24 17:09:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe93d90 dev-qt/qtwebkit: Security cleanup Bug: https://bugs.gentoo.org/665240 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-qt/qtwebkit/Manifest | 1 - .../files/qtwebkit-5.4.2-system-leveldb.patch | 25 - .../files/qtwebkit-5.5.1-disable-jit.patch | 15 --- .../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 --- dev-qt/qtwebkit/metadata.xml | 1 - dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 120 - 6 files changed, 177 deletions(-) diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index 36eb87329b0..2edec829aec 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1,2 +1 @@ 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.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch deleted file mode 100644 index 265d5075f2f..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch +++ /dev/null @@ -1,25 +0,0 @@ -Correct header location so system dev-libs/leveldb can be detected. - a/Tools/qmake/config.tests/leveldb/leveldb.cpp -+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp -@@ -19,7 +19,7 @@ - - #include - #include --#include -+#include - - int main(int, char**) - { - a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch deleted file mode 100644 index 40e58f0d0de..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allow disabling JIT for hardened. - -Author: Magnus Granberg -Gentoo-bug: 562396 - a/Tools/qmake/mkspecs/features/features.pri -+++ b/Tools/qmake/mkspecs/features/features.pri -@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ - ENABLE_INPUT_TYPE_WEEK=0 \ - ENABLE_INSPECTOR=1 \ - ENABLE_INSPECTOR_SERVER=1 \ -+ENABLE_JIT=0 \ - ENABLE_JAVASCRIPT_DEBUGGER=1 \ - ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ - ENABLE_LEGACY_NOTIFICATIONS=1 \ diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch deleted file mode 100644 index 867e8dcb8ef..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch +++ /dev/null @@ -1,15 +0,0 @@ a/Tools/qmake/mkspecs/features/features.prf -+++ b/Tools/qmake/mkspecs/features/features.prf -@@ -101,12 +101,6 @@ defineTest(detectFeatures) { - - # HTML5 Media Support for builds with GStreamer - unix:!mac:qtConfig(pkg-config) { --packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { --WEBKIT_CONFIG += video use_gstreamer --} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { --WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 --} --use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video - } - - !enable?(video):qtHaveModule(multimediawidgets) { diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index c7df499ff74..f76a3bfaff3 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -14,7 +14,6 @@ Enable device orientation detection via dev-qt/qtsensors Enable printing via dev-qt/qtprintsupport Build QML/QtQuick bindings - Enable integration with dev-qt/qtwebchannel Add support for WebP image format diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild deleted file mode 100644 index 61024cda2c3..000 --- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2018 Gentoo
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 56a6822d7da1a3623c6d0cc0ee05ddd6f81de958 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Sep 24 01:36:24 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Sep 24 01:36:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a6822d dev-qt/qtwebkit: x86 stable (bug #665240) Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 3cd293ab98c..3896c99b459 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 5f256d133ddb0661cc634a89d02b3951c424da74 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Sep 15 19:22:52 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Sep 15 19:22:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f256d13 dev-qt/qtwebkit: amd64 stable wrt bug #665240 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 79cee513560..3cd293ab98c 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 0834d4303970a88f03c73ae36141b20ac0545cc9 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Sep 15 18:25:51 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Sep 15 18:25:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0834d430 dev-qt/qtwebkit: stable 5.212.0_pre20180120 for ppc64, bug #665240 Package-Manager: Portage-2.3.49, Repoman-2.3.10 RepoMan-Options: --include-arches="ppc64" dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 4d9b8362f17..79cee513560 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86" IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: dc2cc9062bcc0ccfb1829add054b3fd3e719eb2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 12 14:27:33 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 12 14:27:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2cc906 dev-qt/qtwebkit: Fix invalid SRC_URI Snapshot capability was probably shut down upstream. Closes: https://bugs.gentoo.org/665374 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 038f92f9ecc..4d9b8362f17 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -12,7 +12,7 @@ inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-singl 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" +SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="BSD LGPL-2+" SLOT="5/5.212"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: f573265fb7518d6a86f87b5c49107dc396215d55 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 4 18:31:58 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 4 18:39:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f573265f dev-qt/qtwebkit: Fix USE=-opengl by disabling tools Closes: https://bugs.gentoo.org/662198 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 98972468ba2..0737da5601f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -106,6 +106,7 @@ src_configure() { local mycmakeargs=( -DPORT=Qt -DENABLE_API_TESTS=OFF + -DENABLE_TOOLS=OFF -DENABLE_GEOLOCATION=$(usex geolocation) -DUSE_GSTREAMER=$(usex gstreamer) -DENABLE_JIT=$(usex jit)
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 268537c4b0e9adaae5f30320765bc54375a99e97 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 4 18:35:23 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 4 18:39:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268537c4 dev-qt/qtwebkit: Add missing USE=printsupport handling Closes: https://bugs.gentoo.org/660600 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 0737da5601f..038f92f9ecc 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -113,6 +113,7 @@ src_configure() { -DUSE_QT_MULTIMEDIA=$(usex multimedia) -DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin) -DENABLE_OPENGL=$(usex opengl) + -DENABLE_PRINT_SUPPORT=$(usex printsupport) -DENABLE_DEVICE_ORIENTATION=$(usex orientation) -DENABLE_WEBKIT2=$(usex qml) $(cmake-utils_use_find_package webp WebP)
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 06a1cd6db2ac0c086c132d9200dd227b858bc055 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 14 08:07:58 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 14 08:20:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a1cd6d dev-qt/qtwebkit: Trigger rebuild on dev-qt/qtwidgets subslot change Package is hardcoding Qt version it was built against in cmake files. Closes: https://bugs.gentoo.org/661052 Package-Manager: Portage-2.3.42, Repoman-2.3.9 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 93dd7e443a4..98972468ba2 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -35,7 +35,7 @@ RDEPEND=" >=dev-qt/qtcore-${QT_MIN_VER} >=dev-qt/qtgui-${QT_MIN_VER} >=dev-qt/qtnetwork-${QT_MIN_VER} - >=dev-qt/qtwidgets-${QT_MIN_VER} + >=dev-qt/qtwidgets-${QT_MIN_VER}= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: e46db557f20fd55708967292a7ea54e2b0ef1e3b Author: Davide Pesavento gentoo org> AuthorDate: Thu Jul 5 17:06:00 2018 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 5 17:06:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46db557 dev-qt/qtwebkit: minor improvements * ensure USE=gles2 is enabled/disabled consistently * call the correct check-reqs eclass function Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 27 +++--- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 731937dcc71..93dd7e443a4 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -7,6 +7,7 @@ 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)" @@ -24,12 +25,12 @@ REQUIRED_USE=" ?? ( gstreamer multimedia ) " -QT_MIN_VER="5.9.1:5" # Dependencies found at Source/cmake/OptionsQt.cmake +QT_MIN_VER="5.9.1:5" RDEPEND=" dev-db/sqlite:3 dev-libs/icu:= - dev-libs/libxml2:2 + dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-${QT_MIN_VER} >=dev-qt/qtgui-${QT_MIN_VER} @@ -48,7 +49,7 @@ RDEPEND=" multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) opengl? ( >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] - >=dev-qt/qtopengl-${QT_MIN_VER} + >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=] ) orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) @@ -56,15 +57,13 @@ RDEPEND=" >=dev-qt/qtdeclarative-${QT_MIN_VER} >=dev-qt/qtwebchannel-${QT_MIN_VER}[qml] ) - webp? ( media-libs/libwebp:0= ) + webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender ) " - -# Need real bison, not yacc DEPEND="${RDEPEND} ${PYTHON_DEPS} ${RUBY_DEPS} @@ -75,25 +74,25 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -CHECKREQS_DISK_BUILD="16G" # Debug build requires much more see bug #417307 - -S="${WORKDIR}/${COMMIT}" +S=${WORKDIR}/${COMMIT} PATCHES=( "${FILESDIR}/${P}-functional.patch" ) +CHECKREQS_DISK_BUILD="16G" # bug 417307 + _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 CFLAGS" - check-reqs_pkg_pretend + if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then + einfo "Checking for sufficient disk space to build ${PN} with debugging flags" + check-reqs_$1 fi } pkg_pretend() { - _check_reqs + _check_reqs pkg_pretend } pkg_setup() { - _check_reqs + _check_reqs pkg_setup python-any-r1_pkg_setup }
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 86b411ceb1cc8df7b359c05b8d3dd807a42051b6 Author: Davide Pesavento gentoo org> AuthorDate: Thu Jul 5 16:46:37 2018 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 5 17:06:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b411ce dev-qt/qtwebkit: fix src_install sanity check on prefix Bug: https://bugs.gentoo.org/572056 Package-Manager: Portage-2.3.41, Repoman-2.3.9 dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild index 506e3879d34..731937dcc71 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild @@ -98,7 +98,7 @@ pkg_setup() { } src_configure() { - # Respect CC, otherwise fails on prefix #395875 + # Respect CC, otherwise fails on prefix, bug #395875 tc-export CC # Multiple rendering bugs on youtube, github, etc without this, bug #547224 @@ -134,7 +134,7 @@ src_install() { cmake-utils_src_install # bug 572056 - if [[ ! -f ${D%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then + if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' fi
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/
commit: d43fc7b994fe506b8f1d27cafdb4cb69411686e8 Author: Louis Sautier gmail com> AuthorDate: Sat Jun 16 00:04:51 2018 + Commit: David Seifert gentoo org> CommitDate: Sun Jun 17 20:33:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43fc7b9 dev-qt/qtwebkit: add slot operator to dev-libs/leveldb Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild index 0ed44ca7767..61024cda2c3 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild @@ -20,7 +20,7 @@ REQUIRED_USE="?? ( gstreamer multimedia )" RDEPEND=" dev-db/sqlite:3 dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 + >=dev-libs/leveldb-1.18-r1:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-${QT_MIN_VER}[icu]
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 2e9579ccee7e48a48e821a86ec20dfd319d4b81a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 2 20:31:52 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 2 23:20:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9579cc dev-qt/qtwebkit: 5.9.1 ~ppc, bug #655620 Tested-by: ernsteiswuerfel Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild index 142589aa654..0ed44ca7767 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/
commit: 8a911806ddfa48634342416055e02489ed1f3b72 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat May 12 15:27:12 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 13 06:56:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a911806 dev-qt/qtwebkit: remove unused patches .../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 .../files/qtwebkit-5.3.2-use-gstreamer010.patch| 18 - dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 -- 3 files changed, 125 deletions(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch deleted file mode 100644 index 69550f290fa..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch +++ /dev/null @@ -1,15 +0,0 @@ a/Tools/qmake/mkspecs/features/features.prf2014-03-19 18:35:47.795676444 + -+++ b/Tools/qmake/mkspecs/features/features.prf2014-03-19 18:36:38.602433220 + -@@ -99,12 +99,6 @@ - - # HTML5 Media Support for builds with GStreamer - unix:!mac:!contains(QT_CONFIG, no-pkg-config) { --packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { --WEBKIT_CONFIG += video use_gstreamer --} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { --WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 --} --use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video - } - - !enable?(video):qtHaveModule(multimediawidgets) { diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch deleted file mode 100644 index e44dc295a41..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch +++ /dev/null @@ -1,18 +0,0 @@ a/Tools/qmake/mkspecs/features/features.prf2014-09-27 11:09:50.010617142 +0100 -+++ b/Tools/qmake/mkspecs/features/features.prf2014-09-27 11:17:10.741678989 +0100 -@@ -96,14 +96,8 @@ - use?(3d_graphics): WEBKIT_CONFIG += webgl - - # HTML5 Media Support for builds with GStreamer --unix:!mac:!contains(QT_CONFIG, no-pkg-config) { --packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { --WEBKIT_CONFIG += video use_gstreamer --} else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { --WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 --} -+WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 - use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video --} - - !enable?(video):qtHaveModule(multimediawidgets) { - WEBKIT_CONFIG += video use_qt_multimedia diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch deleted file mode 100644 index 2a2709b34ce..000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch +++ /dev/null @@ -1,92 +0,0 @@ -From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev-Date: Thu, 4 May 2017 15:12:37 +0300 -Subject: [PATCH] Fix compilation with ICU 59 - -Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 - -Task-number: QTBUG-60532 -Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 -Reviewed-by: Allan Sandfeld Jensen - Source/JavaScriptCore/API/JSStringRef.cpp| 6 +++--- - Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- - Source/WTF/wtf/TypeTraits.h | 3 +++ - Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); --return OpaqueJSString::create(chars, numChars).leakRef(); -+return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); --return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars,
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: e95cd0425603cd08fc06e93d0e6c52ce03e3d763 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Mar 26 07:04:10 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Mar 26 07:04:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95cd042 dev-qt/qtwebkit: stable 5.9.1 for ppc64, bug #642822 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ppc64" dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild index 7a8887bdc2a..142589aa654 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/
commit: b52c50c3b77f52cf7c957510ba9309174f80ad60 Author: Davide Pesavento gentoo org> AuthorDate: Sat Dec 2 05:54:56 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 2 05:54:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52c50c3 dev-qt/qtwebkit: restrict icu dependency Gentoo-Bug: https://bugs.gentoo.org/618638 Package-Manager: Portage-2.3.16, Repoman-2.3.6 dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 9af39701444..b3d1ba495de 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -20,7 +20,7 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + icu? (
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: a3cad5267a342385ba5993199d981609c9f78f46 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 2 14:20:59 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 2 14:24:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cad526 dev-qt/qtwebkit: Drop USE=gstreamer depending on deprecated slot 0.10 Gentoo-bug: 629172, 522880 Acked-by: kensington Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild | 12 +++- dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild| 10 ++ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild index b0c28352a72..eb73229ec7d 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ else KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi -IUSE="+gstreamer icu +jit" +IUSE="icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" @@ -23,12 +23,6 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -72,7 +66,7 @@ multilib_src_configure() { -system-sqlite $(qt_use icu) $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) + -DENABLE_VIDEO=0 ) qt4_multilib_src_configure } diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 0eba2efb100..9af39701444 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -10,7 +10,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi -IUSE="+gstreamer icu +jit" +IUSE="icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" @@ -20,12 +20,6 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -69,7 +63,7 @@ multilib_src_configure() { -system-sqlite $(qt_use icu) $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) + -DENABLE_VIDEO=0 ) qt4_multilib_src_configure }
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 19e3762332a2c75d80ac4bf1edfadc99d31f46c7 Author: Markus Meier gentoo org> AuthorDate: Sat Jul 15 05:13:55 2017 + Commit: Markus Meier gentoo org> CommitDate: Sat Jul 15 05:13:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e37623 dev-qt/qtwebkit: arm stable, bug #620334 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild index 86810673395..4407ad91b68 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" + KEYWORDS="amd64 arm ~arm64 ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 8723bfd0e78b74d3b0d2c529b77f43fca7ec652e Author: Alexis Ballier gentoo org> AuthorDate: Fri Jul 7 11:26:09 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jul 7 11:26:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8723bfd0 dev-qt/qtwebkit: remove ~arm64 keywords on 5.6.2. We have 5.7.1 and 5.6 has broken deps on arm64 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild index 5fa5f9b867e..a944be9499b 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ppc64 x86" + KEYWORDS="amd64 arm ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 1fa5ba6e3fba03b4938469ae7f8402f8b7c112d3 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jul 4 15:46:47 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jul 4 15:46:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa5ba6e dev-qt/qtwebkit: x86 stable wrt bug #620334 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild index 6c7eac7c71d..538c903998e 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 00dab61276ebf45a2ca4c504a80ece59067bfb77 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jul 4 14:01:46 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jul 4 14:01:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00dab612 dev-qt/qtwebkit: amd64 stable wrt bug #620334 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild index 8b06b94b888..6c7eac7c71d 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 7f211f960a4b79ce23572e2325c758b788bfdc45 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jun 24 02:28:02 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Jun 24 02:29:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f211f96 dev-qt/qtwebkit: die if nothing is built Gentoo-bug: 572056 Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 10 ++ 1 file changed, 10 insertions(+) diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild index a46c5c9563f..8b06b94b888 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild @@ -107,3 +107,13 @@ src_prepare() { qt5-build_src_prepare } + +src_install() { + qt5-build_src_install + + # bug 572056 + if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then + eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment." + die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH' + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: c7a13c359ac5a60881c2f45e4a2e544f8a477841 Author: Davide Pesavento gentoo org> AuthorDate: Sun Jun 18 02:09:41 2017 + Commit: Davide Pesavento gentoo org> CommitDate: Sun Jun 18 02:09:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a13c35 dev-qt/qtwebkit: fix build with ICU 59 Gentoo-Bug: 618644 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 +++ dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild | 1 + dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 3 +- 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch new file mode 100644 index 000..2a2709b34ce --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch @@ -0,0 +1,92 @@ +From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev+Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + Source/JavaScriptCore/API/JSStringRef.cpp| 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +-return OpaqueJSString::create(chars, numChars).leakRef(); ++return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +-return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +-return string->characters(); ++return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(); +-const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger{ static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: d419ba2ca637e6c2699a702da2b75d57127a45c1 Author: Markus Meier gentoo org> AuthorDate: Tue Jun 6 16:09:48 2017 + Commit: Markus Meier gentoo org> CommitDate: Tue Jun 6 16:09:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d419ba2c dev-qt/qtwebkit: arm stable, bug #552396 Package-Manager: Portage-2.3.5, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 0f985dd706a..0eba2efb100 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 76b298d2179194aa2e5a75b1103ed9a216ae2816 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jun 3 12:57:28 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jun 3 20:08:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b298d2 dev-qt/qtwebkit: ia64 stable, bug #552396 Package-Manager: Portage-2.3.6, Repoman-2.3.2 RepoMan-Options: --include-arches="ia64" dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 63ec542af0e..0f985dd706a 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 5bbc5962e231e56a1ed6d2552a3f2754c45b9d51 Author: Michael Weber gentoo org> AuthorDate: Sun May 21 16:04:28 2017 + Commit: Michael Weber gentoo org> CommitDate: Sun May 21 16:40:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bbc5962 dev-qt/qtwebkit: ppc64 stable (bug 552396) Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64" dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 870ce3d3b9f..63ec542af0e 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: f2c3ea9e48fd4fee314074e0d98169d0fe0c8ef8 Author: Michael Weber gentoo org> AuthorDate: Sat May 20 10:18:35 2017 + Commit: Michael Weber gentoo org> CommitDate: Sat May 20 10:37:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c3ea9e dev-qt/qtwebkit: ppc stable (bug 552396) Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64" dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index d4ba154b85a..870ce3d3b9f 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 0c8e34a4f5bdc3dd7dc83acc6bb1ba23e1a17d61 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat May 20 09:33:07 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat May 20 09:33:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8e34a4 dev-qt/qtwebkit: x86 stable wrt bug #552396 Package-Manager: Portage-2.3.5, Repoman-2.3.1 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 202968d1ad0..d4ba154b85a 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 26a55452d4be44f9a3a710c62f624d88bf148a14 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu May 18 12:38:49 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu May 18 12:38:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a55452 dev-qt/qtwebkit: amd64 stable wrt bug #552396 Package-Manager: Portage-2.3.5, Repoman-2.3.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index fefaffd535a..202968d1ad0 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,7 +7,7 @@ inherit qt4-build-multilib DESCRIPTION="The WebKit module for the Qt toolkit" if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" fi IUSE="+gstreamer icu +jit"
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: c220a90be8b25c0ecaf27d98fe7ae5fca73e75d0 Author: Markus Meier gentoo org> AuthorDate: Mon Jan 2 18:59:42 2017 + Commit: Markus Meier gentoo org> CommitDate: Mon Jan 2 18:59:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c220a90b dev-qt/qtwebkit: arm stable, bug #598780 Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild index b197c31..95a08bf 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 arm ~arm64 ~ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 6409fb82ef110b88cdcc9d262b46b147784400c1 Author: Markus Meier gentoo org> AuthorDate: Tue Aug 23 19:46:22 2016 + Commit: Markus Meier gentoo org> CommitDate: Tue Aug 23 19:46:22 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6409fb82 dev-qt/qtwebkit: arm stable, bug #586180 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="arm" dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild index 680f672..68e36fa 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" + KEYWORDS="amd64 arm ~arm64 ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: aaae3282af588d03f0e703f18ed74687dbc76ed1 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Aug 15 05:30:45 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Aug 15 05:55:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaae3282 dev-qt/qtwebkit: Stable for PPC64 (bug #586180). Package-Manager: portage-2.3.0 RepoMan-Options: --ignore-arches dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild index b197c31..680f672 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.1.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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/files/
commit: 219be92692f4a9388e1c185eb5d5b90233fe543e Author: Davide Pesavento gentoo org> AuthorDate: Sat Apr 23 23:16:54 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Sat Apr 23 23:16:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219be926 dev-qt/qtwebkit: edit gstreamer patches so that they work with eapply Package-Manager: portage-2.2.28 dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 4 ++-- dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch index 05e41a1..69550f2 100644 --- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch +++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch @@ -1,5 +1,5 @@ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 + -+++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 + +--- a/Tools/qmake/mkspecs/features/features.prf2014-03-19 18:35:47.795676444 + b/Tools/qmake/mkspecs/features/features.prf2014-03-19 18:36:38.602433220 + @@ -99,12 +99,6 @@ # HTML5 Media Support for builds with GStreamer diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch index 1c02e45..e44dc29 100644 --- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch +++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch @@ -1,5 +1,5 @@ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 -+++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 +--- a/Tools/qmake/mkspecs/features/features.prf2014-09-27 11:09:50.010617142 +0100 b/Tools/qmake/mkspecs/features/features.prf2014-09-27 11:17:10.741678989 +0100 @@ -96,14 +96,8 @@ use?(3d_graphics): WEBKIT_CONFIG += webgl
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 50614c7202a0d43a4f1eadaa90c556bd6a959af2 Author: Patrice Clement gentoo org> AuthorDate: Mon Apr 18 09:11:47 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Apr 18 09:28:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50614c72 dev-qt/qtwebkit: Fix metadata.xml file. Package-Manager: portage-2.2.26 dev-qt/qtwebkit/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index ae2a6f4..417314c 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -9,8 +9,8 @@ Add support for exceptions - like catching them inside the event loop (recommended by upstream) Enable physical position determination via dev-qt/qtpositioning - Enable HTML5 audio/video support via media-libs/gstreamer-1.0 - Enable HTML5 audio/video support via media-libs/gstreamer-0.10 + Enable HTML5 audio/video support via media-libs/gstreamer using SLOT 1.0 + Enable HTML5 audio/video support via media-libs/gstreamer using SLOT 0.10 Enable HTML5 audio/video support via dev-qt/qtmultimedia Enable device orientation detection via dev-qt/qtsensors Enable printing via dev-qt/qtprintsupport
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: e6d1cc7cc2f37cab90637aebfbb6145d840403f0 Author: Patrice Clement gentoo org> AuthorDate: Mon Apr 18 06:47:04 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Apr 18 07:58:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d1cc7c dev-qt/qtwebkit: Fix metadata.xml file. Package-Manager: portage-2.2.26 dev-qt/qtwebkit/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index 68b6e35..ae2a6f4 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -9,8 +9,8 @@ Add support for exceptions - like catching them inside the event loop (recommended by upstream) Enable physical position determination via dev-qt/qtpositioning - Enable HTML5 audio/video support via media-libs/gstreamer:1.0 - Enable HTML5 audio/video support via media-libs/gstreamer:0.10 + Enable HTML5 audio/video support via media-libs/gstreamer-1.0 + Enable HTML5 audio/video support via media-libs/gstreamer-0.10 Enable HTML5 audio/video support via dev-qt/qtmultimedia Enable device orientation detection via dev-qt/qtsensors Enable printing via dev-qt/qtprintsupport
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 9de4945fea39ed7885b68abd8362852ca953777f Author: Jeroen Roovers gentoo org> AuthorDate: Wed Mar 9 03:41:35 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Mar 9 04:11:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de4945f dev-qt/qtwebkit: Stable for PPC64 (bug #569924). Package-Manager: portage-2.2.27 RepoMan-Options: --ignore-arches dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild index 0af20e3..f5212f3 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 22e1978100f6e9c4ae330cbe3aee26662f59c094 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Mar 5 21:57:01 2016 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Mar 5 22:17:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e19781 dev-qt/qtwebkit: amd64 stable wrt bug #569924 Package-Manager: portage-2.2.26 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild index f54851b..0af20e3 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" fi # TODO: qttestlib
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 2e8f19fe126251a202f10c2a54d65741b0f9ae88 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 15:20:04 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 15:28:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8f19fe dev-qt/qtwebkit: remove old Package-Manager: portage-2.2.27 dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild | 103 -- 1 file changed, 103 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild deleted file mode 100644 index b28a267..000 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -# TODO: qttestlib - -IUSE="geolocation gstreamer gstreamer010 multimedia opengl orientation printsupport qml webchannel webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-qt/qtcore-${PV}:5[icu] - >=dev-qt/qtgui-${PV}:5 - >=dev-qt/qtnetwork-${PV}:5 - >=dev-qt/qtsql-${PV}:5 - >=dev-qt/qtwidgets-${PV}:5 - media-libs/fontconfig:1.0 - media-libs/libpng:0= - >=sys-libs/zlib-1.2.5 - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - geolocation? ( >=dev-qt/qtpositioning-${PV}:5 ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] ) - opengl? ( >=dev-qt/qtopengl-${PV}:5 ) - orientation? ( >=dev-qt/qtsensors-${PV}:5 ) - printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 ) - qml? ( >=dev-qt/qtdeclarative-${PV}:5 ) - webchannel? ( >=dev-qt/qtwebchannel-${PV}:5 ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || die - - # bug 466216 - sed -i -e '/CONFIG +=/s/rpath//' \ - Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ - Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ - || die - - qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri - - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 635b7b8ca77decef9a87de147ddb7d1dcc7f160d Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 15:28:02 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 15:28:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635b7b8c dev-qt/qtwebkit: fix build with USE=-webchannel Gentoo-Bug: 572442 Package-Manager: portage-2.2.27 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild index 7153b72..f54851b 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild @@ -83,7 +83,9 @@ src_prepare() { qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri + qt_use_disable_mod webchannel webchannel \ + Source/WebKit2/Target.pri \ + Source/WebKit2/WebKit2.pri if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" @@ -91,16 +93,16 @@ src_prepare() { epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" fi - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + # bug 562396 + use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" + + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ Tools/qmake/mkspecs/features/features.prf || die # bug 458222 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" - qt5-build_src_prepare }
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/
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() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: 6ff0b5928e44e814e2d34bbc98b20cfae02784d9 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Jan 20 00:20:42 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Jan 20 07:12:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff0b592 dev-qt/qtwebkit: Fix build with GCC-5, bug 570042 Patch taken from upstream, see also: https://bugreports.qt.io/browse/QTBUG-44829 https://codereview.qt-project.org/#/c/107921/ Package-Manager: portage-2.2.27 .../qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch | 35 ++ dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch b/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch new file mode 100644 index 000..3a6b2a3 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-4.10.4-fix-gcc-5.patch @@ -0,0 +1,35 @@ +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/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild index ab983ae..be52f6d 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -58,6 +58,7 @@ S=${WORKDIR} PATCHES=( "${FILESDIR}/${PV}-use-correct-icu-typedef.patch" + "${FILESDIR}/${P}-fix-gcc-5.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
commit: 09ef50e18b133b1fa59ef57a384933d7dde4e69c Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 15 07:08:44 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 15 07:08:56 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ef50e1 dev-qt/qtwebkit: introduce jit USE flag Also prevent mixing of Qt versions. Gentoo-bug: 562396 Package-Manager: portage-2.2.26 .../files/qtwebkit-5.5.1-disable-jit.patch | 15 +++ dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 106 + 2 files changed, 121 insertions(+) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch new file mode 100644 index 000..40e58f0 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch @@ -0,0 +1,15 @@ +Allow disabling JIT for hardened. + +Author: Magnus Granberg+Gentoo-bug: 562396 + +--- a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri +@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ + ENABLE_INPUT_TYPE_WEEK=0 \ + ENABLE_INSPECTOR=1 \ + ENABLE_INSPECTOR_SERVER=1 \ ++ENABLE_JIT=0 \ + ENABLE_JAVASCRIPT_DEBUGGER=1 \ + ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ + ENABLE_LEGACY_NOTIFICATIONS=1 \ diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild new file mode 100644 index 000..7153b72 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 qt5-build + +DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +# TODO: qttestlib + +IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" +REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/icu:= + >=dev-libs/leveldb-1.18-r1 + dev-libs/libxml2:2 + dev-libs/libxslt + ~dev-qt/qtcore-${PV}[icu] + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtsql-${PV} + ~dev-qt/qtwidgets-${PV} + media-libs/fontconfig:1.0 + media-libs/libpng:0= + >=sys-libs/zlib-1.2.5 + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXrender + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( + dev-libs/glib:2 + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 + ) + multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) + opengl? ( ~dev-qt/qtopengl-${PV} ) + orientation? ( ~dev-qt/qtsensors-${PV} ) + printsupport? ( ~dev-qt/qtprintsupport-${PV} ) + qml? ( ~dev-qt/qtdeclarative-${PV} ) + webchannel? ( ~dev-qt/qtwebchannel-${PV} ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/ruby + dev-util/gperf + sys-devel/bison + sys-devel/flex + virtual/rubygems +" + +PATCHES=( + "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" +) + +src_prepare() { + # ensure bundled library cannot be used + rm -r Source/ThirdParty/leveldb || die + + # bug 466216 + sed -i -e '/CONFIG +=/s/rpath//' \ + Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ + Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ + || die + + qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf + qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf + qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf + qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf + qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf + qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri + + if use gstreamer010; then + epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" + elif ! use gstreamer; then + epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + fi + + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + Tools/qmake/mkspecs/features/features.prf || die + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: 2e54c3d7a6902ba6c5e8c928585e1ea3aa1793ff Author: Jeroen Roovers gentoo org> AuthorDate: Mon Sep 21 04:49:30 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Sep 21 04:49:30 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e54c3d7 dev-qt/qtwebkit: Stable for PPC64 (bug #543326). Package-Manager: portage-2.2.20.1 dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild index 831d431..70eab16 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm ~arm64 ppc64 ~x86" fi # TODO: qttestlib, geolocation, orientation/sensors
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/
commit: da565d4a8f17467306270ca032fa4f1b80d50e31 Author: Mikle Kolyada zlogene AT gentoo DOT org AuthorDate: Wed Aug 26 14:51:30 2015 + Commit: Mikle Kolyada zlogene AT gentoo DOT org CommitDate: Wed Aug 26 14:53:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da565d4a dev-qt/qtwebkit: arm stable wrt bug #543326 Package-Manager: portage-2.2.20.1 dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild index 5455bd2..831d431 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build DESCRIPTION=WebKit rendering library for the Qt5 framework if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 + KEYWORDS=amd64 arm ~arm64 ~ppc64 ~x86 fi # TODO: qttestlib, geolocation, orientation/sensors