summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-11-05 01:10:50 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-11-05 01:10:50 +0000
commit2175a2d9ea26c5b85238601118266829b237f8b9 (patch)
tree64b4d7354585ab2038b1df7144eb40432bab9ac4 /x11-libs/gtk+
parentAdd Makefile to compile respecting CFLAGS. #440966 (diff)
downloadhistorical-2175a2d9ea26c5b85238601118266829b237f8b9.tar.gz
historical-2175a2d9ea26c5b85238601118266829b237f8b9.tar.bz2
historical-2175a2d9ea26c5b85238601118266829b237f8b9.zip
Fix 3.4.4 build failure with uclibc (bug #441634, thanks to Anthony Basile). For 2.24.13-r1, share bookmarks with gtk3, and do not install obsolete env.d file (bug #431018, thanks to Hans). UI tests in gtk2 fail if immodules are not already installed (bug #413185, thanks to Patrick Lauer).
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r--x11-libs/gtk+/ChangeLog13
-rw-r--r--x11-libs/gtk+/Manifest21
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch191
-rw-r--r--x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch52
-rw-r--r--x11-libs/gtk+/gtk+-2.24.12.ebuild11
-rw-r--r--x11-libs/gtk+/gtk+-2.24.13-r1.ebuild249
-rw-r--r--x11-libs/gtk+/gtk+-2.24.13.ebuild13
-rw-r--r--x11-libs/gtk+/gtk+-3.4.4.ebuild7
8 files changed, 544 insertions, 13 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 503b8677693a..0f5c09d69c64 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.619 2012/10/28 16:49:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.620 2012/11/05 01:10:44 tetromino Exp $
+
+*gtk+-2.24.13-r1 (05 Nov 2012)
+
+ 05 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-2.24.12.ebuild,
+ gtk+-2.24.13.ebuild, +gtk+-2.24.13-r1.ebuild,
+ +files/gtk+-2.24.13-gtk3-bookmarks.patch, gtk+-3.4.4.ebuild,
+ +files/gtk+-3.4.4-isnan.patch:
+ Fix 3.4.4 build failure with uclibc (bug #441634, thanks to Anthony Basile).
+ For 2.24.13-r1, share bookmarks with gtk3, and do not install obsolete env.d
+ file (bug #431018, thanks to Hans). UI tests in gtk2 fail if immodules are
+ not already installed (bug #413185, thanks to Patrick Lauer).
28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gtk+-2.24.12.ebuild,
gtk+-3.4.4.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6bb3aa923890..7caa0af16a19 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -10,6 +10,7 @@ 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.0.11-darwin-quartz-introspection.patch 2515 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf SHA512 0f6083de2c58c5077a74fb0a63826cc051d7c21cf190f0bbb6f041bc39b223d03a67f6452be6b1576d3c552205183730dbcec9e88f58d652f5bc088191da4c34 WHIRLPOOL 4ffe179808eefbe84e4f1a1920caa314e7fabbeefc03e2fc2448f28c282071cf88e6c0890dca3b3e72d39d56e25adf96984c40a6d2ffbc373f1ccc7dc6b990a7
AUX gtk+-3.0.12-use-const.patch 8069 SHA256 4fbaf845da7aa757280711fc5e9a4b684b4f0f58ac78dc881336ca2cd0064749 SHA512 0c3dbad7009f8ae29b8cae362e2a2dd88d57bffd3450fecf6fa0adda11c036711b746c9cfd828b34cf50c3dfb8fb868de8b5b595d353746d6e7883b3742aff12 WHIRLPOOL 45b0dceb840aab1c3ff691a565524b54849ec7bc3b2e337b09c2764a1469aad3a196a1ae5c4f09cf2b79b8cd9e5810af5aaf3bb3658d4a80c97b6dcc119e909a
@@ -19,6 +20,7 @@ AUX gtk+-3.2.1-selector.errors 55 SHA256 dfec659411fb82ac9464b07e1675bf428a114f0
AUX gtk+-3.2.4-fallback-theme.patch 2880 SHA256 d021df0cc77b7033b57b62e0a3585c2fe7ae6d50273f0819b5de3acfdb73336c SHA512 59e656746d532ba08e0cf0d1308ef94b04c7fff4b0215bfcee1bd11304f876be7d40570a44145b95767e1bb94fabaa94ccd92442cbcbb9a173bb4d2dc0634311 WHIRLPOOL 094511ba6a42e7e2a6b4702351640e50f5b1182a4b51ebd435fdbd4bce06f45427a03974cb43ab12793286f3cfdf67951ddf0a2d741e09c7e0160e93d9dd1bab
AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804
AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78
+AUX gtk+-3.4.4-isnan.patch 1507 SHA256 5219d12c27fa6deba8da1530c504288ec8cb9629fbcdc7a9c1e2890bc82c6fd8 SHA512 1bbae03def87a92167fcde8800ec5554b240174c07d7f434e45f5ffc7ae64092cbbc04d428d786c001c0efba071f5a6e2f7db5da161fdb2cd94459b58a6e98a3 WHIRLPOOL e27c9d8d8f69a81e693df85576a29e3ef8d0badfa5b0c7325c185699fc4a70790ac3a5c20406c5d1ddd5756bcb6d1dadf8af8cde0ed43f4d931072af6f4a6190
AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
@@ -35,19 +37,24 @@ DIST gtk+-3.6.1.tar.xz 13282048 SHA256 fe6c89ae40145b077d7291105e81d4f876be01bf2
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.10-r1.ebuild 8010 SHA256 4f12e76b0524f05fd8415e9c98759112a7ecf31c592dff2920cb83b4d83e132e SHA512 0397b8911aab9806e928886b8b1f012c84714795f9854b0e8273aa7369e0d878701846eb1fea87e70ed536a7c4da89deb28ebfc7f7b5ba2885882f0fbaf1a3db WHIRLPOOL dc80e5e34d425cb68e814dda44095d663ab0a1bfa88be89c7535f325772f25921070f5c5cea92fd79c14090ab7d4938495d2f85a9f1cf1c817c9a60ce375ccad
-EBUILD gtk+-2.24.12.ebuild 8012 SHA256 097d121d923166f771134776203a3af787d5dc3d78376f1150f5b4a4a72ce610 SHA512 39b37f5753e2aaff4a1a5df8058fe8effaab8890c018a171fe10055ed166c4f063cff5cd02473dff0e4f4d74ad1fc253eb879bbd159b58d2dc290a18e7d63257 WHIRLPOOL 731b4741fb916b2503ddf846f20d240c0f2d6a3ed2bf8ece2824838402f4c55785940c9848b4fbd3ff048a947ab60abf1066fedfe8d07cc3027917c55c29be3e
-EBUILD gtk+-2.24.13.ebuild 7955 SHA256 784d91f944e0dda215551d9ccf758e720471dcdd32905b7a7a7af22ce9230bdf SHA512 a42abd58c4316ad7cfbd524c23d1f03991df8bcd45b61d875a9207eee2d36158226900ca42d0ffceb30e7ca888740ebd17d78128549600037f410671f7032553 WHIRLPOOL 47afdf24d37becf0e702147df645c8527636e42eeb44d9b64b18156a2abf77aa6867cca69d0129917b2775af83ecd5e83a1ea3e896f487c1da9def69942658f3
+EBUILD gtk+-2.24.12.ebuild 8381 SHA256 424540ff6cfcad4eb50f81f68acfd8207d13e0a1841759f15183efdd929ae586 SHA512 f21f4a9ab677d7c54f9c8eefe9554811820f8bf357641f0f4bd01540e2300f0a7f18ede23d2f56cf8a624878f7853e8839fd6c49855457f71ab635715c24b80f WHIRLPOOL 4ccb5570a4f695faa03ec41f8be1e36c1beacc67804d22ac0cfe0db46de07e9884803967bf52b005e2a5428942e2348cdd03a18b4f6dddccd78bcadc52935f1c
+EBUILD gtk+-2.24.13-r1.ebuild 8360 SHA256 3fbe5e59079eda7683e423bd1c1110f6ea8f6455591259dcbbcb08fb49e94cbc SHA512 d6fd065e9c1ce2993c4c1fdfeb8cb6d72b2103c4cd1a5ca949c834853624596a727f3e581117f4f63c44ca72e3357ca03f4f25a9b7bfabdcea0fb89bb580b2a7 WHIRLPOOL ea7397ff5a8ae53a2386d3a988437c7032af74a8050abb5bf25a8fbfcb16158ac1a3793a632075faefa2f8d38aa8df2dc62ee0757a71121f48a7b9c69b484fb6
+EBUILD gtk+-2.24.13.ebuild 8372 SHA256 550c527001c0313b725a3c5613ca1df8d96674cd6684caf48b028420f8d43db8 SHA512 fd715e3997bcd30ccf83052c15d101f3a43e23b51a5efb82fbe9de37779ec1a3db14aac5750787ad9069cbadb928f9aa34a0ee35039f1d753779cf16b1aa0c44 WHIRLPOOL d24d496622291e02050cf8ded92ee1b087a29d6adb9c74254d7766bed48309ddeaa14ce17cb9d50b1425cc07f5be32bdd3f4b1a2bfa2c17f9bd0aa8a6399aeb0
EBUILD gtk+-3.0.12-r1.ebuild 6052 SHA256 80cda3de286f6f2b9e52f6c186a269895e4ea1ae77ba655bd4b785f4049b5d7d SHA512 a7a65917ad15179bf8ba5102ef3105633696d550a86562a3e0595449b7e52bba6428129952ab6b05be5f7742dd9556e4b10094e30475e9cd746fd525c4069fa3 WHIRLPOOL e78e7fe9c95fa2e14a963ea1386762466f9a23f7d2b8a84e969456d82c488afb316daf96770d492c6f1f5dd9338ea31048b99b123d41d580b34f28b008c68b9f
EBUILD gtk+-3.2.4-r1.ebuild 6908 SHA256 b2737bbe64493d2111df0d96686e58055bf5bca9d73e512ad5eb899fc8b2594f SHA512 83dcf74fc3d401d0bd60d4f7a81d4ca3699e442be0d6a06b9dd0d975744c87ea3745f791903341d3fd4809400b3a75f5ba188fe880be490c5513841b9911f715 WHIRLPOOL e32c4c01c7b66fb4d310ddcd1a790207c8efdf1cd0d128a3cf3eba626d64b5ec119bf20f858101290030ef5096c3a477692e840a633b1de16e8316c6b6d86dd1
-EBUILD gtk+-3.4.4.ebuild 6847 SHA256 50e38eb8594c459bba550298c767fadde7f35fc2cb1a4d837539ab2e1e45cc49 SHA512 ce5fbd077512fb806547ce3f47d28915d9f20d72faeb4515605545b0780c207165aa04c5f29e5c5f793991ef6decb381c701560eede43362a25668d03f2ea24d WHIRLPOOL 6fc367647309411d3733c52e66246d375a84e0aa7c9f0664250bf3c9279eda7728ade15a8651767a158e07248238e1fb14f727ecc999b7f8fa9bda047ef8d991
+EBUILD gtk+-3.4.4.ebuild 6949 SHA256 73395e24954b04c5dc6d26e937d9753c7acaab74be5ab75f0c4f09d577ad1858 SHA512 8636178df94525cf033ae874feede58bfd842c65e4ac399980f1c59ad2b4c424b1921d448a2b672cc7e0c58e613992d92efd4f3de25b0720822650d618e97372 WHIRLPOOL 171ac4d84a9f4eb3ac88636c5f469bbfd602e806c9632f6a07ba7338e1eb662365ab49fe86e84b10476a40a0de96efdccac84486f6a843e5f2f1408039f38579
EBUILD gtk+-3.6.0.ebuild 6943 SHA256 0cf5089448f2811b25599bed096790716ff12371b6b8aeef90092ed137a4a90f SHA512 71d6a1d7661b7c6976340fbc6b0a41c02a8a346fc0011636625e88e905cc8b062bbdd2e931e832e2b16aaa8f35bfb4afadffc462c95e58a45aeaadcea021f6a5 WHIRLPOOL 00f44a2737355670e0e614671f847f216dba4e2a19a67bb31ee61d570b185f3e82debed67e2b8a8b2b508ec86780dcadc88fbc1e421ea7c590524e81a9987cc8
EBUILD gtk+-3.6.1.ebuild 6943 SHA256 bbe071fd5e809b82f4dc820504cd68b1b03f874885de32ae503ab9094b162e00 SHA512 59a9069438b22eff8c54a3a1ca1e08d1a0114bb3e9b252a88f93733f24ec31d73c280b51eefabe197d84fab365d1c6c8d15b99243cad46281a792ccf59710f28 WHIRLPOOL fda15a1654f2669490459a0cbc36b3496c2e0db950701d795a9b2b59d4c98417e1dd5c7504885183edaf17ec6791d9f150d8852e003592370f9d979c2d1f0b28
-MISC ChangeLog 96788 SHA256 e5693cda7d6e1b0fa18cb443438524d23006bca4628f9e5d36686f85c5efb5bf SHA512 877e4363321bdf3aab56ec09d27d177dabaa0c7cf2e44c494c7c566b24dd78f7b8367480b9d47979030d8699e0fe3fb702688dcebbaadafed112ebaf8270beaf WHIRLPOOL ba2fd81159b0a6e81034d52c898a37cd398b641b5a394cef3d80150dd603cf32ef2f210e52f38af74db2f888598b6988137cab98207d015ffb08032f479a97df
+MISC ChangeLog 97346 SHA256 a0b8a6184b4db5d59672bd214fa69383d008465f8d0ecadb24fb463fe506ee80 SHA512 adcb5c9637e4a57957afe2244abf51d3b7cd8935eadef66db18b2dbbbafa4de6d298bd288083ff05e230bc52d9432021f22d00505e5a58bf0641cdeba9a4e5ce WHIRLPOOL f5cfedf260529db85c8782130a65a2cbd1dae20d9bcc008730e019079d4ecc109ac8d4bcc9fe50c0ab8a9427d2831b77f115f91967a14f4db6b4b09986a1eec1
MISC metadata.xml 999 SHA256 a1de360baa14695acc4e1012d6c240584b6478572bcd1d656cc6406f9f005fdc SHA512 a3926595f2eb14dbe1d91986ee3b9dfaccaffb2d39c4014efe649ed09e8173cf10ea885b4c255fa13b3e6f10c2961fdd0efce1a08c5b9e99e089d407cef7df29 WHIRLPOOL 8baad7fd68f7e0dfb55bc7b42bdb4889f5970f25317f268e7ebf7e270dc3177f3812de11d1610b2f26611a88ff9b6b704fb097aa08cdbe614bf709653ffb6632
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCNYhUACgkQuQc30/atMkDuuwCfW7TBm/aM525oaJEaUSh+7+PN
-tuIAn0Ykgz7o9vbzL+8+matJFniIdXYT
-=gssi
+iQEcBAEBCAAGBQJQlxIWAAoJEJ0WA1zPCt1hHW0H/3yOU3wqqZ7s2dVIrt+dp16C
+g6lYn8/uPk1wmLPdtobyyVipnjqO3DWDnXD973k6qPixpLBZzl15q7JkiWyd5nHb
+0psysGP3v7Qv8nnhNuAi0pY2sV4QP7y/ZolqGrulhffevjDkVhfNzg2q1Ka5pec9
+CUiQ53bFBve7WJyQKmePdWCpYmVYqFg9hf3FvtJ1c77d0XZdzVFD9MLVXRlxDe0L
+aB/gSiv83T7F7zAKUbHgJFTrrJgdohjF0+gwcIbocvzoU30w1ZJto4AfWLHg5F0J
+ebxkP3SrEv63yRwa6Whym7RZT7quabd8rAZH7wrVfE0gtti+dLPGaDAgzqOLuUU=
+=8tJc
-----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
new file mode 100644
index 000000000000..3cf1e82d738d
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.13-gtk3-bookmarks.patch
@@ -0,0 +1,191 @@
+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+/files/gtk+-3.4.4-isnan.patch b/x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch
new file mode 100644
index 000000000000..710c33b71d19
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch
@@ -0,0 +1,52 @@
+From d6aee922bb5da8254fafdf605951cf5b0150537d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 15 May 2012 13:09:24 +0200
+Subject: [PATCH] Bug 676087-configure.ac: isnan() and isinf() are macros, not
+ functions
+
+The isnan() and isinf() are C99 macros not functions so use
+AC_CHECK_DECL instead of AC_CHECK_FUNCS for those.
+---
+ configure.ac | 3 ++-
+ gdk/fallback-c89.c | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 857d015..c801dd2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -751,7 +751,8 @@ AC_TYPE_UID_T
+
+ # Check for round(), rint(), isnan(), isinf() and nearbyint()
+ AC_CHECK_LIB(m,round,,)
+-AC_CHECK_FUNCS(round rint isnan isinf nearbyint)
++AC_CHECK_FUNCS(round rint nearbyint)
++AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
+
+ # Checks for gdkspawn
+ AC_CHECK_HEADERS(crt_externs.h)
+diff --git a/gdk/fallback-c89.c b/gdk/fallback-c89.c
+index 35dea77..b150044 100644
+--- a/gdk/fallback-c89.c
++++ b/gdk/fallback-c89.c
+@@ -19,7 +19,7 @@
+
+ #include <float.h>
+
+-#ifndef HAVE_ISNAN
++#ifndef HAVE_DECL_ISNAN
+ /* it seems of the supported compilers only
+ * MSVC does not have isnan(), but it does
+ * have _isnan() which does the same as isnan()
+@@ -31,7 +31,7 @@ isnan (double x)
+ }
+ #endif
+
+-#ifndef HAVE_ISINF
++#ifndef HAVE_DECL_ISINF
+ /* Unfortunately MSVC does not have finite()
+ * but it does have _finite() which is the same
+ * as finite() except when x is a NaN
+--
+1.7.12.4
+
diff --git a/x11-libs/gtk+/gtk+-2.24.12.ebuild b/x11-libs/gtk+/gtk+-2.24.12.ebuild
index 13665234501b..037c75d53d48 100644
--- a/x11-libs/gtk+/gtk+-2.24.12.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.12.ebuild,v 1.11 2012/10/28 16:49:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.12.ebuild,v 1.12 2012/11/05 01:10:44 tetromino Exp $
EAPI="4"
@@ -132,6 +132,15 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=617473
sed -i -e 's:pltcheck.sh:$(NULL):g' \
gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
fi
if ! use examples; then
diff --git a/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild
new file mode 100644
index 000000000000..caf4a47e4db5
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.13-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2012 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.1 2012/11/05 01:10:44 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org virtualx autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="!aqua? (
+ x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXt
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ >=x11-libs/cairo-1.6[X,svg]
+ x11-libs/gdk-pixbuf:2[X,introspection?]
+ )
+ aqua? (
+ >=x11-libs/cairo-1.6[aqua,svg]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ )
+ xinerama? ( x11-libs/libXinerama )
+ >=dev-libs/glib-2.30:2
+ >=x11-libs/pango-1.20[introspection?]
+ >=dev-libs/atk-1.29.2[introspection?]
+ media-libs/fontconfig
+ x11-misc/shared-mime-info
+ cups? ( net-print/cups )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ !<gnome-base/gail-1000"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ !aqua? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/damageproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ >=dev-util/gtk-doc-am-1.11
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )"
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Remove blocker after >=vte-0.28.2-r201:0 is stable
+RDEPEND="${COMMON_DEPEND}
+ !<x11-libs/vte-0.28.2-r201:0"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+ # An arch specific config directory is used on multilib systems
+ GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+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"
+
+ # Don't break inclusion of gtkclist.h, upstream bug 536767
+ epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+ # 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
+
+ # Stop trying to build unmaintained docs, bug #349754
+ strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
+ strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
+
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ use ppc64 && append-flags -mminimal-toc
+
+ if ! use test; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+ else
+ # Non-working test in gentoo's env
+ sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+ -i gtk/tests/testing.c || die "sed 1 failed"
+
+ # Cannot work because glib is too clever to find real user's home
+ # gentoo bug #285687, upstream bug #639832
+ # XXX: /!\ Pay extra attention to second sed when bumping /!\
+ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+ || die "failed to disable recentmanager test (1)"
+ sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+ || die "failed to disable recentmanager test (2)"
+ sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+ || die "failed to disable recentmanager test (3)"
+
+ # Skip tests known to fail
+ # https://bugzilla.gnome.org/show_bug.cgi?id=646609
+ sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+ -i "${S}/gtk/tests/testing.c" || die
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=617473
+ sed -i -e 's:pltcheck.sh:$(NULL):g' \
+ gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+ fi
+
+ # http://bugs.gentoo.org/show_bug.cgi?id=371907
+ mkdir -p "${S}/m4" || die
+ mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
+ AT_M4DIR=m4macros eautoreconf
+ # Use elibtoolize in place of eautoreconf when it will be dropped
+ #elibtoolize
+}
+
+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}
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ # Exporting HOME fixes tests using XDG directories spec since all defaults
+ # are based on $HOME. It is also backward compatible with functions not
+ # yet ported to this spec.
+ XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ set_gtk2_confdir
+ dodir ${GTK2_CONFDIR}
+ keepdir ${GTK2_CONFDIR}
+
+ # see bug #133241
+ echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+ insinto /etc/gtk-2.0
+ doins "${T}"/gtkrc
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # add -framework Carbon to the .pc files
+ use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+ sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
+ done
+
+ # dev-util/gtk-builder-convert split off into a separate package, #402905
+ rm "${ED}"usr/bin/gtk-builder-convert
+
+ find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+ set_gtk2_confdir
+
+ # gtk.immodules should be in their CHOST directories respectively.
+ gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
+ || ewarn "Failed to run gtk-query-immodules-2.0"
+
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+ elog "aware location. Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+ fi
+
+ # pixbufs are now handled by x11-libs/gdk-pixbuf
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+ fi
+
+ # two checks needed since we dropped multilib conditional
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+ fi
+
+ if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+ fi
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your gtkrc."
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.13.ebuild b/x11-libs/gtk+/gtk+-2.24.13.ebuild
index c138c03d3816..a48e5a3e8028 100644
--- a/x11-libs/gtk+/gtk+-2.24.13.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.ebuild,v 1.3 2012/10/10 07:44:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.13.ebuild,v 1.4 2012/11/05 01:10:44 tetromino Exp $
EAPI="4"
@@ -77,7 +77,7 @@ 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
@@ -131,6 +131,15 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=617473
sed -i -e 's:pltcheck.sh:$(NULL):g' \
gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
fi
if ! use examples; then
diff --git a/x11-libs/gtk+/gtk+-3.4.4.ebuild b/x11-libs/gtk+/gtk+-3.4.4.ebuild
index 5ad1837d6e0c..5f399ed94a27 100644
--- a/x11-libs/gtk+/gtk+-3.4.4.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.4.ebuild,v 1.10 2012/10/28 16:49:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.4.ebuild,v 1.11 2012/11/05 01:10:44 tetromino Exp $
EAPI="4"
@@ -100,6 +100,9 @@ src_prepare() {
# Apparently needed for new libxkbcommon headers; bug #408131
epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
+ # Build fix for uclibc from gtk+-3.5.x; bug #441634
+ epatch "${FILESDIR}/${PN}-3.4.4-isnan.patch"
+
# Non-working test in gentoo's env
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-i gtk/tests/testing.c || die "sed 1 failed"
@@ -159,7 +162,7 @@ src_test() {
# would result in circular dependencies.
# https://bugzilla.gnome.org/show_bug.cgi?id=669562
if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
- ewarn "Tests will be skipped because >=gnome-themes-standard-3.3.90"
+ ewarn "Tests will be skipped because >=gnome-themes-standard-3.3.91"
ewarn "is not installed. Please re-run tests after installing the"
ewarn "required version of gnome-themes-standard."
return 0