From 432ec10ea7a3cf01032cff5f7926e55c4e2376fb Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Thu, 23 Jul 2015 20:36:54 +0000 Subject: Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the installed library). See bug 388207. Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D! --- dev-qt/qtwebkit/ChangeLog | 10 +- dev-qt/qtwebkit/Manifest | 35 +++--- .../files/4.10.4-use-correct-icu-typedef.patch | 40 +++++++ dev-qt/qtwebkit/metadata.xml | 4 +- dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild | 124 +++++++++++++++++++++ 5 files changed, 194 insertions(+), 19 deletions(-) create mode 100644 dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch create mode 100644 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild (limited to 'dev-qt') diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog index fc374388b926..d0c0bc5f042b 100644 --- a/dev-qt/qtwebkit/ChangeLog +++ b/dev-qt/qtwebkit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.39 2015/07/15 01:37:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.40 2015/07/23 20:36:44 pesa Exp $ + +*qtwebkit-4.10.4 (23 Jul 2015) + + 23 Jul 2015; Davide Pesavento + +files/4.10.4-use-correct-icu-typedef.patch, +qtwebkit-4.10.4.ebuild, + metadata.xml: + Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the + installed library). See bug 388207. 15 Jul 2015; Davide Pesavento qtwebkit-5.4.2.ebuild: Disable rpath wrt bug 466216. diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index e8c27d460663..d1c430601d69 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +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-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71 @@ -9,29 +10,31 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 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.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea +EBUILD qtwebkit-4.10.4.ebuild 3534 SHA256 09d69d11546f082c3edcb8e6d45ffa458d2e3f3c95e1e4364f23305d754cfbda SHA512 f2e4599c2012e79caa86359f8e9468fe9d76c70ce8ca04cfd0429721794a823ff41d6abf5cad06f9b9a8dc66bf73135f4ddcc0e1620d6f567a14b2db98500e4f WHIRLPOOL ea699015f8067b3049965db5c667e8148d16c3ff1e36b96424b2d3db7e631ced3eedc32270b5f2aa9f4078dc48eb784c2f051e4da9a193f7972262bc50d814e2 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109 EBUILD qtwebkit-4.8.6-r1.ebuild 2381 SHA256 732ab6ee9b3d8cd853f263490979e113b3d2174344c5c6f5d18b37871cbe73eb SHA512 502b63e892f578e0361804ec8d717587afabaceda0499fe1dd7c09a6457ac72e6b1d708dcf719bf3452ae15b33a948590094054a29a47607231fad4433b7773e WHIRLPOOL 723fc3198093afe0c3e96c4d37aab84b5f075b00275a4674082554a8977de96af0b2b2d07a82ad44a4170bd962535c84f6a13d10b6f7d7688d0e80b6b03dfbd1 EBUILD qtwebkit-4.8.7.ebuild 2352 SHA256 a705d3bf6a7ea7827bcb2f7f36cc54e78a0dd0f2366bf64c0effc07a1eb234d2 SHA512 430d003f3ce6ca9132af7715423591aa92b0cb684d47c7c9ce63c7c817cd16fcdc89029dd0572a1c033a58a576fa13a4d840cd9c4b36c188f7945a5264e1add2 WHIRLPOOL 53adb551d9bdc4d3197fd10e74b23737a6847129cfcc2afd9aa3eb63e567414ae3cfec736d37c997c8941a4ed10e94d2ce4f922ff65bde0e8dd307ec24894fc4 EBUILD qtwebkit-5.4.2.ebuild 3017 SHA256 f6be9feee16b834f71ada0d673d59f93ac31400068bfdc712e3b1b02fde344ad SHA512 cdd5b86ffd50e4d2a129649d6b0918127310d40f7ead05583677e8421f5ddd6ca6f83171dfb25fe3e6ff7937a7b8cddb835ccb195cfbfc32c335d2c4893f8052 WHIRLPOOL 7d72243b27056782e9fdbe41e57afc29c23e28e6acd54928180671aadb96edbb2d174ca90ed2e8991d04e0f381ce179b03c1fd198a7fb7c786a9993fafa220c0 -MISC ChangeLog 30919 SHA256 2f3dce33eb66950da8c0456dfb042bb2494934bf6ebafd91133eafd51c2b95bb SHA512 bb6fda147f5fa41c4b944bc6005d99d889c3226ca63bb807d18f25837298b36b9f0824633286774921127311fa41229ee96319761bb94a2da6ae486f5ba0c693 WHIRLPOOL cb3c1a28321466708ff201c2fae31dfcee48a211c600dc9a2bcb21781b30c1cc5b8bdd5c47a85a2a562fdbe4b585a07c42ecd9d5a89ea7b89b4bf50bb4897f16 -MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9 +MISC ChangeLog 31205 SHA256 5b5884fabcc4a41367751b877cda75aaf5732038a824c58b6ee99b9f82f0fed0 SHA512 0ff174a0e74a2c74a326eb911237d6936495c2b312a388a003b3eb755bc1c6d2fe99c3e616009042d701f086e55fd58b41d945ef7a7e26a919139687a4668214 WHIRLPOOL ee6bf723f02da226ee9e26557d60b47c517470cd2b87cae5d9fcab2644c7d36734d1e74d6dd30e75b87e6f734589fe9713c45bfc0f16c3fbae0dfdd36f59ba7a +MISC metadata.xml 926 SHA256 3d138e0a2e8eb177d69a8288023fd12ae62047a2806236fd65b9cd3b3c278c86 SHA512 55ed26910eb00412e7de9129cffc634bade1992ab2f9ec0a80f2dbf5d1f5f32cb0e7d138e312de2012dcdec730ab98a6da7b466c947ee21e3dad9ae9c8aca1ab WHIRLPOOL 0259dd709dfbe97c82f1938c688d618fdd18603920b4b7a62b529f88d5698e560256290ac419b66edd603f3c7308a2fbdab05d14b4552c89ba11fa933076dff7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1 -iQJ8BAEBCABmBQJVpblAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVsVBdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Gv0P/1+EbF5urrqr9S3TzVCMzvq8 -IeKpfyDNMP3SUCfcpeEfID+2xx5tTPTsBAf7Me3h9tlhdI6VpSguLHxWNkyNITQe -ZEi7Qd16qHNFGH8nogP8aClwYpfqz1rM4MlIf94+Yn9cncba1aZ64+YAnlZk90VB -M5MgLaqU42CwRdo/pWFsTHIkkk9tDHoTESNqaIWpwinjOqMZTQr5mdJGsmD2iVYn -9L8q9QoVX4LB6k9uCDTXwdNbpU4AnAokh4jmezdAX4XmiMdE4ZoJH9AkyPUq2FCp -72rmwEw9g0BVTUnnzMBOqiCvA3lEYbYBF1HpsFKEoQQqQnlh3MA7tCDmyol1XBkt -fUhtCpt7EgkYK+8u/54xYNPwsTFASrE/gRFxqXO56mBqToDhlI6zw8WZFalT8Mp0 -SuHCgDWKFsTYtwcmq711cfWyZLmfA1+hVzPxZw5QJTWolpDep1ugCHcEcYPGEbUt -bvLKudj0ZsXyJxkgmpQT06n4Aj6Mp+YykGfS4qgAY9jLi8sPsySsRk4UQW78KNqS -sWifOCAHpZnLiXwfK+AMEMP7JAoBRUpEcB0qikNvzN+FPshECJtJQwcuutLPDfOy -p8CmnDPM0IH2O+YI9nOd5oEcq/2+0U5+ghZdz8mbMkP/epJichn8SMJFvj+cMq2k -az/oxN8+NRyhZoyX+zJ6 -=F/2S +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9JbYP/ArHfsnIBl6S2tcwqDHYhnXz +1psyTFucyMZts/IOnHjeymQVG47WR+I7wF9etcDhRJ8ElhadLTERTaXpRtVQMStz +r8PDgjgTJwFwyIUqBC/xrNT+57WS0pxELcxadgBcZChJQSlRbEuyYm6xljUOM+Xm +Q9XGV9uVFxbGyDEqTUEGuL+7iL3Gpaf8MpdAi/RERiLNw4v2vzOA5s1pFSb0fMbm +ep18LBqI5cdrQhBkS2Wx9SA9mUFy8lR0icTDxh/qQkygZvKYjxNJbAf6sHYu7CZh +I469vA2lZ0HC2OpnYDCslRSyiw1qCiGBU0B9S8B9b+T+Q2BxJl1Xs3/rhS3IP0+j +M7GdQgkw+CfvkbjxNsQEJCCmFiVZnrIzIUXD1+X6xVH+MJ/XhcuAjV155d5efD3X +XBUXkyTPTxophpzhm6Q6OAn5rW+HdGwTFJHVyEcoV7e0JgU8mNpVX8lWDXDiPTk3 +4YzeQ5VE4Tw44pw/3lEiPlFpQAogcbNHTiLIFyyF9AfB2F3NYt0df9pyIemdcOsq +yy1eX4O1jkegB0oTw68gNP07zulbWRLUwpYSsmrzWv3ebpnrRmtX902NwyvMUa2m +cRq2ZQtEwKDfC1pOYSqRr6L4hE2YyCky9ZDdVMK3dKdYQHotP9FxSz6oq/XdcTtS +t0XtgJHSKJGA6pw4eGKu +=wm6Y -----END PGP SIGNATURE----- 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?= +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 + + 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/metadata.xml b/dev-qt/qtwebkit/metadata.xml index 0ca02a93e967..8640de507d56 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -5,8 +5,8 @@ Add support for exceptions - like catching them inside the event loop (recommended by upstream) - 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 + Enable HTML5 audio/video support via legacy media-libs/gstreamer:0.10 Enable HTML5 audio/video support via dev-qt/qtmultimedia Enable printing via dev-qt/qtprintsupport Build QML/QtQuick bindings 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..fd037cda20cb --- /dev/null +++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild,v 1.1 2015/07/23 20:36:44 pesa Exp $ + +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 +" + +S=${WORKDIR} + +PATCHES=( + "${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 +} -- cgit v1.2.3-65-gdbad