diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-10 21:53:50 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-10 21:53:50 +0000 |
commit | 3de6006d16072a59523d6d0e50bfe9d8581a1e13 (patch) | |
tree | f3cd7f90ca3b8a692a8101892e1173188f640ced /x11-libs | |
parent | package.mask net-wireless/at76c503a for removal. (diff) | |
download | historical-3de6006d16072a59523d6d0e50bfe9d8581a1e13.tar.gz historical-3de6006d16072a59523d6d0e50bfe9d8581a1e13.tar.bz2 historical-3de6006d16072a59523d6d0e50bfe9d8581a1e13.zip |
Version bump with minor bugfixes. Drop old.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/ChangeLog | 9 | ||||
-rw-r--r-- | x11-libs/gtk+/Manifest | 21 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch | 191 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.24.15.ebuild (renamed from x11-libs/gtk+/gtk+-2.24.13-r1.ebuild) | 46 |
4 files changed, 45 insertions, 222 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 42521377ca1d..1c7bbce3c231 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.633 2013/02/04 15:39:52 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.634 2013/02/10 21:53:44 tetromino Exp $ + +*gtk+-2.24.15 (10 Feb 2013) + + 10 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + -gtk+-2.24.13-r1.ebuild, -files/gtk+-2.24.13-gtk3-bookmarks.patch, + +gtk+-2.24.15.ebuild: + Version bump with minor bugfixes. Drop old. 04 Feb 2013; Benda Xu <heroxbd@gentoo.org> gtk+-3.6.3-r2.ebuild: Specify xml catalog explicitly for Prefix. bug 455292. Credits to Linpeng Tang diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index af25eb648abe..18d1c5c154bc 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX gtk+-1.2-locale_fix.patch 419 SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb SHA512 7350d2b60e4d66219ec57ce56f9e2cd3c9c2b5c399d8e35c49243a0383b3455ba4225257bcd1303ad5b4ef98ea6b6ff401afde43b1b3841eeac2527443f7cd33 WHIRLPOOL d9be6ee6014f4a62b6ef962be5fa610084148e479d916838390dce8f2acff525b1ecb6d596d9af4058177eb21753fa7bcadd7fdebc95fe905cd3cf3829d7db1a AUX gtk+-1.2.10-as-needed.patch 19865 SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7 SHA512 e69ab1a967218889dda64e8a87a390140ab70585b0ad031c3d6cbd5431857c0bf9c76300bb0f9ca8dfd703c0297c618d806795df1f18a5ab23fe3f06fb11c5a2 WHIRLPOOL 9281fcda1a9ab7e1542eb466573887ca258aec440d83d64901f9122ab41ab0c91e5bcbedce8abb2c9952f6be2e5459e4a84bf3f0374f5305579c5bbd20dfc0e9 AUX gtk+-1.2.10-automake.patch 3270 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2 SHA512 8e603e8c313a87646b3d0b81cd59dfcfcc1f318c7bac58c6fcfde12b1cbbd235b0e6a14ce76643d1a6fccd8507f37e345ff21a2e9273a3a7922e21e1a8515bf7 WHIRLPOOL ce47fe13bad5ef4d659ee83755d703e229f25b3fcd85c38dbbfe6e3381a8400598437a727bb5fb6753462ba54a29ccf1ec51be2f90c63e6f0cbaf47df78b3136 @@ -7,7 +10,6 @@ AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 SHA256 20e7536c29e2675d18fd3a AUX gtk+-2.21.3-multilib.patch 611 SHA256 4c3db89f401176ea121a982974d81ca6ba3db315d2bce16c83ef7f7d7f629f3b SHA512 291e784c482ede1930d85f57b2ecacd6c8b8522d79f0c69f27ef29818c812b951587e16bd5d4236b8ca77a7ad773fa8f0b84c615e9bdbdb2d465134fcd6448ce WHIRLPOOL d67b05a8fb3d3dd38a4980ae1868ba31017b98d5e9a802f3499810d1f90d850dfbddf76ae3d5f6b7b3454db4d0b67156b251e75232fe2b2a07606e29ea6555ca AUX gtk+-2.24.10-gold.patch 797 SHA256 e5964362087f276a1d1087239e0b33395a7a8132021bacd7061f80819e0eedac SHA512 0ccd0e07d139f2440cc67951fb1d2a4102dea9b70ab4872c737a9ab6bd2d46ac7fd1ece42aa4c0e25bbd01af129a15ea2816c0b2b6fe8dd94b625fc40827050f WHIRLPOOL 01e01cc0ab6f35cb026ca91ae6f61d74c4c4a9b9e926e2676a66673ebec9aa25e1ba22cfdd3884d15f682ddd6fb657699fa64167f49190a9d18c69247b0df78a AUX gtk+-2.24.13-gold.patch 953 SHA256 72b6ff99c8d3a653c95a2079a4479ef53f7366bd13959bbbd3f13b0185f3e00a SHA512 47a03489aacf67c29795a33d89728327610a03a3e95a973f5ae743be862e084c825c0de05ea357eae10b049b93dd905ff12da885dee8a9e0e7148bd4b827f24e WHIRLPOOL e2ce4f84e8f3a61d05dabe2e278271405783c89c0e8033b8628d13b64f3c6b491b6051bac2142eba3cbb2dac7096551b041adf2d11ec307a544d356052ce4a3f -AUX gtk+-2.24.13-gtk3-bookmarks.patch 5805 SHA256 3a5826efbf2abbeed1e581d7320f1d3b37ecbf8b6118702b6b82747645c72222 SHA512 655f7eae01d68049bfe89754dff9596df3e4f4bd952bbeb745bd668a606d9eff76236a46ee7ee68ad926ab9ea2c55813fb953160a3adcaf0b3139f5d3a6a1e9c WHIRLPOOL 05455ecd61a09092282388003b5d32e16cfc4d5fb589724fac821ac6ed05add80f412edf9506c46c2df30fc237bc5d524e5e4a75688ceddbaf158dd6e1de3b81 AUX gtk+-2.24.7-darwin-quartz-introspection.patch 1239 SHA256 c718aae4511d9de28ea7b300a7f3d5e1099889a320847c8e642a2e6010838069 SHA512 c618aa19791f258d95cc31efe00b7515992b150933c591b9bbc87c0972646f9982126c0a2f279e287bcbb2768b57d117c59d806b1e60641f070818f78957955e WHIRLPOOL 173e0a8404bfcd29adf0b55155eef80d927ca536f89806591bc87c90b6eed4e64f9e2cb9ad5ce15f6f8f63381a378abc4cfb8c9b802166763111a052681c9bc4 AUX gtk+-3.2.1-failing-tests.patch 1287 SHA256 07368c5a7b577b9493c3be423c51feadcfe48503203785e2e944309996a30850 SHA512 8e946133fa40fce121d2e360e80b54d86bd623991b8485088edfa75045cfa6cc8ca6be925f98dded4d6ada3a91d3b1873085bd56dd65f2a49cdb63ed3ef17ab6 WHIRLPOOL 152ad0dae80ebe77bcc0d1813efbee30d8cbd0f55fb66438dbe97759b5699d0e1b82a5b40b02741c654fea51fea8921129522451f57a3b910f82416dfc2de64a AUX gtk+-3.2.1-selector.errors 55 SHA256 dfec659411fb82ac9464b07e1675bf428a114f0348836dc1f4a9f98b9a1b5707 SHA512 59d8c70e82dc47b1c2886bc342534ea1ad0e9e4c45a54bc7175e32c1045fe3aec679f8086c82976033facb1501af6f276e8c97d508662f4d2d90409fa4331e20 WHIRLPOOL 55e508107ae5968eb2343468e517f0cfbc3929270fb9b71a233ab5b262dcc3bb1a53b1d68b6f2066d2c7ac5aea8b0b8682de155ecb7a3e69e9ade7dd91bb2553 @@ -22,8 +24,8 @@ AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15 DIST gtk+-2.24.12.tar.xz 13255456 SHA256 c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808 SHA512 b5abb66adc01d90c1ce62845bb264a159f4c73d0e9dce32abc80ce8fab8d72b21e22aaf0d8fa870530c019f2249fe2244d5c85e8d3d06b7541d19302bc08e641 WHIRLPOOL 7c55c5d91ecd1f6e4cde0026eeb23302f7812049d0d5ac38c79c0cf0f92b72428d59512519c8b3c4a403d1d85ed2da300c11227fd9f754a3c7a01fd9083203dc -DIST gtk+-2.24.13.tar.xz 13278972 SHA256 35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d SHA512 95cdb709b128b5fb35def329b51b14b8c8721db644831f540ed57211945147379027f7866c1463d750a05f447648fc66eb1e6e81c69fda2f90225b8e3401b717 WHIRLPOOL b5dbe77b8eb9fa2ef9a280ac83c7db5dfe4609aa254e72a1d526eda2e157dfbd2097b6ea3d083340a75cb07d2f7b3ab7bba988682be34726154fe34e109bceb9 DIST gtk+-2.24.14.tar.xz 13258752 SHA256 8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac SHA512 f262ddd728ca2d93889bb1b113866932edf7d61ab3248ca11f2c83dbb181fcc0eaab900e6ed4933e4b597cac1ed1bf622711a617e0867ec10730c934d21dc911 WHIRLPOOL ec1b37c4439e80b6693e52c5c910c28533b478c3c994f5d8f3b8b5be2ac792dae7bec36ed92dc39ce35183d48d8bfdec347c32f55f8cc3b521e90554c8c679c8 +DIST gtk+-2.24.15.tar.xz 13276488 SHA256 d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b SHA512 5f62c8fb36e0be78d0556024b2e994b11bf81e0a975d5fb5ce68716065ed0f4b330309e81df7c5dd77d76f91a7e00df4358e4a8c6e65b2431d0d588239b68ff7 WHIRLPOOL 349c7bb55fc1304a89a2f1fd7a5a80fb7eb680a41798ba3e1adc4ae4097b0ee44c67460df77aa12778ffbe6934b60eb14c2c2c29e96f753867b4f8d726988073 DIST gtk+-3.2.4.tar.xz 12261004 SHA256 f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd SHA512 89eb2157262a448cf32a5c11cc8ab5a6b916c04119d16fb6f33a44e616e0236427921a0ee221df175c21f395a73958f02516f5aa6167ca2cc3f5b4550e8d3e3a WHIRLPOOL f9c67a34d5a3bf59ebd623fe16e81a471a4af90f698a50848d163ff1d6a6c0989a3d061951793a286bec00a6008db09bea70d513bcd47aab78f7387af62dbf37 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a DIST gtk+-3.6.2.tar.xz 13288392 SHA256 aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c SHA512 3b67c75e1de29679f2d3ffb095d7999a89967c77673b9daa574f63c8553fab9075627c892f92a4e5caf618c8736a5b476994eb13cedd4b29dadcab19b1a5d5aa WHIRLPOOL 24113134e6e73d62e2e1694fc4f9f0f6a8d2d0a976efed9c5638e0d7aa62431f37b0ca96c5cea90f1915a0161a155ed4fdcd8e39347a0cc6d1ca768f710f4c1f @@ -31,13 +33,24 @@ DIST gtk+-3.6.3.tar.xz 13274804 SHA256 da376bc0623650b1560c844d94dc3bc259edb7cac DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc EBUILD gtk+-1.2.10-r12.ebuild 2393 SHA256 1375c5850b23a82e3724f3ad23be8058dcf1c164e146aab6d8b60dd55f3c694d SHA512 4fffd0ed56f05583f5d12fafb47bfd90c84cd81d568d0f425620b3b867fa33e746bfdff528cc798c524781689ed55017b823a31b168b53447950e8abaca14d62 WHIRLPOOL 03b4508a09c1f18ce53bea5aac93658f3205e6fd727acc93903a7af23dc970defcc6e819eaccc2d4cb7793b7bdd0d13fdbbf535ec7d7ddf5178202e2e4571850 EBUILD gtk+-2.24.12.ebuild 8395 SHA256 bb0df7d6771c06c2195df54a48d1b006b32a5d21aa493a4b8bad9d16c220eed6 SHA512 5ba4f233729d17ea3f4b0d6cef446f6e5d2bb939daec1b81d3d3055ff79c2b54402a59a8c6c7e28d5e316b0e51b4426f0d860c1996848dcea6b7c44043dacf57 WHIRLPOOL 177555bdcea980e48a2d037fbaa4ec607093271ab63908c12c4afb57f1ae684b3206bd0e913ed78981a59df6379ee2470fb08bdb4be3c5a269c6d9dbdcd31735 -EBUILD gtk+-2.24.13-r1.ebuild 8374 SHA256 3c78cb94cbf962896449a7c564a1ee54fbd22c789f906a89e4e63e31d89f5a92 SHA512 fa4d1adf469c68eb28ab3ddaafb44b40ea31dcbdc12914f5a63907f63e91275e5ee4b91bd859dcec7eadf050a2017f086f11ee6bb136ede64571cd2dc22b3bf7 WHIRLPOOL 5a11e4065089884a9a818432e306cf79607285bfe70aab5da8646c2ec9947194ae38eb2571a61d00e39a4e67a3d7004e0c1014293fb1810cc1e804db21250fbd EBUILD gtk+-2.24.14.ebuild 8395 SHA256 dbc956990101408216e2f0e79e11d8157cb186619a76203d282a79a0b81f45ab SHA512 6bdb023528fc9d42209d1c9b0ad4bb5e138905e16eee682913162dc49870ff704f9a98a409c34999d9436fcd066b4fcb6fdbcbf6e9bef9e43e30ee4f4bee2349 WHIRLPOOL d3a24d8e7c54b3a8d5675df4c57bacac14035192fdae24a08fb6e57222718624f129aa823de2347a9109cf8f40093b98118737ede771832351b6b5134e87c596 +EBUILD gtk+-2.24.15.ebuild 8294 SHA256 fb02d419e294870f8e8ea51d8acb7487536b680d75adcea342dd409f28e4d970 SHA512 a8624b85085217fd256f5b958f4e83415fb53a8ee62f7c96448ce37c40a83a6c7a3a4aa96ad8403dca4136683c95827d9fe6d37bdf8379e602e343c7d0882c5e WHIRLPOOL cd79871e57d628d319186e583ab52b842cca127ba9d22de7bb5821ac0bd53fafb3a846119228f58925c3c156b50aefb484851700aaba9304728987567cc6e08f EBUILD gtk+-3.2.4-r1.ebuild 6922 SHA256 a5a138e1243cc1a25f6d6a29f9a1f3fcffabc939b4c12cb4c6fbfd46f1059299 SHA512 0a67fb5b8114ad8fedcc54dbc0d0ab9db1ec7252d7cc4f6bd092f770fa8c85de9bd743738d1da2824c18382e065dab95e27f1acd8b1347203777ee6a22ef65af WHIRLPOOL ffabadedaea7bbc5807ec2304c45d758156f9c40e3319a1c88eea4600221f3cbe35e27b1d4a1d05f0985117b715152c46da8bbb9b7f20cfef6c3fba726bf6178 EBUILD gtk+-3.4.4.ebuild 7094 SHA256 928b0f6acf86fba5109d8e8f4d5bc1b365d19ec8092b2b7103f5c8ff005cda27 SHA512 2df2bf8b4c9d1535a2c4ca3a27f2324de4eff6ec79f712ff4cef72849fdb0b0fc6a7cb8a5084483881d97e55032c177e3c59f92f60444d0701c53b76224b1ac5 WHIRLPOOL 745c204b2459e94a6fa225a4d19a99581ff3f71713a3559cdd9a6871f8fff80c6c7e5c673059a2377145b16dda5ffb1371ad0c9bb0bf0eb806000a3e49d1f6bb EBUILD gtk+-3.6.2.ebuild 6926 SHA256 221183e85b8a661422d4ffd41bea0167a89c9c40d8fbf3409984d9936c0b1a21 SHA512 c1a1c60dcf7826246d72ed1a57620cc8f0c28dc13f93bcdeee37c5d37c767802f311a8405ecc0883de678d6dcc3cd6fa89cc39799b1dd22fe8298ebbc9adea35 WHIRLPOOL bb324d8d6bc9635c71302013dfc30abd6f7cb286577ac64b334dcb53446e268d5b40ec434539b63fa9d41302d4b08577b3a30f3f60c641728d3b8b61960ec295 EBUILD gtk+-3.6.3-r1.ebuild 7102 SHA256 274ae2208522cf40060fd603dffd6fc426848f9ac1e3032c430c495a715d3dd9 SHA512 d7e8a8775b0bf94c4c2d3731cb15baf306cd80c02854ce63f8208082964da289a8242838209e23dd47983b515134cce3029c0d89a466f0401509324d844a1b0d WHIRLPOOL ed465fe4047c5cb37bf84a07e3f359be1f5d704c1cd7bc17a44a295db82c3f64b85a7ae32e7224d85c57705a28e9b38fb4d24c90fc2112e0018c31bed8b3e614 EBUILD gtk+-3.6.3-r2.ebuild 7129 SHA256 30313bbf3cd9c15d931d6d8242cf41f4a973160d3fec54e253ce6fcebd8e2a9c SHA512 bf24d29a726a1727500e9023b7df68acd3bd158934612bc5fa7a31ea4c38e01fcb3c960b4a90725c6a63576cc2eedb6db763d6e52ba9f84c34e6beaf91f19624 WHIRLPOOL 5148548b281f82804132f5e1157c3bbd452e391e7eb33855631c79e5fb13c6e27e951360b26ada5fe6107e635c1f5f2a66d213bbd33638965d27a7d287987110 -MISC ChangeLog 1411 SHA256 4ad93dcc9656ada74e2ff0b7ca6ab3f21397c613db17575d33be38749f6ffca8 SHA512 bf6f3726332488eb6a8761a98c9a083213b076670a6daee1c7d1fbc78782a71743ebb656394ea6b14e3f1768d05cd24ef147d9547a72d5c5f20ae19a3f10dca4 WHIRLPOOL e307a7162c5c540c6fe3ffb6d8897e3d48117e3c9cd727a1b5d23f1bf23fc2e9bbf55bf33816644e073c35cd6716d3fcbf13c85328418b8ee17e63cd951e10dd +MISC ChangeLog 1641 SHA256 a90902271dbca644d6d921e6e56c5959bf37fabda5a77fbe985d291c34c10f6e SHA512 f79731bd1e3b2535989b7a076177b53a20be4d8c9091c87c2cf5e39e9587ecbd7990ededa5714c7d7c31816be5db8f219254d3938ad6f60ba22c75cda2f8646b WHIRLPOOL 7339f2e8cab83a293ee1d63e20e33909063aec2ec0cb824645946837d88f254a0120a2b87a36bf935328fa26c39a9cacdcb229d10e32ef8c2288625bc3db13bc MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec MISC metadata.xml 819 SHA256 209dfda45798143d24e44a476d11c0c1b6d714069cbdb45e1eda91384d316266 SHA512 2c67e6ef20846e825c2b9f90a4f1d8d69d20bcaeae0b27b4d318944653259e4f0afe4107ed457471f36cb832eefed007bde17f4aa59d8c97062fb641f4adc9d0 WHIRLPOOL cb99e984950e6144a68886606962b66004dc2b97e6930fe350ddb7a0a5bb0e2f4af671f9c9292be803629a05ce7fe4dc2a9ebef422951568e8c2f20aa53b378a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRGBbpAAoJEJ0WA1zPCt1h/VYH/ihcc10d3ibakE+SIOzVg/ye +LgK+t9n+5YbU96t/e7oFTx88e6rW4YTrQulKQLnzo7eMHfegG19+7SqngWNsl/QO +LBdMvJKEddNp3O9VBGWwvJvGmipPzetO6Lsq/fUTjwIT0a3lm1PK2hp9cnsxKuMJ +gSZ5mR0TA6vwYjh/Xl2UwqPfoDlw6v001lBS3/VEdpfK3qyYG5JW7EX4fIZGnqBy +jlH47HEakpQ2G/mwwol6inEPzQTWcY8mVuHhlfZOMHAXGHHzR39N3tSXnYptgra+ +SzBWTrz73R7BBD++3SqJ9Jzky7r8iYErftECU7tsQUMRCvv47yF1FMAvnT0j93M= +=56qy +-----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch b/x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch deleted file mode 100644 index 3cf1e82d738d..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch +++ /dev/null @@ -1,191 +0,0 @@ -From de89546e30db83e6e10f72062b3b5c38814bb64d Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Fri, 27 Apr 2012 12:57:50 -0400 -Subject: [PATCH] Use bookmarks file from gtk-3.0 XDG config dir if present - -Will read from old location if new location isn't found, and will always -write back to the original location the file was read from. - -Adapted from commit ceb3fecd117293387547c284e8294e4cddaa8f17 on the -master branch, based on a patch from -William Jon McCann <jmccann@redhat.com> ---- - gtk/gtkfilesystem.c | 69 +++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 46 insertions(+), 23 deletions(-) - -diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c -index f2897d2..4871904 100644 ---- a/gtk/gtkfilesystem.c -+++ b/gtk/gtkfilesystem.c -@@ -92,6 +92,7 @@ struct GtkFileSystemPrivate - - /* This list contains GtkFileSystemBookmark structs */ - GSList *bookmarks; -+ GFile *bookmarks_file; - - GFileMonitor *bookmarks_monitor; - }; -@@ -206,6 +207,9 @@ gtk_file_system_finalize (GObject *object) - g_slist_free (priv->bookmarks); - } - -+ if (priv->bookmarks_file) -+ g_object_unref (priv->bookmarks_file); -+ - G_OBJECT_CLASS (_gtk_file_system_parent_class)->finalize (object); - } - -@@ -239,7 +243,7 @@ _gtk_file_system_class_init (GtkFileSystemClass *class) - } - - static GFile * --get_bookmarks_file (void) -+get_legacy_bookmarks_file (void) - { - GFile *file; - gchar *filename; -@@ -251,6 +255,19 @@ get_bookmarks_file (void) - return file; - } - -+static GFile * -+get_bookmarks_file (void) -+{ -+ GFile *file; -+ gchar *filename; -+ -+ filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); -+ file = g_file_new_for_path (filename); -+ g_free (filename); -+ -+ return file; -+} -+ - static GSList * - read_bookmarks (GFile *file) - { -@@ -301,6 +318,8 @@ save_bookmarks (GFile *bookmarks_file, - GError *error = NULL; - GString *contents; - GSList *l; -+ GFile *parent_file; -+ gchar *path; - - contents = g_string_new (""); - -@@ -322,16 +341,22 @@ save_bookmarks (GFile *bookmarks_file, - g_free (uri); - } - -- if (!g_file_replace_contents (bookmarks_file, -- contents->str, -- strlen (contents->str), -- NULL, FALSE, 0, NULL, -- NULL, &error)) -+ parent_file = g_file_get_parent (bookmarks_file); -+ path = g_file_get_path (parent_file); -+ if (g_mkdir_with_parents (path, 0700) == 0) - { -- g_critical ("%s", error->message); -- g_error_free (error); -+ if (!g_file_replace_contents (bookmarks_file, -+ contents->str, -+ strlen (contents->str), -+ NULL, FALSE, 0, NULL, -+ NULL, &error)) -+ { -+ g_critical ("%s", error->message); -+ g_error_free (error); -+ } - } -- -+ g_free (path); -+ g_object_unref (parent_file); - g_string_free (contents, TRUE); - } - -@@ -579,6 +604,14 @@ _gtk_file_system_init (GtkFileSystem *file_system) - /* Bookmarks */ - bookmarks_file = get_bookmarks_file (); - priv->bookmarks = read_bookmarks (bookmarks_file); -+ if (!priv->bookmarks) -+ { -+ /* Use the legacy file instead */ -+ g_object_unref (bookmarks_file); -+ bookmarks_file = get_legacy_bookmarks_file (); -+ priv->bookmarks = read_bookmarks (bookmarks_file); -+ } -+ - priv->bookmarks_monitor = g_file_monitor_file (bookmarks_file, - G_FILE_MONITOR_NONE, - NULL, &error); -@@ -591,7 +624,7 @@ _gtk_file_system_init (GtkFileSystem *file_system) - g_signal_connect (priv->bookmarks_monitor, "changed", - G_CALLBACK (bookmarks_file_changed), file_system); - -- g_object_unref (bookmarks_file); -+ priv->bookmarks_file = g_object_ref (bookmarks_file); - } - - /* GtkFileSystem public methods */ -@@ -1097,7 +1130,6 @@ _gtk_file_system_insert_bookmark (GtkFileSystem *file_system, - GSList *bookmarks; - GtkFileSystemBookmark *bookmark; - gboolean result = TRUE; -- GFile *bookmarks_file; - - priv = GTK_FILE_SYSTEM_GET_PRIVATE (file_system); - bookmarks = priv->bookmarks; -@@ -1134,10 +1166,7 @@ _gtk_file_system_insert_bookmark (GtkFileSystem *file_system, - bookmark->file = g_object_ref (file); - - priv->bookmarks = g_slist_insert (priv->bookmarks, bookmark, position); -- -- bookmarks_file = get_bookmarks_file (); -- save_bookmarks (bookmarks_file, priv->bookmarks); -- g_object_unref (bookmarks_file); -+ save_bookmarks (priv->bookmarks_file, priv->bookmarks); - - g_signal_emit (file_system, fs_signals[BOOKMARKS_CHANGED], 0); - -@@ -1153,7 +1182,6 @@ _gtk_file_system_remove_bookmark (GtkFileSystem *file_system, - GtkFileSystemBookmark *bookmark; - GSList *bookmarks; - gboolean result = FALSE; -- GFile *bookmarks_file; - - priv = GTK_FILE_SYSTEM_GET_PRIVATE (file_system); - -@@ -1193,9 +1221,7 @@ _gtk_file_system_remove_bookmark (GtkFileSystem *file_system, - return FALSE; - } - -- bookmarks_file = get_bookmarks_file (); -- save_bookmarks (bookmarks_file, priv->bookmarks); -- g_object_unref (bookmarks_file); -+ save_bookmarks (priv->bookmarks_file, priv->bookmarks); - - g_signal_emit (file_system, fs_signals[BOOKMARKS_CHANGED], 0); - -@@ -1239,7 +1265,6 @@ _gtk_file_system_set_bookmark_label (GtkFileSystem *file_system, - { - GtkFileSystemPrivate *priv; - gboolean changed = FALSE; -- GFile *bookmarks_file; - GSList *bookmarks; - - DEBUG ("set_bookmark_label"); -@@ -1263,9 +1288,7 @@ _gtk_file_system_set_bookmark_label (GtkFileSystem *file_system, - } - } - -- bookmarks_file = get_bookmarks_file (); -- save_bookmarks (bookmarks_file, priv->bookmarks); -- g_object_unref (bookmarks_file); -+ save_bookmarks (priv->bookmarks_file, priv->bookmarks); - - if (changed) - g_signal_emit_by_name (file_system, "bookmarks-changed", 0); --- -1.8.0 - diff --git a/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.15.ebuild index 223ca8ecd238..0a0d39107cb8 100644 --- a/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.15.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild,v 1.2 2012/12/06 06:13:35 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.15.ebuild,v 1.1 2013/02/10 21:53:44 tetromino Exp $ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic gnome.org virtualx autotools @@ -27,11 +27,11 @@ COMMON_DEPEND="!aqua? ( x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage - >=x11-libs/cairo-1.6[X,svg] + >=x11-libs/cairo-1.6:=[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( - >=x11-libs/cairo-1.6[aqua,svg] + >=x11-libs/cairo-1.6:=[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) @@ -40,7 +40,7 @@ COMMON_DEPEND="!aqua? ( >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info - cups? ( net-print/cups ) + cups? ( net-print/cups:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000" DEPEND="${COMMON_DEPEND} @@ -77,9 +77,6 @@ set_gtk2_confdir() { } src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=684787 - epatch "${FILESDIR}/${PN}-2.24.13-gold.patch" - # use an arch-specific config directory so that 32bit and 64bit versions # dont clash on multilib systems epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch" @@ -90,9 +87,6 @@ src_prepare() { # fix building with gir #372953, upstream bug #642085 epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch - # share bookmarks with gtk3 if they are found; in 2.24.14 - epatch "${FILESDIR}/${P}-gtk3-bookmarks.patch" - # marshalers code was pre-generated with glib-2.31, upstream bug #671763 rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ perf/marshalers.c || die @@ -161,20 +155,15 @@ src_prepare() { } src_configure() { - local myconf="$(use_enable xinerama) - $(use_enable cups cups auto) - $(use_enable introspection) - --disable-papi" - if use aqua; then - myconf="${myconf} --with-gdktarget=quartz" - else - myconf="${myconf} --with-gdktarget=x11 --with-xinput" - fi - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} + econf \ + $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ + $(usex aqua "" --with-xinput) \ + $(usex debug --enable-debug=yes "") \ + $(use_enable cups cups auto) \ + $(use_enable introspection) \ + $(use_enable xinerama) \ + --disable-papi } src_test() { @@ -186,7 +175,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install + default set_gtk2_confdir dodir ${GTK2_CONFDIR} @@ -248,4 +237,9 @@ pkg_postinst() { elog "Alternatively, check \"gtk-print-preview-command\" documentation and" elog "add it to your gtkrc." fi + + elog "To make the gtk2 file chooser use 'current directory' mode by default," + elog "edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:" + elog "[Filechooser Settings]" + elog "StartupMode=cwd" } |