diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2009-11-02 16:01:32 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-11-02 16:01:32 +0000 |
| commit | b1c9fa6745092bb6f3a68c3808d17ac91b3b9237 (patch) | |
| tree | 2be0c8337e210dec057bcdd691506d1097048394 /x11-libs | |
| parent | net-libs/libmfcr2: removing (pending 10/20/2009). (diff) | |
| download | historical-b1c9fa6745092bb6f3a68c3808d17ac91b3b9237.tar.gz historical-b1c9fa6745092bb6f3a68c3808d17ac91b3b9237.tar.bz2 historical-b1c9fa6745092bb6f3a68c3808d17ac91b3b9237.zip | |
Restore removed patch
Package-Manager: portage-2.2_rc47/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 23 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-ulibc.patch | 13 |
3 files changed, 40 insertions, 2 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index a9ee677264b9..afbb3a2a0022 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.595 2009/11/02 09:13:31 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.596 2009/11/02 16:01:31 tampakrap Exp $ + + 02 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> + +files/qt-ulibc.patch: + Restore removed patch 02 Nov 2009; Jonathan Callen <abcd@gentoo.org> -files/0037-dnd-timestamp-fix.patch, diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 157edd4b1ccd..bd2cb0684cce 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,3 +1,9 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +- -----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c @@ -11,6 +17,7 @@ AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 AUX qt-3.3.8b-cjk-fix.patch 1191 RMD160 62cc0a9db2ab42b9081967033ae75b0a0eed9e93 SHA1 24bf196b466f4b3956149b29830b158944b6a545 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b +AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 EBUILD qt-3.3.8b-r1.ebuild 10842 RMD160 1792a6bfc6a946dc5b9da2b62b9cc9a83409b132 SHA1 1e6c65520259fdfb9893c338459c5a445f94830a SHA256 18c2ebaf40f51aabe185cf923bbeb9c1672232bfd3c42fb9a2e8c340ef9627b0 @@ -20,5 +27,19 @@ EBUILD qt-4.5.1.ebuild 1365 RMD160 61613317878179108dda8873062ee6d8d51ddb33 SHA1 EBUILD qt-4.5.2.ebuild 1361 RMD160 9968b6b881593c7fc032014e19ebc52db5fa70f8 SHA1 f5fd5cb1f7e37f855dd0e51f8fe2a715be70d899 SHA256 8ddaf9242a41aafa9a5e83a03327a51e0a0a9190f4fd7dc246e21fa125bcaefa EBUILD qt-4.5.3.ebuild 1364 RMD160 bba14886b02179626996889a2851baac5537e1f2 SHA1 4b0b89b7344752a4f944f29785159c49602605ac SHA256 f1695f571d88e5c3195eb1d875d21cb776cb7471e6d5af51af5be664915096f1 EBUILD qt-4.6.0_beta1.ebuild 1353 RMD160 a395bb679f0130facd7367b7e4160b199e1142f7 SHA1 eecb24b7070682ae416cf9318185169e322e134f SHA256 d1a751c7b2559209755aeb7a74a9f47acc745334166935607bda9a8363c68216 -MISC ChangeLog 48939 RMD160 5410978201461b128b6eb68528ef7a99764eb185 SHA1 a2172ec1eaf7484456c1d16560161fd18bdb986e SHA256 4846d0d24d6d618f64355f7e20208dc5fb2e064a2ee36121554104c77a377ef4 +MISC ChangeLog 49050 RMD160 2e08593edc5a084b904ffd2a6341dec879787e56 SHA1 c47c588dca370f208990987ed55a7fd72d9aab65 SHA256 4debc37937c5e64a3732c2365cde8ac791f993d6337cb9771289682f82e33204 MISC metadata.xml 504 RMD160 1c964085340a6c32da556e0dddba675aa599ca0c SHA1 eb798d83a888e31c15db0affca952dbdaf99ba28 SHA256 b3441d2b0fedef04315e978acea237525c7ef6899b5721174f55e82dc50bbb1d +- -----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAkrvAmMACgkQjDdoMVfcAHgM3wCgsYkij5Hay6rU9pH7XZ+4+/WS +Zc0AniDNmLyI56nITv9YopJlVEBwD/Xl +=k4Ve +- -----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAkrvAqgACgkQjDdoMVfcAHh0ugCdHJmsQBruaGsNgm62s8P8oMZM +iucAoOyCzlnuTBrKQiyJm1TIlv8/ywrM +=oz7o +-----END PGP SIGNATURE----- diff --git a/x11-libs/qt/files/qt-ulibc.patch b/x11-libs/qt/files/qt-ulibc.patch new file mode 100644 index 000000000000..f188778e4bdf --- /dev/null +++ b/x11-libs/qt/files/qt-ulibc.patch @@ -0,0 +1,13 @@ +--- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp 2005-01-21 17:16:05.000000000 +0000 ++++ qt-x11-free-3.3.4/src/tools/qlocale.cpp 2005-02-18 13:36:59.000000000 +0000 +@@ -55,6 +55,10 @@ + # undef INFINITY + #endif + ++#if defined(Q_OS_LINUX) && defined(__UCLIBC__) ++# undef Q_OS_LINUX ++#endif ++ + #ifdef Q_OS_LINUX + # include <fenv.h> + #endif |