| 1 |
pesa 15/04/26 23:01:54 |
| 2 |
|
| 3 |
Modified: qtwebkit-4.8.6-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Prevent automagic dependency on qt-mobility (bug 547350). |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: qtwebkit-4.8.6-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- qtwebkit-4.8.6-r1.ebuild 15 Nov 2014 02:38:53 -0000 1.1 |
| 23 |
+++ qtwebkit-4.8.6-r1.ebuild 26 Apr 2015 23:01:54 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.2 2015/04/26 23:01:54 pesa Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -47,14 +47,18 @@ |
| 34 |
QCONFIG_DEFINE="QT_WEBKIT" |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
- # Fix version number in generated pkgconfig file, bug 406443 |
| 38 |
- sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ |
| 39 |
- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die |
| 40 |
- |
| 41 |
# Remove -Werror from CXXFLAGS |
| 42 |
sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ |
| 43 |
src/3rdparty/webkit/Source/WebKit.pri || die |
| 44 |
|
| 45 |
+ # Fix version number in generated pkgconfig file (bug 406443) |
| 46 |
+ sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ |
| 47 |
+ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die |
| 48 |
+ |
| 49 |
+ # Prevent automagic dependency on qt-mobility (bug 547350) |
| 50 |
+ sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ |
| 51 |
+ src/3rdparty/webkit/Source/WebCore/features.pri || die |
| 52 |
+ |
| 53 |
if use icu; then |
| 54 |
sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ |
| 55 |
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.30 dev-qt/qtwebkit/ChangeLog |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.30&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.30&content-type=text/plain |
| 63 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.29&r2=1.30 |
| 64 |
|
| 65 |
Index: ChangeLog |
| 66 |
=================================================================== |
| 67 |
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v |
| 68 |
retrieving revision 1.29 |
| 69 |
retrieving revision 1.30 |
| 70 |
diff -u -r1.29 -r1.30 |
| 71 |
--- ChangeLog 15 Apr 2015 04:41:43 -0000 1.29 |
| 72 |
+++ ChangeLog 26 Apr 2015 23:01:54 -0000 1.30 |
| 73 |
@@ -1,6 +1,9 @@ |
| 74 |
# ChangeLog for dev-qt/qtwebkit |
| 75 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 76 |
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.29 2015/04/15 04:41:43 dlan Exp $ |
| 77 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.30 2015/04/26 23:01:54 pesa Exp $ |
| 78 |
+ |
| 79 |
+ 26 Apr 2015; Davide Pesavento <pesa@g.o> qtwebkit-4.8.6-r1.ebuild: |
| 80 |
+ Prevent automagic dependency on qt-mobility (bug 547350). |
| 81 |
|
| 82 |
15 Apr 2015; Yixun Lan <dlan@g.o> qtwebkit-5.4.1.ebuild: |
| 83 |
keyword arm64, tested on cortex-a53 hardware |
Archives