pesa        15/05/26 18:13:09

  Modified:             ChangeLog
  Added:                qtwebkit-4.8.7.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.36                 dev-qt/qtwebkit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.36&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.36&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog   16 May 2015 11:34:19 -0000      1.35
+++ ChangeLog   26 May 2015 18:13:09 -0000      1.36
@@ -1,6 +1,11 @@
 # 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.35 2015/05/16 
11:34:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.36 2015/05/26 
18:13:09 pesa Exp $
+
+*qtwebkit-4.8.7 (26 May 2015)
+
+  26 May 2015; Davide Pesavento <[email protected]> +qtwebkit-4.8.7.ebuild:
+  Version bump.
 
   16 May 2015; Pacho Ramos <[email protected]> qtwebkit-4.8.6-r1.ebuild:
   ppc stable wrt bug #530238



1.1                  dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild?rev=1.1&content-type=text/plain

Index: qtwebkit-4.8.7.ebuild
===================================================================
# 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.8.7.ebuild,v 1.1 
2015/05/26 18:13:09 pesa Exp $

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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x64-solaris ~x86-solaris"
fi

IUSE="+gstreamer 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}]
        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}"

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)
                $(use gstreamer || echo -DENABLE_VIDEO=0)
        )
        qt4_multilib_src_configure
}




Reply via email to