diff options
author | Ben de Groot <yngwin@gentoo.org> | 2009-07-23 20:44:16 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2009-07-23 20:44:16 +0000 |
commit | 758b829a97dcf8645f88b304c8106af0a50ba529 (patch) | |
tree | ca56d6100316b3769aa071b2a3152a2d5120d48a | |
parent | Fix building with app-crypt/gpgme >= 1.2.0 (bug #278720). (diff) | |
download | historical-758b829a97dcf8645f88b304c8106af0a50ba529.tar.gz historical-758b829a97dcf8645f88b304c8106af0a50ba529.tar.bz2 historical-758b829a97dcf8645f88b304c8106af0a50ba529.zip |
Add upstream patch to fix bug 276527. Drop some old ebuilds.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
-rw-r--r-- | x11-libs/qt-gui/ChangeLog | 9 | ||||
-rw-r--r-- | x11-libs/qt-gui/Manifest | 6 | ||||
-rw-r--r-- | x11-libs/qt-gui/files/qt-gui-4.5.2-x11-timestamp.patch | 92 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.4.2-r1.ebuild | 134 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild | 138 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.5.2-r2.ebuild | 177 |
6 files changed, 280 insertions, 276 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index b573dc21caed..3b9dbf0faa27 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.65 2009/07/15 18:57:29 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.66 2009/07/23 20:44:16 yngwin Exp $ + +*qt-gui-4.5.2-r2 (23 Jul 2009) + + 23 Jul 2009; Ben de Groot <yngwin@gentoo.org> -qt-gui-4.4.2-r1.ebuild, + -qt-gui-4.4.2-r2.ebuild, +qt-gui-4.5.2-r2.ebuild, + +files/qt-gui-4.5.2-x11-timestamp.patch: + Add upstream patch to fix bug 276527. Drop some old ebuilds. 15 Jul 2009; Ben de Groot <yngwin@gentoo.org> qt-gui-4.5.2-r1.ebuild: Don't add useflag defaults that are in desktop profile, as was decided in diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 71232e800af7..f73316a063c0 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -24,6 +24,7 @@ AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SH AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945 AUX qt-gui-4.5.1-0282-fix-qpixmapcache-leak.diff 896 RMD160 86d836db8f4bfb99304b152f70bd8c2bd551c4ad SHA1 82a823695986815e3ae3edcb3047daea1738ebb9 SHA256 dc5d5adc065f03390cacf2266c2a73f1c04cce9179bfbe1c1eb8e2cd6e02aa84 AUX qt-gui-4.5.1-ppc-pixmap-fix-backport-196152.patch 505 RMD160 b68b063ff6a62e06623d7298568c6d8046517cae SHA1 556d0331ed67506aeec1ff7477c65e315119b015 SHA256 de132f66e07ec7439b6897c375c9e3631a2142bf0cb5abadc77997e3cc444694 +AUX qt-gui-4.5.2-x11-timestamp.patch 3324 RMD160 a00c439efc446a7501e9f17a29d3df27ca4ecf65 SHA1 c4c5e8d8a1a9957394583f6bdcfd646639e49e71 SHA256 5a8e5383b17c1a3dedfa4d69d93a5e8eaafb7ae381df44890b3e4c9a16bc654f AUX qt-gui-designer-4.4.1.patch 531 RMD160 ab7e5f965541ff4e16d3530f55b8fc40cfc6d5a5 SHA1 dba254383e0504e8f4257217e15e201cc5216f9c SHA256 fbc46d38a87ab3ffaec5ac5b58f4a534e1ef3af050f9f68eb6001ddb33920b12 AUX qt-x11-opensource-src-4.5.0-linguist-crash.patch 1329 RMD160 b3f5a13a6f0af11544543e6c5b684a19dd4f93d3 SHA1 c4f3748cfac5640694772aab817ea6df04e7dd1c SHA256 c309e79e4181f58409a7d567afc1b73beeb7539b0456e87eb1332da744795e00 AUX qt-x11-opensource-src-4.5.0-lrelease.patch 896 RMD160 98f02d419fcb43e08b0c499b0cdc993216de5f83 SHA1 b78116dd7af72e44472e3faa840fcfcfe7dc9968 SHA256 c9cc5a23034fca0e5440d5f6cdc27903101251956821c398375d679e8774562d @@ -32,12 +33,11 @@ DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c0695 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75 DIST qt-x11-opensource-src-4.5.2.tar.bz2 116015284 RMD160 1af31d7fe66665e718f0c728b41becea9996fba7 SHA1 bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b SHA256 d26d94c9cb90dfe16a13b39ac7157f66ec9f5fbbf9d7faa57f7466157721f836 -EBUILD qt-gui-4.4.2-r1.ebuild 4583 RMD160 b7bad820fd4f8f20b1a5da254f35474348eaf2ab SHA1 69433465c142d9a10b2404eac33c666098e0a9c6 SHA256 0e907e74d2360be7fa22dcf2389ab6209ab58f1e73a7e1e7a09ed8684dce0145 -EBUILD qt-gui-4.4.2-r2.ebuild 4870 RMD160 7bb9cbf0f2990fe4098d2d691e4275745cfe37e3 SHA1 586c4fefd44948a4ae370f64e9ea410241633cfc SHA256 5226ed0dcf8e5d33393ecdd76d6e273c4871ba6c573091b5d1b07d3228a56c35 EBUILD qt-gui-4.4.2-r3.ebuild 5722 RMD160 79ee98acf0dabc3d6925a277f947e2786d1c209d SHA1 0bc49f5b5e8758594a8f578a3d64078c88b0ddbc SHA256 87195ed3e697f41cadf2afb74e9175f5b58c13f07aaee07b9d652362fe29c728 EBUILD qt-gui-4.5.1-r1.ebuild 5770 RMD160 9b6474f7a64cf9ccc37427707cbc650c80db9b8a SHA1 9dd3da3aa2a57eb3b96e47f27d85ce2b0f952d9f SHA256 a2a23597c602a2f0b8337174c4539df37617f083b749c5571e235d5ac6aa0981 EBUILD qt-gui-4.5.1-r2.ebuild 5949 RMD160 31a4252375083ef3b6e96911b59eae816ccf90c7 SHA1 a4b57fe1c52bae6f46c16c508107d257adaaf71c SHA256 4d958b328b9a2b890a22817ed034b750d30946891d4be03cafb1de36b518d609 EBUILD qt-gui-4.5.1.ebuild 5493 RMD160 e9fe7e5e1bed1b492e296330835635136f38fd1d SHA1 2ed6e707d7b818c5b276457a23dfc401dbad2d22 SHA256 0ad1a2bb09d98a19b1a736806e00dee7f8e62d8787d9818bcdf70d0f783bde60 EBUILD qt-gui-4.5.2-r1.ebuild 5849 RMD160 67ea0d91ba612bfa0c42f8ba8ba4842c6d334e93 SHA1 22087fae2ac824bc6c4f901429e7d6e687add4f1 SHA256 35ca53943627d723d4e027c26bfeaa0c127edebf994d8b212fd40f287309325c -MISC ChangeLog 9755 RMD160 b9bc94e5b0fb79d29d30a56b39f0607588fcb08a SHA1 576c58d19c8855f4a935dc01674a71985bc9231b SHA256 fa20baf07e1ba9c059c08c6fe7a8508199d4f6a376743da96610e1b951a25fc4 +EBUILD qt-gui-4.5.2-r2.ebuild 5963 RMD160 8f5e4088ce77dc4d7028a440214c1ae4e2d11f3b SHA1 11b907bd7c712ef4cc822530f10711f019ec5149 SHA256 1c65e25aa1d1f5b2028544ed45630e55790b7a69445e44d2c634fd3c42d8065d +MISC ChangeLog 10019 RMD160 a83f82094380e3fc686326b8959324d1cb1352d8 SHA1 f122d012dce9d7fd1d1a1010c8289a5e9c2564a0 SHA256 3e40554970671cc1bdebc9d87afc116130234cc5ccac0b48a92caec66edf4f60 MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3 diff --git a/x11-libs/qt-gui/files/qt-gui-4.5.2-x11-timestamp.patch b/x11-libs/qt-gui/files/qt-gui-4.5.2-x11-timestamp.patch new file mode 100644 index 000000000000..696e8a83415b --- /dev/null +++ b/x11-libs/qt-gui/files/qt-gui-4.5.2-x11-timestamp.patch @@ -0,0 +1,92 @@ +From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001 +From: Denis Dzyubenko <denis.dzyubenko@nokia.com> +Date: Wed, 22 Jul 2009 17:12:17 +0200 +Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only." + +In some cases we might get an invalid timestamp that is far away in +the future, so remembering it will break all consequent X calls that +require a timestamp because it just contains junk (for example +clipboard will stop working). This happens with XIM+SCIM pair - +whenever we start input method and type something to the widget, we +get a XKeyPress event with a commited string, however the 'serial' and +'time' members of the XEvent structure are not initialized (according +to valgrind) and contain junk. + +This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. + +Reviewed-By: Brad +--- + src/gui/kernel/qapplication_x11.cpp | 35 +++++++++++++++-------------------- + 1 files changed, 15 insertions(+), 20 deletions(-) + +diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp +index 163ceb6..abedfd6 100644 +--- a/src/gui/kernel/qapplication_x11.cpp ++++ b/src/gui/kernel/qapplication_x11.cpp +@@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event) + #ifdef ALIEN_DEBUG + //qDebug() << "QApplication::x11ProcessEvent:" << event->type; + #endif +- Time time = 0, userTime = 0; + switch (event->type) { + case ButtonPress: + pressed_window = event->xbutton.window; +- userTime = event->xbutton.time; ++ X11->userTime = event->xbutton.time; + // fallthrough intended + case ButtonRelease: +- time = event->xbutton.time; ++ X11->time = event->xbutton.time; + break; + case MotionNotify: +- time = event->xmotion.time; ++ X11->time = event->xmotion.time; + break; + case XKeyPress: +- userTime = event->xkey.time; ++ X11->userTime = event->xkey.time; + // fallthrough intended + case XKeyRelease: +- time = event->xkey.time; ++ X11->time = event->xkey.time; + break; + case PropertyNotify: +- time = event->xproperty.time; ++ X11->time = event->xproperty.time; + break; + case EnterNotify: + case LeaveNotify: +- time = event->xcrossing.time; ++ X11->time = event->xcrossing.time; + break; + case SelectionClear: +- time = event->xselectionclear.time; ++ X11->time = event->xselectionclear.time; + break; + default: +-#ifndef QT_NO_XFIXES +- if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { +- XFixesSelectionNotifyEvent *req = +- reinterpret_cast<XFixesSelectionNotifyEvent *>(event); +- time = req->selection_timestamp; +- } +-#endif + break; + } +- if (time > X11->time) +- X11->time = time; +- if (userTime > X11->userTime) +- X11->userTime = userTime; ++#ifndef QT_NO_XFIXES ++ if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { ++ XFixesSelectionNotifyEvent *req = ++ reinterpret_cast<XFixesSelectionNotifyEvent *>(event); ++ X11->time = req->selection_timestamp; ++ } ++#endif + + QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window); + +-- +1.6.1 + diff --git a/x11-libs/qt-gui/qt-gui-4.4.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.2-r1.ebuild deleted file mode 100644 index c84ff7fbd44d..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.4.2-r1.ebuild +++ /dev/null @@ -1,134 +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-gui/qt-gui-4.4.2-r1.ebuild,v 1.9 2009/02/18 19:55:05 jer Exp $ - -EAPI="1" -inherit eutils qt4-build - -DESCRIPTION="The GUI module(s) for the Qt toolkit." -HOMEPAGE="http://www.trolltech.com/" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="4" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" - -IUSE_INPUT_DEVICES="input_devices_wacom" -IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}" - -RDEPEND="!<=x11-libs/qt-4.4.0_alpha:${SLOT} - media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/jpeg - media-libs/libpng - sys-libs/zlib - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - ~x11-libs/qt-core-${PV} - ~x11-libs/qt-script-${PV} - cups? ( net-print/cups ) - dbus? ( ~x11-libs/qt-dbus-${PV} ) - input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom ) - 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 ) - x11-proto/xextproto - x11-proto/inputproto" -PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV} )" - -QT4_TARGET_DIRECTORIES=" -src/gui -tools/designer -tools/linguist -src/plugins/imageformats/gif -src/plugins/imageformats/ico -src/plugins/imageformats/jpeg" -QT4_EXTRACT_DIRECTORIES=" -src/tools/rcc/ -tools/shared/" - -pkg_setup() { - use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} - ~x11-libs/qt-core-${PV} glib" - use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} - ~x11-libs/qt-core-${PV} qt3support" - - 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" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_src_unpack - - # fix for bug 253044 - epatch "${FILESDIR}"/0254-fix-qgraphicsproxywidget-deletion-crash.diff - - # 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 -} - -src_compile() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - local myconf - myconf="$(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use input_devices_wacom tablet) - $(qt_use mng libmng system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use dbus qdbus) - $(qt_use qt3support) - $(qt_use xinerama)" - - use nas && myconf="${myconf} -system-nas-sound" - - 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" - - # Explictly 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_compile -} - -src_install() { - QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig - $(use input_devices_wacom && echo tablet) $(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 - - # install correct designer and linguist icons, bug 241208 - dodir /usr/share/pixmaps/ || die "dodir failed" - insinto /usr/share/pixmaps/ || die "insinto failed" - doins tools/linguist/linguist/images/icons/linguist-128-32.png \ - tools/designer/src/designer/images/designer.png || die "doins 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 "make_desktop_entry failed" - make_desktop_entry /usr/bin/designer Designer \ - /usr/share/pixmaps/designer.png 'Qt;Development;GUIDesigner' \ - || die "make_desktop_entry failed" -} diff --git a/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild deleted file mode 100644 index 85b300ed93db..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild +++ /dev/null @@ -1,138 +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-gui/qt-gui-4.4.2-r2.ebuild,v 1.2 2009/02/04 12:35:56 alexxy Exp $ - -EAPI="1" -inherit eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -HOMEPAGE="http://www.trolltech.com/" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -IUSE_INPUT_DEVICES="input_devices_wacom" -IUSE="+accessibility cups +dbus debug +glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/jpeg - media-libs/libpng - sys-libs/zlib - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - ~x11-libs/qt-core-${PV} - ~x11-libs/qt-script-${PV} - cups? ( net-print/cups ) - dbus? ( ~x11-libs/qt-dbus-${PV} ) - input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom ) - 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 ) - x11-proto/xextproto - x11-proto/inputproto" -PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV} )" - -QT4_TARGET_DIRECTORIES=" -src/gui -tools/designer -tools/linguist -src/plugins/imageformats/gif -src/plugins/imageformats/ico -src/plugins/imageformats/jpeg" -QT4_EXTRACT_DIRECTORIES=" -src/tools/rcc/ -tools/shared/" - -pkg_setup() { - use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} - ~x11-libs/qt-core-${PV} glib" - use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} - ~x11-libs/qt-core-${PV} qt3support" - - 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" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_src_unpack - - # Apply bugfix patches from qt-copy - epatch "${FILESDIR}"/0248-fix-qwidget-scroll-slowness.diff - epatch "${FILESDIR}"/0254-fix-qgraphicsproxywidget-deletion-crash.diff - epatch "${FILESDIR}"/0256-fix-recursive-backingstore-sync-crash.diff - epatch "${FILESDIR}"/0262-fix-treeview-animation-crash.diff - epatch "${FILESDIR}"/0263-fix-fontconfig-handling.diff - epatch "${FILESDIR}"/0265-fix-formlayoutcrash.diff - - # 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 -} - -src_compile() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - local myconf - myconf="$(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use input_devices_wacom tablet) - $(qt_use mng libmng system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use dbus qdbus) - $(qt_use qt3support) - $(qt_use xinerama)" - - use nas && myconf="${myconf} -system-nas-sound" - - 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" - - # Explictly 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_compile -} - -src_install() { - QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig - $(use input_devices_wacom && echo tablet) $(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 - - # install correct designer and linguist icons, bug 241208 - dodir /usr/share/pixmaps/ || die "dodir failed" - insinto /usr/share/pixmaps/ || die "insinto failed" - doins tools/linguist/linguist/images/icons/linguist-128-32.png \ - tools/designer/src/designer/images/designer.png || die "doins 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 "make_desktop_entry failed" - make_desktop_entry /usr/bin/designer Designer \ - /usr/share/pixmaps/designer.png 'Qt;Development;GUIDesigner' \ - || die "make_desktop_entry failed" -} diff --git a/x11-libs/qt-gui/qt-gui-4.5.2-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.2-r2.ebuild new file mode 100644 index 000000000000..e730cb494029 --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.5.2-r2.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2009 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.2-r2.ebuild,v 1.1 2009/07/23 20:44:16 yngwin 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 + media-libs/jpeg + media-libs/libpng + 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 ) + 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 +src/plugins/imageformats/gif +src/plugins/imageformats/ico +src/plugins/imageformats/jpeg +src/plugins/inputmethods" + +QT4_EXTRACT_DIRECTORIES=" +include/ +src/ +tools/shared/" + +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 + + # fix bug with messed up timestamps, bug 276527 (upstream patch) + epatch "${FILESDIR}"/${P}-x11-timestamp.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 +} |