diff options
author | Alex Alexander <wired@gentoo.org> | 2010-12-05 21:51:09 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2010-12-05 21:51:09 +0000 |
commit | d3930fc626739e95c1ce20c2202c756b08054074 (patch) | |
tree | 18796d5dcb34d4e5b92a8ba9c47113707c71752f | |
parent | Version bump (diff) | |
download | historical-d3930fc626739e95c1ce20c2202c756b08054074.tar.gz historical-d3930fc626739e95c1ce20c2202c756b08054074.tar.bz2 historical-d3930fc626739e95c1ce20c2202c756b08054074.zip |
removed 4.5.3
Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64
42 files changed, 70 insertions, 1240 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 23838c0459c1..a1c39a5a8daa 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.99 2010/11/09 15:51:17 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.100 2010/12/05 21:45:26 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-assistant-4.5.3.ebuild: + removed 4.5.3 *qt-assistant-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-assistant/qt-assistant-4.5.3.ebuild b/x11-libs/qt-assistant/qt-assistant-4.5.3.ebuild deleted file mode 100644 index da3f30079a7a..000000000000 --- a/x11-libs/qt-assistant/qt-assistant-4.5.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.5.3.ebuild,v 1.10 2010/11/05 18:05:30 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The assistant help module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -DEPEND="~x11-libs/qt-gui-${PV}[debug=] - ~x11-libs/qt-sql-${PV}[debug=,sqlite] - ~x11-libs/qt-webkit-${PV}[debug=]" -RDEPEND="${DEPEND} !<x11-libs/qt-4.4.0:4" - -# Pixeltool isn't really assistant related, but it relies on -# the assistant libraries. And qdoc3 is needed by qt-creator... -QT4_TARGET_DIRECTORIES="tools/assistant tools/pixeltool tools/qdoc3" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -src/3rdparty/clucene/ -tools/shared/fontpanel -include/ -src/ -doc/" - -src_configure() { - myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon - -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility - -no-fontconfig -no-glib -no-opengl -no-qt3support -no-svg -no-gtkstyle" - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - insinto ${QTDOCDIR} - doins -r "${S}"/doc/qch/ || die "Installing qch documentation failed" - dobin "${S}"/tools/qdoc3/qdoc3 || die "Installing qdoc3 failed" - - # install correct assistant icon, bug 241208 - dodir /usr/share/pixmaps/ || die "dodir failed" - insinto /usr/share/pixmaps/ || die "insinto failed" - doins tools/assistant/tools/assistant/images/assistant.png \ - || die "doins failed" - # Note: absolute image path required here! - make_desktop_entry /usr/bin/assistant Assistant \ - /usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \ - || die "make_desktop_entry failed" -} diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 45ef06b52ff1..44eea6b7253b 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.115 2010/11/19 01:27:29 chiiph Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.116 2010/12/05 21:45:43 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-core-4.5.3-r2.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-core-4.7.1-r1 (19 Nov 2010) diff --git a/x11-libs/qt-core/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-core/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-core/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-core/qt-core-4.5.3-r2.ebuild b/x11-libs/qt-core/qt-core-4.5.3-r2.ebuild deleted file mode 100644 index 0e3319c77340..000000000000 --- a/x11-libs/qt-core/qt-core-4.5.3-r2.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.3-r2.ebuild,v 1.9 2010/07/11 13:51:10 mr_bones_ Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="doc +glib iconv qt3support ssl" - -RDEPEND="sys-libs/zlib - glib? ( dev-libs/glib ) - ssl? ( dev-libs/openssl ) - !<x11-libs/qt-4.4.0:4" -DEPEND="${RDEPEND} - dev-util/pkgconfig" -PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )" - -QT4_TARGET_DIRECTORIES=" -src/tools/bootstrap -src/tools/moc -src/tools/rcc -src/tools/uic -src/corelib -src/xml -src/network -src/plugins/codecs -tools/linguist/lrelease -tools/linguist/lupdate -tools/linguist/lconvert" - -# Most ebuilds include almost everything for testing -# Will clear out unneeded directories after everything else works OK -QT4_EXTRACT_DIRECTORIES=" -include/Qt -include/QtCore -include/QtNetwork -include/QtScript -include/QtXml -src/plugins/plugins.pro -src/plugins/qpluginbase.pri -src/src.pro -src/3rdparty/des -src/3rdparty/harfbuzz -src/3rdparty/md4 -src/3rdparty/md5 -src/3rdparty/sha1 -src/script -tools/linguist/shared -translations" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -pkg_setup() { - qt4-build_pkg_setup - - if has_version x11-libs/qt-core; then - # Check to see if they've changed the glib flag since the last time installing this package. - if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then - ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." - ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." - elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then - ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." - ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." - fi - - # Check to see if they've changed the qt3support flag since the last time installing this package. - # If so, give a list of packages they need to uninstall first. - if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then - local need_to_remove - ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - for x in sql opengl gui qt3support; do - local pkg="x11-libs/qt-${x}" - if has_version $pkg; then - need_to_remove="${need_to_remove} ${pkg}" - fi - done - if [[ -n ${need_to_remove} ]]; then - die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" - fi - elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then - local need_to_remove - ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - for x in sql opengl gui qt3support; do - local pkg="x11-libs/qt-${x}" - if has_version $pkg; then - need_to_remove="${need_to_remove} ${pkg}" - fi - done - if [[ -n ${need_to_remove} ]]; then - die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" - fi - fi - fi -} - -src_unpack() { - if use doc; then - QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} - doc/" - QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - tools/qdoc3" - fi - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_src_unpack - - # Don't pre-strip, bug 235026 - for i in kr jp cn tw ; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done -} - -src_prepare() { - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" -} - -src_configure() { - unset QMAKESPEC - - myconf="${myconf} - $(qt_use glib) - $(qt_use iconv) - $(qt_use ssl openssl) - $(qt_use qt3support)" - - myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng - -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns - -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl - -no-svg -no-gtkstyle" - - if ! use doc; then - myconf="${myconf} -nomake docs" - fi - - cp -f "${FILESDIR}"/moc.pro "${S}"/src/tools/moc/ - cp -f "${FILESDIR}"/rcc.pro "${S}"/src/tools/rcc/ - cp -f "${FILESDIR}"/uic.pro "${S}"/src/tools/uic/ - - qt4-build_src_configure -} - -src_compile() { - # bug 259736 - unset QMAKESPEC - qt4-build_src_compile -} - -src_install() { - dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" - fi - - # use freshly built libraries - LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto ${QTTRANSDIR} - doins translations/*.qm || die "doins translations failed" - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}/44qt4" - LDPATH=${libdirs:1} - EOF - doenvd "${T}/44qt4" - - dodir /${QTDATADIR}/mkspecs/gentoo - mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "Failed to move qconfig.pri" - - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - - if use glib; then - QCONFIG_DEFINE="$(use glib && echo QT_GLIB) - $(use ssl && echo QT_OPENSSL)" - install_qconfigs - fi - # remove .la files - find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm - # remove some unnecessary headers - rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ -qatomic_macosx.h,\ -qatomic_windows.h,\ -qatomic_windowsce.h,\ -qt_windows.h} - - keepdir "${QTSYSCONFDIR}" -} diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index 35f5f9d20df6..4442255da325 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-dbus # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.80 2010/11/09 15:47:37 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.81 2010/12/05 21:46:00 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-dbus-4.5.3-r1.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-dbus-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-dbus/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-dbus/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-dbus/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-dbus/qt-dbus-4.5.3-r1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.5.3-r1.ebuild deleted file mode 100644 index 6b317d9f94b1..000000000000 --- a/x11-libs/qt-dbus/qt-dbus-4.5.3-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.5.3-r1.ebuild,v 1.7 2009/11/10 22:36:57 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The DBus module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="~x11-libs/qt-core-${PV}[debug=] - >=sys-apps/dbus-1.0.2" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" -src/dbus -tools/qdbus/qdbus -tools/qdbus/qdbusxml2cpp -tools/qdbus/qdbuscpp2xml" -QCONFIG_ADD="dbus dbus-linked" -QCONFIG_DEFINE="QT_DBUS" - -#FIXME: Check if these are still needed with the header package -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtCore -include/QtDBus -include/QtXml -src/corelib -src/xml" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" - "${FILESDIR}/qt-4.5.3-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} -dbus-linked" - qt4-build_src_configure -} diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 7dd16559c130..27ab68aed140 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.61 2010/11/09 15:49:26 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.62 2010/12/05 21:46:16 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-demo-4.5.3.ebuild: + removed 4.5.3 *qt-demo-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-demo/qt-demo-4.5.3.ebuild b/x11-libs/qt-demo/qt-demo-4.5.3.ebuild deleted file mode 100644 index b098d64e2dc3..000000000000 --- a/x11-libs/qt-demo/qt-demo-4.5.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.5.3.ebuild,v 1.6 2010/11/05 18:07:22 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="Demonstration module of the Qt toolkit" -SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="kde" - -DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT} - ~x11-libs/qt-core-${PV}:${SLOT} - ~x11-libs/qt-dbus-${PV}:${SLOT} - ~x11-libs/qt-gui-${PV}:${SLOT} - ~x11-libs/qt-opengl-${PV}:${SLOT} - || ( ~x11-libs/qt-phonon-${PV}:${SLOT} media-sound/phonon ) - kde? ( media-sound/phonon ) - ~x11-libs/qt-script-${PV}:${SLOT} - ~x11-libs/qt-sql-${PV}:${SLOT} - ~x11-libs/qt-svg-${PV}:${SLOT} - ~x11-libs/qt-test-${PV}:${SLOT} - ~x11-libs/qt-webkit-${PV}:${SLOT} - ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}" - -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="demos - examples" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - doc/src/images - src/ - include/ - tools/" - -src_prepare() { - # patch errors in arthurwidgets and plugandpaint - epatch "${FILESDIR}"/qt-demo-4.5.0-fixes.patch - - qt4-build_src_prepare -} - -src_install() { - insinto ${QTDOCDIR}/src - doins -r "${S}"/doc/src/images || die "Installing images failed." - - qt4-build_src_install -} diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 508e36361db5..6f8951a685a3 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.132 2010/12/05 19:53:27 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.133 2010/12/05 21:46:38 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-gui-4.5.3-r2.ebuild, + -files/qt-4.5.3-glib-event-loop.patch, -files/qt-4.5.3-libpng14.patch: + removed 4.5.3 05 Dec 2010; Alex Alexander <wired@gentoo.org> qt-gui-4.6.2.ebuild, qt-gui-4.6.3.ebuild, qt-gui-4.6.3-r2.ebuild, qt-gui-4.7.1-r1.ebuild: diff --git a/x11-libs/qt-gui/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-gui/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-gui/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch b/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch deleted file mode 100644 index 656cbaddfd42..000000000000 --- a/x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/gui/image/qpnghandler.cpp -+++ src/gui/image/qpnghandler.cpp -@@ -205,7 +205,7 @@ - image.setColor(i, qRgba(c,c,c,0xff)); - } - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr->trans_color.gray; - if (g < ncols) { - image.setColor(g, 0); - } -@@ -234,7 +234,7 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr->trans_alpha[i] - ) - ); - i++; -@@ -454,9 +454,9 @@ - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); - for (uint y=0; y<height; y++) { - for (uint x=0; x<info_ptr->width; x++) { - if (((uint**)jt)[y][x] == trans) { diff --git a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild deleted file mode 100644 index c66d0b6b6c01..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.11 2010/09/26 13:32:36 wired Exp $ - -EAPI="2" -inherit eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xinerama" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2 - virtual/jpeg - >=media-libs/libpng-1.4 - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - x11-libs/libXi - ~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=] - ~x11-libs/qt-script-${PV}[debug=] - cups? ( net-print/cups ) - dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] ) - gtk? ( x11-libs/gtk+:2 ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - xinerama? ( x11-proto/xineramaproto ) - gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) ) - x11-proto/xextproto - x11-proto/inputproto" -PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )" - -QT4_TARGET_DIRECTORIES=" -src/gui -src/scripttools/ -tools/designer -tools/linguist/linguist -src/plugins/imageformats/gif -src/plugins/imageformats/ico -src/plugins/imageformats/jpeg -src/plugins/inputmethods" - -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/linguist/shared -tools/linguist/phrasebooks -tools/shared/" - -PATCHES=( - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -pkg_setup() { - if use raster; then - ewarn "WARNING: You have enabled raster backend rendering engine." - ewarn "This is a new feature and may lead to composite problems" - ewarn "screen corruption and broken qt4 or kde4 applications. " - ewarn "If you encounter such problems please" - ewarn "remove 'raster' use flag and re-compile qt-gui before" - ewarn "filling a bug on gentoo bugzilla." - ebeep 5 - fi - qt4-build_pkg_setup -} - -src_unpack() { - use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" - use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" - use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_src_unpack -} - -src_prepare() { - qt4-build_src_prepare - - # Don't build plugins this go around, because they depend on qt3support lib - sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro - - # fixing hardcoded fonts, bug #252312 - EPATCH_OPTS="--ignore-whitespace" - epatch "${FILESDIR}"/hardcoded_fonts.patch - - has_version ">=media-libs/libpng-1.4" && epatch \ - "${FILESDIR}"/qt-${PV}-libpng14.patch -} - -src_configure() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - myconf="$(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use dbus qdbus) - $(qt_use qt3support) - $(qt_use gtk gtkstyle) - $(qt_use xinerama)" - - use nas && myconf="${myconf} -system-nas-sound" - use raster && myconf="${myconf} -graphicssystem raster" - - myconf="${myconf} -qt-gif -system-libpng -system-libjpeg - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -xrender -xrandr -xkb -xshape -sm -no-svg" - - # Explicitly don't compile these packages. - # Emerge "qt-webkit", "qt-phonon", etc for their functionality. - myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl" - - qt4-build_src_configure -} - -src_install() { - QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig - $(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas) - gif png system-png system-jpeg - $(use mng && echo system-mng) - $(use tiff && echo system-tiff)" - QCONFIG_REMOVE="no-gif no-png" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE - $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR - $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" - - qt4-build_src_install - - # remove some unnecessary headers - rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \ - "${D}${QTHEADERDIR}"/QtGui/QMacStyle - - # qt-creator - # some qt-creator headers are located - # under /usr/include/qt4/QtDesigner/private. - # those headers are just includes of the headers - # which are located under tools/designer/src/lib/* - # So instead of installing both, we create the private folder - # and drop tools/designer/src/lib/* headers in it. - dodir /usr/include/qt4/QtDesigner/private/ - insinto /usr/include/qt4/QtDesigner/private/ - doins "${S}"/tools/designer/src/lib/shared/* - doins "${S}"/tools/designer/src/lib/sdk/* - - # install correct designer and linguist icons, bug 241208 - doicon tools/linguist/linguist/images/icons/linguist-128-32.png \ - tools/designer/src/designer/images/designer.png \ - || die "doicon failed" - # Note: absolute image path required here! - make_desktop_entry /usr/bin/linguist Linguist \ - /usr/share/pixmaps/linguist-128-32.png \ - 'Qt;Development;GUIDesigner' \ - || die "linguist make_desktop_entry failed" - make_desktop_entry /usr/bin/designer Designer \ - /usr/share/pixmaps/designer.png \ - 'Qt;Development;GUIDesigner' \ - || die "designer make_desktop_entry failed" -} - -pkg_postinst() { - if use gtk ; then - ewarn 'If you get the following error when setting Qt to use the GTK style:' - ewarn ' "QGtkStyle cannot be used together with the GTK_Qt engine."' - ewarn 'make sure you have GTK configured to NOT use the GTK_Qt engine and' - ewarn 'export GTK2_RC_FILES="$HOME/.gtkrc-2.0" in your environment.' - fi - qt4-build_pkg_postinst -} diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index 5fe42652a878..3b6c6d1e7d87 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.81 2010/11/09 15:48:31 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.82 2010/12/05 21:46:55 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-opengl-4.5.3-r1.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-opengl-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-opengl/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-opengl/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-opengl/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-opengl/qt-opengl-4.5.3-r1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.5.3-r1.ebuild deleted file mode 100644 index 245554d25a04..000000000000 --- a/x11-libs/qt-opengl/qt-opengl-4.5.3-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.5.3-r1.ebuild,v 1.8 2010/09/17 11:10:53 scarabeus Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The OpenGL module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="qt3support" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=] - ~x11-libs/qt-gui-${PV}[debug=,qt3support=] - virtual/opengl" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" -src/opengl -src/plugins/graphicssystems/opengl" - -QT4_EXTRACT_DIRECTORIES=" -include/QtCore -include/QtGui -include/QtOpenGL -src/corelib -src/gui -src/opengl -src/plugins -src/3rdparty" - -QCONFIG_ADD="opengl" -QCONFIG_DEFINE="QT_OPENGL" - -PATCHES=( - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} -opengl - $(qt_use qt3support)" - - qt4-build_src_configure - - # Not building tools/designer/src/plugins/tools/view3d as it's - # commented out of the build in the source -} diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 61f09585096d..914e6a259bed 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.85 2010/11/09 15:50:02 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.86 2010/12/05 21:47:12 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-phonon-4.5.3.ebuild: + removed 4.5.3 *qt-phonon-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-phonon/qt-phonon-4.5.3.ebuild b/x11-libs/qt-phonon/qt-phonon-4.5.3.ebuild deleted file mode 100644 index 2c632b863261..000000000000 --- a/x11-libs/qt-phonon/qt-phonon-4.5.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.5.3.ebuild,v 1.10 2009/12/11 14:57:52 armin76 Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="dbus" - -DEPEND="~x11-libs/qt-gui-${PV}[debug=,glib,qt3support] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-sound/phonon - media-libs/gstreamer - media-libs/gst-plugins-base - dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" -src/phonon -src/plugins/phonon" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/ -src" - -QCONFIG_ADD="phonon" -QCONFIG_DEFINE="QT_GSTREAMER" - -src_configure() { - myconf="${myconf} -phonon -no-opengl -no-svg - $(qt_use dbus qdbus)" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index d2069d0a192e..509896599254 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.85 2010/11/09 15:49:08 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.86 2010/12/05 21:47:29 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-qt3support-4.5.3.ebuild: + removed 4.5.3 *qt-qt3support-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.3.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.3.ebuild deleted file mode 100644 index a75210d93175..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.5.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.3.ebuild,v 1.7 2009/11/10 22:35:42 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt3 support module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+accessibility kde phonon" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support] - ~x11-libs/qt-sql-${PV}[debug=,qt3support] - phonon? ( - !kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=] - media-sound/phonon[gstreamer] ) ) - kde? ( media-sound/phonon[gstreamer] ) - )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" -src/qt3support -src/tools/uic3 -tools/designer/src/plugins/widgets -tools/qtconfig -tools/porting" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -src/ -include/ -tools/" - -src_configure() { - myconf="${myconf} -qt3support - $(qt_use phonon gstreamer) - $(qt_use phonon) - $(qt_use accessibility)" - qt4-build_src_configure -} diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index e2d73cfce84b..9deac20acb5c 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.84 2010/11/19 03:25:40 chiiph Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.85 2010/12/05 21:47:46 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-script-4.5.3-r1.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-script-4.7.1-r1 (19 Nov 2010) diff --git a/x11-libs/qt-script/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-script/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-script/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-script/qt-script-4.5.3-r1.ebuild b/x11-libs/qt-script/qt-script-4.5.3-r1.ebuild deleted file mode 100644 index 2b07d410f3ef..000000000000 --- a/x11-libs/qt-script/qt-script-4.5.3-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.5.3-r1.ebuild,v 1.7 2009/11/10 22:37:23 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The ECMAScript module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="iconv" - -DEPEND="~x11-libs/qt-core-${PV}[debug=]" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/script/" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/Qt/ -include/QtCore/ -include/QtScript/ -src/corelib/" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility - -no-fontconfig -no-glib -no-opengl -no-svg -no-gtkstyle" - qt4-build_src_configure -} diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index 0a4f95572c63..0899e79533b1 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.101 2010/12/05 19:35:43 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.102 2010/12/05 21:48:10 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-sql-4.5.3.ebuild: + removed 4.5.3 *qt-sql-4.7.1-r1 (05 Dec 2010) diff --git a/x11-libs/qt-sql/qt-sql-4.5.3.ebuild b/x11-libs/qt-sql/qt-sql-4.5.3.ebuild deleted file mode 100644 index 02085913772e..000000000000 --- a/x11-libs/qt-sql/qt-sql-4.5.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.5.3.ebuild,v 1.9 2010/06/17 21:11:48 patrick Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The SQL module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="firebird iconv mysql odbc postgres qt3support +sqlite" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=] - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( dev-db/sqlite:3 )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/Qt/ -include/QtCore/ -include/QtSql/ -include/QtScript/ -src/src.pro -src/corelib/ -src/plugins -src/3rdparty -src/tools" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" -) - -pkg_setup() { - if ! (use firebird || use mysql || use odbc || use postgres || use sqlite); then - ewarn "You need to enable at least one SQL driver. Enable at least" - ewarn "one of these USE flags: \"firebird mysql odbc postgres sqlite\"" - die "Enable at least one SQL driver." - fi - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - sed -e '/pg_config --libs/d' -i "${S}"/configure \ - || die 'sed to fix postgresql usage in ./configure failed.' -} - -src_configure() { - # Don't support sqlite2 anymore - myconf="${myconf} -no-sql-sqlite2 - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ") - $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/usr/include/postgresql/pgsql ") - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite') - $(qt_use odbc sql-odbc plugin) - $(qt_use qt3support)" - - myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility -no-fontconfig - -no-glib -no-opengl -no-svg -no-gtkstyle" - - qt4-build_src_configure -} diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index 752847e6c3bd..6362ead7953e 100644 --- a/x11-libs/qt-svg/ChangeLog +++ b/x11-libs/qt-svg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-svg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.79 2010/11/09 15:47:55 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.80 2010/12/05 21:48:27 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-svg-4.5.3-r1.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-svg-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-svg/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-svg/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-svg/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-svg/qt-svg-4.5.3-r1.ebuild b/x11-libs/qt-svg/qt-svg-4.5.3-r1.ebuild deleted file mode 100644 index 6ce3aca02b9e..000000000000 --- a/x11-libs/qt-svg/qt-svg-4.5.3-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.5.3-r1.ebuild,v 1.7 2009/11/10 22:40:26 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The SVG module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="iconv" - -DEPEND="~x11-libs/qt-gui-${PV}[debug=]" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" -src/svg -src/plugins/imageformats/svg -src/plugins/iconengines/svgiconengine" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtSvg/ -include/Qt/ -include/QtGui/ -include/QtCore/ -include/QtXml/ -src/corelib/ -src/gui/ -src/plugins/ -src/xml -src/3rdparty" - -QCONFIG_ADD="svg" -QCONFIG_DEFINE="QT_SVG" - -PATCHES=( - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} $(qt_use iconv) -svg -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility - -v -no-fontconfig -no-glib -no-opengl -no-gtkstyle -continue" - qt4-build_src_configure -} diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 91a31bc6276b..27e0703ead16 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.79 2010/11/09 15:46:57 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.80 2010/12/05 21:48:44 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-test-4.5.3-r1.ebuild, + -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-test-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-test/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-test/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-test/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-test/qt-test-4.5.3-r1.ebuild b/x11-libs/qt-test/qt-test-4.5.3-r1.ebuild deleted file mode 100644 index 927dc8c27701..000000000000 --- a/x11-libs/qt-test/qt-test-4.5.3-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.5.3-r1.ebuild,v 1.7 2009/11/10 22:40:47 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The testing framework module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="iconv" - -DEPEND="~x11-libs/qt-core-${PV}[debug=]" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/testlib" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtTest/ -include/QtCore/ -src/corelib/" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} $(qt_use iconv) -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility - -no-fontconfig -no-glib -no-opengl -no-svg" - qt4-build_src_configure -} diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 8222de47025d..699217c5b46c 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.112 2010/11/19 02:58:09 chiiph Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.113 2010/12/05 21:49:02 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-webkit-4.5.3.ebuild, + -qt-webkit-4.5.3-r1.ebuild, -qt-webkit-4.5.3-r2.ebuild, + -qt-webkit-4.5.3-r3.ebuild: + removed 4.5.3 *qt-webkit-4.7.1-r1 (19 Nov 2010) diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.3-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.3-r1.ebuild deleted file mode 100644 index b2c27b6ef3a2..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.5.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r1.ebuild,v 1.5 2010/11/05 18:05:45 jer Exp $ - -EAPI="2" -inherit eutils qt4-build flag-o-matic - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd" -IUSE="kde" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] - ~x11-libs/qt-dbus-${PV}[debug=] - ~x11-libs/qt-gui-${PV}[dbus,debug=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus,debug=] - media-sound/phonon ) ) - kde? ( media-sound/phonon )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/" -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - epatch "${FILESDIR}"/30_webkit_unaligned_access.diff #235685 - qt4-build_src_prepare -} - -src_configure() { - # This fixes relocation overflows on alpha - use alpha && append-ldflags "-Wl,--no-relax" - myconf="${myconf} -webkit" - qt4-build_src_configure -} diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild deleted file mode 100644 index c9613af5834e..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r2.ebuild,v 1.2 2010/11/05 18:05:45 jer Exp $ - -EAPI="2" -inherit eutils qt4-build flag-o-matic - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="kde" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] - ~x11-libs/qt-dbus-${PV}[debug=] - ~x11-libs/qt-gui-${PV}[dbus,debug=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus,debug=] - media-sound/phonon ) ) - kde? ( media-sound/phonon )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/" -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - epatch "${FILESDIR}"/30_webkit_unaligned_access.diff #235685 - epatch "${FILESDIR}"/"${P}"-no-javascript-crash.patch #295573 - qt4-build_src_prepare -} - -src_configure() { - # This fixes relocation overflows on alpha - use alpha && append-ldflags "-Wl,--no-relax" - myconf="${myconf} -webkit" - qt4-build_src_configure -} diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild deleted file mode 100644 index 62f4c64299be..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild,v 1.8 2010/11/05 18:05:45 jer Exp $ - -EAPI="2" -inherit eutils qt4-build flag-o-matic - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="dbus kde" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] - ~x11-libs/qt-gui-${PV}[dbus?,debug=] - dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] ) - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus=,debug=] - media-sound/phonon ) ) - kde? ( media-sound/phonon )" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/WebCore - tools/designer/src/plugins/qwebview" - QT4_EXTRACT_DIRECTORIES=" - include/ - src/ - tools/" - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - epatch "${FILESDIR}"/30_webkit_unaligned_access.diff #235685 - epatch "${FILESDIR}"/${P}-no-javascript-crash.patch #295573 - - # patches graciously borrowed from Fedora for bug #314193 - epatch "${FILESDIR}"/${P}-cve-2010-0046-css-format-mem-corruption.patch - epatch "${FILESDIR}"/${P}-cve-2010-0049-freed-line-boxes-ltr-rtl.patch - epatch "${FILESDIR}"/${P}-cve-2010-0050-crash-misnested-style-tags.patch - epatch "${FILESDIR}"/${P}-cve-2010-0052-destroyed-input-cached.patch - - qt4-build_src_prepare -} - -src_configure() { - # This fixes relocation overflows on alpha - use alpha && append-ldflags "-Wl,--no-relax" - myconf="${myconf} -webkit $(qt_use dbus qdbus)" - qt4-build_src_configure -} diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.3.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.3.ebuild deleted file mode 100644 index 717ff3abbf31..000000000000 --- a/x11-libs/qt-webkit/qt-webkit-4.5.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3.ebuild,v 1.8 2010/11/05 18:05:45 jer Exp $ - -EAPI="2" -inherit qt4-build flag-o-matic - -DESCRIPTION="The Webkit module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 -sparc x86 ~x86-fbsd" -IUSE="kde" - -DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] - ~x11-libs/qt-dbus-${PV}[debug=] - ~x11-libs/qt-gui-${PV}[dbus,debug=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus,debug=] - media-sound/phonon ) ) - kde? ( media-sound/phonon )" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" -QT4_EXTRACT_DIRECTORIES=" -include/ -src/ -tools/" -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 - qt4-build_src_prepare -} - -src_configure() { - # This fixes relocation overflows on alpha - use alpha && append-ldflags "-Wl,--no-relax" - myconf="${myconf} -webkit" - qt4-build_src_configure -} diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index ddf01d9b09c4..7e53d6d60a30 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-xmlpatterns # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.79 2010/11/09 15:48:12 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.80 2010/12/05 21:49:18 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> + -qt-xmlpatterns-4.5.3-r1.ebuild, -files/qt-4.5.3-glib-event-loop.patch: + removed 4.5.3 *qt-xmlpatterns-4.7.1 (09 Nov 2010) diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.5.3-glib-event-loop.patch b/x11-libs/qt-xmlpatterns/files/qt-4.5.3-glib-event-loop.patch deleted file mode 100644 index 580f027a5471..000000000000 --- a/x11-libs/qt-xmlpatterns/files/qt-4.5.3-glib-event-loop.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp ---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than 2009-10-29 16:15:58.000000000 +0100 -+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp 2009-10-29 16:16:22.000000000 +0100 -@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa - (void) new (&timerSource->timerList) QTimerInfoList(); - timerSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&timerSource->source, true); -- g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach(&timerSource->source, mainContext); - } - diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3-r1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3-r1.ebuild deleted file mode 100644 index e845fb4224b2..000000000000 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3-r1.ebuild,v 1.7 2009/11/10 22:38:29 jer Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The patternist module for the Qt toolkit" -SLOT="4" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="~x11-libs/qt-core-${PV}[debug=]" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns" -QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} -include/QtCore -include/QtNetwork -include/QtXmlPatterns -src/network/ -src/corelib/" - -QCONFIG_ADD="xmlpatterns" -QCONFIG_DEFINE="QT_XMLPATTERNS" - -PATCHES=( - "${FILESDIR}/qt-4.5-nolibx11.diff" - "${FILESDIR}/qt-${PV}-glib-event-loop.patch" -) - -src_configure() { - myconf="${myconf} -xmlpatterns" - qt4-build_src_configure -} diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 8394488fb643..868caf841b5e 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.626 2010/11/13 21:40:55 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.627 2010/12/05 21:51:09 wired Exp $ + + 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-4.5.3.ebuild: + removed 4.5.3 *qt-4.7.1 (13 Nov 2010) diff --git a/x11-libs/qt/qt-4.5.3.ebuild b/x11-libs/qt/qt-4.5.3.ebuild deleted file mode 100644 index 168e7f288445..000000000000 --- a/x11-libs/qt/qt-4.5.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.5.3.ebuild,v 1.8 2010/08/18 03:59:27 jer Exp $ - -EAPI=2 -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -HOMEPAGE="http://qt.nokia.com/" - -LICENSE="|| ( LGPL-2.1 GPL-3 )" -SLOT="4" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 -sparc x86" -IUSE="dbus kde opengl qt3support" - -DEPEND="" -RDEPEND="~x11-libs/qt-core-${PV} - ~x11-libs/qt-gui-${PV} - ~x11-libs/qt-svg-${PV} - ~x11-libs/qt-sql-${PV} - ~x11-libs/qt-script-${PV} - ~x11-libs/qt-xmlpatterns-${PV} - dbus? ( ~x11-libs/qt-dbus-${PV} ) - opengl? ( ~x11-libs/qt-opengl-${PV} ) - !kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) ) - kde? ( media-sound/phonon ) - qt3support? ( ~x11-libs/qt-qt3support-${PV} ) - ~x11-libs/qt-webkit-${PV} - ~x11-libs/qt-test-${PV} - ~x11-libs/qt-assistant-${PV}" - -pkg_postinst() { - echo - elog "Please note that this meta package is only provided for convenience." - elog "No packages should depend directly on this meta package, but on the" - elog "specific split Qt packages needed. This ebuild will be removed in" - elog "future versions. Users that want all Qt components installed are" - elog "advised to use the set currently available in qting-edge overlay." - echo -} |