# ChangeLog for x11-libs/qt
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.434 2007/04/18 17:23:12 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.435 2007/04/18 18:10:34 caleb Exp $
+
+ 18 Apr 2007; Caleb Tennis <caleb@gentoo.org>
+ -files/qt-3.3.5-immodule.patch, -files/qt-3.3.6-CVE-2006-4811-bis.patch,
+ -files/qt-3.3.6-CVE-2006-4811.patch, -files/qt-3.3.6-seli-xinerama.patch,
+ -files/qt-3.3.6-uic-fix.patch, -files/qt-3.3.6-visibility.patch,
+ -files/qt-4.1.4-CVE-2006-4811-bis.patch,
+ -files/qt-4.1.4-CVE-2006-4811.patch, qt-3.3.4-r8.ebuild,
+ -qt-3.3.6-r4.ebuild, -qt-3.3.6-r5.ebuild, -qt-4.1.4-r2.ebuild,
+ -qt-4.2.2.ebuild:
+ remove lots of old security ridden versions. Removing arches on 3.3.4-r8
+ except for mips which hasn't stabilized 3.3.8-r2 yet
18 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> qt-3.3.8-r2.ebuild,
qt-4.2.3-r1.ebuild:
MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb files/qt-3.3.4-qclipboard-hack.patch 1662
SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c files/qt-3.3.4-qclipboard-hack.patch 1662
-AUX qt-3.3.5-immodule.patch 773 RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c SHA1 85db58105f968742740ba7ba41710931809c12c3 SHA256 a1cc1594c7795e034298aebb534bc4cb213af7fd0045036030d46e2c8f6edbd8
-MD5 3e41898f6a3f5ff8518f5df0cb1e23cf files/qt-3.3.5-immodule.patch 773
-RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c files/qt-3.3.5-immodule.patch 773
-SHA256 a1cc1594c7795e034298aebb534bc4cb213af7fd0045036030d46e2c8f6edbd8 files/qt-3.3.5-immodule.patch 773
-AUX qt-3.3.6-CVE-2006-4811-bis.patch 4944 RMD160 3ec0629247b77fc0ffda9818a4ee2cb50c203168 SHA1 b70374b0457cdba4fd466031a8b7b99f20364ccb SHA256 de6b838047c217b129d9992a44972406eb1dc8c8d6d9a58c8520f95faaf92704
-MD5 684040b974c8837a52c0e6733d4b0c22 files/qt-3.3.6-CVE-2006-4811-bis.patch 4944
-RMD160 3ec0629247b77fc0ffda9818a4ee2cb50c203168 files/qt-3.3.6-CVE-2006-4811-bis.patch 4944
-SHA256 de6b838047c217b129d9992a44972406eb1dc8c8d6d9a58c8520f95faaf92704 files/qt-3.3.6-CVE-2006-4811-bis.patch 4944
-AUX qt-3.3.6-CVE-2006-4811.patch 955 RMD160 5732c149546be0b45b8ba4d21e54827deb21dd5c SHA1 f22855de64f22d88cfac0aa35681d09a76afa2da SHA256 7a14a9930ff6afbd46d4eb573fe3fd4d05608aa83e0c90214bf3adf4aaa1fe93
-MD5 5e242e38c19bbfafce46a047f948f4ce files/qt-3.3.6-CVE-2006-4811.patch 955
-RMD160 5732c149546be0b45b8ba4d21e54827deb21dd5c files/qt-3.3.6-CVE-2006-4811.patch 955
-SHA256 7a14a9930ff6afbd46d4eb573fe3fd4d05608aa83e0c90214bf3adf4aaa1fe93 files/qt-3.3.6-CVE-2006-4811.patch 955
-AUX qt-3.3.6-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503
-MD5 5a809da59debd0d8242c25c1f5ae7697 files/qt-3.3.6-seli-xinerama.patch 1960
-RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 files/qt-3.3.6-seli-xinerama.patch 1960
-SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 files/qt-3.3.6-seli-xinerama.patch 1960
-AUX qt-3.3.6-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3
-MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.6-uic-fix.patch 711
-RMD160 19964cfc6714e2ad38659e268ef248501db606aa files/qt-3.3.6-uic-fix.patch 711
-SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 files/qt-3.3.6-uic-fix.patch 711
-AUX qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407
-MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.6-visibility.patch 5554
-RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.6-visibility.patch 5554
-SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.6-visibility.patch 5554
AUX qt-3.3.8-mysql-unload-crash.diff 1150 RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 SHA1 bb6aad81cce143c23ff7840b1d79f6b2007a0c04 SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076
MD5 7d40ed1bd40d33d8b9b27a2076a5d22a files/qt-3.3.8-mysql-unload-crash.diff 1150
RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 files/qt-3.3.8-mysql-unload-crash.diff 1150
MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.8-visibility.patch 5554
RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.8-visibility.patch 5554
SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.8-visibility.patch 5554
-AUX qt-4.1.4-CVE-2006-4811-bis.patch 6884 RMD160 b6d321e1e6fa6520a4e5c67d6dd259610d6f057d SHA1 791f8d80ce24ca63372b0ec013bdbf54ea737a22 SHA256 89bad02c95f3ca7471581a4f879d31a0300bf809042e9b67fb1514f64588fe25
-MD5 118a9449bf90cce72da95598ae303b55 files/qt-4.1.4-CVE-2006-4811-bis.patch 6884
-RMD160 b6d321e1e6fa6520a4e5c67d6dd259610d6f057d files/qt-4.1.4-CVE-2006-4811-bis.patch 6884
-SHA256 89bad02c95f3ca7471581a4f879d31a0300bf809042e9b67fb1514f64588fe25 files/qt-4.1.4-CVE-2006-4811-bis.patch 6884
-AUX qt-4.1.4-CVE-2006-4811.patch 6795 RMD160 3ec4e8409d4e61ffcf38d76bb0447081331e0ac3 SHA1 a4d4ca92bca69a00ed951c0f1cea19bdb5e5dbc7 SHA256 de2ae324a3dfff454fe5a85c83bda37e6ecccb0f61241813301a8892334eb1c7
-MD5 6a0567d1e034a2181d4ac18eefaa7b6f files/qt-4.1.4-CVE-2006-4811.patch 6795
-RMD160 3ec4e8409d4e61ffcf38d76bb0447081331e0ac3 files/qt-4.1.4-CVE-2006-4811.patch 6795
-SHA256 de2ae324a3dfff454fe5a85c83bda37e6ecccb0f61241813301a8892334eb1c7 files/qt-4.1.4-CVE-2006-4811.patch 6795
AUX qt-4.1.4-sparc.patch 475 RMD160 1af71a9748963bca0a24911b880d11f1384543e2 SHA1 240486510de64c4e9e4deb0454cc5783bdd67298 SHA256 c9700bbe6b57ec448e67a77443dff534daf8093c5834c9d4ebaa8b3de29b118a
MD5 838314a6c48d8f188ccd6c7d4c938a56 files/qt-4.1.4-sparc.patch 475
RMD160 1af71a9748963bca0a24911b880d11f1384543e2 files/qt-4.1.4-sparc.patch 475
MD5 341ca0df76ba1dcb9fd0847566055a99 files/qt4-sqlite-configure.patch 738
RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch 738
SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738
+AUX qt4/Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
+MD5 08afb9af6b61475a516879b8ff95fdf0 files/qt4/Assistant.desktop 368
+RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d files/qt4/Assistant.desktop 368
+SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b files/qt4/Assistant.desktop 368
+AUX qt4/Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
+MD5 1911e414ddc29513f2204c432b6879ea files/qt4/Designer.desktop 374
+RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 files/qt4/Designer.desktop 374
+SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741 files/qt4/Designer.desktop 374
+AUX qt4/Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
+MD5 cf4cf235c1eb98d99879962c6cc12030 files/qt4/Linguist.desktop 362
+RMD160 ce7f588d57300eb859634cabdccd5331da572c76 files/qt4/Linguist.desktop 362
+SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7 files/qt4/Linguist.desktop 362
AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0
MD5 f6b3b39040f2b8f19ba1cf1445468c28 files/utf8-bug-qt3.diff 2670
RMD160 f5db1461cd82ac98417ab641228e15816d160724 files/utf8-bug-qt3.diff 2670
RMD160 f2b4847666b5daa2fcb3c333dd6c2c95df4323cc files/utf8-bug-qt4-2.diff 4762
SHA256 a567b86d40b815a941d4650049a2133721f9e6e3edc629b500783f1de9854935 files/utf8-bug-qt4-2.diff 4762
DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
-DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
-DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
-DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
-DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-EBUILD qt-3.3.4-r8.ebuild 10491 RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 SHA1 03703f79f821ebf07cf4220d5368450099ebd36c SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6
-MD5 9cd4050cbf79528363ca2e0dbfbfd9fb qt-3.3.4-r8.ebuild 10491
-RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 qt-3.3.4-r8.ebuild 10491
-SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6 qt-3.3.4-r8.ebuild 10491
-EBUILD qt-3.3.6-r4.ebuild 11006 RMD160 5074eae8c52629128ec789e3b8580bb2f8373ca7 SHA1 ece478e4c1de636cd3b280f3496bafe4dbfcb070 SHA256 d5397c7c6fab19496ab1d36232fcc2317467baaa27eada8d8df251ef7ea06ca2
-MD5 d9d6a521694aa694ce6776ddfaa7322b qt-3.3.6-r4.ebuild 11006
-RMD160 5074eae8c52629128ec789e3b8580bb2f8373ca7 qt-3.3.6-r4.ebuild 11006
-SHA256 d5397c7c6fab19496ab1d36232fcc2317467baaa27eada8d8df251ef7ea06ca2 qt-3.3.6-r4.ebuild 11006
-EBUILD qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced SHA1 31cbe8b8bc65f57ff435afa036b545bb88f50466 SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225
-MD5 9e4b234be100199e8a74f09e748ecd52 qt-3.3.6-r5.ebuild 11117
-RMD160 464d1a225f2ba385cc80e662046de4998c720ced qt-3.3.6-r5.ebuild 11117
-SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 qt-3.3.6-r5.ebuild 11117
+EBUILD qt-3.3.4-r8.ebuild 10447 RMD160 537e65af09d1034192c7d46f32d0b21e1a806443 SHA1 b913e71c83105f4e81def17dee2f2637d22857fe SHA256 709be4da8cfc9e333a74d762137ebd4e75e9c7bfd85957d3724bb83068693a1d
+MD5 59a454ed21ad1579424b9209883fbd48 qt-3.3.4-r8.ebuild 10447
+RMD160 537e65af09d1034192c7d46f32d0b21e1a806443 qt-3.3.4-r8.ebuild 10447
+SHA256 709be4da8cfc9e333a74d762137ebd4e75e9c7bfd85957d3724bb83068693a1d qt-3.3.4-r8.ebuild 10447
EBUILD qt-3.3.8-r2.ebuild 11319 RMD160 5af4500fb6f2a6698bb3abb11fbad49d8a34e873 SHA1 5d7fa5d8aa36dd7f6202771e37602034d6d937a6 SHA256 a8d5baa630300a0e592cdd5fe94399ee814edfdadb88bd735669e1ccc18e1f01
MD5 e5b7f11d9514ac2665e0eb75ebf82d3d qt-3.3.8-r2.ebuild 11319
RMD160 5af4500fb6f2a6698bb3abb11fbad49d8a34e873 qt-3.3.8-r2.ebuild 11319
SHA256 a8d5baa630300a0e592cdd5fe94399ee814edfdadb88bd735669e1ccc18e1f01 qt-3.3.8-r2.ebuild 11319
-EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff SHA1 dffa6d4bae33a49c7c75e6d75736b70f0228fb25 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff
-MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855
-RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855
-SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff qt-4.1.4-r2.ebuild 6855
-EBUILD qt-4.2.2.ebuild 7692 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 SHA1 45f98dfceadfb0dbfb79f786f035f5b90168ecbe SHA256 1d7322eec33620e1f7fae1c8a2a9fabc98ef74e1b91b0135de84c802291611e3
-MD5 d9d58ed2097ab604884c022c2eb5f108 qt-4.2.2.ebuild 7692
-RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 qt-4.2.2.ebuild 7692
-SHA256 1d7322eec33620e1f7fae1c8a2a9fabc98ef74e1b91b0135de84c802291611e3 qt-4.2.2.ebuild 7692
EBUILD qt-4.2.3-r1.ebuild 7856 RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 SHA1 f305cd010e972bab7d2acd542163fffe69bf85e8 SHA256 ee0cd48cbff455f8207226e566b3353e655397c963d2690a56dee5285b4b92e9
MD5 73dbcb21eb75b0cac5609776ccc2b7cc qt-4.2.3-r1.ebuild 7856
RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 qt-4.2.3-r1.ebuild 7856
SHA256 ee0cd48cbff455f8207226e566b3353e655397c963d2690a56dee5285b4b92e9 qt-4.2.3-r1.ebuild 7856
-MISC ChangeLog 27511 RMD160 08713cae0cf26431b0cc3fc06a9cd00a9e4b4925 SHA1 6f6e8404f81548a9fc079b6622de91fa346d68bc SHA256 44958a6536f6ad75b29d6517f5c856d4d7b438fa29d8bd7d2b281cca4166f15b
-MD5 77a89aaf2eeecabf46179e2dd451ab36 ChangeLog 27511
-RMD160 08713cae0cf26431b0cc3fc06a9cd00a9e4b4925 ChangeLog 27511
-SHA256 44958a6536f6ad75b29d6517f5c856d4d7b438fa29d8bd7d2b281cca4166f15b ChangeLog 27511
+MISC ChangeLog 28092 RMD160 16eb5e789789f0469581e568407b28c4c135b6b4 SHA1 6c42691373bea3d6d7c3260877b5720e710d9248 SHA256 fe66236b62ed8273aef789f4d4608afc2b899bc29cfb6ccb5b8035631cbfdf37
+MD5 0543caa6e383a5f735984dd06abb874a ChangeLog 28092
+RMD160 16eb5e789789f0469581e568407b28c4c135b6b4 ChangeLog 28092
+SHA256 fe66236b62ed8273aef789f4d4608afc2b899bc29cfb6ccb5b8035631cbfdf37 ChangeLog 28092
MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
MD5 7b2e89178256792970af91c675736674 files/digest-qt-3.3.4-r8 590
RMD160 be12f3901344be36b1ca42df80a5d4bd29e98a27 files/digest-qt-3.3.4-r8 590
SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/digest-qt-3.3.4-r8 590
-MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r4 611
-RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r4 611
-SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r4 611
-MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r5 611
-RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r5 611
-SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r5 611
MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8-r2 608
RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8-r2 608
SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8-r2 608
-MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289
-RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289
-SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289
-MD5 521080f3e0b421ab5ad25f9dc25b69f1 files/digest-qt-4.2.2 289
-RMD160 6d2f65f407b6e455d477a31d49d969eeaf6db6da files/digest-qt-4.2.2 289
-SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/digest-qt-4.2.2 289
MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3-r1 289
RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3-r1 289
SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3-r1 289
+++ /dev/null
-MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
-RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
-SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
-MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+++ /dev/null
-MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
-RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
-SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
-MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
-SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+++ /dev/null
-MD5 88f8c9c4622108baca2950baac3c02d6 qt-x11-opensource-src-4.1.4.tar.gz 32174985
-RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f qt-x11-opensource-src-4.1.4.tar.gz 32174985
-SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c qt-x11-opensource-src-4.1.4.tar.gz 32174985
+++ /dev/null
-MD5 19f6374fe7924e33775cb87ee02669cb qt-x11-opensource-src-4.2.2.tar.gz 37636491
-RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 qt-x11-opensource-src-4.2.2.tar.gz 37636491
-SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c qt-x11-opensource-src-4.2.2.tar.gz 37636491
+++ /dev/null
-Index: qt-x11-free-3.3.5/src/kernel/qapplication_x11.cpp
-===================================================================
---- qt-x11-free-3.3.5.orig/src/kernel/qapplication_x11.cpp
-+++ qt-x11-free-3.3.5/src/kernel/qapplication_x11.cpp
-@@ -5220,11 +5220,12 @@ bool QETWidget::translateKeyEventInterna
- } else {
- key = (int)(long)keyDict->find( keycode );
- if ( key )
-- if( !willRepeat ) // Take out key of dictionary only if this call.
-+ if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
- keyDict->take( keycode );
- long s = (long)textDict->find( keycode );
- if ( s ) {
-- textDict->take( keycode );
-+ if ( statefulTranslation )
-+ textDict->take( keycode );
- ascii = (char)(s-256);
- }
- }
+++ /dev/null
---- //depot/qt/3/src/kernel/qfontengine_x11.cpp Thu Oct 19 14:41:41 CEST 2006
-+++ //depot/qt/3/src/kernel/qfontengine_x11.cpp Thu Oct 19 14:41:41 CEST 2006
-
-@@ -171,7 +171,8 @@
-
- QRect br = xmat.mapRect(QRect(x, y - si->ascent, w, h));
- QRect br2 = br & pdevRect;
-- if (br2.width() <= 0 || br2.height() <= 0)
-+ if (br2.width() <= 0 || br2.height() <= 0
-+ || br2.width() >= 32768 || br2.height() >= 32768)
- return;
- QWMatrix mat = QPixmap::trueMatrix( xmat, w, h );
- QBitmap wx_bm = ::transform(dpy, bm, br2.x() - br.x(), br2.y() - br.y(), br2.width(), br2.height(), mat);
-
---- //depot/qt/3/src/kernel/qimage.cpp Thu Oct 19 14:41:41 CEST 2006
-+++ //depot/qt/3/src/kernel/qimage.cpp Thu Oct 19 14:41:41 CEST 2006
-
-@@ -475,7 +475,12 @@
- Endian bitOrder )
- {
- init();
-- if ( w <= 0 || h <= 0 || depth <= 0 || numColors < 0 )
-+ int bpl = ((w*depth+31)/32)*4; // bytes per scanline
-+ if ( w <= 0 || h <= 0 || depth <= 0 || numColors < 0
-+ || INT_MAX / sizeof(uchar *) < uint(h)
-+ || INT_MAX / uint(depth) < uint(w)
-+ || bpl <= 0
-+ || INT_MAX / uint(bpl) < uint(h) )
- return; // invalid parameter(s)
- data->w = w;
- data->h = h;
-@@ -483,7 +488,6 @@
- data->ncols = depth != 32 ? numColors : 0;
- if ( !yourdata )
- return; // Image header info can be saved without needing to allocate memory.
-- int bpl = ((w*depth+31)/32)*4; // bytes per scanline
- data->nbytes = bpl*h;
- if ( colortable || !data->ncols ) {
- data->ctbl = colortable;
-@@ -525,7 +529,10 @@
- Endian bitOrder )
- {
- init();
-- if ( !yourdata || w <= 0 || h <= 0 || depth <= 0 || numColors < 0 )
-+ if ( !yourdata || w <= 0 || h <= 0 || depth <= 0 || numColors < 0
-+ || INT_MAX / sizeof(uchar *) < uint(h)
-+ || INT_MAX / uint(bpl) < uint(h)
-+ )
- return; // invalid parameter(s)
- data->w = w;
- data->h = h;
-@@ -1264,7 +1271,7 @@
- if ( data->ncols != numColors ) // could not alloc color table
- return FALSE;
-
-- if ( INT_MAX / depth < width) { // sanity check for potential overflow
-+ if ( INT_MAX / uint(depth) < uint(width) ) { // sanity check for potential overflow
- setNumColors( 0 );
- return FALSE;
- }
-@@ -1277,7 +1284,9 @@
- // #### WWA: shouldn't this be (width*depth+7)/8:
- const int pad = bpl - (width*depth)/8; // pad with zeros
- #endif
-- if (INT_MAX / bpl < height) { // sanity check for potential overflow
-+ if ( INT_MAX / uint(bpl) < uint(height)
-+ || bpl < 0
-+ || INT_MAX / sizeof(uchar *) < uint(height) ) { // sanity check for potential overflow
- setNumColors( 0 );
- return FALSE;
- }
-
---- //depot/qt/3/src/kernel/qpixmap_x11.cpp Thu Oct 19 14:41:41 CEST 2006
-+++ //depot/qt/3/src/kernel/qpixmap_x11.cpp Thu Oct 19 14:41:41 CEST 2006
-
-@@ -953,6 +953,9 @@
- bool force_mono = (dd == 1 || isQBitmap() ||
- (conversion_flags & ColorMode_Mask)==MonoOnly );
-
-+ if ( w >= 32768 || h >= 32768 )
-+ return FALSE;
-+
- // get rid of the mask
- delete data->mask;
- data->mask = 0;
-@@ -1678,11 +1681,11 @@
-
- QPixmap QPixmap::xForm( const QWMatrix &matrix ) const
- {
-- int w = 0;
-- int h = 0; // size of target pixmap
-- int ws, hs; // size of source pixmap
-+ uint w = 0;
-+ uint h = 0; // size of target pixmap
-+ uint ws, hs; // size of source pixmap
- uchar *dptr; // data in target pixmap
-- int dbpl, dbytes; // bytes per line/bytes total
-+ uint dbpl, dbytes; // bytes per line/bytes total
- uchar *sptr; // data in original pixmap
- int sbpl; // bytes per line in original
- int bpp; // bits per pixel
-@@ -1697,19 +1700,24 @@
-
- QWMatrix mat( matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), 0., 0. );
-
-+ double scaledWidth;
-+ double scaledHeight;
-+
- if ( matrix.m12() == 0.0F && matrix.m21() == 0.0F ) {
- if ( matrix.m11() == 1.0F && matrix.m22() == 1.0F )
- return *this; // identity matrix
-- h = qRound( matrix.m22()*hs );
-- w = qRound( matrix.m11()*ws );
-- h = QABS( h );
-- w = QABS( w );
-+ scaledHeight = matrix.m22()*hs;
-+ scaledWidth = matrix.m11()*ws;
-+ h = QABS( qRound( scaledHeight ) );
-+ w = QABS( qRound( scaledWidth ) );
- } else { // rotation or shearing
- QPointArray a( QRect(0,0,ws+1,hs+1) );
- a = mat.map( a );
- QRect r = a.boundingRect().normalize();
- w = r.width()-1;
- h = r.height()-1;
-+ scaledWidth = w;
-+ scaledHeight = h;
- }
-
- mat = trueMatrix( mat, ws, hs ); // true matrix
-@@ -1718,7 +1726,8 @@
- bool invertible;
- mat = mat.invert( &invertible ); // invert matrix
-
-- if ( h == 0 || w == 0 || !invertible ) { // error, return null pixmap
-+ if ( h == 0 || w == 0 || !invertible
-+ || QABS(scaledWidth) >= 32768 || QABS(scaledHeight) >= 32768 ) { // error, return null pixmap
- QPixmap pm;
- pm.data->bitmap = data->bitmap;
- return pm;
+++ /dev/null
---- src/kernel/qpixmap_x11.cpp.josh 2006-10-13 23:30:27.000000000 -0400
-+++ src/kernel/qpixmap_x11.cpp 2006-10-14 00:31:01.000000000 -0400
-@@ -1758,6 +1758,12 @@ QPixmap QPixmap::xForm( const QWMatrix &
- dbpl = ((w*bpp+31)/32)*4;
- dbytes = dbpl*h;
-
-+ if (dbytes != (long long) dbpl*h) { // Integer overflow detection
-+ QPixmap pm;
-+ pm.data->bitmap = data->bitmap;
-+ return pm;
-+ }
-+
- #if defined(QT_MITSHM)
- if ( use_mitshm ) {
- dptr = (uchar *)xshmimg->data;
-@@ -1867,6 +1873,11 @@ QPixmap QPixmap::xForm( const QWMatrix &
- sptr = (uchar *) axi->data;
- bpp = axi->bits_per_pixel;
- dbytes = dbpl * h;
-+ if (dbytes != (long long) dbpl*h) { // Integer overflow detection
-+ QPixmap pm;
-+ pm.data->bitmap = data->bitmap;
-+ return pm;
-+ }
- dptr = (uchar *) malloc(dbytes);
- Q_CHECK_PTR( dptr );
- memset(dptr, 0, dbytes);
+++ /dev/null
---- src/kernel/qapplication_x11.cpp.sav 2006-06-01 13:31:04.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2006-06-01 13:33:07.000000000 +0200
-@@ -271,6 +271,7 @@ Atom qt_net_wm_frame_strut = 0; // KDE
- Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
- Atom qt_net_wm_pid = 0;
- Atom qt_net_wm_user_time = 0;
-+Atom qt_net_wm_full_placement = 0; // KDE extension
- // Enlightenment support
- Atom qt_enlightenment_desktop = 0;
-
-@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha
- &qt_net_wm_state_stays_on_top );
- qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
- qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
-+ qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
- qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
- qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
- qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
---- src/dialogs/qdialog.cpp.sav 2006-03-17 14:33:44.000000000 +0100
-+++ src/dialogs/qdialog.cpp 2006-06-01 13:38:00.000000000 +0200
-@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e )
-
- #if defined(Q_WS_X11)
- extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-+#include <private/qt_x11_p.h>
-+#undef FocusIn
-+// defined in qapplication_x11.cpp
-+extern Atom qt_net_wm_full_placement;
-+extern bool qt_net_supports(Atom atom);
- #endif // Q_WS_X11
-
- /*!
-@@ -691,10 +696,12 @@ void QDialog::show()
-
- if ( !did_resize )
- adjustSize();
-- if ( has_relpos && !did_move ) {
-- adjustPositionInternal( parentWidget(), TRUE );
-- } else if ( !did_move ) {
-- adjustPositionInternal( parentWidget() );
-+ if( !qt_net_supports( qt_net_wm_full_placement )) {
-+ if ( has_relpos && !did_move ) {
-+ adjustPositionInternal( parentWidget(), TRUE );
-+ } else if ( !did_move ) {
-+ adjustPositionInternal( parentWidget() );
-+ }
- }
-
- if (windowState() != state)
+++ /dev/null
-Index: tools/designer/uic/form.cpp
-===================================================================
---- tools/designer/uic/form.cpp (revision 460038)
-+++ tools/designer/uic/form.cpp (working copy)
-@@ -731,6 +731,13 @@
- while ( !n2.isNull() ) {
- if ( n2.tagName() == "includehint" ) {
- QString file = n2.firstChild().toText().data();
-+ int colons = file.find("::");
-+
-+ if (colons != -1)
-+ {
-+ file = file.right(file.length() - colons - 2);
-+ }
-+
- localIncludes += file;
- }
- n2 = n2.nextSibling().toElement();
+++ /dev/null
-Index: configure
-===================================================================
---- configure (revision 471775)
-+++ configure (working copy)
-@@ -1053,6 +1053,7 @@
- [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
- cat > $outpath/src/tools/qconfig.cpp.new <<EOF
- /* Install paths from configure */
-+#include "qglobal.h"
-
- static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX";
- static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS";
-Index: src/kernel/qgplugin.h
-===================================================================
---- src/kernel/qgplugin.h (revision 471775)
-+++ src/kernel/qgplugin.h (working copy)
-@@ -90,35 +90,19 @@
- return i->iface(); \
- }
-
--# ifdef Q_WS_WIN
--# ifdef Q_CC_BOR
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C __declspec(dllexport) \
-- const char * __stdcall qt_ucm_query_verification_data() \
-- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
-- __stdcall ucm_instantiate() \
-- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# else
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C __declspec(dllexport) \
-- const char *qt_ucm_query_verification_data() \
-- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
-- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# endif
--# else
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-+#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
-+# define Q_STDCALL __stdcall
-+#else
-+# define Q_STDCALL
-+#endif
-+
-+#define Q_EXPORT_PLUGIN(PLUGIN) \
- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C \
-- const char *qt_ucm_query_verification_data() \
-+ Q_EXTERN_C Q_EXPORT \
-+ const char * Q_STDCALL qt_ucm_query_verification_data() \
- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
-+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# endif
--
- #endif
-
- struct QUnknownInterface;
-Index: src/kernel/qapplication_x11.cpp
-===================================================================
---- src/kernel/qapplication_x11.cpp (revision 471775)
-+++ src/kernel/qapplication_x11.cpp (working copy)
-@@ -314,7 +314,7 @@
-
- // flags for extensions for special Languages, currently only for RTL languages
- static bool qt_use_rtl_extensions = FALSE;
--bool qt_hebrew_keyboard_hack = FALSE;
-+Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE;
-
- static Window mouseActWindow = 0; // window where mouse is
- static int mouseButtonPressed = 0; // last mouse button pressed
-@@ -3800,7 +3800,7 @@
- }
-
-
--bool qt_try_modal( QWidget *widget, XEvent *event )
-+Q_EXPORT bool qt_try_modal( QWidget *widget, XEvent *event )
- {
- if (qt_xdnd_dragging) {
- // allow mouse events while DnD is active
-Index: src/kernel/qtextengine_p.h
-===================================================================
---- src/kernel/qtextengine_p.h (revision 471775)
-+++ src/kernel/qtextengine_p.h (working copy)
-@@ -280,7 +280,7 @@
-
- class QFontPrivate;
-
--class QTextEngine {
-+class Q_EXPORT QTextEngine {
- public:
- QTextEngine( const QString &str, QFontPrivate *f );
- ~QTextEngine();
-Index: src/tools/qglobal.h
-===================================================================
---- src/tools/qglobal.h (revision 471775)
-+++ src/tools/qglobal.h (working copy)
-@@ -865,6 +865,10 @@
- # define Q_TEMPLATE_EXTERN
- # undef Q_DISABLE_COPY /* avoid unresolved externals */
- # endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+# define Q_EXPORT __attribute__((visibility("default")))
-+# undef QT_MAKEDLL /* ignore these for other platforms */
-+# undef QT_DLL
- #else
- # undef QT_MAKEDLL /* ignore these for other platforms */
- # undef QT_DLL
-Index: tools/designer/uilib/qwidgetfactory.h
-===================================================================
---- tools/designer/uilib/qwidgetfactory.h (revision 471775)
-+++ tools/designer/uilib/qwidgetfactory.h (working copy)
-@@ -48,7 +48,7 @@
- class QWidgetFactoryPrivate;
- class UibStrTable;
-
--class QWidgetFactory
-+class Q_EXPORT QWidgetFactory
- {
- public:
- QWidgetFactory();
-Index: tools/designer/uilib/qwidgetfactory.cpp
-===================================================================
---- tools/designer/uilib/qwidgetfactory.cpp (revision 471775)
-+++ tools/designer/uilib/qwidgetfactory.cpp (working copy)
-@@ -113,13 +113,13 @@
- static QMap<QString, bool> *availableWidgetMap = 0;
- static QStringList *availableWidgetList = 0;
-
--QMap<QWidget*, QString> *qwf_forms = 0;
-+Q_EXPORT QMap<QWidget*, QString> *qwf_forms = 0;
- QString *qwf_language = 0;
--bool qwf_execute_code = TRUE;
-+Q_EXPORT bool qwf_execute_code = TRUE;
- bool qwf_stays_on_top = FALSE;
- QString qwf_currFileName = "";
- QObject *qwf_form_object = 0;
--QString *qwf_plugin_dir = 0;
-+Q_EXPORT QString *qwf_plugin_dir = 0;
-
- static void setupPluginDir()
- {
-Index: tools/designer/shared/domtool.h
-===================================================================
---- tools/designer/shared/domtool.h (revision 471775)
-+++ tools/designer/shared/domtool.h (working copy)
-@@ -33,7 +33,7 @@
- class QDomElement;
- class QDomDocument;
-
--class DomTool : public Qt
-+class Q_EXPORT DomTool : public Qt
- {
- public:
- static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue );
+++ /dev/null
---- qt/4.1.5/src/gui/image/qimage.cpp Fri Oct 20 10:22:49 CEST 2006
-+++ qt/4.1.5/src/gui/image/qimage.cpp Fri Oct 20 10:22:49 CEST 2006
-@@ -180,12 +180,12 @@
-
- QImageData * QImageData::create(const QSize &size, QImage::Format format, int numColors)
- {
-- int width = size.width();
-- int height = size.height();
-- if (width <= 0 || height <= 0 || numColors < 0 || format == QImage::Format_Invalid)
-+ if (!size.isValid() || numColors < 0 || format == QImage::Format_Invalid)
- return 0; // invalid parameter(s)
-+ uint width = size.width();
-+ uint height = size.height();
-
-- int depth = 0;
-+ uint depth = 0;
- switch(format) {
- case QImage::NImageFormats:
- case QImage::Format_Invalid:
-@@ -214,6 +214,15 @@
- #endif
- }
-
-+ const int bytes_per_line = ((width * depth + 31) >> 5) << 2; // bytes per scanline (must be multiple of 8)
-+
-+ // sanity check for potential overflows
-+ if (INT_MAX/depth < width
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < height
-+ || INT_MAX/sizeof(uchar *) < uint(height))
-+ return 0;
-+
- QImageData *d = new QImageData;
- d->colortable.resize(numColors);
- if (depth == 1) {
-@@ -230,7 +239,7 @@
- d->format = format;
- d->has_alpha_clut = false;
-
-- d->bytes_per_line = ((width * d->depth + 31) >> 5) << 2; // bytes per scanline (must be multiple of 8)
-+ d->bytes_per_line = bytes_per_line;
-
- d->nbytes = d->bytes_per_line*height;
- d->data = (uchar *)malloc(d->nbytes);
-@@ -753,7 +762,16 @@
- : QPaintDevice()
- {
- d = 0;
-- if (format == Format_Invalid || width <= 0 || height <= 0 || !data)
-+
-+ if (format == Format_Invalid )
-+ return;
-+ const int depth = depthForFormat(format);
-+ const int bytes_per_line = ((width * depth + 31)/32) * 4;
-+ if (width <= 0 || height <= 0 || !data
-+ || INT_MAX/sizeof(uchar *) < uint(height)
-+ || INT_MAX/uint(depth) < uint(width)
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < uint(height))
- return; // invalid parameter(s)
- d = new QImageData;
- d->ref.ref();
-@@ -762,10 +780,10 @@
- d->data = data;
- d->width = width;
- d->height = height;
-- d->depth = depthForFormat(format);
-+ d->depth = depth;
- d->format = format;
-
-- d->bytes_per_line = ((width * d->depth + 31)/32) * 4;
-+ d->bytes_per_line = bytes_per_line;
- d->nbytes = d->bytes_per_line * height;
- }
-
-@@ -987,7 +1005,13 @@
- Format f = formatFor(depth, bitOrder);
- if (f == Format_Invalid)
- return;
-- if (w <= 0 || h <= 0 || numColors < 0 || !data)
-+
-+ const int bytes_per_line = ((w*depth+31)/32)*4; // bytes per scanline
-+ if (w <= 0 || h <= 0 || numColors < 0 || !data
-+ || INT_MAX/sizeof(uchar *) < uint(h)
-+ || INT_MAX/uint(depth) < uint(w)
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < uint(h))
- return; // invalid parameter(s)
- d = new QImageData;
- d->ref.ref();
-@@ -1001,7 +1025,7 @@
- if (depth == 32)
- numColors = 0;
-
-- d->bytes_per_line = ((w*depth+31)/32)*4; // bytes per scanline
-+ d->bytes_per_line = bytes_per_line;
- d->nbytes = d->bytes_per_line * h;
- if (colortable) {
- d->colortable.resize(numColors);
-@@ -1035,7 +1059,11 @@
- Format f = formatFor(depth, bitOrder);
- if (f == Format_Invalid)
- return;
-- if (!data || w <= 0 || h <= 0 || depth <= 0 || numColors < 0)
-+ if (!data || w <= 0 || h <= 0 || depth <= 0 || numColors < 0
-+ || INT_MAX/sizeof(uchar *) < uint(h)
-+ || INT_MAX/uint(depth) < uint(w)
-+ || bpl <= 0
-+ || INT_MAX/uint(bpl) < uint(h))
- return; // invalid parameter(s)
-
- d = new QImageData;
---- qt/4.1.5/src/gui/image/qpixmap_x11.cpp Fri Oct 20 10:22:59 CEST 2006
-+++ qt/4.1.5/src/gui/image/qpixmap_x11.cpp Fri Oct 20 10:22:59 CEST 2006
-@@ -978,6 +978,9 @@
- const int dd = X11->use_xrender && img.hasAlphaChannel() ? 32 : pixmap.data->xinfo.depth();
- bool force_mono = (dd == 1 || (flags & Qt::ColorMode_Mask) == Qt::MonoOnly);
-
-+ if (uint(w) >= 32768 || uint(h) >= 32768)
-+ return QPixmap();
-+
- // must be monochrome
- if (force_mono) {
- if (d != 1) {
-@@ -1787,11 +1790,11 @@
-
- QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) const
- {
-- int w = 0;
-- int h = 0; // size of target pixmap
-- int ws, hs; // size of source pixmap
-+ uint w = 0;
-+ uint h = 0; // size of target pixmap
-+ uint ws, hs; // size of source pixmap
- uchar *dptr; // data in target pixmap
-- int dbpl, dbytes; // bytes per line/bytes total
-+ uint dbpl, dbytes; // bytes per line/bytes total
- uchar *sptr; // data in original pixmap
- int sbpl; // bytes per line in original
- int bpp; // bits per pixel
-@@ -1806,20 +1809,24 @@
-
- QMatrix mat(matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), 0., 0.);
- bool complex_xform = false;
-+ qreal scaledWidth;
-+ qreal scaledHeight;
-
- if (mat.m12() == 0.0F && mat.m21() == 0.0F) {
- if (mat.m11() == 1.0F && mat.m22() == 1.0F) // identity matrix
- return *this;
-- h = int(qAbs(mat.m22()) * hs + 0.9999);
-- w = int(qAbs(mat.m11()) * ws + 0.9999);
-- h = qAbs(h);
-- w = qAbs(w);
-+ scaledHeight = qAbs(mat.m22()) * hs + 0.9999;
-+ scaledWidth = qAbs(mat.m11()) * ws + 0.9999;
-+ h = qAbs(int(scaledHeight));
-+ w = qAbs(int(scaledWidth));
- } else { // rotation or shearing
- QPolygonF a(QRectF(0, 0, ws+1, hs+1));
- a = mat.map(a);
- QRectF r = a.boundingRect().normalized();
- w = int(r.width() + 0.9999);
- h = int(r.height() + 0.9999);
-+ scaledWidth = w;
-+ scaledHeight = h;
- complex_xform = true;
- }
- mat = trueMatrix(mat, ws, hs); // true matrix
-@@ -1828,7 +1835,8 @@
- bool invertible;
- mat = mat.inverted(&invertible); // invert matrix
-
-- if (h == 0 || w == 0 || !invertible)
-+ if (h == 0 || w == 0 || !invertible
-+ || qAbs(scaledWidth) >= 32768 || qAbs(scaledHeight) >= 32768 ) // error, return null pixmap
- return QPixmap();
-
- if (mode == Qt::SmoothTransformation) {
+++ /dev/null
---- //depot/qt/4.1.5/src/gui/image/qimage.cpp Thu Oct 19 17:01:50 CEST 2006
-+++ //depot/qt/4.1.5/src/gui/image/qimage.cpp Thu Oct 19 17:01:50 CEST 2006
-
-@@ -180,12 +180,12 @@
-
- QImageData * QImageData::create(const QSize &size, QImage::Format format, int numColors)
- {
-- int width = size.width();
-- int height = size.height();
-+ uint width = size.width();
-+ uint height = size.height();
- if (width <= 0 || height <= 0 || numColors < 0 || format == QImage::Format_Invalid)
- return 0; // invalid parameter(s)
-
-- int depth = 0;
-+ uint depth = 0;
- switch(format) {
- case QImage::NImageFormats:
- case QImage::Format_Invalid:
-@@ -214,6 +214,15 @@
- #endif
- }
-
-+ const int bytes_per_line = ((width * depth + 31) >> 5) << 2; // bytes per scanline (must be multiple of 8)
-+
-+ // sanity check for potential overflows
-+ if (INT_MAX/depth < width
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < height
-+ || INT_MAX/sizeof(uchar *) < uint(height))
-+ return 0;
-+
- QImageData *d = new QImageData;
- d->colortable.resize(numColors);
- if (depth == 1) {
-@@ -230,7 +239,7 @@
- d->format = format;
- d->has_alpha_clut = false;
-
-- d->bytes_per_line = ((width * d->depth + 31) >> 5) << 2; // bytes per scanline (must be multiple of 8)
-+ d->bytes_per_line = bytes_per_line;
-
- d->nbytes = d->bytes_per_line*height;
- d->data = (uchar *)malloc(d->nbytes);
-@@ -753,7 +762,13 @@
- : QPaintDevice()
- {
- d = 0;
-- if (format == Format_Invalid || width <= 0 || height <= 0 || !data)
-+ const int depth = depthForFormat(format);
-+ const int bytes_per_line = ((width * d->depth + 31)/32) * 4;
-+ if (format == Format_Invalid || width <= 0 || height <= 0 || !data
-+ || INT_MAX/sizeof(uchar *) < uint(height)
-+ || INT_MAX/uint(depth) < uint(width)
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < uint(height))
- return; // invalid parameter(s)
- d = new QImageData;
- d->ref.ref();
-@@ -762,10 +777,10 @@
- d->data = data;
- d->width = width;
- d->height = height;
-- d->depth = depthForFormat(format);
-+ d->depth = depth;
- d->format = format;
-
-- d->bytes_per_line = ((width * d->depth + 31)/32) * 4;
-+ d->bytes_per_line = bytes_per_line;
- d->nbytes = d->bytes_per_line * height;
- }
-
-@@ -987,7 +1002,13 @@
- Format f = formatFor(depth, bitOrder);
- if (f == Format_Invalid)
- return;
-- if (w <= 0 || h <= 0 || numColors < 0 || !data)
-+
-+ const int bytes_per_line = ((w*depth+31)/32)*4; // bytes per scanline
-+ if (w <= 0 || h <= 0 || numColors < 0 || !data
-+ || INT_MAX/sizeof(uchar *) < uint(h)
-+ || INT_MAX/uint(depth) < uint(w)
-+ || bytes_per_line <= 0
-+ || INT_MAX/uint(bytes_per_line) < uint(h))
- return; // invalid parameter(s)
- d = new QImageData;
- d->ref.ref();
-@@ -1001,7 +1022,7 @@
- if (depth == 32)
- numColors = 0;
-
-- d->bytes_per_line = ((w*depth+31)/32)*4; // bytes per scanline
-+ d->bytes_per_line = bytes_per_line;
- d->nbytes = d->bytes_per_line * h;
- if (colortable) {
- d->colortable.resize(numColors);
-@@ -1035,7 +1056,11 @@
- Format f = formatFor(depth, bitOrder);
- if (f == Format_Invalid)
- return;
-- if (!data || w <= 0 || h <= 0 || depth <= 0 || numColors < 0)
-+ if (!data || w <= 0 || h <= 0 || depth <= 0 || numColors < 0
-+ || INT_MAX/sizeof(uchar *) < uint(h)
-+ || INT_MAX/uint(depth) < uint(w)
-+ || bpl <= 0
-+ || INT_MAX/uint(bpl) < uint(h))
- return; // invalid parameter(s)
-
- d = new QImageData;
-
---- //depot/qt/4.1.5/src/gui/image/qpixmap_x11.cpp Thu Oct 19 17:01:50 CEST 2006
-+++ //depot/qt/4.1.5/src/gui/image/qpixmap_x11.cpp Thu Oct 19 17:01:50 CEST 2006
-
-@@ -978,6 +978,9 @@
- const int dd = X11->use_xrender && img.hasAlphaChannel() ? 32 : pixmap.data->xinfo.depth();
- bool force_mono = (dd == 1 || (flags & Qt::ColorMode_Mask) == Qt::MonoOnly);
-
-+ if (uint(w) >= 32768 || uint(h) >= 32768)
-+ return QPixmap();
-+
- // must be monochrome
- if (force_mono) {
- if (d != 1) {
-@@ -1787,11 +1790,11 @@
-
- QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) const
- {
-- int w = 0;
-- int h = 0; // size of target pixmap
-- int ws, hs; // size of source pixmap
-+ uint w = 0;
-+ uint h = 0; // size of target pixmap
-+ uint ws, hs; // size of source pixmap
- uchar *dptr; // data in target pixmap
-- int dbpl, dbytes; // bytes per line/bytes total
-+ uint dbpl, dbytes; // bytes per line/bytes total
- uchar *sptr; // data in original pixmap
- int sbpl; // bytes per line in original
- int bpp; // bits per pixel
-@@ -1806,20 +1809,24 @@
-
- QMatrix mat(matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), 0., 0.);
- bool complex_xform = false;
-+ qreal scaledWidth;
-+ qreal scaledHeight;
-
- if (mat.m12() == 0.0F && mat.m21() == 0.0F) {
- if (mat.m11() == 1.0F && mat.m22() == 1.0F) // identity matrix
- return *this;
-- h = int(qAbs(mat.m22()) * hs + 0.9999);
-- w = int(qAbs(mat.m11()) * ws + 0.9999);
-- h = qAbs(h);
-- w = qAbs(w);
-+ scaledHeight = qAbs(mat.m22()) * hs + 0.9999;
-+ scaledWidth = qAbs(mat.m11()) * ws + 0.9999;
-+ h = qAbs(int(h));
-+ w = qAbs(int(w));
- } else { // rotation or shearing
- QPolygonF a(QRectF(0, 0, ws+1, hs+1));
- a = mat.map(a);
- QRectF r = a.boundingRect().normalized();
- w = int(r.width() + 0.9999);
- h = int(r.height() + 0.9999);
-+ scaledWidth = w;
-+ scaledHeight = h;
- complex_xform = true;
- }
- mat = trueMatrix(mat, ws, hs); // true matrix
-@@ -1828,7 +1835,8 @@
- bool invertible;
- mat = mat.inverted(&invertible); // invert matrix
-
-- if (h == 0 || w == 0 || !invertible)
-+ if (h == 0 || w == 0 || !invertible
-+ || qAbs(scaledWidth) >= 32768 || qAbs(scaledHeight) >= 32768 ) // error, return null pixmap
- return QPixmap();
-
- if (mode == Qt::SmoothTransformation) {
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.22 2007/02/18 15:43:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.23 2007/04/18 18:10:34 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs
LICENSE="|| ( QPL-1.0 GPL-2 )"
SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="mips"
IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
DEPEND="|| ( ( x11-libs/libXcursor
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r4.ebuild,v 1.13 2007/02/18 15:43:00 grobian Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
- immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
- immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
-
-DEPEND="|| ( ( x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libSM
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-
- )
- <virtual/x11-7
- )
- virtual/xft
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.9
- >=media-libs/freetype-2
- sys-libs/zlib
- nas? ( >=media-libs/nas-1.5 )
- mysql? ( virtual/mysql )
- firebird? ( dev-db/firebird )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/postgresql )
- cups? ( net-print/cups )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-
-pkg_setup() {
- if use immqt && use immqt-bc ; then
- ewarn
- ewarn "immqt and immqt-bc are exclusive. You cannot set both."
- ewarn "Please specify either immqt or immqt-bc."
- ewarn
- die
- elif use immqt ; then
- ewarn
- ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
- ewarn "you have to recompile everything depending on Qt after you install it."
- ewarn "Be aware."
- ewarn
- fi
-
- export QTDIR=${S}
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- PLATCXX="g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- PLATCXX="icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- PLATNAME="freebsd" ;;
- *-openbsd*)
- PLATNAME="openbsd" ;;
- *-netbsd*)
- PLATNAME="netbsd" ;;
- *-darwin*)
- PLATNAME="darwin" ;;
- *-linux-*|*-linux)
- PLATNAME="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- # probably this should be '*-64' for 64bit archs
- # in a fully multilib environment (no compatibility symlinks)
- export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- # Do not link with -rpath. See bug #75181.
- find ${S}/mkspecs -name qmake.conf | xargs \
- sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
- # Patch for uic includehint errors (aseigo patch)
- epatch ${FILESDIR}/${P}-uic-fix.patch
-
- # KDE related patches
- epatch ${FILESDIR}/0001-dnd_optimization.patch
- epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
- epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
- epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff
- epatch ${FILESDIR}/0047-fix-kmenu-widget.diff
- epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch
-
- # ulibc patch (bug #100246)
- epatch ${FILESDIR}/qt-ulibc.patch
-
- # bug #151838
- epatch "${FILESDIR}/${P}-CVE-2006-4811-bis.patch"
-
- # Visibility patch, apply only on GCC 4.1 and later for safety
- [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
- epatch "${FILESDIR}/${P}-visibility.patch"
-
- if use immqt || use immqt-bc ; then
- epatch ../${IMMQT_P}.diff
- sh make-symlinks.sh || die "make symlinks failed"
- fi
-
- # known working flags wrt #77623
- use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
- # set c/xxflags and ldflags
- strip-flags
- append-flags -fno-strict-aliasing
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
- -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
- ${S}/mkspecs/${PLATFORM}/qmake.conf || die
-
- if [ $(get_libdir) != "lib" ] ; then
- sed -i -e "s:/lib$:/$(get_libdir):" \
- ${S}/mkspecs/${PLATFORM}/qmake.conf || die
- fi
-}
-
-src_compile() {
- export SYSCONF=${D}${QTBASE}/etc/settings
-
- # Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
- addwrite "${QTBASE}/etc/settings"
- addwrite "${HOME}/.qt"
-
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
- use nas && myconf="${myconf} -system-nas-sound"
- use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
- use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
- use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
- use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
- use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
- use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
- use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
-
- myconf="${myconf} -system-zlib"
-
- use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
- use immqt-bc && myconf="${myconf} -inputmethod"
- use immqt && myconf="${myconf} -inputmethod -inputmethod-ext"
-
- if use ppc-macos ; then
- myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
- myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
- myconf="${myconf} -L${S}/lib -I${S}/include"
- sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
- fi
-
- export YACC='byacc -d'
- tc-export CC CXX
- export LINK="$(tc-getCXX)"
-
- ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
- emake src-qmake src-moc sub-src || die
-
- export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- emake sub-tools || die
-
- if use examples; then
- emake sub-tutorial sub-examples || die
- fi
-
- # Make the msg2qm utility (not made by default)
- cd ${S}/tools/msg2qm
- ../../bin/qmake
- emake
-
- # Make the qembed utility (not made by default)
- cd ${S}/tools/qembed
- ../../bin/qmake
- emake
-
-}
-
-src_install() {
- # binaries
- into ${QTBASE}
- dobin bin/*
- dobin tools/msg2qm/msg2qm
- dobin tools/qembed/qembed
-
- # libraries
- if use ppc-macos; then
- # dolib is broken on BSD because of missing readlink(1)
- dodir ${QTBASE}/$(get_libdir)
- cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
-
- cd ${D}/${QTBASE}/$(get_libdir)
- for lib in libqt-mt* ; do
- ln -s ${lib} ${lib/-mt/}
- done
- else
- dolib.so lib/lib{editor,qassistantclient,designercore}.a
- dolib.so lib/libqt-mt.la
- dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
- cd ${D}/${QTBASE}/$(get_libdir)
-
- for x in libqui.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.3.5->3.3->3->.so
- ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
- ln -s libqt-mt.so.3.3 libqt-mt.so.3
- ln -s libqt-mt.so.3 libqt-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqt-mt.so.${PV} libqt.so.${PV}
- ln -s libqt-mt.so.3.3 libqt.so.3.3
- ln -s libqt-mt.so.3 libqt.so.3
- ln -s libqt-mt.so libqt.so
- fi
-
- # plugins
- cd ${S}
- local plugins=$(find plugins -name "lib*.so" -print)
- for x in ${plugins}; do
- exeinto ${QTBASE}/$(dirname ${x})
- doexe ${x}
- done
-
- # Past this point just needs to be done once
- is_final_abi || return 0
-
- # includes
- cd ${S}
- dodir ${QTBASE}/include/private
- cp include/* ${D}/${QTBASE}/include/
- cp include/private/* ${D}/${QTBASE}/include/private/
-
- # prl files
- sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
- insinto ${QTBASE}/$(get_libdir)
- doins ${S}/lib/*.prl
-
- # pkg-config file
- insinto ${QTBASE}/$(get_libdir)/pkgconfig
- doins ${S}/lib/*.pc
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${QTBASE}/${libdir}"
- done
-
- # environment variables
- if use ppc-macos; then
- cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-DYLD_LIBRARY_PATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
- else
- cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
- fi
- cat <<EOF > ${T}/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
- cat <<EOF > ${T}/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
- insinto /etc/revdep-rebuild
- doins ${T}/50-qt3-revdep
-
- insinto /etc/env.d
- doins ${T}/45qt3 ${T}/50qtdir3
-
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
- fi
-
- insinto ${QTBASE}/tools/designer
- doins -r tools/designer/templates
-
- insinto ${QTBASE}
- doins -r translations
-
- keepdir ${QTBASE}/etc/settings
-
- if use doc; then
- insinto ${QTBASE}
- doins -r ${S}/doc
- fi
-
- if use examples; then
- find ${S}/examples ${S}/tutorial -name Makefile | \
- xargs sed -i -e "s:${S}:${QTBASE}:g"
-
- cp -r ${S}/examples ${D}${QTBASE}/
- cp -r ${S}/tutorial ${D}${QTBASE}/
- fi
-
- # misc build reqs
- insinto ${QTBASE}/mkspecs
- doins -r ${S}/mkspecs/${PLATFORM}
-
- sed -e "s:${S}:${QTBASE}:g" \
- ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
- dodoc FAQ README README-QT.TXT changes*
- if use immqt || use immqt-bc ; then
- dodoc ${S}/README.immodule
- fi
-}
-
-pkg_postinst() {
- echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
- elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
- elog "same version of gcc. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
- echo
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r5.ebuild,v 1.4 2007/02/18 15:43:00 grobian Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
- immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
- immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
-
-DEPEND="|| ( ( x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libSM
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-
- )
- <virtual/x11-7
- )
- virtual/xft
- media-libs/libpng
- media-libs/jpeg
- >=media-libs/libmng-1.0.9
- >=media-libs/freetype-2
- sys-libs/zlib
- nas? ( >=media-libs/nas-1.5 )
- mysql? ( virtual/mysql )
- firebird? ( dev-db/firebird )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/postgresql )
- cups? ( net-print/cups )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-
-pkg_setup() {
- if use immqt && use immqt-bc ; then
- ewarn
- ewarn "immqt and immqt-bc are exclusive. You cannot set both."
- ewarn "Please specify either immqt or immqt-bc."
- ewarn
- die
- elif use immqt ; then
- ewarn
- ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
- ewarn "you have to recompile everything depending on Qt after you install it."
- ewarn "Be aware."
- ewarn
- fi
-
- export QTDIR=${S}
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- PLATCXX="g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- PLATCXX="icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- PLATNAME="freebsd" ;;
- *-openbsd*)
- PLATNAME="openbsd" ;;
- *-netbsd*)
- PLATNAME="netbsd" ;;
- *-darwin*)
- PLATNAME="darwin" ;;
- *-linux-*|*-linux)
- PLATNAME="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- # probably this should be '*-64' for 64bit archs
- # in a fully multilib environment (no compatibility symlinks)
- export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- # Do not link with -rpath. See bug #75181.
- find ${S}/mkspecs -name qmake.conf | xargs \
- sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
- # Patch for uic includehint errors (aseigo patch)
- epatch ${FILESDIR}/${P}-uic-fix.patch
-
- # KDE related patches
- epatch ${FILESDIR}/0001-dnd_optimization.patch
- epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
- epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
- epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff
- epatch ${FILESDIR}/0047-fix-kmenu-widget.diff
- epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch
-
- # ulibc patch (bug #100246)
- epatch ${FILESDIR}/qt-ulibc.patch
-
- # bug #151838
- epatch "${FILESDIR}/${P}-CVE-2006-4811-bis.patch"
-
- # xinerama patch: http://ktown.kde.org/~seli/xinerama/
- epatch "${FILESDIR}/${P}-seli-xinerama.patch"
-
- # Visibility patch, apply only on GCC 4.1 and later for safety
- [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
- epatch "${FILESDIR}/${P}-visibility.patch"
-
- if use immqt || use immqt-bc ; then
- epatch ../${IMMQT_P}.diff
- sh make-symlinks.sh || die "make symlinks failed"
- fi
-
- # known working flags wrt #77623
- use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
- # set c/xxflags and ldflags
- strip-flags
- append-flags -fno-strict-aliasing
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
- -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
- -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
- ${S}/mkspecs/${PLATFORM}/qmake.conf || die
-
- if [ $(get_libdir) != "lib" ] ; then
- sed -i -e "s:/lib$:/$(get_libdir):" \
- ${S}/mkspecs/${PLATFORM}/qmake.conf || die
- fi
-}
-
-src_compile() {
- export SYSCONF=${D}${QTBASE}/etc/settings
-
- # Let's just allow writing to these directories during Qt emerge
- # as it makes Qt much happier.
- addwrite "${QTBASE}/etc/settings"
- addwrite "${HOME}/.qt"
-
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
- use nas && myconf="${myconf} -system-nas-sound"
- use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
- use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
- use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
- use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
- use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
- use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
- use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
- use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
-
- myconf="${myconf} -system-zlib"
-
- use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
- use immqt-bc && myconf="${myconf} -inputmethod"
- use immqt && myconf="${myconf} -inputmethod -inputmethod-ext"
-
- if use ppc-macos ; then
- myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
- myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
- myconf="${myconf} -L${S}/lib -I${S}/include"
- sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
- fi
-
- export YACC='byacc -d'
- tc-export CC CXX
- export LINK="$(tc-getCXX)"
-
- ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
- -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
- -system-libpng -xft -platform ${PLATFORM} -xplatform \
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
- -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
- emake src-qmake src-moc sub-src || die
-
- export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- emake sub-tools || die
-
- if use examples; then
- emake sub-tutorial sub-examples || die
- fi
-
- # Make the msg2qm utility (not made by default)
- cd ${S}/tools/msg2qm
- ../../bin/qmake
- emake
-
- # Make the qembed utility (not made by default)
- cd ${S}/tools/qembed
- ../../bin/qmake
- emake
-
-}
-
-src_install() {
- # binaries
- into ${QTBASE}
- dobin bin/*
- dobin tools/msg2qm/msg2qm
- dobin tools/qembed/qembed
-
- # libraries
- if use ppc-macos; then
- # dolib is broken on BSD because of missing readlink(1)
- dodir ${QTBASE}/$(get_libdir)
- cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
-
- cd ${D}/${QTBASE}/$(get_libdir)
- for lib in libqt-mt* ; do
- ln -s ${lib} ${lib/-mt/}
- done
- else
- dolib.so lib/lib{editor,qassistantclient,designercore}.a
- dolib.so lib/libqt-mt.la
- dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
- cd ${D}/${QTBASE}/$(get_libdir)
-
- for x in libqui.so ; do
- ln -s $x.1.0.0 $x.1.0
- ln -s $x.1.0 $x.1
- ln -s $x.1 $x
- done
-
- # version symlinks - 3.3.5->3.3->3->.so
- ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
- ln -s libqt-mt.so.3.3 libqt-mt.so.3
- ln -s libqt-mt.so.3 libqt-mt.so
-
- # libqt -> libqt-mt symlinks
- ln -s libqt-mt.so.${PV} libqt.so.${PV}
- ln -s libqt-mt.so.3.3 libqt.so.3.3
- ln -s libqt-mt.so.3 libqt.so.3
- ln -s libqt-mt.so libqt.so
- fi
-
- # plugins
- cd ${S}
- local plugins=$(find plugins -name "lib*.so" -print)
- for x in ${plugins}; do
- exeinto ${QTBASE}/$(dirname ${x})
- doexe ${x}
- done
-
- # Past this point just needs to be done once
- is_final_abi || return 0
-
- # includes
- cd ${S}
- dodir ${QTBASE}/include/private
- cp include/* ${D}/${QTBASE}/include/
- cp include/private/* ${D}/${QTBASE}/include/private/
-
- # prl files
- sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
- insinto ${QTBASE}/$(get_libdir)
- doins ${S}/lib/*.prl
-
- # pkg-config file
- insinto ${QTBASE}/$(get_libdir)/pkgconfig
- doins ${S}/lib/*.pc
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:${QTBASE}/${libdir}"
- done
-
- # environment variables
- if use ppc-macos; then
- cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-DYLD_LIBRARY_PATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
- else
- cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
- fi
- cat <<EOF > ${T}/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
- cat <<EOF > ${T}/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
- insinto /etc/revdep-rebuild
- doins ${T}/50-qt3-revdep
-
- insinto /etc/env.d
- doins ${T}/45qt3 ${T}/50qtdir3
-
- if [ "${SYMLINK_LIB}" = "yes" ]; then
- dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
- fi
-
- insinto ${QTBASE}/tools/designer
- doins -r tools/designer/templates
-
- insinto ${QTBASE}
- doins -r translations
-
- keepdir ${QTBASE}/etc/settings
-
- if use doc; then
- insinto ${QTBASE}
- doins -r ${S}/doc
- fi
-
- if use examples; then
- find ${S}/examples ${S}/tutorial -name Makefile | \
- xargs sed -i -e "s:${S}:${QTBASE}:g"
-
- cp -r ${S}/examples ${D}${QTBASE}/
- cp -r ${S}/tutorial ${D}${QTBASE}/
- fi
-
- # misc build reqs
- insinto ${QTBASE}/mkspecs
- doins -r ${S}/mkspecs/${PLATFORM}
-
- sed -e "s:${S}:${QTBASE}:g" \
- ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
- dodoc FAQ README README-QT.TXT changes*
- if use immqt || use immqt-bc ; then
- dodoc ${S}/README.immodule
- fi
-}
-
-pkg_postinst() {
- echo
- elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
- elog "or widgets for the Qt designer) are no longer recognized. If this situation"
- elog "occurs you should recompile the packages providing these plugins,"
- elog "and you should also make sure that Qt and its plugins were compiled with the"
- elog "same version of gcc. Packages that may need to be rebuilt are, for instance,"
- elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
- elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
- echo
-}
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.14 2006/12/19 19:11:20 caleb Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
-
-DEPEND="x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXfont
- x11-libs/libSM
- x11-proto/xextproto
- x11-proto/inputproto
- xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
- virtual/xft
- >=media-libs/freetype-2
- png? ( media-libs/libpng )
- jpeg? ( media-libs/jpeg )
- mng? ( media-libs/libmng )
- nas? ( >=media-libs/nas-1.5 )
- odbc? ( dev-db/unixODBC )
- mysql? ( virtual/mysql )
- firebird? ( dev-db/firebird )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/libpq )
- cups? ( net-print/cups )
- zlib? ( sys-libs/zlib )"
-
-pkg_setup() {
- QTBASEDIR=/usr/$(get_libdir)/qt4
- QTPREFIXDIR=/usr
- QTBINDIR=/usr/bin
- QTLIBDIR=/usr/$(get_libdir)/qt4
- QTPCDIR=/usr/$(get_libdir)/pkgconfig
- QTDATADIR=/usr/share/qt4
- QTDOCDIR=/usr/share/doc/${PF}
- QTHEADERDIR=/usr/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTSYSCONFDIR=/etc/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
-
- PLATFORM=$(qt_mkspecs_dir)
-}
-
-qt_use() {
- useq ${1} && echo "-${1}" || echo "-no-${1}"
- return 0
-}
-
-qt_mkspecs_dir() {
- # Allows us to define which mkspecs dir we want to use.
- local spec
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- spec="freebsd" ;;
- *-openbsd*)
- spec="openbsd" ;;
- *-netbsd*)
- spec="netbsd" ;;
- *-darwin*)
- spec="darwin" ;;
- *-linux-*|*-linux)
- spec="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- spec="${spec}-g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- spec="${spec}-icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- if [[ $(get_libdir) == "lib64" ]]; then
- spec="${spec}-64"
- fi
-
- echo "${spec}"
-}
-
-src_unpack() {
-
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/qt4-parisc-linux.diff
- epatch ${FILESDIR}/qt-4.1.4-sparc.patch
-
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
- cd mkspecs/$(qt_mkspecs_dir)
- # set c/xxflags and ldflags
-
- # Don't let the user go too overboard with flags. If you really want to, uncomment
- # out the line below and give 'er a whirl.
- strip-flags
- replace-flags -O3 -O2
-
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- qmake.conf
-
- # Do not link with -rpath. See bug #75181.
- sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \
- qmake.conf
-
- # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
- sed -i -e "s:X11R6/::" qmake.conf
-
- cd ${S}
-
- if [[ "$(gcc-major-version)" == "4" ]]; then
- einfo "Visibility support: auto"
- else
- einfo "Visibility support: disabled"
- sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
- fi
-
- epatch "${FILESDIR}/${P}-CVE-2006-4811-bis.patch"
-}
-
-src_compile() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
- myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
- use png && myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
- use jpeg && myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
- use debug && myconf="${myconf} -debug-and-release" || myconf="${myconf} -release"
- use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
-
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
- use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
- use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
- use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
- myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
-
- ./configure -stl -verbose -largefile \
- -platform ${PLATFORM} -xplatform ${PLATFORM} \
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
-
- emake sub-tools-all-ordered || die
- if use examples; then
- emake sub-examples-all-ordered || die
- fi
-}
-
-src_install() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-
- if use examples; then
- make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
- make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
- fi
-
- make INSTALL_ROOT=${D} install_qmake || die
- make INSTALL_ROOT=${D} install_mkspecs || die
-
- if use doc; then
- make INSTALL_ROOT=${D} install_htmldocs || die
- fi
-
- # Install the translations. This may get use flagged later somehow
- make INSTALL_ROOT=${D} install_translations || die
-
- # The private header files of QTestLib aren't installed, but are needed by the test library.
- # This is supposedly fixed in Qt 4.1.1, so this can probably be removed when it is released
- dodir ${QTHEADERDIR}/QtTest/private
- cp -pPR ${S}/tools/qtestlib/src/*_p.h ${D}/${QTHEADERDIR}/QtTest/private
-
- keepdir "${QTSYSCONFDIR}"
-
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR}
- mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:/usr/${libdir}/qt4"
- done
-
- cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
- doenvd "${T}/44qt4"
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.17 2007/03/27 13:53:10 armin76 Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-DEPEND="x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXfont
- x11-libs/libSM
- x11-proto/xextproto
- x11-proto/inputproto
- dev-util/pkgconfig
- xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
- virtual/xft
- >=media-libs/freetype-2
- png? ( media-libs/libpng )
- jpeg? ( media-libs/jpeg )
- mng? ( >=media-libs/libmng-1.0.9 )
- nas? ( >=media-libs/nas-1.5 )
- odbc? ( dev-db/unixODBC )
- mysql? ( virtual/mysql )
- firebird? ( dev-db/firebird )
- sqlite3? ( =dev-db/sqlite-3* )
- sqlite? ( =dev-db/sqlite-2* )
- opengl? ( virtual/opengl virtual/glu )
- postgres? ( dev-db/libpq )
- cups? ( net-print/cups )
- zlib? ( sys-libs/zlib )
- glib? ( dev-libs/glib )
- dbus? ( >=sys-apps/dbus-0.93 )
- input_devices_wacom? ( x11-drivers/linuxwacom )"
-
-pkg_setup() {
- QTBASEDIR=/usr/$(get_libdir)/qt4
- QTPREFIXDIR=/usr
- QTBINDIR=/usr/bin
- QTLIBDIR=/usr/$(get_libdir)/qt4
- QTPCDIR=/usr/$(get_libdir)/pkgconfig
- QTDATADIR=/usr/share/qt4
- QTDOCDIR=/usr/share/doc/${PF}
- QTHEADERDIR=/usr/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTSYSCONFDIR=/etc/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
-
- PLATFORM=$(qt_mkspecs_dir)
-
-}
-
-qt_use() {
- useq ${1} && echo "-${1}" || echo "-no-${1}"
- return 0
-}
-
-qt_mkspecs_dir() {
- # Allows us to define which mkspecs dir we want to use.
- local spec
-
- case ${CHOST} in
- *-freebsd*|*-dragonfly*)
- spec="freebsd" ;;
- *-openbsd*)
- spec="openbsd" ;;
- *-netbsd*)
- spec="netbsd" ;;
- *-darwin*)
- spec="darwin" ;;
- *-linux-*|*-linux)
- spec="linux" ;;
- *)
- die "Unknown CHOST, no platform choosed."
- esac
-
- CXX=$(tc-getCXX)
- if [[ ${CXX/g++/} != ${CXX} ]]; then
- spec="${spec}-g++"
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then
- spec="${spec}-icc"
- else
- die "Unknown compiler ${CXX}."
- fi
-
- echo "${spec}"
-}
-
-src_unpack() {
-
- unpack ${A}
- cd ${S}
-# epatch ${FILESDIR}/qt4-parisc-linux.diff
- epatch ${FILESDIR}/qt-4.1.4-sparc.patch
- epatch ${FILESDIR}/qt4-sqlite-configure.patch
-
- cd ${S}/mkspecs/$(qt_mkspecs_dir)
- # set c/xxflags and ldflags
-
- # Don't let the user go too overboard with flags. If you really want to, uncomment
- # out the line below and give 'er a whirl.
- strip-flags
- replace-flags -O3 -O2
-
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- qmake.conf
-
- # Do not link with -rpath. See bug #75181.
- sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
- # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
- sed -i -e "s:X11R6/::" qmake.conf
-
- # The trolls moved the definitions of the above stuff for g++, so we need to edit those files
- # separately as well.
- cd ${S}/mkspecs/common
-
- sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
- g++.conf
-
- # Do not link with -rpath. See bug #75181.
- sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
- # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
- sed -i -e "s:X11R6/::" linux.conf
-
- cd ${S}
-
-}
-
-src_compile() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # Disable visibility explicitly if gcc version isn't 4
- if [[ "$(gcc-major-version)" != "4" ]]; then
- myconf="${myconf} -no-reduce-exports"
- fi
-
- myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
- myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
- use nas && myconf="${myconf} -system-nas-sound"
- use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
- use png && myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
- use jpeg && myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
- use debug && myconf="${myconf} -debug -separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
- use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
-
- use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
- use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
- use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
- use sqlite3 && myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
- use sqlite && myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
- use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
- use dbus && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
- use glib && myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
- use qt3support && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-
- use pch && myconf="${myconf} -pch"
-
- use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
- myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
- if ! use examples; then
- myconf="${myconf} -nomake examples"
- fi
-
-
- ./configure -stl -verbose -largefile -confirm-license \
- -platform ${PLATFORM} -xplatform ${PLATFORM} \
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
-
- emake all || die
-}
-
-src_install() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- make INSTALL_ROOT=${D} install_subtargets || die
- make INSTALL_ROOT=${D} install_qmake || die
- make INSTALL_ROOT=${D} install_mkspecs || die
-
- if use doc; then
- make INSTALL_ROOT=${D} install_htmldocs || die
- fi
-
- # Install the translations. This may get use flagged later somehow
- make INSTALL_ROOT=${D} install_translations || die
-
- keepdir "${QTSYSCONFDIR}"
-
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR}
- mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
-
- # List all the multilib libdirs
- local libdirs
- for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:/usr/${libdir}/qt4"
- done
-
- cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
- doenvd "${T}/44qt4"
-}
projects / gentoo.git / commitdiff