diff options
Diffstat (limited to 'x11-libs/qt-gui')
| -rw-r--r-- | x11-libs/qt-gui/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-libs/qt-gui/Manifest | 5 | ||||
| -rw-r--r-- | x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch | 41 | ||||
| -rw-r--r-- | x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch | 23 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.5.0-r2.ebuild | 166 |
5 files changed, 243 insertions, 2 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 8faf8caa1218..9c32a1c71bc8 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,14 @@ # 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.47 2009/04/15 12:18:54 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.48 2009/04/22 11:06:12 hwoarang Exp $ + +*qt-gui-4.5.0-r2 (22 Apr 2009) + + 22 Apr 2009; Markos Chandras <hwoarang@gentoo.org> + +files/qt-x11-opensource-src-4.5.0-linguist-crash.patch, + +files/qt-x11-opensource-src-4.5.0-lrelease.patch, + +qt-gui-4.5.0-r2.ebuild: + New revbump for qt-gui. Fixes bug 265878, bug 260244, bug 259414 15 Apr 2009; Brent Baude <ranger@gentoo.org> qt-gui-4.4.2-r3.ebuild: Marking qt-gui-4.4.2-r3 ppc64 for bug 263945 diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index bb8d75dc3547..f841e067b224 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -23,6 +23,8 @@ AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51 AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945 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 AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848994884a62a0d599e0cb499e546688bfba062 SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675 @@ -31,6 +33,7 @@ EBUILD qt-gui-4.4.2-r1.ebuild 4583 RMD160 b7bad820fd4f8f20b1a5da254f35474348eaf2 EBUILD qt-gui-4.4.2-r2.ebuild 4870 RMD160 7bb9cbf0f2990fe4098d2d691e4275745cfe37e3 SHA1 586c4fefd44948a4ae370f64e9ea410241633cfc SHA256 5226ed0dcf8e5d33393ecdd76d6e273c4871ba6c573091b5d1b07d3228a56c35 EBUILD qt-gui-4.4.2-r3.ebuild 5726 RMD160 e27d051d7ea1079c47847e43abd5548649ff4500 SHA1 6cdad0c09de9a1c0584e29edbe3a52b582020203 SHA256 054a42376638573ffa55a7429ad4e69cbc35e2ae3d95603f10654c4283b53ea4 EBUILD qt-gui-4.5.0-r1.ebuild 5505 RMD160 47110fcb41b8d547b9d92e82a5986d4d55e51f63 SHA1 f6a7ce5c91480dd32d251ac6280469459565e7e3 SHA256 2b243917ebadc3b98554845df9e57678f36f34fdfa7136d58983c20b5e79ecbb +EBUILD qt-gui-4.5.0-r2.ebuild 5744 RMD160 80ca1b75722e96798bdcf4a122954d522cab312b SHA1 a7617310c605d76c4438cfb452859b143d4dd9f5 SHA256 0c7ee97d1dee75db5a3333b0d58c099912ba3a09e231f6f939c2d02e0afce3b6 EBUILD qt-gui-4.5.0.ebuild 4900 RMD160 7f3e2597e83ac4546c452d52341b22bbb9051473 SHA1 10eb43e2870fd1bd04ceb0f2e1b49264db3d37e5 SHA256 339949fe93b160bf781e2d5e73eed3e1bdc738b096c267183200b4900d8bfe2e -MISC ChangeLog 7147 RMD160 68cee5b46ad8fa4a5be4dd13d77350ca26da95d9 SHA1 45a318c57dcd8abda64b76522e832487311de491 SHA256 374a443f6b1c1361b89b527ebe9048bd5125b52eb788524973be379319260f09 +MISC ChangeLog 7441 RMD160 478b7bfecab4405781a3cbbc304a4fed09f1ca07 SHA1 51e87b241f5e319baf8d18d504d2c3c3c65f649e SHA256 f0f544278d9ee14b61a848de2e480f4d7003d094c1115052bba2e1a1108c931c MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3 diff --git a/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch b/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch new file mode 100644 index 000000000000..aa6c2497fb0e --- /dev/null +++ b/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch @@ -0,0 +1,41 @@ +diff -up qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp +--- qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig 2009-03-16 12:50:03.000000000 +0100 ++++ qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp 2009-03-17 00:42:51.000000000 +0100 +@@ -86,6 +86,7 @@ public: + void enterScope(bool multiLine); + void leaveScope(); + void finalizeBlock(); ++ void cleanup(); + + // implementation of AbstractProItemVisitor + bool visitBeginProBlock(ProBlock *block); +@@ -164,6 +165,15 @@ ProFileEvaluator::Private::Private(ProFi + m_contNextLine = false; + } + ++void ProFileEvaluator::Private::cleanup() ++{ ++ m_commentItem = 0; ++ m_block = 0; ++ m_proitem.clear(); ++ m_blockstack.clear(); ++ m_pendingComment.clear(); ++} ++ + bool ProFileEvaluator::Private::read(ProFile *pro) + { + QFile file(pro->fileName()); +@@ -180,11 +190,14 @@ bool ProFileEvaluator::Private::read(Pro + while (!ts.atEnd()) { + QString line = ts.readLine(); + if (!parseLine(line)) { ++ cleanup(); + q->errorMessage(format(".pro parse failure.")); + return false; + } + ++m_lineNo; + } ++ ++ cleanup(); + return true; + } diff --git a/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch b/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch new file mode 100644 index 000000000000..284520e8595a --- /dev/null +++ b/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch @@ -0,0 +1,23 @@ +Index: qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp +=================================================================== +--- qt-x11-opensource-src-4.5.0.orig/tools/linguist/lrelease/main.cpp ++++ qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp +@@ -88,6 +88,8 @@ static bool loadTsFile(Translator &tor, + bool ok = tor.load(tsFileName, cd, QLatin1String("auto")); + if (!ok) { + qWarning("lrelease error: %s\n", qPrintable(cd.error())); ++ // dont fail ++ ok = true; + } else { + if (!cd.errors().isEmpty()) + printOut(cd.error()); +@@ -102,7 +104,8 @@ static bool loadTsFile(Translator &tor, + if (!msg.comment().isEmpty()) + qWarning("\n* Comment: %s", qPrintable(msg.comment())); + } +- ok = false; ++ // dont fail ++ //ok = false; + } + } + return ok; diff --git a/x11-libs/qt-gui/qt-gui-4.5.0-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.0-r2.ebuild new file mode 100644 index 000000000000..445840a72529 --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.5.0-r2.ebuild @@ -0,0 +1,166 @@ +# 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.0-r2.ebuild,v 1.1 2009/04/22 11:06:12 hwoarang 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 +gtkstyle 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/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=] ) + gtkstyle? ( 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 + + # linguist segfault ( bug #265878 ) + epatch "${FILESDIR}"/qt-x11-opensource-src-4.5.0-linguist-crash.patch + + # lrelease fail with translations ( bug #260244,bug #259414 ) + epatch "${FILESDIR}"/qt-x11-opensource-src-4.5.0-lrelease.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 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" + + # 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_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 + 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" +} |