pesa 15/05/04 00:09:31
Modified: qt-creator-3.2.2.ebuild qt-creator-3.4.0.ebuild
ChangeLog
Log:
Add webkit USE flag wrt bug 538236. Remove unused debug USE flag from 3.4
ebuild.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.8 dev-qt/qt-creator/qt-creator-3.2.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?r1=1.7&r2=1.8
Index: qt-creator-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt-creator-3.2.2.ebuild 1 Apr 2015 20:57:55 -0000 1.7
+++ qt-creator-3.2.2.ebuild 4 May 2015 00:09:31 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v
1.7 2015/04/01 20:57:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v
1.8 2015/05/04 00:09:31 pesa Exp $
EAPI=5
@@ -32,7 +32,7 @@
QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
ios mercurial perforce python:pythoneditor qnx subversion valgrind)
-IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc test webkit ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="4.8.5:4"
@@ -47,8 +47,9 @@
>=dev-qt/qtscript-${QT_PV}
>=dev-qt/qtsql-${QT_PV}
>=dev-qt/qtsvg-${QT_PV}[accessibility]
- >=sys-devel/gdb-7.4[client(+),python]
+ >=sys-devel/gdb-7.5[client,python]
clang? ( >=sys-devel/clang-3.2:= )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -75,6 +76,12 @@
fi
done
+ # automagic dep on qtwebkit (bug 538236)
+ if ! use webkit; then
+ sed -i -e 's/contains(QT_CONFIG, webkit).*$/DEFINES +=
QT_NO_WEBKIT/' \
+ src/plugins/help/help.pro || die "failed to disable
webkit"
+ fi
+
# disable broken or unreliable tests
sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
@@ -112,9 +119,10 @@
# install documentation
if use doc; then
emake docs
- insinto /usr/share/doc/${PF}
+ # don't use ${PF} or the doc will not be found
+ insinto /usr/share/doc/qtcreator
doins share/doc/qtcreator/qtcreator{,-dev}.qch
- docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+ docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
fi
# install desktop file
1.3 dev-qt/qt-creator/qt-creator-3.4.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild?r1=1.2&r2=1.3
Index: qt-creator-3.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-creator-3.4.0.ebuild 28 Apr 2015 16:11:47 -0000 1.2
+++ qt-creator-3.4.0.ebuild 4 May 2015 00:09:31 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v
1.2 2015/04/28 16:11:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v
1.3 2015/05/04 00:09:31 pesa Exp $
EAPI=5
@@ -32,7 +32,7 @@
QTC_PLUGINS=('android:android|qmakeandroidsupport'
autotools:autotoolsprojectmanager baremetal
bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
ios mercurial
perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion
valgrind winrt)
-IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="5.3.2:5"
@@ -59,6 +59,7 @@
clang? ( >=sys-devel/clang-3.2:= )
qbs? ( >=dev-util/qbs-1.4.0 )
systemd? ( sys-apps/systemd:= )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
@@ -93,6 +94,12 @@
fi
done
+ # automagic dep on qtwebkit (bug 538236)
+ if ! use webkit; then
+ sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable
webkit"
+ fi
+
# disable broken or unreliable tests
sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
1.50 dev-qt/qt-creator/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.50&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.50&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 28 Apr 2015 16:11:47 -0000 1.49
+++ ChangeLog 4 May 2015 00:09:31 -0000 1.50
@@ -1,6 +1,11 @@
# ChangeLog for dev-qt/qt-creator
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.49
2015/04/28 16:11:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.50
2015/05/04 00:09:31 pesa Exp $
+
+ 04 May 2015; Davide Pesavento <p...@gentoo.org> qt-creator-3.2.2.ebuild,
+ qt-creator-3.4.0.ebuild:
+ Add webkit USE flag wrt bug 538236. Remove unused debug USE flag from 3.4
+ ebuild.
28 Apr 2015; Davide Pesavento <p...@gentoo.org> qt-creator-3.4.0.ebuild:
Raise dev-util/qbs dep to match bundled version and to fix bug 537244.
