diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-qt/qtwebkit |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-qt/qtwebkit')
-rw-r--r-- | dev-qt/qtwebkit/Manifest | 24 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/4.10.4-gcc5.patch | 35 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch | 40 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch | 11 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch | 25 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch | 15 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch | 92 | ||||
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 | ||||
-rw-r--r-- | dev-qt/qtwebkit/metadata.xml | 31 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild | 125 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild | 72 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 69 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild | 109 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild | 119 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 120 |
17 files changed, 935 insertions, 0 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest new file mode 100644 index 000000000000..5556905d1926 --- /dev/null +++ b/dev-qt/qtwebkit/Manifest @@ -0,0 +1,24 @@ +AUX 4.10.4-gcc5.patch 1599 SHA256 f5a998dcf3b21ef15b281d86cd7245e4d0ceb885f0e18c0fb7b367f81d1c8a6f SHA512 76cdccc1f1cd07ae226599b5f0e03b4e3f347d11aa1bc025a0c2ac4d30842852666393dcf3a5302156fb6adee874d87e8f89d3a63a72cde3a7dff2328201a974 WHIRLPOOL 10df94f2e1d9bb322b8f605631aa577ca45c5b72b056e258211d5cc94a9b007f790044d9d04032e7fedf22c47e2db5b7365343ba3832cccca63208984a45cb34 +AUX 4.10.4-use-correct-icu-typedef.patch 1262 SHA256 356a316ef34902e1738803d6ad6e2c6f9265bca7dd67fd41d3912436e96c459e SHA512 73915919247a09796c5923f1524b1a003f196a9bcd8b19ef47e10196c59febcf4792cb3da02c93f881773a1b0d6bb041dd4c2dffc894dec9fb3a641032919558 WHIRLPOOL 34305ddc7734379aaf87dfeb6c666e222d15ba3b7feca7f421d65ed2677e66be8e7551d2bc9e1369fa7f97404528bf7d2a9438f6cfb8d318b9661d71fcb58b78 +AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80 +AUX qtwebkit-5.2.1-disable-gstreamer.patch 770 SHA256 ece0e5c2bc46e5cb5174a6cc946838a9666a77edb4415a75226c064a90c1df5e SHA512 56a7f24dd7bbd48a5d8db2e205cdca0f635cc84b62bab2bf22cf9cf42f0503033e86b2ec96d0286ffa36ba59d1dca64701c0652b80387aa9e7bef155e49de15e WHIRLPOOL 5b4c1464ef056ce06082db48c396bb24d878d71ec8fa71c33f04e912157267d4a55482fd8c1749883bfea3879fbdd3d61e5fb0fbc0015b61b4d8f8383fc991c4 +AUX qtwebkit-5.3.2-use-gstreamer010.patch 930 SHA256 cef69a22f8719f4854e2996395632c26a156cee5b63bf47ae445ded9aa945621 SHA512 a8a1d51713177e3085e07b9f0aa74123acaaea4415f86bd8a75d9f9f81ace4411eb8ddf7ef887c621a527f6e8023f955855aec972d568275e0da90733df04ea1 WHIRLPOOL 62a9182eefe56e00a6fcbab796df9c961649545fcc9d4ba42f7ee7aa87213c6f87960889a846048db798bf2be86b037908a8e91435018813fb23098b5d5ca9f2 +AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd6829e88b3fb59b6d8ccefe469df272957e7 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb WHIRLPOOL e979a7691faeeda737c916c183365619b875dd5fd872f1fcba16ff19549d0d6238c813cf01b0fa9cd649100422ed2de8987191d2343c062d46ee2276d7cd2407 +AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec +AUX qtwebkit-5.6.2-icu-59.patch 4683 SHA256 45af86da2d8b0621b213668808aee4136022c5a16b8baae11367d98acd5838b2 SHA512 189b523c8ee6ae8b62b93e8a46319a2a656280a6aca476fc2bc04d8066f497a9fd3f18029659558bedf985ba7c500eb2d541c4140158e2410cc01db29612f356 WHIRLPOOL 838c887a0af099c6a22e4516a2aa24428c5266f2d0eb99e68ccf21aa4c0ce625cac2cd1d763ec6fcf6843fd7409fb79092643c4e7b2aedad7d2313590c9e47ef +AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 SHA256 9d07ef5ebb167ef877c95c38ce0080c39338f2dac5e7adf5cb7e94d901781b55 SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d WHIRLPOOL e2073f06156d66b8bc5b57359ed173d61c9239383c0b0e5bdf928eb55b7747b4e7aa10721968bfce603c7adff8af46b02b4583a6ddb90fc0145607839e2f5624 +DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 +DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 +DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542 +DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf +DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd +DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 SHA256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 WHIRLPOOL 85bb21fb4ed3895c8d78d86a0725d650179b6d2bfea418cf8a54b98d8dac91f98a1423c78058feed54349ebb25fc934ecd82122413f22338b6d49083e21d41b9 +EBUILD qtwebkit-4.10.4.ebuild 3494 SHA256 6f68f93b4a4d441c0deb88b33df77220ade03ea8ade629888c363929671bcc65 SHA512 b639e4913d72e7da97992da94545af42cb4428c45b3265f9274c4fa76f2e440afb9f84ad30a7bc537716ed946ae72b997cde9f691020c1dcde0238654c0af14d WHIRLPOOL b2fd77022b2319cc718be314f232972503761cc169d88683a5ab9824bc8ab4e574eff24fff51b65ddb814decdc110b0bdad27b87b3b9af9d2b232c15d0c8df96 +EBUILD qtwebkit-4.8.6-r1.ebuild 1918 SHA256 94d69bdf14527dfc23e52d772b511536b1f5b3a68afd00c9f4b8512d892223bf SHA512 20a5647a270a7f72263921c2ea9144500e1e4019155bb27f92df6b72733d27acd7c6a4c848669e68339bd34c2f40b9397a770920e934a9a53bba49de46559d1a WHIRLPOOL aafc7a1c84cbc0d76c2af19c8334524a61eb8caf3c2c04c0ca7b61ebed88965453acf02f876b339f5a8006f6bc997b17b88eeeaf770f2be6f12ee245d456fe76 +EBUILD qtwebkit-4.8.7.ebuild 1884 SHA256 431c77f8be50833918d9b617a3b5e092cebe376b24dcec12e0d4cf4ab19ccc6f SHA512 162070940a680a8f9b3e9f008dd5f640a8e634443621edf878bdb7bec2f9725f48696ebc054455e099d2374d1f226031e02b571f3d45713541750d5061caca68 WHIRLPOOL 2465e8663d5d5ea90fe02041fbab2338d2b21148f8a0c9f1bc764731165480b22bfde6b5d3af01ed6c9921f6d5c98b6e2cc3b0990aefc21b2263b652976ad9f2 +EBUILD qtwebkit-5.6.2.ebuild 3262 SHA256 b7d7fa7adccac1873228bcae368f73355144d837dba57d9608b7f76428952a78 SHA512 25d3a1554d8c9f77b881dfb0a9fd97d420b009483ec1752f2a737c2302ae91a8577d238b37214f38c8b01b396475f02aaf7e0283c79953ad44310a2d7f7b200d WHIRLPOOL 48c8457a9161f0f46dac20daf2fbe8a9a00056ff6f977a7fb1f82b3c751239ce1cff0a739b449a0c9eadc2ad90678780971c5ac864f0576da574c94ff0d3d897 +EBUILD qtwebkit-5.7.1.ebuild 3544 SHA256 ffd1cbe63831e12da3e4fc0f30aff8944006c272ed80b47dd389b823032bc439 SHA512 e4159313513e9c8f628eae43fe1f5a4412c84de66ce52cb20b3a7dd8e5d18195f50c25408995987c3d5e9635e937a27a13d9642722677f1a1f4a3190991aaac5 WHIRLPOOL 4ee6fa8274b16fdfce4bb7cb9ad52243ea618cee432d0f078c7cf3b0a8e6e46f20766d1b9a6d5cbbf2be642648472a0041e9d2226d937db2040d71d7329f5dec +EBUILD qtwebkit-5.9.1.ebuild 3499 SHA256 0d7a22016ae106e8096977e41796d68ac133ed1eb8e66b7246a859613438e2eb SHA512 051bbaa3ef288492e6f25e868269462325b13849ed0ccd7b0c5fffe07d9ac012980726e4c361a5676b5ba485a0fdbd396896836cf6c0f88971fd0f046b9d2301 WHIRLPOOL bce03b838faffab69e7547a699910d9e2a2449c42bf27d9ced857675e43edfd7616df5c4ef11ac982042e0b1384a87b99e42fe5772abbdfcb6ddd84c2a8911c0 +MISC ChangeLog 8577 SHA256 8c3013ae304b6073455ac7b762e164a240d9b7beadaa40b3734fb6316eccc569 SHA512 cc728a9137e7b1b07c0f54ce98d154400f678f32ae1fb9a50720f53a0659d8a3d1a44fe5e866f9d994e82f5c89ebfc3ccac12191a3cc3cc8e872cde1a01c56d0 WHIRLPOOL 6860249a4bf13d829e900dca2b7950cde91b143c9009515257dfa5a83045a7579f366e9118e07603a94579a87a32fb7e498e2c242d75222f68a74a03150325a9 +MISC ChangeLog-2015 31426 SHA256 306bd008471585efee73ae42bc3cee0118c54051717991197cefabef002257a1 SHA512 164d4537f4e9d27ec37da6c1acbe3261620ee96b05b725a2a0f2a252f2f30915634f9001dd02f0ddbf69540f20aaa1f1edc541f9dcb6bad27b93c1343ab89da9 WHIRLPOOL 3a8d622bbd360ffcff4bdee63c120526d761594a7912c1d45b23b76c192e10a1e72d96eb6f5905f82ca0dcc609830fb4b22d9e99aec55c17d51d31eaa8aaf866 +MISC metadata.xml 1539 SHA256 3ed94c56aecca8b0e5b4011df5210c100074d2035e822a096430591135df0c31 SHA512 b36674bc6c25fced3ee0b2c2501eb542806e5de53c2410f61a7d7571091f75c3068042d7b8076654088ad1ec6e05c851007c5cdeb07f7f4af9c1fe9be477b556 WHIRLPOOL 3c4bac080279078c578a720fc0cc5f642a783bed54c950b5ccd4801240ef7328f0614158432a7b00fbf39489521ab92d3ef2a9ca80f466c3d4d192cc1ec6d33c diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch new file mode 100644 index 000000000000..3a6b2a39c0e8 --- /dev/null +++ b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch @@ -0,0 +1,35 @@ +From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> +Date: Fri, 6 Mar 2015 10:20:13 +0000 (+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 <andras.becsi@theqtcompany.com> +--- + +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<Int32Shape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(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 new file mode 100644 index 000000000000..3e4816255fed --- /dev/null +++ b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch @@ -0,0 +1,40 @@ +From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@flaska.net> +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 deletions(-) + +diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h +index a2d1ad4..392d2db 100644 +--- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h ++++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h +@@ -69,7 +69,7 @@ typedef uint16_t UChar; + #endif + + #if !USE(ICU_UNICODE) +-typedef uint32_t UChar32; ++typedef int32_t UChar32; + #endif + + namespace WTF { +diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h +index 10c2026..db8944e 100644 +--- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h ++++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h +@@ -31,7 +31,7 @@ + #include <wtf/unicode/UnicodeMacrosFromICU.h> + + typedef wchar_t UChar; +-typedef uint32_t UChar32; ++typedef int32_t UChar32; + + namespace WTF { + namespace Unicode { +-- +1.7.1 + diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch new file mode 100644 index 000000000000..16f52d9cb07e --- /dev/null +++ b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch @@ -0,0 +1,11 @@ +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 +@@ -993,7 +993,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ ++#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ + || CPU(SPARC64) \ 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 new file mode 100644 index 000000000000..69550f290faa --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch @@ -0,0 +1,15 @@ +--- a/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000 ++++ b/Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000 +@@ -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 new file mode 100644 index 000000000000..e44dc295a411 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch @@ -0,0 +1,18 @@ +--- a/Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 ++++ b/Tools/qmake/mkspecs/features/features.prf 2014-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.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch new file mode 100644 index 000000000000..265d5075f2fa --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch @@ -0,0 +1,25 @@ +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 <leveldb/db.h> + #include <leveldb/env.h> +-#include <helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + + int main(int, char**) + { + +--- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp ++++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp +@@ -38,7 +38,7 @@ + #include <leveldb/comparator.h> + #include <leveldb/db.h> + #include <leveldb/env.h> +-#include <helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + #include <leveldb/slice.h> + #include <string> + #include <wtf/PassOwnPtr.h> 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 000000000000..40e58f0d0dec --- /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 <zorry@gentoo.org> +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.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch new file mode 100644 index 000000000000..2a2709b34ce9 --- /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 <annulen@yandex.ru> +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 <allan.jensen@qt.io> +--- + 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<const UChar*>(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<const UChar*>(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<const JSChar*>(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(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast<const UChar*>(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<unsigned long> { static const bool value = true; }; + template<> struct IsInteger<long long> { static const bool value = true; }; + template<> struct IsInteger<unsigned long long> { 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<char16_t> { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger<wchar_t> { 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 ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) +-- +2.13.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 new file mode 100644 index 000000000000..867e8dcb8ef9 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 000000000000..885ad268a503 --- /dev/null +++ b/dev-qt/qtwebkit/metadata.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <use> + <flag name="exceptions">Add support for exceptions - like catching them + inside the event loop (recommended by upstream)</flag> + <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> + <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> + <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> + <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag> + <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> + <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> + <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> + <flag name="qml">Build QML/QtQuick bindings</flag> + <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag> + <flag name="webp">Add support for WebP image format</flag> + </use> + <upstream> + <bugs-to>https://bugreports.qt.io/</bugs-to> + <doc>https://doc.qt.io/</doc> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Qt API. + </subslots> + </slots> +</pkgmetadata> diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild new file mode 100644 index 000000000000..8a1810e3d7f1 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal + +MY_PV=${PV/4.10/2.3} + +DESCRIPTION="The WebKit module for the Qt toolkit" +HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit" +SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz" + +LICENSE="|| ( LGPL-2.1 GPL-3 )" +SLOT="4" +KEYWORDS="~amd64" +IUSE="debug +gstreamer" + +RDEPEND=" + >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] + dev-libs/libxml2:2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}] + >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}] + >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}] + >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}] + >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}] + >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + virtual/jpeg:0[${MULTILIB_USEDEP}] + virtual/libudev:=[${MULTILIB_USEDEP}] + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] + gstreamer? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/perl + dev-lang/ruby + dev-util/gperf + sys-devel/bison + sys-devel/flex + virtual/perl-Digest-MD5 + virtual/perl-File-Spec + virtual/perl-Getopt-Long + virtual/pkgconfig[${MULTILIB_USEDEP}] +" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}/${PV}-gcc5.patch" + "${FILESDIR}/${PV}-use-correct-icu-typedef.patch" +) + +src_prepare() { + # examples cause a sandbox violation (bug 458222) + sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + + # respect CXXFLAGS + sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \ + Source/WTF/WTF.pro \ + Source/JavaScriptCore/Target.pri || die + + # apply patches + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user +} + +multilib_src_compile() { + local -x \ + QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \ + WEBKITOUTPUTDIR=${BUILD_DIR} + + local myconf=( + "${S}"/Tools/Scripts/build-webkit + --qt + # tell the build system where to find the qmake binary for the current ABI + --qmake="$(qt4_get_bindir)"/qmake + --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" + --makeargs="${MAKEOPTS}" + --$(usex debug debug release) + --$(usex gstreamer video no-video) + # disable WebKit2 since it requires Qt5 + --no-webkit2 + # prevent automagic dependency on qt-mobility (bug 547350) + --no-geolocation + --no-device-orientation + --no-orientation-events + # copied from eqmake4 + QMAKE_AR="'$(tc-getAR) cqs'" + QMAKE_CC="'$(tc-getCC)'" + QMAKE_CXX="'$(tc-getCXX)'" + QMAKE_LINK="'$(tc-getCXX)'" + QMAKE_LINK_C="'$(tc-getCC)'" + QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'" + QMAKE_RANLIB= + QMAKE_STRIP= + QMAKE_CFLAGS="'${CFLAGS}'" + QMAKE_CFLAGS_RELEASE= + QMAKE_CFLAGS_DEBUG= + QMAKE_CXXFLAGS="'${CXXFLAGS}'" + QMAKE_CXXFLAGS_RELEASE= + QMAKE_CXXFLAGS_DEBUG= + QMAKE_LFLAGS="'${LDFLAGS}'" + QMAKE_LFLAGS_RELEASE= + QMAKE_LFLAGS_DEBUG= + ) + echo "${myconf[@]}" + "${myconf[@]}" || die +} + +multilib_src_install() { + emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release) + + # move pkgconfig file to the correct location + mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die +} diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild new file mode 100644 index 000000000000..eb73229ec7df --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit qt4-build-multilib + +DESCRIPTION="The WebKit module for the Qt toolkit" + +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="arm ia64 ppc ppc64" +else + KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" +fi + +IUSE="icu +jit" + +# libxml2[!icu?] is needed for bugs 407315 and 411091 +DEPEND=" + >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] + ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] + ~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}] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/4.8.2-javascriptcore-x32.patch" +) + +QT4_TARGET_DIRECTORIES=" + src/3rdparty/webkit/Source/JavaScriptCore + src/3rdparty/webkit/Source/WebCore + src/3rdparty/webkit/Source/WebKit/qt" + +QCONFIG_ADD="webkit" +QCONFIG_DEFINE="QT_WEBKIT" + +src_prepare() { + # Remove -Werror from CXXFLAGS + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ + src/3rdparty/webkit/Source/WebKit.pri || die + + # Fix version number in generated pkgconfig file (bug 406443) + sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ + src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die + + # Prevent automagic dependency on qt-mobility (bug 547350) + sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ + src/3rdparty/webkit/Source/WebCore/features.pri || die + + if use icu; then + sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ + src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die + fi + + qt4-build-multilib_src_prepare +} + +multilib_src_configure() { + local myconf=( + -webkit + -system-sqlite + $(qt_use icu) + $(qt_use jit javascript-jit) + -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 new file mode 100644 index 000000000000..9af397014440 --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +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" +fi + +IUSE="icu +jit" + +# libxml2[!icu?] is needed for bugs 407315 and 411091 +DEPEND=" + >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] + ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] + ~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}] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/4.8.2-javascriptcore-x32.patch" +) + +QT4_TARGET_DIRECTORIES=" + src/3rdparty/webkit/Source/JavaScriptCore + src/3rdparty/webkit/Source/WebCore + src/3rdparty/webkit/Source/WebKit/qt" + +QCONFIG_ADD="webkit" +QCONFIG_DEFINE="QT_WEBKIT" + +src_prepare() { + # Remove -Werror from CXXFLAGS + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ + src/3rdparty/webkit/Source/WebKit.pri || die + + # Fix version number in generated pkgconfig file (bug 406443) + sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ + src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die + + # Prevent automagic dependency on qt-mobility (bug 547350) + sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ + src/3rdparty/webkit/Source/WebCore/features.pri || die + + if use icu; then + sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ + src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die + fi + + qt4-build-multilib_src_prepare +} + +multilib_src_configure() { + local myconf=( + -webkit + -system-sqlite + $(qt_use icu) + $(qt_use jit javascript-jit) + -DENABLE_VIDEO=0 + ) + qt4_multilib_src_configure +} diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild new file mode 100644 index 000000000000..a944be9499ba --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 qt5-build + +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 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" + "${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644 +) + +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/Target.pri \ + Source/WebKit2/WebKit2.pri + + if use gstreamer010; then + PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") + elif ! use gstreamer; then + PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") + fi + + # bug 562396 + use jit || PATCHES+=("${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' \ + Tools/qmake/mkspecs/features/features.prf || die + + # bug 458222 + sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild new file mode 100644 index 000000000000..4407ad91b68c --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 qt5-build + +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" +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" + "${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644 +) + +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/Target.pri \ + Source/WebKit2/WebKit2.pri + + if use gstreamer010; then + PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") + elif ! use gstreamer; then + PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") + fi + + # bug 562396 + use jit || PATCHES+=("${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' \ + Tools/qmake/mkspecs/features/features.prf || die + + # bug 458222 + sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + + 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 +} diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild new file mode 100644 index 000000000000..af4f3594111b --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +QT_MIN_VER="5.9.1:5" +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 gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp" +REQUIRED_USE="?? ( gstreamer 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-${QT_MIN_VER}[icu] + >=dev-qt/qtgui-${QT_MIN_VER} + >=dev-qt/qtnetwork-${QT_MIN_VER} + >=dev-qt/qtsql-${QT_MIN_VER} + >=dev-qt/qtwidgets-${QT_MIN_VER} + 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-${QT_MIN_VER} ) + gstreamer? ( + dev-libs/glib:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] ) + opengl? ( + >=dev-qt/qtgui-${QT_MIN_VER}[gles2=] + >=dev-qt/qtopengl-${QT_MIN_VER} + ) + orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} ) + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} ) + webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/ruby + dev-util/gperf + sys-devel/bison + sys-devel/flex + virtual/rubygems + test? ( >=dev-qt/qttest-${QT_MIN_VER} ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" +) + +src_prepare() { + # ensure bundled library cannot be used + rm -r Source/ThirdParty/leveldb || die + + # force using system library + sed -i -e 's/qtConfig(system-jpeg)/true/' \ + -e 's/qtConfig(system-png)/true/' \ + Tools/qmake/mkspecs/features/features.prf || 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_config opengl opengl Tools/qmake/mkspecs/features/features.prf + + 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/Target.pri \ + Source/WebKit2/WebKit2.pri + + if ! use gstreamer; then + PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") + fi + + # bug 562396 + use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") + + 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 +} + +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 +} |