diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 11:04:47 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 11:04:47 +0000 |
commit | ccc9739975bfe7b38ece54d3c91b91561ea3983e (patch) | |
tree | 230bd982fba1e50e6ade2fe23a59562053688ee8 /x11-libs/qt-gui | |
parent | Unused USE flag (diff) | |
download | historical-ccc9739975bfe7b38ece54d3c91b91561ea3983e.tar.gz historical-ccc9739975bfe7b38ece54d3c91b91561ea3983e.tar.bz2 historical-ccc9739975bfe7b38ece54d3c91b91561ea3983e.zip |
Drop old versions; files
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'x11-libs/qt-gui')
-rw-r--r-- | x11-libs/qt-gui/ChangeLog | 10 | ||||
-rw-r--r-- | x11-libs/qt-gui/Manifest | 21 | ||||
-rw-r--r-- | x11-libs/qt-gui/files/Designer.desktop | 20 | ||||
-rw-r--r-- | x11-libs/qt-gui/files/Linguist.desktop | 20 | ||||
-rw-r--r-- | x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch | 13 | ||||
-rw-r--r-- | x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch | 12 | ||||
-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/files/xinerama.patch | 15 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild | 174 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.5.3-r1.ebuild | 176 |
11 files changed, 10 insertions, 515 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 8bd280b34e70..d45575b14e18 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.76 2009/11/05 11:31:20 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.77 2009/11/09 11:04:47 abcd Exp $ + + 09 Nov 2009; Jonathan Callen <abcd@gentoo.org> + -files/qt-gui-4.4.0-scrollbars.patch, -files/qt-gui-designer-4.4.1.patch, + -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.2-r1.ebuild, -qt-gui-4.5.3-r1.ebuild, -files/Designer.desktop, + -files/Linguist.desktop, -files/xinerama.patch: + Drop old versions; files 05 Nov 2009; Markus Meier <maekke@gentoo.org> qt-gui-4.5.3-r2.ebuild: x86 stable, bug #290922 diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 63b623495d89..befb97efdb89 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0195-compositing-properties.diff 2504 RMD160 d58c531b84776745edc0147787029beb3f24dfde SHA1 a32e067fc3921b5febab504ec16f236abe2e0eef SHA256 1c75c3c4f94d73548336153bc0e47cdfc36c721257ec7368be82c515d71f97ac AUX 0203-qtexthtmlparser-link-color.diff 769 RMD160 c3e0509fdc4494ac41cde71af7d0afa0fc5b6073 SHA1 7643807e1e382f7d47a5c895f4ce1d7fa2c74a39 SHA256 7554145154a592fae5599de5d41d86112b9896e9821ace00034d5b6c8a72bba0 AUX 0224-fast-qpixmap-fill.diff 2150 RMD160 4e2d019d0b19250d1eca53fe49f087ef6257bb81 SHA1 6847a629fa24bfb78f12dd598149ccdfe1855e44 SHA256 ab0875ccb4dadcad2c3d394504c965a4ccd5067a2c6d37c32be24bbc035b8c32 @@ -21,18 +18,11 @@ AUX 0264-fix-zero-height-qpixmap-isnull.diff 1415 RMD160 5ffbbaac0146a7269084e6f AUX 0265-fix-formlayoutcrash.diff 942 RMD160 5fb1f77bec05db7b6e567923c3f7e69abd737a60 SHA1 da689978030dfc6abe823aa7cf1de4ef3c534722 SHA256 d890a97fb97625dd8e0211c3cb458a45318184d7266636deda909a980f6d02c2 AUX 0266-fix-focusChain1.diff 4204 RMD160 65b84e9644c90e23843e11e83e35c230d5911897 SHA1 6bed8f4536f08d050e9e3530bb8a9607b6564e04 SHA256 d783e3ee7bd1ac596899160b74ea73d5cfe95d4897760786455c4ec39a67cf41 AUX 0267-fix-focusChain2.diff 4108 RMD160 df2299892d1098156538b6827615741d8cb2218c SHA1 896c5077010a3fca1dbb2a54f8295d058edcae1f SHA256 79439283b3ac21917a526c91c45fa4d17b55461d6811b71b10e4ec5e851d95bf -AUX Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741 -AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7 AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb -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 -AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848994884a62a0d599e0cb499e546688bfba062 SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b DIST qt-everywhere-opensource-src-4.6.0-beta1.tar.gz 154892235 RMD160 aa3df8dc0ea601f73abe624f376cf3df032d77d1 SHA1 ab3898f0d7307decbce03a6fc6829218bba17311 SHA256 033bdd4bc1d371ea21b03098a8276d957ecc535725fa1122d17220d47f15e9ee 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 @@ -43,17 +33,8 @@ EBUILD qt-gui-4.4.2-r3.ebuild 5722 RMD160 79ee98acf0dabc3d6925a277f947e2786d1c20 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 EBUILD qt-gui-4.5.2-r2.ebuild 5957 RMD160 b0ba55eb07fa621fbed49dac26620aa939f791a9 SHA1 4dd96fcc067a0ec73f0a4650fd02bb4b50a5ccee SHA256 fb2990c0ad0916280231a6ba481ac6f572fb1c32cfa75290d2146b72d36ad6d0 -EBUILD qt-gui-4.5.3-r1.ebuild 5905 RMD160 2cbd2b9b6f3fcfb318d3b89aac4968f28de42810 SHA1 8b286dfd145f57f7429093578bc382f70239f0fd SHA256 60cd2c1e96a410dc1b2618470a4d2f89c492c2f2954420794d61d706a87f9452 EBUILD qt-gui-4.5.3-r2.ebuild 5964 RMD160 99caa79a966b2b8408b64487a20df3fa5da8f406 SHA1 fa8566a96232f60b56b6b0ace73dd241b34b8ba7 SHA256 8dfdd04fd965910bebe90ad05a010b232a32ae4e26be8c45b8e3804acb1b583a EBUILD qt-gui-4.6.0_beta1.ebuild 5534 RMD160 4453f4c29908ef580a76a237e6dade0f7a2a7826 SHA1 020de9c8601f9efc17006256b344739bccfcdb57 SHA256 57f6318b6efaa719b3c1617858c89815a91d39c8c444c692ae5a6dcc490cbec3 -MISC ChangeLog 11249 RMD160 8efe2d29d7dad0e2c2971df7100d47e3be86bb78 SHA1 27baf8c12c834a6e45ba67b913ab4e946a3d70fd SHA256 f98d371acdf4e9ee202630cd03c2591fab3a48124e91080cbb6cd54093fb3721 +MISC ChangeLog 11639 RMD160 0c1313de7431ca9c552a0eb978d25296fcce204a SHA1 8750846ec41d96f7d234d39be850effa31d28ac1 SHA256 8f85c107d421f6f223648b142cb8dfa9e1a3bf42e7cc4a745106cbeaa72a2c4a MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkryt6UACgkQkKaRLQcq0GIg0QCfRm2UQyHdV7EumXyCHPqg6ecp -lXsAn261KmlhhxZBn5v7pR/t+vzWuI5Q -=8yL/ ------END PGP SIGNATURE----- diff --git a/x11-libs/qt-gui/files/Designer.desktop b/x11-libs/qt-gui/files/Designer.desktop deleted file mode 100644 index aaeb24f674cb..000000000000 --- a/x11-libs/qt-gui/files/Designer.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Comment= -Comment[en_US]= -Encoding=UTF-8 -Exec=/usr/bin/designer -GenericName=Qt Designer -GenericName[en_US]=Qt Designer -Icon=designer -MimeType= -Name=Qt Designer -Name[en_US]=Qt Designer -Path= -StartupNotify=true -Terminal=false -TerminalOptions= -Type=Application -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -Categories=Qt;Development;GUIDesigner; diff --git a/x11-libs/qt-gui/files/Linguist.desktop b/x11-libs/qt-gui/files/Linguist.desktop deleted file mode 100644 index 2a2c3dea350f..000000000000 --- a/x11-libs/qt-gui/files/Linguist.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Comment= -Comment[en_US]= -Encoding=UTF-8 -Exec=/usr/bin/linguist -GenericName=Linguist -GenericName[en_US]=Linguist -Icon=linguist -MimeType= -Name=Linguist -Name[en_US]=Linguist -Path= -StartupNotify=true -Terminal=false -TerminalOptions= -Type=Application -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -Categories=Qt;Development;GUIDesigner; diff --git a/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch b/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch deleted file mode 100644 index 0f754eb142b2..000000000000 --- a/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch +++ /dev/null @@ -1,13 +0,0 @@ -Bug 220751, Mikko Cal. - ---- src/gui/itemviews/qabstractitemview.cpp 2008-04-28 15:11:18.000000000 +0200 -+++ src/gui/itemviews/qabstractitemview.cpp 2008-04-10 01:00:58.000000000 +0200 -@@ -2980,7 +2982,7 @@ - if (q->isVisible()) { - q->doItemsLayout(); - const QModelIndex current = q->currentIndex(); -- if (current.isValid()) -+ if (current.isValid() && state == QAbstractItemView::EditingState) - q->scrollTo(current); - } else { - doDelayedItemsLayout(); diff --git a/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch b/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch deleted file mode 100644 index e82ab9dfb0b7..000000000000 --- a/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/tools/designer/src/components/propertyeditor/propertyeditor.cpp 2008-08-14 10:25:28 -0000 -+++ src/tools/designer/src/components/propertyeditor/propertyeditor.cpp 2008-08-14 10:25:28 -0000 - -@@ -656,7 +656,7 @@ - - void PropertyEditor::updateColors() - { -- if (m_currentBrowser == m_treeBrowser) { -+ if (m_treeBrowser && m_currentBrowser == m_treeBrowser) { - QList<QtBrowserItem *> items = m_treeBrowser->topLevelItems(); - QListIterator<QtBrowserItem *> itItem(items); - while (itItem.hasNext()) { 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 deleted file mode 100644 index aa6c2497fb0e..000000000000 --- a/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 284520e8595a..000000000000 --- a/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/files/xinerama.patch b/x11-libs/qt-gui/files/xinerama.patch deleted file mode 100644 index 5edd03395e61..000000000000 --- a/x11-libs/qt-gui/files/xinerama.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/gui/kernel/qapplication_x11.cpp.orig 2007-12-23 15:10:43.000000000 -0500 -+++ src/gui/kernel/qapplication_x11.cpp 2007-12-23 15:11:01.000000000 -0500 -@@ -1715,9 +1715,9 @@ - (PtrXineramaQueryScreens) xineramaLib.resolve("XineramaQueryScreens"); - } - #else -- ptrXineramaQueryScreens = XineramaQueryScreens; -- ptrXineramaIsActive = XineramaIsActive; -- ptrXineramaQueryExtension = XineramaQueryExtension; -+ X11->ptrXineramaQueryScreens = XineramaQueryScreens; -+ X11->ptrXineramaIsActive = XineramaIsActive; -+ X11->ptrXineramaQueryExtension = XineramaQueryExtension; - #endif // QT_RUNTIME_XINERAMA - #endif // QT_NO_XINERAMA - diff --git a/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild deleted file mode 100644 index 056fe99e72b3..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild +++ /dev/null @@ -1,174 +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.5.2-r1.ebuild,v 1.3 2009/07/15 18:57:29 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 -} - -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-gui/qt-gui-4.5.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.5.3-r1.ebuild deleted file mode 100644 index 8ba48e35f36d..000000000000 --- a/x11-libs/qt-gui/qt-gui-4.5.3-r1.ebuild +++ /dev/null @@ -1,176 +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.5.3-r1.ebuild,v 1.2 2009/10/29 11:30:54 fauli 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/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/" - -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 -} - -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 -} |