diff options
Diffstat (limited to 'dev-qt/qtwebkit')
| -rw-r--r-- | dev-qt/qtwebkit/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.5-r1.ebuild | 41 |
2 files changed, 20 insertions, 23 deletions
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index dfa0372..3fe5304 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -1,6 +1,6 @@ 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 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtwebkit-4.8.5-r1.ebuild 1958 SHA256 4f5cfe73916c1eb3f9ed743478a82290753f0934a1bb96efc0b69c035fe0e01c SHA512 e11cd7b1e94e05f4d7f0c433b3c6b2b0eeca9c9d0656a50b701fe3445503826d392248c02eea188409bcc1cea59cb994f3870513306c05aec3fb41f3210aef77 WHIRLPOOL a692b3f934b5bb3f53072d3d11efd01b9118414455fa28c7984f5213f59baf50c38d8b19663e6469d4f1196f6da70150c2ce9de7b72dc28fbc9437d7a7dabc62 +EBUILD qtwebkit-4.8.5-r1.ebuild 2239 SHA256 f2259ac630ceee15d8fa60eebb2f8dfc02fb7c24e77dc34d43f1975b27db03fc SHA512 ba4f5dd6dc5ae5182a3bef70cba12ed596626fcc1d77fb91097a36cab2ea450c69ae563df2d3f210521d314aa86911cd5ab4ebe0f16426727a11f82b01baced4 WHIRLPOOL a408eb02a5735fc5c3fcdb9341f6e9da35e2570911d375467bf83315e22cc0d7e4ede68ceed385ec62d8616d1ed1a2ad023c0c7aa82abdc60aad40cec2d1c7d9 MISC ChangeLog 26899 SHA256 66b012e570342b6ceb2d0f589686133bc79d13a606c0aad5ce23627bf16fc5b1 SHA512 3ae8065abd3e62e88f3c615cb2305f49663d06e74521b85de03b8f555c5ee501956933a60151996536abb31f96b8a58dcfe92dc9ab825d75e83e381ec933022b WHIRLPOOL 6e1723bff911a674683540d1abab7b0fc715a2caa251d9d97686916aa38f777ba781a61fc29ef774825cfa9d3bc974124ab8ca9299c38953a47a728164d4b84f MISC metadata.xml 522 SHA256 6f4c021a3440a17b85509b316089ef738dfad8ed92297c2f5c652be44f4c17cf SHA512 79883d12a8eb849f3657fd6df06df92bc78b30bc845cedcb69255bf6b5dab58ef3029581a03a251bc7afcf3574391c92907118242b1f9afa75f0cc5ebfc92754 WHIRLPOOL bd2a4c8981de43707177e6cfb56942d19ca3c3351ff03e535468fcf1063ea48280aae36edb04d307f6d870ad5e3c6d4245e6cfab3c632f81ba58c909f9346130 diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5-r1.ebuild index b33a027..c4a1312 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.5-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.5-r1.ebuild @@ -4,32 +4,32 @@ EAPI=5 -inherit qt4-build flag-o-matic +inherit qt4-build-multilib flag-o-matic DESCRIPTION="The WebKit module for the Qt toolkit" SLOT="4" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" else - KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~amd64" fi IUSE="+gstreamer icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" - dev-db/sqlite:3 - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - x11-libs/libX11 - x11-libs/libXrender + dev-db/sqlite: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[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] gstreamer? ( - dev-libs/glib:2 - dev-libs/libxml2:2[!icu?] - >=media-libs/gstreamer-0.10.36:0.10 - >=media-libs/gst-plugins-base-0.10.36:0.10 + dev-libs/glib:2[${MULTILIB_USEDEP}] + dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] + >=media-libs/gstreamer-0.10.36:0.10[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}] ) - icu? ( dev-libs/icu:= ) + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -38,7 +38,8 @@ PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) -pkg_setup() { +ehook qt4-build-multilib-global-pre_pkg_setup my_global_pre_pkg_setup +my_global_pre_pkg_setup() { QT4_TARGET_DIRECTORIES=" src/3rdparty/webkit/Source/JavaScriptCore src/3rdparty/webkit/Source/WebCore @@ -50,11 +51,10 @@ pkg_setup() { QCONFIG_ADD="webkit" QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup } -src_prepare() { +ehook qt4-build-multilib-global-pre_src_prepare my_global_pre_src_prepare +my_global_pre_src_prepare() { # 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 @@ -67,17 +67,14 @@ src_prepare() { sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die fi - - qt4-build_src_prepare } -src_configure() { +ehook qt4-build-multilib-global-pre_src_configure my_global_pre_src_configure +my_global_pre_src_configure() { myconf+=" -webkit -system-sqlite $(qt_use icu) $(qt_use jit javascript-jit) $(use gstreamer || echo -DENABLE_VIDEO=0)" - - qt4-build_src_configure } |