From d3930fc626739e95c1ce20c2202c756b08054074 Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Sun, 5 Dec 2010 21:51:09 +0000 Subject: removed 4.5.3 Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64 --- x11-libs/qt-gui/ChangeLog | 6 +- .../qt-gui/files/qt-4.5.3-glib-event-loop.patch | 11 -- x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch | 33 ---- x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild | 184 --------------------- 4 files changed, 5 insertions(+), 229 deletions(-) delete mode 100644 x11-libs/qt-gui/files/qt-4.5.3-glib-event-loop.patch delete mode 100644 x11-libs/qt-gui/files/qt-4.5.3-libpng14.patch delete mode 100644 x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild (limited to 'x11-libs/qt-gui') 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 -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 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; ywidth; 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] =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 -} -- cgit v1.2.3-65-gdbad