From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1N3Zyh-0005DA-MM for garchives@archives.gentoo.org; Thu, 29 Oct 2009 18:44:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B41BE096C; Thu, 29 Oct 2009 18:44:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DBC5BE096C for ; Thu, 29 Oct 2009 18:44:06 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 74E846730E for ; Thu, 29 Oct 2009 18:44:06 +0000 (UTC) Received: from ayoy by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1N3Zyf-0003cC-E0 for gentoo-commits@lists.gentoo.org; Thu, 29 Oct 2009 18:44:05 +0000 From: "Dominik Kapusta (ayoy)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ayoy@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-gui: ChangeLog qt-gui-4.5.3-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog qt-gui-4.5.3-r2.ebuild X-VCS-Directories: x11-libs/qt-gui X-VCS-Committer: ayoy X-VCS-Committer-Name: Dominik Kapusta Content-Type: text/plain; charset=utf8 Message-Id: Sender: Dominik Kapusta Date: Thu, 29 Oct 2009 18:44:05 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 93c8703a-3a6e-4c0c-a712-2519f8681564 X-Archives-Hash: 85fcac65d2c750e3a81eb1956d3adfe1 ayoy 09/10/29 18:44:05 Modified: ChangeLog Added: qt-gui-4.5.3-r2.ebuild Log: Adding a patch to fix regression in event loop (Portage version: 2.2_rc46/cvs/Linux x86_64) Revision Changes Path 1.74 x11-libs/qt-gui/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/Ch= angeLog?rev=3D1.74&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/Ch= angeLog?rev=3D1.74&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/Ch= angeLog?r1=3D1.73&r2=3D1.74 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- ChangeLog 29 Oct 2009 11:30:54 -0000 1.73 +++ ChangeLog 29 Oct 2009 18:44:04 -0000 1.74 @@ -1,6 +1,12 @@ # 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.73 2009= /10/29 11:30:54 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.74 2009= /10/29 18:44:04 ayoy Exp $ + +*qt-gui-4.5.3-r2 (29 Oct 2009) + + 29 Oct 2009; Dominik Kapusta +qt-gui-4.5.3-r2.ebuild= , + +files/qt-4.5.3-glib-event-loop.patch: + Adding a patch to fix regression in event loop =20 29 Oct 2009; Christian Faulhammer qt-gui-4.5.3-r1.ebuild: 1.1 x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.5.3-r2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt= -gui-4.5.3-r2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: qt-gui-4.5.3-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.3-r2.ebuild= ,v 1.1 2009/10/29 18:44:04 ayoy Exp $ EAPI=3D"2" inherit eutils qt4-build DESCRIPTION=3D"The GUI module for the Qt toolkit" SLOT=3D"4" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 = ~x86-fbsd" IUSE=3D"+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3sup= port xinerama" RDEPEND=3D"media-libs/fontconfig >=3Dmedia-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=3D,glib=3D,qt3support=3D] ~x11-libs/qt-script-${PV}[debug=3D] cups? ( net-print/cups ) dbus? ( ~x11-libs/qt-dbus-${PV}[debug=3D] ) gtk? ( x11-libs/gtk+:2 ) mng? ( >=3Dmedia-libs/libmng-1.0.9 ) nas? ( >=3Dmedia-libs/nas-1.5 ) tiff? ( media-libs/tiff ) xinerama? ( x11-libs/libXinerama )" DEPEND=3D"${RDEPEND} xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/inputproto" PDEPEND=3D"qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=3D] )" QT4_TARGET_DIRECTORIES=3D" 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=3D" include/ src/ tools/linguist/shared tools/linguist/phrasebooks tools/shared/" PATCHES=3D( "${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=3D"${QT4_TARGET_DIRECTORIES} tools/qd= bus/qdbusviewer" use mng && QT4_TARGET_DIRECTORIES=3D"${QT4_TARGET_DIRECTORIES} src/plugi= ns/imageformats/mng" use tiff && QT4_TARGET_DIRECTORIES=3D"${QT4_TARGET_DIRECTORIES} src/plug= ins/imageformats/tiff" use accessibility && QT4_TARGET_DIRECTORIES=3D"${QT4_TARGET_DIRECTORIES}= src/plugins/accessible/widgets" QT4_EXTRACT_DIRECTORIES=3D"${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIREC= TORIES}" 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=3D"--ignore-whitespace" epatch "${FILESDIR}"/hardcoded_fonts.patch } src_configure() { export PATH=3D"${S}/bin:${PATH}" export LD_LIBRARY_PATH=3D"${S}/lib:${LD_LIBRARY_PATH}" myconf=3D"$(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=3D"${myconf} -system-nas-sound" use raster && myconf=3D"${myconf} -graphicssystem raster" myconf=3D"${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=3D"${myconf} -no-webkit -no-phonon -no-dbus -no-opengl" qt4-build_src_configure } src_install() { QCONFIG_ADD=3D"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=3D"no-gif no-png" QCONFIG_DEFINE=3D"$(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_SHAP= E $(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR $(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XREN= DER" 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 st= yle:' 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 a= nd' ewarn 'export GTK2_RC_FILES=3D"$HOME/.gtkrc-2.0" in your environment.' fi qt4-build_pkg_postinst }