Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-27 17:20:59 +02:00
Code Issues Projects Releases Wiki Activity

webkit-gtk: killed with fire

Browse source
This commit is contained in:
Anton Bolshakov 2014-07-26 02:49:13 +00:00
parent 2568f493e9
commit 799eaf0964
44 changed files with 0 additions and 2339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
net-libs/webkit-gtk/Manifest
View file

@ -1,44 +0,0 @@
AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c
AUX textrel.patch 691 SHA256 dc65c0c8e3f11a4dc7f527241ae4116945490dbc1b0fa9d8b319904249aca022 SHA512 45e163fad37b5bd3b8403dde64d420016fe1854694b60337ed7c06021b29f63b99070201725396c07d6bd6857073da1938c2168ee243ee95e1587d5947f9d3d5 WHIRLPOOL 4b7996d6153d9b22b6227d6410c292408ceef4687e854038a37fcd104a8e4a3d47a1d16de53b21462aec39a38a19fb01508a7dde8043ce681cde9d7cf104cfb5
AUX webkit-gtk-1.10.1-disable-backtrace-uclibc.patch 1056 SHA256 3d899d5d93e4d5c96c7fe1f82ab96038b8a3add8cec001f023badb1a21eebfb2 SHA512 09c9d3f5dc64d1389279d8fba9027772c9d718ea86ec9649deb01841d5b45930ee5fe9bbc61829cb7b2df0e4a05b8acfdaba0dc08b2786eb9c5e39626fe54b98 WHIRLPOOL d7dc3b235465bc4c96eed6d2b79ceb579b7ed6958b95faeab5e8421a286e03bef48bcfb963fa3cd5ef1375a75749b458227d1b4516dddfdb49e15eee1508bb32
AUX webkit-gtk-1.10.2-gcc-4.8.patch 2354 SHA256 9336af033a43f166a67e5e9bdd23b4181225c7695c4011c04783ba7d9becdc81 SHA512 da92230ebbb45c14ed3557bf716f49e2e89c1a7f6fb1e7033f24d6dee407cd4936437eb416724a34d46caf4e83c258e736f0e9c8c7919cbae459ac093bf6ff3b WHIRLPOOL a65c0189ee853ca388aa912ec97d41e4f37280132764519357e5af73653d10207a4ab2ab42dea5a07912f2455082b39f11cf724e1110e0735d6f12287750b072
AUX webkit-gtk-1.10.2-librt.patch 1570 SHA256 27b9cbb716e3a78bfd83351c0ab91ab4caff0d2e52bc5b9002cc281f37c783a4 SHA512 464ea019eab06ef38263fd7c05fb87f92c743eb09fcaf8524ac917d479169f281cfa28f6d1e08fca5dc1100898ddb90690cb057786550a935783cd857e7011d3 WHIRLPOOL 12d1572a14e62b5411e9019e09835a315db57801bc8c5d819cf3a9c276e06ab257aaf694a4337e2b7ff37d5211d5143a33606de68c768f28be5644aa384849e9
AUX webkit-gtk-1.10.2-wifexited.patch 1045 SHA256 c710aa913e86896365920e3eadab28c3efdbb41906b5b1818bdc40023abd0fee SHA512 078a9b5ed0b5c2b0d13d63b871d837d6dace5a9830ff5a25abe2aca12669ea1941b963c0772659975073cd604757655f0ef972dfeb5a64cd817824cad48f7465 WHIRLPOOL d7b35fccef866bc4eabc18dc0bd21bdf8f392c313cfdf5612153cae0fa4d90c8f628de5aa18c13fe812f1c19dee6bc300559229c94c9a7c2c729acc283495442
AUX webkit-gtk-1.11.1-libdl.patch 621 SHA256 e99823ba03b99e6490b53b881f67090112d9b8c2ff30b92666e3c9bb39a5cef0 SHA512 46ebcb3ed83a0d2c5d30627c18013a6d1a481be78672e36fea7fbfaa4459a26700446c1a03054e03e87a7d84ab8990467c23187f62a11349d7ccda42c6a14ccc WHIRLPOOL 2ab17276050dac09dd3e78f9b0761d7484e06b5d288ebe75d798f5fe97714e3a7d8b081d356eee279dd2ddfb42d4838474fe48010f1629f27e1c6ff787c14c53
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434 SHA512 9f1787ee4cb78239475577c46361ef70e2c889ff3ed784c31a4dde638339c25d2f659f9411a11764c5a2d034783b2f47e27860129554196bd5d8faa14a99801f WHIRLPOOL 16c989a480bcb13322f9f620e291efc8fbab86730f4510b54e78145841ba3de2ee2036749ac1856dff69fd043de3fcbe17b0bdb77f11281782be608f71999e0f
AUX webkit-gtk-1.2.5-darwin-quartz.patch 1858 SHA256 694ad79c55d737a919f6246566c5c64a0282caf02fbdb6d371152da49bcf233d SHA512 3179a4da9a6d34883de533e66e135e052da7c9f9fcb14c7b3d0a9dcfad6047408864a0cb0845d5b8f834d9a938644a3f17369df42ac9698707c1d1fec7e848ed WHIRLPOOL d8f208bea4933f5227f8aca4b965167d94caefe3517c83864259a1187f64eeb975257c9b9bef1eb4717cf6ef7248adfec6239a3685b202290829e8144556b8e5
AUX webkit-gtk-1.2.5-darwin8.patch 1152 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6 SHA512 82f63c0954af5ffc37acd7a21ba367b9b3687773d2a3ea777d26cdbadd96f6274bd28388d667e49aec894d90efea481ff097046338e5ec581e79a4cc7b09ac10 WHIRLPOOL 3c94112f4ff8050f7762cdf750074f99903a155ee7795694a27f8f3f3308944a2bd2cad3e96110c5c673be75dd85214ba1105e376a91c3f94076fdd8e8d98808
AUX webkit-gtk-1.2.5-tests-build.patch 526 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383 SHA512 0db9519c2733c8964ba4748fc36abeee7327f7fe7e4fac04c57f83bddbbd88ce8dac40e2752611e371d2e07b604fb4dedf747284a2a3ca294e47f197c43865cb WHIRLPOOL 173fdfa77b9892098fe37e0b1263e8c902830d366b3b08444189eb191a1342533cd45bdd935af6a752313a73abe555ff0fbabb56d966f0db09217b3cd6e53c14
AUX webkit-gtk-1.2.7-libpng15.patch 1657 SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7 SHA512 4fef77d8b36540b83b5df4725a0d00b86324d26e29ec55dbd13117af69a3c59121c87e8a742bb44283d7710de7cf8925aef277ba867450169aab240a11e06a79 WHIRLPOOL 395a1b272f33421680e4bacf020e91de3f4cf88e0dab31a514ae36c4be60a0f19dcd819295108e14532d22b6e88cb7390dd7f272d4cf382aa276ac60e8cf8546
AUX webkit-gtk-1.4.1-libpng15.patch 2571 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705 SHA512 0506e59374bd32233452fb389a8d7d0814b9db63407464655610fbcf893cb5123b4ee2506b753b29ca14b1e366c809928a534d1e6b4108127c5e5625c59b0268 WHIRLPOOL bfa96ab02d12a188693590e2a0e4b2ed187cc5b7ecef2f9ac202d86d2b39d23de1be2fe744cb177f9c128bf2ef4bb243426041e982f8dd22dfabf4bd3eceb433
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
AUX webkit-gtk-1.6.1-double-conversion.patch 1599 SHA256 7699e501785518bce36ebdd4faf2d3ace521fc27e748dfadedd65420de5d1e41 SHA512 fb51220dfa696d9da19ffe62bcff1323e44fa0cb740ef2db5aa27a14073c8ba05aa3f196cc6ba7c59134730624703cf99c20ebc9cd8212b202e558560e96dd34 WHIRLPOOL aa2b112956d541dfbd98263cb9a7761620038883d6a37be057644e772e70990064005b9a610a22c7a53d0e1ab1a6bfb9ac260ec74b666e7932106c83099e1d0e
AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014 SHA512 36b4a8b34b6c37f6a2e05cb87b524a693c638744650fb9e2a99e396513c4f353d327d73dccddace424b8146172315e475e00eff38f0bd4befea0718e36f13f28 WHIRLPOOL 5f8c76464821b2ea822c2add2e05e56c2ae94d49d970e790eefd3defc6784930f3bd78c715920dedfac9e1c85996720e1638ca61391485a4f232733c431670f6
AUX webkit-gtk-1.6.1-sparc-needs-alignment.patch 430 SHA256 870f314ed330b8cb1d7ffc498e2019c001eded83f14dfb4976804f85af403f80 SHA512 9767253267e343b8a0d7f1e255c59e8f803b0c755a8f5b6eb4891688df05dca8629ed52366399502dce8710a6eba5591e3a0ac9ba4d74959c6e89fa7c6fadf77 WHIRLPOOL 9a5d150a6c9a34f6996334b0df969437787d54409fbda5b3ed3eb1c93a0a4bf89f3b50ccdd7b28f0ef36d311dd431208c7c1e88dca8cb2a95b69d87188bd8371
AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 SHA256 96efa5fcd823eca76f24c4d975dda0f7d9cfc439c71807941e895a70d0aea377 SHA512 5822a3a4044bba43e536c793237e8fa3141d6bb68d02f165222b8bd95e8f43e6b5c5ee5539fb980dcb55709c6b14526e14ed2c87e6c258d23fd54d40c6e0da13 WHIRLPOOL e7a0552801c26caca6a46ef64151111bc4d9a0569df53ab3ac0a21c81c1dd538d53ed15f9780fee32e122ec7a8d7903e9ace78983e67e8f4926bb8afc447804e
AUX webkit-gtk-1.7.5-linguas.patch 1447 SHA256 42cf057556cb1493a40b12db87fa91820c0e493e542e211e9aed10c86bcb3d74 SHA512 842cfa7cc16bb225654fd70ce33d81bb51e2d92eed6ab123dca0a4da4eee8a3fd5e7d5e04b113c77e5f4198118ac8e4bea53dcbaf0d924752e01a897e8abfc03 WHIRLPOOL 25c9e0f506bed031536acd6d0d98e2ee2eddf7bed9b66ad570665d3dea27c3377c8698170ea0ff34b6240fb4342c4092278b9e4eda4e768ba0f9b082fcb4d3cc
AUX webkit-gtk-1.7.90-parallel-make-hack.patch 592 SHA256 e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 SHA512 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 WHIRLPOOL 0e405878a137f6ddc2de84ec242cd5fb1ebcf20030a22299a9d6132a8f0c2880ab8718124dec6c89d1d8504bb8bc51a36194a7edad21a766e75c408c96f77ba5
AUX webkit-gtk-1.7.90-test_garbage_collection.patch 597 SHA256 f2ca641430a0ff09001391d649aaf135c151177ce879a29136c78a68f2dfc4d0 SHA512 5d6cbe8977918ef75d9d9d2b3c31815981e85ebe2ddf467577a3de5854aa123b884158fb4c3142ab69e028f32e3715f8d9ace56545236b6bf470af8a3dff42ec WHIRLPOOL c905f847ea9c75eca9f1ba127ab0a46d3c993bef23d5c40b75bfe4fa109bb01d8f3f181c933ac7440308d112bffc5c50f20af735d24b7781b43f742be5e9e888
AUX webkit-gtk-1.8.0-typedef-WebKitWebView.patch 1259 SHA256 7ea519b8212d752c3a794ec7f54b6222defc3c08d8a82b9a11bcea8875e783aa SHA512 9c0451ba7e9bf57474f7f96d2851d874d9b5cec2f55ea9e1f2ce40954214b56d33aa4b23faec74b2fafa886297f438d23b8c6cc1aadd2711ca256a7a6dda9799 WHIRLPOOL 03ad809f64394fad460014d96670318d47aea6e90fb3ccd33ea0d814eb41d41143369faf46fcf4523f43969575b9e3dc878283e7434fbcd22a85356bc92d8bbb
AUX webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch 712 SHA256 a83c1ac0682598600d15f8e682a24ccb660e21ddedd730bc2f52e20b5d21fc6b SHA512 69cdb516edc02fef9cdb94aad7e91383c54349c62804e7881912ad7d0c11e178328a763f2e6d6da2ca0ae688f7d672197afc908acc8744d47dabaf3ba3f87d95 WHIRLPOOL 671840d83230561da9a3bd7d019ad332fcf38aa8e296c8af009f1c5acc2e27021f8f2b75a652c9e39b9df94f95d1cdef1f5066f4bda4bced6cf653916099c822
AUX webkit-gtk-1.8.1-gst-required-version.patch 1321 SHA256 7301b76ccc98d3f9d96bb15c15e543568ef2360277cf85a8c24a93f3d490ce61 SHA512 aa9f2f8ade47fe8c4043cf1194a29fcb3a68feab70a9aa2575b0d366ffaa3786960116099b6f1213488cda20b2e1ea7984e8ec59add01a0d1056f50281ee290d WHIRLPOOL 5d55cb276c29ba6d3c355bb04e60e9789d4e4ce19fd7de71fb72825c95073633c8a36edcf2f547d1b5e42420fbee4b7a1573011c938f88418e00d839216d2508
AUX webkit-gtk-1.8.1-tests-xvfb.patch 1391 SHA256 9ba0bd2364b9c766921b2b4440d1921773dd28a323868703dbf7ae495d52487c SHA512 3e00bf13dfaf0a38b881f8aa66cc25657b8e41aa2f19c0f635f06ff777697228dea442638e00f21cb3ce88c8c13a04b852f90398fab2dfe4114b36096b70f113 WHIRLPOOL 824479742482caba3bfb5c874602d01412c6a25042ae6cf2a63ad1894dfb1ab1c9927a555323ce069b64c6a71ee9c1daf953528df72d38c0670c9aef58b0df75
AUX webkit-gtk-1.8.2-bison-2.6.patch 15829 SHA256 dcbb85c73be96841a69a1be5d01f9b110fa1f6cbc4ebd4e0c6a6470bca6627ef SHA512 a430a1286ad4e9a9ad33680c95e19408e99b2fade3cc5f8b45c6346c2f06316ec62a4736ad754ecec14ee410723d166a1cd4ccbe7cd0a89c6cf07f2a7b551183 WHIRLPOOL 2d41d72dc67da9927dabee09874c482b02691ede9b1e62ccad7a56d3ab6f8fd3ede94ee2393602e2d6b4b488e17a0dfa8eb1143cad956b7288652525efa19ae9
AUX webkit-gtk-1.8.3-bison-3.patch 441 SHA256 01fef0947d7a5cbf936462d3911da677800a0fce27e51b78c949be95918a6ebf SHA512 086298d5d57dd4ad0fbe4620e43876c98371acfe2b555a09f842767a2c07a6deab6a597487e70dbad85cb57e7238e6af4298e85fceb0423c43809e24fb8374fc WHIRLPOOL 90088409541ceb781c0a9926db199746680a52e63cd27b9fff38d304f70a3aa9c530ac1e79aeb4256ee7dcf5910d0f8d8b567a03e63ed57fb3b467e3c30a825e
AUX webkit-gtk-1.8.3-disable-backtrace-uclibc.patch 1007 SHA256 5f4f640991a1822f45f6a97c6aef016fdff411f8ee68b0dfea208cc5b9cc1ed5 SHA512 710da823e0506140239bc5890ce8a47a830ec1dd2ebf2134092e533e0f9041e400d680f65b3a45247a370443bc346b11bfcdea4873d6ddd569650495c724a276 WHIRLPOOL 5cc137dcdcfa858c02daf0be2389cf95a7fd7db88e92ba5e3d251092969c32cef95c0e98a1829fb2cd2ce715ce2b8d49c20602b80d0a71bf99ce1e1d08654c55
AUX webkit-gtk-1.8.3-libdl.patch 874 SHA256 4cc477deb430915a60af6267e0400ea6210e9febea775d6d231aac6c408867b2 SHA512 87cfff6f72d73cf8ca2b9da3d59bef292f97688063bb9c6f8c8b3e0eb4ddfa0242300b5d35e5c6a41d75ee2a0f1e4a2e78a9fee6e702dac619401c8a92efaf99 WHIRLPOOL 1457c87606f9ace7067e93e43a6575e5ccb912ab1fe080f8c868ccbda252e293d24be20ed7e9bfc256cf10caa9441766f82cd4808688eb6ac4336ef646ab9b85
AUX webkit-gtk-1.8.3-spellchecker.patch 792 SHA256 5c68f2c4052f660ab34476006f5fd600c6ba5427079ac83e08e787b7cbe6598c SHA512 a182a22b58aaa9e5efda5b23851d5c224370e03835ff76353f54fceabdb9dc2244c324cf0d3d5069ea8773e32008e671cdc7921846233397d7d9ec44fdf63118 WHIRLPOOL f7060b8c6aa88df85c583c65635a1a1845e1d0a0442d554a618d42759c13b4dbdb23dfb4dd18094915a42bfe8f90399ea84375b4ae6b3d94042947cb6367b0e0
AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cbdc0785af2d2655a6cf6b1ff67072c SHA512 a7d3ab2a2065d18b16d5758c29d63543da1902f71dfb641e5b7d5db0a50c90b443026368b24b9f601d2f63f9eaaea67d3f686492d49068c2b013ad1cf6cf76a9 WHIRLPOOL 7808838f8d5389adb703dce234fa28e2da8266b57576fc70c37d11ea22af3b21a68f0e8600d237fbfc645a2796a7694e75c176035d57df75402f2adef690c4f8
AUX webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 1374 SHA256 2a1b197842fc36607e68cf35fa222eaaf780064cb17bd40cf318ab1f3693f40f SHA512 eeddbc8cf51727b6f69c06f215a58b73704a626f8c0dd05370bda988409ad8b161a6393baafa9af65fd3ef961f9c559280af7626c41f5689684bba79a8570083 WHIRLPOOL 884b5bb0c483fe78bf73ac5a429953a9b084700068bfd923a86150c03ebe4bbd5cf6101c60654f82da19a5f28c617df5d8221e726a254ff250494c30e954d022
AUX webkit-gtk-2.0.4-freetype-2.5.1.patch 2893 SHA256 f1069fa1f7a867bdf894dd6295caac12ff5ed3353aa54ad047b22907c2028205 SHA512 c36cd38a3898daee31c814780e18ea0b0c8b8fe7bca9242564cec93240bc79cd28f59060be9c9dd99ef2e5399c5dc4a11837ea01603abe541d4d9caa902c32c8 WHIRLPOOL 4262e2d3f0c40c17644c3cf4126d13151f445e1acf8adb3654f57afc79544b8b75c6a705a4d11216370484ea85190effb310f1dbfd2d54af1c569c45978c7455
AUX webkit-gtk-2.2.2-freetype-2.5.1.patch 2851 SHA256 5f1fe73fb19c91b44749cdd68452ab124b533001d9e8a1c90f4cb9cbe416a9d8 SHA512 19c51e02189a177ce4a2b4a2f929cacc621e2e453d402c3b0eea91306a1ed6cde638ce62b665301a48c365efc8aedcedb2370ea95555515d4d6c546dc19c569f WHIRLPOOL cfa950c38310effa0eb09c3942d8e321097d783197e5bbcfbf2967a5414d40a8270baf2589765cc12da32ab1b25b26752d9932158b91df404aee2e8ece6fef2c
AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
AUX webkit-gtk-2.2.5-gir-nvidia-hangs.patch 4078 SHA256 843ed737a72f4cb705901efc05ba23442e1eceb21602c21a7593fa81e5b78a51 SHA512 3cb09602a87e7ab0f45ec1ae38f4ac51f2af86a871fe66373723ed1ce911984d5e9ba572b9d46601ac1f14ca8ecabcd21296b7c32cb21f2c1a1fe005248128d0 WHIRLPOOL aefa244dc599729c9fadb0faeb3f217d8b89b3be35ee2e19e86aa84ec2081d1ac35b81a29255992f9d952bf96386af701bf5a31c0f2aeb139b2044b1a0b394d1
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-malloc.patch 780 SHA256 4a057c94f3e83101dc48401897a2e9295106e395bdf2a7abcad8334afb26f22b SHA512 09d3287fb41dbe5f87e483874f9c81b0e5dbcc1eed709285aaa4f0232377ba19865491ed0f2e5a108bbc8f3d486bc6ab30f3c940cb68dc8515c1826b181051df WHIRLPOOL 4f97a8d74b95cdfe1d223391b93c6de0dbe0944fd9872bf81c5e1d357f677ca6650beb73ad44e50dd51dc4505807592b2caaee4010e271cbb6ada772c6b2a72d
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c547a65185b36c314d6f55a7980c640da0a53b56 SHA512 c59c6aed45ce237d68e58e5b03f46dc66ae4b73cd8a78f7eab9429ef3fe13882d0985da33f30fb425e0b5945298502ac35f9888e666c177fe2467f3f1ed35892 WHIRLPOOL f5a55fcaafc203352583e9ded39e79edca8e9d13cb1cf6e6574e905729fc8e9f92ccd75cd9309b66734f91830847164ebe9011c149e17c85af5549bd40b04f90
DIST webkitgtk-2.2.5.tar.xz 9400456 SHA256 c710994a1ed0ec78f746a05ae7dc65369ed56d7475f0de576ca7a73ad9c6e670 SHA512 e412c0bc97b700e76b25c55f12be26e57701c448b5bf2dc060c361be2b85ef7dd2a7d7c178450703cac83f41ebc4f291a562b867453793e553683dac1cb920bd WHIRLPOOL f585b994569130f702f9ac0874066fa045bbc3ebcf0c14d2510920860a3e207130c0c8847e62af232b06ce86489da3cfe5921f37c1ca6ce15c95c7f499d88893
EBUILD webkit-gtk-2.2.5-r200.ebuild 10140 SHA256 b85692080409147a33ac4a53f80eee2534023faea08dce6f7920fcdb2643a656 SHA512 9d6c844be5ba8886981e27a07048f539f129387093e2aa998a42c5b4e346885f5abd25b952cfea2473fe2255063b8120c083a46d38bda78f15c91b26a6e23737 WHIRLPOOL 12fec608b070f9292997e012bc82d98f10b63b68c72872388e0c9b7dfdac83ad8febc882d6681842b2277714a5d150038d668270a10962bd9e2d1e1cccc0aceb

33
net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
View file

@ -1,33 +0,0 @@
#!/bin/bash
# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
# generated by g-ir-scanner.
# PaX marking code stolen from pax-utils.eclass
flags=${1//-}; shift
echo ${LIBTOOL} "$@"
${LIBTOOL} "$@"
retval=$?
files=$(find . -path "*tmp-introspect*/.libs/*")
if type -p paxctl > /dev/null; then
echo "PT PaX marking -${flags} ${files}"
for f in ${files}; do
# First, try modifying the existing PAX_FLAGS header
paxctl -q${flags} "${f}" && continue
# Second, try stealing the (unused under PaX) PT_GNU_STACK header
paxctl -qc${flags} "${f}" && continue
# Third, try pulling the base down a page, to create space and
# insert a PT_GNU_STACK header (works on ET_EXEC)
paxctl -qC${flags} "${f}" && continue
done
elif type -p scanelf > /dev/null; then
# Try scanelf, the Gentoo swiss-army knife ELF utility
# Currently this sets PT if it can, no option to control what it does.
echo "Fallback PaX marking -${flags} ${files}"
scanelf -Xxz ${flags} ${files}
fi
exit ${retval}

20
net-libs/webkit-gtk/files/textrel.patch
View file

@ -1,20 +0,0 @@
2014-02-06 Magnus Granberg <zorry@gentoo.org>
# 70610 b.w.o
Source/WTF/wtf/InlineASM.h: add @plt if we have PIC and x86
to fix the textrel on x86
--- a/Source/WTF/wtf/InlineASM.h 2014-02-17 12:24:03.000000000 +0100
+++ b/Source/WTF/wtf/InlineASM.h 2014-03-06 23:12:45.951530546 +0100
@@ -46,8 +46,10 @@
#define GLOBAL_REFERENCE(name) #name "@plt"
#elif CPU(X86) && COMPILER(MINGW)
#define GLOBAL_REFERENCE(name) "@" #name "@4"
+#elif OS(LINUX) && CPU(X86) && __PIC__
+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
#else
-#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
#endif
#if HAVE(INTERNAL_VISIBILITY)

29
net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch
View file

@ -1,29 +0,0 @@
From: Anthony Basile <blueness@gentoo.org>
Date: Sun, 04 Nov 2012 01:51:27 +0000
webkit-gtk fails to build on a uclibc system because
Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
/usr/include/execinfo.h and provide backtrace(). But uclibc does not. Its
straightforward to extend the test to see if its also a uclibc system and not
include execinfo.h or call backtrace()
--- a/Source/WTF/wtf/Assertions.cpp
+++ b/Source/WTF/wtf/Assertions.cpp
@@ -58,7 +58,7 @@
#include <windows.h>
#endif
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -268,7 +268,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined

55
net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch
View file

@ -1,55 +0,0 @@
2013-04-04 Andras Becsi <andras.becsi@digia.com>
Fix the build with GCC 4.8
https://bugs.webkit.org/show_bug.cgi?id=113147
Initialize JSObject* exception to suppress warnings that make
the build fail because of -Werror=maybe-uninitialized.
* runtime/Executable.cpp:
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):
Fix the build with GCC 4.8
https://bugs.webkit.org/show_bug.cgi?id=113147
Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
since dummy typedefs are commonly used in the codebase.
* wtf/Compiler.h:
diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp
index 8b58b62aa3e39a347fae92961af69484de795a07..057bb43c6777bc4b63b23c0cabf32d106ca0243c 100644
--- a/Source/JavaScriptCore/runtime/Executable.cpp
@@ -515,7 +515,7 @@
UNUSED_PARAM(bytecodeIndex);
#endif
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
- JSObject* exception;
+ JSObject* exception = 0;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForCall ? OptimizingCompilation : FirstCompilation, CodeForCall, exception);
if (!newCodeBlock)
return exception;
@@ -558,7 +558,7 @@
#endif
ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
- JSObject* exception;
+ JSObject* exception = 0;
OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForConstruct ? OptimizingCompilation : FirstCompilation, CodeForConstruct, exception);
if (!newCodeBlock)
return exception;
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
index e11747fb6519fe59560b47aabbe5480e98a9f155..b886f37151292851f311306b90fa5b9bc2880e06 100644
--- a/Source/WTF/wtf/Compiler.h
+++ b/Source/WTF/wtf/Compiler.h
@@ -122,6 +122,9 @@
/* Specific compiler features */
#if COMPILER(GCC) && !COMPILER(CLANG)
+#if GCC_VERSION_AT_LEAST(4, 8, 0)
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1

49
net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch
View file

@ -1,49 +0,0 @@
From 3c499aa2a70b06b40a64fb5699622ff458e4ee0f Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sun, 25 Nov 2012 03:26:42 +0100
Subject: [PATCH] [GTK] Explicitly link against librt
Fixes broken build with undefined references to shm_open / shm_unlink
symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
https://bugs.webkit.org/show_bug.cgi?id=103194
---
ChangeLog | 12 ++++++++++++
Source/WebKit2/ChangeLog | 12 ++++++++++++
Source/WebKit2/GNUmakefile.am | 1 +
configure.ac | 7 +++++++
4 files changed, 32 insertions(+)
diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
index 9a02bbd..c775990 100644
--- a/Source/WebKit2/GNUmakefile.am
+++ b/Source/WebKit2/GNUmakefile.am
@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \
$(PANGO_LIBS) \
$(PNG_LIBS) \
$(SHLWAPI_LIBS) \
+ $(SHM_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
$(XRENDER_LIBS) \
diff --git a/configure.ac b/configure.ac
index 4e1f0e8..97980e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then
if test "$have_gtk_unix_printing" = "yes"; then
AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
fi
+
+ # On some Linux/Unix platforms, shm_* may only be available if linking
+ # against librt
+ if test "$os_win32" = "no"; then
+ AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
+ AC_SUBST(SHM_LIBS)
+ fi
fi
# Plugin Process
--
1.8.0

25
net-libs/webkit-gtk/files/webkit-gtk-1.10.2-wifexited.patch
View file

@ -1,25 +0,0 @@
WIFEXITED definitions: POSIX documents this in stdlib.h as optional, and is
defined there on linux, but on FreeBSD it is not, so we need to include
sys/wait.h where POSIX mandates it to be.
--- webkitgtk-1.10.2/Source/WebKit2/UIProcess/Plugins/gtk/PluginProcessProxyGtk.cpp.old 2013-01-28 20:38:45.000000000 -0300
+++ webkitgtk-1.10.2/Source/WebKit2/UIProcess/Plugins/gtk/PluginProcessProxyGtk.cpp 2013-01-28 20:39:10.000000000 -0300
@@ -35,6 +35,7 @@
#include <glib.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
+#include <sys/wait.h> // WIFEXITED
using namespace WebCore;
--- webkitgtk-1.10.2/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.old 2013-01-28 20:40:26.000000000 -0300
+++ webkitgtk-1.10.2/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2013-01-28 20:40:46.000000000 -0300
@@ -38,6 +38,7 @@
#include <wtf/text/WTFString.h>
#include <wtf/gobject/GOwnPtr.h>
#include <wtf/gobject/GlibUtilities.h>
+#include <sys/wait.h> // WIFEXITED
#if OS(LINUX)
#include <sys/prctl.h>

24
net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch
View file

@ -1,24 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=96602
--- configure.ac (revision 132329)
+++ configure.ac (working copy)
@@ -278,6 +278,10 @@
AC_SUBST([OLE32_LIBS])
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
@@ -1039,7 +1043,7 @@
if test "$enable_glx" = "yes"; then
acceleration_backend_description+=", glx"
fi
- OPENGL_LIBS+=" -ldl"
+ OPENGL_LIBS+=" $DLOPEN_LIBS"
acceleration_backend_description+=")"
fi
AC_SUBST([OPENGL_LIBS])

10
net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
View file

@ -1,10 +0,0 @@
--- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
+++ configure.ac 2013-03-02 09:24:56.725213764 +0200
@@ -24,6 +24,7 @@
m4_include([Source/autotools/SetupLibtool.m4])
m4_include([Source/autotools/ReadCommandLineArguments.m4])
m4_include([Source/autotools/FindDependencies.m4])
+GTK_DOC_CHECK([1.10])
m4_include([Source/autotools/SetupCompilerFlags.m4])
m4_include([Source/autotools/SetupAutoconfHeader.m4])

65
net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
View file

@ -1,65 +0,0 @@
Description: Fixup pool and add sparc support
--- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
+++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
@@ -127,7 +127,7 @@ namespace WTF {
: m_freeList(pool())
, m_isDoneWithInitialFreeList(false)
{
- memset(m_pool.pool, 0, sizeof(m_pool.pool));
+ memset(m_pool, 0, sizeof(m_pool));
}
Node* allocate()
@@ -171,7 +171,7 @@ namespace WTF {
}
private:
- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
+ Node* pool() { return reinterpret_cast<Node*>(m_pool); }
Node* pastPool() { return pool() + m_poolSize; }
bool inPool(Node* node)
@@ -182,10 +182,7 @@ namespace WTF {
Node* m_freeList;
bool m_isDoneWithInitialFreeList;
static const size_t m_poolSize = 256;
- union {
- char pool[sizeof(Node) * m_poolSize];
- double forAlignment;
- } m_pool;
+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
};
template<typename ValueArg> struct ListHashSetNode {
--- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
+++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
if (string->length() != length)
return false;
+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
--- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
+++ webkit-1.2.1/WebCore/platform/text/StringHash.h
@@ -54,13 +54,13 @@ namespace WebCore {
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
const UChar* aChars = a->characters();
const UChar* bChars = b->characters();
- for (unsigned i = 0; i != aLength; ++i) {
+ for (unsigned i = 0; i != aLength; ++i)
if (*aChars++ != *bChars++)
return false;
- }
+
return true;
#else
/* Do it 4-bytes-at-a-time on architectures where it's safe */

79
net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch
View file

@ -1,79 +0,0 @@
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
--- Source/WebCore/plugins/gtk/gtk2xtbin.c
+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
@@ -41,7 +41,7 @@
* The GtkXtBin widget allows for Xt toolkit code to be used
* inside a GTK application.
*/
-
+#if 0
#include "GtkVersioning.h"
#include "xembed.h"
#include "gtk2xtbin.h"
@@ -951,3 +951,4 @@
return;
}
+#endif
--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -60,10 +60,13 @@
#include "runtime_root.h"
#include <runtime/JSLock.h>
#include <runtime/JSValue.h>
+#include "NotImplemented.h"
#include <gdkconfig.h>
#include <gtk/gtk.h>
+#undef XP_UNIX
+
#if defined(XP_UNIX)
#include "gtk2xtbin.h"
#define Bool int // this got undefined somewhere
@@ -441,9 +444,9 @@
event->setDefaultHandled();
}
-#if defined(XP_UNIX)
void PluginView::handleFocusInEvent()
{
+#if defined(XP_UNIX)
XEvent npEvent;
initXEvent(&npEvent);
@@ -453,10 +456,12 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
+#endif
}
void PluginView::handleFocusOutEvent()
{
+#if defined(XP_UNIX)
XEvent npEvent;
initXEvent(&npEvent);
@@ -466,8 +471,8 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
-}
#endif
+}
void PluginView::setParent(ScrollView* parent)
{
@@ -797,8 +802,8 @@
}
if (m_isWindowed) {
-#if defined(XP_UNIX)
GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+#if defined(XP_UNIX)
if (m_needsXEmbed) {
// If our parent is not anchored the startup process will

33
net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch
View file

@ -1,33 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=39847
additionally, also on Darwin8 glib stuff includes system headers that
use isascii, so we can't have it die on that.
--- JavaScriptCore/wtf/FastMalloc.cpp
+++ JavaScriptCore/wtf/FastMalloc.cpp
@@ -1381,14 +1381,12 @@
// Bytes allocated from system
uint64_t system_bytes_;
-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
// Number of pages kept in free lists that are still committed.
Length free_committed_pages_;
// Minimum number of free committed pages since last scavenge. (Can be 0 if
// we've committed new pages since the last scavenge.)
Length min_free_committed_pages_since_last_scavenge_;
-#endif
bool GrowHeap(Length n);
--- WebCore/config.h
+++ WebCore/config.h
@@ -125,7 +125,7 @@
// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
// Also generates errors on wx on Windows, presumably because these functions
// are used from wx headers.
-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(BUILDING_ON_TIGER)
#include <wtf/DisallowCType.h>
#endif

22
net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
View file

@ -1,22 +0,0 @@
Do not build tests if not requested to.
--- a/GNUmakefile.am 2010-12-21 17:23:58.000000000 +0100
+++ b/GNUmakefile.am 2010-12-21 17:24:28.000000000 +0100
@@ -46,7 +46,8 @@
# Libraries and support components
bin_PROGRAMS :=
+check_PROGRAMS :=
noinst_PROGRAMS :=
noinst_HEADERS :=
noinst_LTLIBRARIES :=
lib_LIBRARIES :=
@@ -541,7 +541,7 @@
include WebKit/gtk/po/GNUmakefile.am
# Build unit tests
-noinst_PROGRAMS += $(TEST_PROGS)
+check_PROGRAMS += $(TEST_PROGS)
webkit_tests_cflags = \
-fno-strict-aliasing \

36
net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch
View file

@ -1,36 +0,0 @@
--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -242,9 +242,9 @@
png_structp png = m_reader->pngPtr();
png_infop info = m_reader->infoPtr();
- png_uint_32 width = png->width;
- png_uint_32 height = png->height;
+ png_uint_32 width = png_get_image_width(png, info);
+ png_uint_32 height = png_get_image_height(png, info);
// Protect against large images.
- if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
+ if (width > cMaxPNGSize || height > cMaxPNGSize) {
longjmp(JMPBUF(png), 1);
return;
@@ -319,7 +319,12 @@
if (m_reader->decodingSizeOnly()) {
- // If we only needed the size, halt the reader.
+ // If we only needed the size, halt the reader.
+#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5))
+ // '0' argument to png_process_data_pause means: Do not cache unprocessed data.
+ m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0));
+#else
m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
png->buffer_size = 0;
+#endif
}
}
@@ -344,5 +349,5 @@
buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
- if (m_reader->pngPtr()->interlaced)
+ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE)
m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
}

57
net-libs/webkit-gtk/files/webkit-gtk-1.4.1-libpng15.patch
View file

@ -1,57 +0,0 @@
diff --git a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index 8edfe36..44cb98c 100644
--- a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -226,7 +226,11 @@ static ColorProfile readColorProfile(png_structp png, png_infop info)
#ifdef PNG_iCCP_SUPPORTED
char* profileName;
int compressionType;
- char* profile;
+#if (PNG_LIBPNG_VER < 10500)
+ png_charp profile;
+#else
+ png_bytep profile;
+#endif
png_uint_32 profileLength;
if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
ColorProfile colorProfile;
@@ -241,11 +245,11 @@ void PNGImageDecoder::headerAvailable()
{
png_structp png = m_reader->pngPtr();
png_infop info = m_reader->infoPtr();
- png_uint_32 width = png->width;
- png_uint_32 height = png->height;
+ png_uint_32 width = png_get_image_width(png, info);
+ png_uint_32 height = png_get_image_height(png, info);
// Protect against large images.
- if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
+ if (width > cMaxPNGSize || height > cMaxPNGSize) {
longjmp(JMPBUF(png), 1);
return;
}
@@ -318,9 +322,14 @@ void PNGImageDecoder::headerAvailable()
m_reader->setHasAlpha(channels == 4);
if (m_reader->decodingSizeOnly()) {
- // If we only needed the size, halt the reader.
+ // If we only needed the size, halt the reader.
+#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5))
+ // '0' argument to png_process_data_pause means: Do not cache unprocessed data.
+ m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0));
+#else
m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
png->buffer_size = 0;
+#endif
}
}
@@ -343,7 +352,7 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
// For PNGs, the frame always fills the entire image.
buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
- if (m_reader->pngPtr()->interlaced)
+ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE)
m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
}

67
net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
View file

@ -1,67 +0,0 @@
Original from:
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
Adapted for 1.6.1
--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -70,6 +70,8 @@
#endif
#include <gtk/gtk.h>
+#undef XP_UNIX
+
#if defined(XP_UNIX)
#include "RefPtrCairo.h"
#include "gtk2xtbin.h"
@@ -439,9 +441,9 @@
event->setDefaultHandled();
}
-#if defined(XP_UNIX)
void PluginView::handleFocusInEvent()
{
+#if defined(XP_UNIX)
if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
return;
@@ -454,10 +456,12 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
+#endif
}
void PluginView::handleFocusOutEvent()
{
+#if defined(XP_UNIX)
if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
return;
@@ -470,8 +474,8 @@
event.detail = NotifyDetailNone;
dispatchNPEvent(npEvent);
-}
#endif
+}
void PluginView::setParent(ScrollView* parent)
{
--- Source/WebCore/plugins/gtk/gtk2xtbin.c
+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
@@ -41,7 +41,7 @@
* The GtkXtBin widget allows for Xt toolkit code to be used
* inside a GTK application.
*/
-
+#if 0
#include "GtkVersioning.h"
#include "xembed.h"
#include "gtk2xtbin.h"
@@ -966,3 +966,4 @@
return;
}
+#endif

36
net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
View file

@ -1,36 +0,0 @@
From adad38e6096468a22f62a913cd4cc8fb95e698ec Mon Sep 17 00:00:00 2001
From: "commit-queue@webkit.org"
<commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun, 16 Oct 2011 00:54:05 +0000
Subject: [PATCH] The s390 and s390x architectures both use 64-bit double type
that conforms to the IEEE-754 standard.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
https://bugs.webkit.org/show_bug.cgi?id=69940
Patch by Dan Horák <dan@danny.cz> on 2011-10-15
Reviewed by Gavin Barraclough.
* wtf/dtoa/utils.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
Source/JavaScriptCore/ChangeLog | 11 +++++++++++
Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +-
2 files changed, 12 insertions(+), 1 deletions(-)
Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
===================================================================
--- webkit-1.6.1.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:44:37.000000000 -0200
+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:46:41.928885576 -0200
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)

29
net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch
View file

@ -1,29 +0,0 @@
From 9adb931bd0899eaa53aa77a57a296b75ece8f0dc Mon Sep 17 00:00:00 2001
From: "kov@webkit.org" <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 20 Oct 2011 15:00:16 +0000
Subject: [PATCH] [GTK] webkitgtk's pkgconfig file needs to require
javascriptcoregtk
https://bugs.webkit.org/show_bug.cgi?id=70500
Reviewed by Philippe Normand.
* webkit.pc.in: add javascriptcoregtk to Requires
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
Source/WebKit/gtk/ChangeLog | 9 +++++++++
Source/WebKit/gtk/webkit.pc.in | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
Index: webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in
===================================================================
--- webkit-1.6.1.orig/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:36:14.000000000 -0200
+++ webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:38:06.180793290 -0200
@@ -6,6 +6,6 @@
Name: WebKit
Description: Web content engine for GTK+
Version: @VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@

12
net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
View file

@ -1,12 +0,0 @@
diff -aur a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
--- a/Source/JavaScriptCore/wtf/Platform.h 2012-02-25 11:10:13.000000000 +0000
+++ b/Source/JavaScriptCore/wtf/Platform.h 2012-02-25 11:26:17.992010602 +0000
@@ -295,7 +295,7 @@
#endif /* ARM */
-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif

21
net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
View file

@ -1,21 +0,0 @@
diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
--- a/Source/WebKit/gtk/GNUmakefile.am
+++ b/Source/WebKit/gtk/GNUmakefile.am
@@ -269,7 +269,7 @@
WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
- $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+ $(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
--symbol-prefix=webkit \
--identifier-prefix=WebKit \
--namespace=WebKit \
@@ -280,7 +280,7 @@
--include=Soup-2.4 \
--library=webkitgtk-@WEBKITGTK_API_VERSION@ \
--library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
- --libtool="$(LIBTOOL)" \
+ --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
--pkg=gobject-2.0 \
--pkg=gtk+-@GTK_API_VERSION@ \
--pkg=libsoup-2.4 \

47
net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
View file

@ -1,47 +0,0 @@
Respect intltool's LINGUAS variable for building translations.
--- a/webkit-1.7.5/GNUmakefile.am
+++ b/webkit-1.7.5/GNUmakefile.am
@@ -54,6 +54,9 @@
IDL_BINDINGS :=
TEST_PROGS :=
POFILES :=
+PO_LINGUAS :=
+USER_LINGUAS :=
+USE_LINGUAS :=
MOFILES :=
dom_binding_idls :=
wtf_cppflags:=
--- a/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
+++ b/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
@@ -27,7 +27,15 @@
POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
-MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
+PO_LINGUAS += $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFILES))
+
+USER_LINGUAS += $(filter $(LINGUAS),$(PO_LINGUAS))
+
+USE_LINGUAS += $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+MOFILES += $(USE_LINGUAS:%=Source/WebKit/gtk/po/%.mo)
+
+ALL_MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
.po.mo:
test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
@@ -124,11 +132,11 @@
$(top_builddir)/stamp-po
MAINTAINERCLEANFILES += \
- $(MOFILES) \
+ $(ALL_MOFILES) \
$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
DISTCLEANFILES += \
- $(MOFILES) \
+ $(ALL_MOFILES) \
$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
po-install-data-local: all

21
net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
View file

@ -1,21 +0,0 @@
Horrible failure of a hack to enable workaround for
https://bugs.webkit.org/show_bug.cgi?id=79498
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -285,6 +285,15 @@
all-local: stamp-po
$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
+# Horrible hack to enable workaround for parallel make failure
+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
+
+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
+
+all-programs-local: GNUmakefile $(PROGRAMS)
+
+all-data-local: GNUmakefile $(DATA)
+
# remove built sources and program directories
clean-local:
-rm -rf $(GENPROGRAMS)

18
net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
View file

@ -1,18 +0,0 @@
Garbage collection test fails intermittently if icedtea browser plugin is
installed.
--- a/Source/WebKit/gtk/tests/testdomdocument.c
+++ b/Source/WebKit/gtk/tests/testdomdocument.c
@@ -353,12 +353,6 @@
test_dom_document_get_links,
dom_document_fixture_teardown);
- g_test_add("/webkit/domdocument/test_garbage_collection",
- DomDocumentFixture, HTML_DOCUMENT_LINKS,
- dom_document_fixture_setup,
- test_dom_document_garbage_collection,
- dom_document_fixture_teardown);
-
return g_test_run();
}

28
net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch
View file

@ -1,28 +0,0 @@
Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h
===================================================================
--- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h (revision 109222)
+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h (revision 109329)
@@ -34,4 +34,6 @@
typedef struct _WebKitPrintOperation WebKitPrintOperation;
+typedef struct _WebKitFindController WebKitFindController;
+typedef struct _WebKitWebView WebKitWebView;
#ifdef G_OS_WIN32
@@ -47,6 +49,3 @@
#endif
-typedef struct _WebKitFindController WebKitFindController;
-typedef struct _WebKitWebView WebKitWebView;
-
#endif // WebKitDefines_h
Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
===================================================================
--- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (revision 109222)
+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (revision 109329)
@@ -49,5 +49,4 @@
#define WEBKIT_WEB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
-typedef struct _WebKitWebView WebKitWebView;
typedef struct _WebKitWebViewClass WebKitWebViewClass;
typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;

20
net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch
View file

@ -1,20 +0,0 @@
From: Mikhail Khokhlov <mikhail.khokhlov@lge.com>
https://bugs.webkit.org/show_bug.cgi?id=84526
Index: Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
===================================================================
--- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (revision 115562)
+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (working copy)
@@ -1444,9 +1444,10 @@
print IMPL "namespace WebKit {\n\n";
print IMPL @cBodyPriv;
print IMPL "} // namespace WebKit\n\n";
+
+ print IMPL @cBodyProperties;
print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString;
- print IMPL @cBodyProperties;
print IMPL @cBody;
close(IMPL);

29
net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
View file

@ -1,29 +0,0 @@
2012-05-01 Landry Breuil <landry@openbsd.org>
[GTK] Fix gstreamer detection during configure
https://bugs.webkit.org/show_bug.cgi?id=84325
Reviewed by Philippe Normand.
* configure.ac: Fix GSTREAMER_REQUIRED_VERSION and
GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments.
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac (revision 115666)
+++ /trunk/configure.ac (revision 115737)
@@ -343,10 +343,10 @@
case "$with_gstreamer" in
- 0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
- GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
+ 0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
+ GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
GST_API_VERSION=0.10
;;
- 0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
- GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
+ 0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION
+ GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
GST_API_VERSION=0.11
;;

32
net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch
View file

@ -1,32 +0,0 @@
Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasional
test failures.
--- a/Tools/Scripts/run-gtk-tests
+++ b/Tools/Scripts/run-gtk-tests
@@ -147,18 +147,9 @@
def _setup_testing_environment(self):
self._test_env = os.environ
- self._test_env["DISPLAY"] = self._options.display
self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector'))
self._test_env['GSETTINGS_BACKEND'] = 'memory'
- try:
- self._xvfb = self._create_process(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- except Exception as e:
- sys.stderr.write("Failed to run Xvfb: %s\n", e)
- sys.stderr.flush()
- return False
-
# If we cannot start the accessibility daemons, we can just skip the accessibility tests.
if not self._start_accessibility_daemons():
print "Could not start accessibility bus, so skipping TestWebKitAccessibility"
@@ -170,7 +161,6 @@
self._spi_registryd.terminate()
if self._spi_bus_launcher:
self._spi_bus_launcher.terminate()
- self._xvfb.kill();
def _remove_skipped_tests(self):
tests_to_remove = []

508
net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch
View file

@ -1,508 +0,0 @@
2012-07-30 Alexis Menard <alexis.menard@openbossa.org>
Build fix with newer bison 2.6.
https://bugs.webkit.org/show_bug.cgi?id=92264
Reviewed by Adam Barth.
As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
version I had access to as well as recent Linux runs at least version 2.3 so it's safe
to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
No new tests : build fix and the patch should not trigger any regressions
* css/CSSGrammar.y:
* css/CSSParser.cpp:
* xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
* xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
therefore including this file within the namespace {} declarations leads to xpathyyparse being
defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
(generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs
to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
Index: /trunk/Source/WebCore/css/CSSParser.cpp
===================================================================
--- /trunk/Source/WebCore/css/CSSParser.cpp (revision 124098)
+++ /trunk/Source/WebCore/css/CSSParser.cpp (revision 124099)
@@ -115,5 +115,5 @@
#endif
-extern int cssyyparse(void* parser);
+extern int cssyyparse(WebCore::CSSParser*);
using namespace std;
Index: /trunk/Source/WebCore/css/CSSGrammar.y
===================================================================
--- /trunk/Source/WebCore/css/CSSGrammar.y (revision 124098)
+++ /trunk/Source/WebCore/css/CSSGrammar.y (revision 124099)
@@ -54,11 +54,10 @@
#define YYDEBUG 0
-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
-#define YYPARSE_PARAM parser
-#define YYLEX_PARAM parser
-
%}
%pure_parser
+
+%parse-param { CSSParser* parser }
+%lex-param { CSSParser* parser }
%union {
@@ -90,5 +89,5 @@
%{
-static inline int cssyyerror(const char*)
+static inline int cssyyerror(void*, const char*)
{
return 1;
Index: /trunk/Source/WebCore/xml/XPathParser.cpp
===================================================================
--- /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124098)
+++ /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099)
@@ -33,22 +33,19 @@
#include "XPathException.h"
#include "XPathNSResolver.h"
+#include "XPathPath.h"
#include "XPathStep.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringHash.h>
-int xpathyyparse(void*);
-
+using namespace WebCore;
using namespace WTF;
using namespace Unicode;
-
-namespace WebCore {
-namespace XPath {
-
-class LocationPath;
-
-#include "XPathGrammar.h"
+using namespace XPath;
+
+extern int xpathyyparse(WebCore::XPath::Parser*);
+#include "XPathGrammar.h"
Parser* Parser::currentParser = 0;
-
+
enum XMLCat { NameStart, NameCont, NotPartOfName };
@@ -631,4 +628,2 @@
}
-}
-}
Index: /trunk/Source/WebCore/xml/XPathGrammar.y
===================================================================
--- /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124098)
+++ /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099)
@@ -35,4 +35,5 @@
#include "XPathPath.h"
#include "XPathPredicate.h"
+#include "XPathStep.h"
#include "XPathVariableReference.h"
#include <wtf/FastMalloc.h>
@@ -45,6 +46,4 @@
#define YYDEBUG 0
#define YYMAXDEPTH 10000
-#define YYPARSE_PARAM parserParameter
-#define PARSER static_cast<Parser*>(parserParameter)
using namespace WebCore;
@@ -54,4 +53,5 @@
%pure_parser
+%parse-param { WebCore::XPath::Parser* parser }
%union
@@ -72,5 +72,5 @@
static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
-static void xpathyyerror(const char*) { }
+static void xpathyyerror(void*, const char*) { }
%}
@@ -119,5 +119,5 @@
OrExpr
{
- PARSER->m_topExpr = $1;
+ parser->m_topExpr = $1;
}
;
@@ -139,5 +139,5 @@
{
$$ = new LocationPath;
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
@@ -151,5 +151,5 @@
$$ = $2;
$$->insertFirstStep($1);
- PARSER->unregisterParseNode($1);
+ parser->unregisterParseNode($1);
}
;
@@ -160,6 +160,6 @@
$$ = new LocationPath;
$$->appendStep($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->registerParseNode($$);
}
|
@@ -167,5 +167,5 @@
{
$$->appendStep($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
|
@@ -174,6 +174,6 @@
$$->appendStep($2);
$$->appendStep($3);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
}
;
@@ -184,9 +184,9 @@
if ($2) {
$$ = new Step(Step::ChildAxis, *$1, *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, *$1);
- PARSER->deleteNodeTest($1);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($1);
+ parser->registerParseNode($$);
}
|
@@ -195,6 +195,6 @@
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
@@ -202,9 +202,9 @@
if ($2) {
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
- PARSER->deletePredicateVector($2);
+ parser->deletePredicateVector($2);
} else
$$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -213,9 +213,9 @@
if ($3) {
$$ = new Step($1, *$2, *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, *$2);
- PARSER->deleteNodeTest($2);
- PARSER->registerParseNode($$);
+ parser->deleteNodeTest($2);
+ parser->registerParseNode($$);
}
|
@@ -224,6 +224,6 @@
String localName;
String namespaceURI;
- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
- PARSER->m_gotNamespaceError = true;
+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
+ parser->m_gotNamespaceError = true;
YYABORT;
}
@@ -231,9 +231,9 @@
if ($3) {
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
- PARSER->deletePredicateVector($3);
+ parser->deletePredicateVector($3);
} else
$$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
- PARSER->deleteString($2);
- PARSER->registerParseNode($$);
+ parser->deleteString($2);
+ parser->registerParseNode($$);
}
|
@@ -260,6 +260,6 @@
$$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
@@ -267,6 +267,6 @@
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
- PARSER->deleteString($1);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->registerNodeTest($$);
}
|
@@ -274,7 +274,7 @@
{
$$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
- PARSER->deleteString($1);
- PARSER->deleteString($3);
- PARSER->registerNodeTest($$);
+ parser->deleteString($1);
+ parser->deleteString($3);
+ parser->registerNodeTest($$);
}
;
@@ -294,6 +294,6 @@
$$ = new Vector<Predicate*>;
$$->append(new Predicate($1));
- PARSER->unregisterParseNode($1);
- PARSER->registerPredicateVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerPredicateVector($$);
}
|
@@ -301,5 +301,5 @@
{
$$->append(new Predicate($2));
- PARSER->unregisterParseNode($2);
+ parser->unregisterParseNode($2);
}
;
@@ -316,5 +316,5 @@
{
$$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -324,5 +324,5 @@
{
$$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
|
@@ -330,5 +330,5 @@
{
$$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
- PARSER->registerParseNode($$);
+ parser->registerParseNode($$);
}
;
@@ -338,6 +338,6 @@
{
$$ = new VariableReference(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -350,6 +350,6 @@
{
$$ = new StringExpression(*$1);
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -357,6 +357,6 @@
{
$$ = new Number($1->toDouble());
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -370,6 +370,6 @@
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->registerParseNode($$);
}
|
@@ -379,7 +379,7 @@
if (!$$)
YYABORT;
- PARSER->deleteString($1);
- PARSER->deleteExpressionVector($3);
- PARSER->registerParseNode($$);
+ parser->deleteString($1);
+ parser->deleteExpressionVector($3);
+ parser->registerParseNode($$);
}
;
@@ -390,6 +390,6 @@
$$ = new Vector<Expression*>;
$$->append($1);
- PARSER->unregisterParseNode($1);
- PARSER->registerExpressionVector($$);
+ parser->unregisterParseNode($1);
+ parser->registerExpressionVector($$);
}
|
@@ -397,5 +397,5 @@
{
$$->append($3);
- PARSER->unregisterParseNode($3);
+ parser->unregisterParseNode($3);
}
;
@@ -413,7 +413,7 @@
$$->addSubExpression($1);
$$->addSubExpression($3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -431,7 +431,7 @@
$3->setAbsolute(true);
$$ = new Path(static_cast<Filter*>($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
@@ -441,8 +441,8 @@
$3->setAbsolute(true);
$$ = new Path(static_cast<Filter*>($1), $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($2);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($2);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -454,7 +454,7 @@
{
$$ = new Filter($1, *$2);
- PARSER->unregisterParseNode($1);
- PARSER->deletePredicateVector($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->deletePredicateVector($2);
+ parser->registerParseNode($$);
}
;
@@ -466,7 +466,7 @@
{
$$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -478,7 +478,7 @@
{
$$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -490,7 +490,7 @@
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -502,7 +502,7 @@
{
$$ = new EqTestOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -514,7 +514,7 @@
{
$$ = new NumericOp(NumericOp::OP_Add, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
|
@@ -522,7 +522,7 @@
{
$$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -534,7 +534,7 @@
{
$$ = new NumericOp($2, $1, $3);
- PARSER->unregisterParseNode($1);
- PARSER->unregisterParseNode($3);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($1);
+ parser->unregisterParseNode($3);
+ parser->registerParseNode($$);
}
;
@@ -547,6 +547,6 @@
$$ = new Negative;
$$->addSubExpression($2);
- PARSER->unregisterParseNode($2);
- PARSER->registerParseNode($$);
+ parser->unregisterParseNode($2);
+ parser->registerParseNode($$);
}
;

15
net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch
View file

@ -1,15 +0,0 @@
can't rely on YYLEX_PARAM calling yylex correctly, so use %lex-param
instead. fixes building with bison-3.
https://bugs.gentoo.org/485818
--- Source/ThirdParty/ANGLE/src/compiler/glslang.y
+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
@@ -32,6 +32,7 @@
%expect 1 /* One shift reduce conflict because of if | else */
%pure-parser
%parse-param {TParseContext* context}
+%lex-param {TParseContext* context}
%union {
struct {

29
net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
View file

@ -1,29 +0,0 @@
From: Anthony Basile <blueness@gentoo.org>
Date: Sun, 04 Nov 2012 01:51:27 +0000
webkit-gtk fails to build on a uclibc system because
Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
/usr/include/execinfo.h and provide backtrace(). But uclibc does not. Its
straightforward to extend the test to see if its also a uclibc system and not
include execinfo.h or call backtrace().
--- a/Source/JavaScriptCore/wtf/Assertions.cpp
+++ b/Source/JavaScriptCore/wtf/Assertions.cpp
@@ -52,7 +52,7 @@
#include <windows.h>
#endif
-#if OS(DARWIN) || OS(LINUX)
+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -249,7 +249,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if OS(DARWIN) || OS(LINUX)
+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined

27
net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch
View file

@ -1,27 +0,0 @@
https://bugs.gentoo.org/show_bug.cgi?id=417523
https://bugs.webkit.org/show_bug.cgi?id=96602
Index: configure.ac
===================================================================
--- configure.ac (revision 128398)
+++ configure.ac (working copy)
@@ -268,6 +268,10 @@
AC_SUBST([OLE32_LIBS])
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
@@ -554,7 +558,7 @@
if test "$enable_webgl" = "yes" || test "$with_accelerated_compositing" = "opengl" ; then
AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
- OPENGL_LIBS="-lGL -ldl"
+ OPENGL_LIBS="-lGL $DLOPEN_LIBS"
fi
AC_SUBST([OPENGL_LIBS])

12
net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch
View file

@ -1,12 +0,0 @@
diff -Naur webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
--- webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp 2012-12-16 14:58:49.658580218 +0100
+++ webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp 2012-12-16 14:59:05.546538356 +0100
@@ -141,7 +141,7 @@
for (; dicts; dicts = dicts->next) {
EnchantDict* dict = static_cast<EnchantDict*>(dicts->data);
- if (enchant_dict_check(dict, word.get(), wordLength)) {
+ if (enchant_dict_check(dict, word.get(), bytes)) {
*misspellingLocation = start;
*misspellingLength = wordLength;
} else {

27
net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
View file

@ -1,27 +0,0 @@
https://bugs.gentoo.org/show_bug.cgi?id=417523
https://bugs.webkit.org/show_bug.cgi?id=96602
Index: configure.ac
===================================================================
--- configure.ac (revision 128397)
+++ configure.ac (working copy)
@@ -278,6 +278,10 @@
AC_SUBST([OLE32_LIBS])
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
@@ -1124,7 +1128,7 @@
fi
if test "$with_acceleration_backend" = "opengl"; then
- OPENGL_LIBS="-lGL -ldl"
+ OPENGL_LIBS="-lGL $DLOPEN_LIBS"
fi
AC_SUBST([OPENGL_LIBS])

32
net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
View file

@ -1,32 +0,0 @@
2013-05-30 Alberto Garcia <agarcia@igalia.com>
[GTK] Needs to check for harfbuzz-icu
https://bugs.webkit.org/show_bug.cgi?id=116978
Reviewed by Xan Lopez.
HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
also need to check for it in order to get the necessary flags for
the compiler and the linker.
We keep this conditional for now since we still want to support
earlier versions of HarfBuzz.
* Source/autotools/FindDependencies.m4:
Index: /trunk/Source/autotools/FindDependencies.m4
===================================================================
--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
@@ -376,4 +376,11 @@
[cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
fi
+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
+# Since we support earlier HarfBuzz versions we keep this conditional for now.
+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
+fi
AC_SUBST([FREETYPE_CFLAGS])
AC_SUBST([FREETYPE_LIBS])

63
net-libs/webkit-gtk/files/webkit-gtk-2.0.4-freetype-2.5.1.patch
View file

@ -1,63 +0,0 @@
diff -bur Source-Old/WebCore/ChangeLog Source/WebCore/ChangeLog
--- Source-Old/WebCore/ChangeLog 2014-01-03 17:02:12.986019512 -0500
+++ Source/WebCore/ChangeLog 2014-01-03 17:05:19.242746641 -0500
@@ -1,3 +1,19 @@
+2013-12-02 Andres Gomez <agomez@igalia.com>
+
+ [GTK] Fails to build with freetype 2.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=125074
+
+ Reviewed by Carlos Garcia Campos.
+
+ FreeType specifies a canonical way of including their own
+ headers. Now, we are following this recommendation so the
+ compilation won't be broken again due to an upgrade in FeeType's
+ including paths.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+ * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
+
2013-05-03 Xabier Rodriguez Calvar <calvaris@igalia.com>
[GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
diff -bur Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
--- Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
+++ Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:07:05.353299934 -0500
@@ -29,6 +29,8 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include <wtf/text/WTFString.h>
#if !PLATFORM(EFL)
diff -bur Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
--- Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
+++ Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:06:34.064841946 -0500
@@ -43,6 +43,9 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_TAGS_H
#include <unicode/normlzr.h>
#include <wtf/MathExtras.h>
#include <wtf/unicode/Unicode.h>
diff -bur Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
--- Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:02:12.963019175 -0500
+++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:10:17.954121668 -0500
@@ -39,8 +39,9 @@
#include "TextEncoding.h"
#include <cairo-ft.h>
#include <cairo.h>
-#include <freetype/freetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
#include <hb.h>
#include <wtf/text/CString.h>

63
net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch
View file

@ -1,63 +0,0 @@
diff -bur Source-Old/WebCore/ChangeLog Source/WebCore/ChangeLog
--- Source-Old/WebCore/ChangeLog 2013-11-11 20:57:19.000000000 +1100
+++ Source/WebCore/ChangeLog 2014-01-19 10:57:59.164325097 +1100
@@ -1,3 +1,19 @@
+2013-12-02 Andres Gomez <agomez@igalia.com>
+
+ [GTK] Fails to build with freetype 2.5.1
+ https://bugs.webkit.org/show_bug.cgi?id=125074
+
+ Reviewed by Carlos Garcia Campos.
+
+ FreeType specifies a canonical way of including their own
+ headers. Now, we are following this recommendation so the
+ compilation won't be broken again due to an upgrade in FeeType's
+ including paths.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+ * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
+
2013-09-24 Lorenzo Tilve <ltilve@igalia.com>
[GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
diff -bur Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
--- Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
+++ Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-01-03 17:07:05.353299934 -0500
@@ -29,6 +29,8 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
#include <wtf/text/WTFString.h>
#if !PLATFORM(EFL)
diff -bur Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
--- Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:02:12.965019204 -0500
+++ Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2014-01-03 17:06:34.064841946 -0500
@@ -43,6 +43,9 @@
#include <cairo-ft.h>
#include <cairo.h>
#include <fontconfig/fcfreetype.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
+#include FT_TRUETYPE_TAGS_H
#include <unicode/normlzr.h>
#include <wtf/MathExtras.h>
#include <wtf/unicode/Unicode.h>
diff -bur Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
--- Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:02:12.963019175 -0500
+++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2014-01-03 17:10:17.954121668 -0500
@@ -39,8 +39,9 @@
#include "TextEncoding.h"
#include <cairo-ft.h>
#include <cairo.h>
-#include <freetype/freetype.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
#include <hb.h>
#include <wtf/text/CString.h>

45
net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch
View file

@ -1,45 +0,0 @@
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Wed, 27 Nov 2013 23:36:41 +0100
Subject: [PATCH] Build unittests on demand
--- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100
+++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100
@@ -51,6 +51,7 @@
# Libraries and support components
bin_PROGRAMS :=
noinst_PROGRAMS :=
+check_PROGRAMS :=
libexec_PROGRAMS :=
noinst_DATA :=
noinst_HEADERS :=
--- a/Source/WebKit/gtk/GNUmakefile.am
+++ b/Source/WebKit/gtk/GNUmakefile.am
@@ -446,7 +446,7 @@ webkit_tests_ldflags = \
-no-fast-install
if ENABLE_WEBKIT1
-noinst_PROGRAMS += \
+check_PROGRAMS += \
Programs/unittests/testapplicationcache \
Programs/unittests/testcontextmenu \
Programs/unittests/testdomdocument \
--- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
@@ -25,12 +25,12 @@ TEST_PROGS += \
Programs/WebKit2APITests/TestWebKitWebViewGroup \
Programs/WebKit2APITests/TestWebViewEditor
-noinst_PROGRAMS += $(TEST_PROGS)
+check_PROGRAMS += $(TEST_PROGS)
if HAVE_ATSPI2
TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility
-noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
+check_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
endif
webkit2_tests_cppflags = \
--
1.8.3.2

103
net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
View file

@ -1,103 +0,0 @@
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Wed, 03 Feb 2014 23:47:39 +0100
Subject: [PATCH] Build unittests on demand
--- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100
+++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100
@@ -51,6 +51,9 @@
# Libraries and support components
bin_PROGRAMS :=
noinst_PROGRAMS :=
+check_PROGRAMS :=
+check_LTLIBRARIES :=
+check_DATA :=
libexec_PROGRAMS :=
noinst_DATA :=
noinst_HEADERS :=
--- a/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:44:52.534272572 +0100
+++ b/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:45:41.711783299 +0100
@@ -1,8 +1,8 @@
-noinst_LTLIBRARIES += \
+check_LTLIBRARIES += \
Libraries/libTestWebKitAPIMain.la
if ENABLE_WEBKIT2
-noinst_LTLIBRARIES += \
+check_LTLIBRARIES += \
Libraries/libTestWebKit2GtkAPI.la
endif
@@ -111,14 +111,14 @@
Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
-noinst_PROGRAMS += \
+check_PROGRAMS += \
Programs/TestWebKitAPI/WTF/TestWTF \
Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
Programs/TestWebKitAPI/WebCore/TestWebCore \
Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
if ENABLE_WEBKIT1
-noinst_PROGRAMS += \
+check_PROGRAMS += \
Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
@@ -150,7 +150,7 @@
endif
if ENABLE_WEBKIT2
-noinst_PROGRAMS += \
+check_PROGRAMS += \
Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
@@ -179,7 +179,7 @@
Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
if HAVE_ATSPI2
-noinst_PROGRAMS += \
+check_PROGRAMS += \
Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
endif
@@ -627,7 +627,7 @@
Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp
if ENABLE_WEBKIT2
-noinst_LTLIBRARIES += \
+check_LTLIBRARIES += \
Libraries/libTestWebKitAPIInjectedBundle.la
endif # ENABLE_WEBKIT2
@@ -684,7 +684,7 @@
if ENABLE_WEBKIT2
-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
+check_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
endif
Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
@@ -711,7 +711,7 @@
if ENABLE_WEBKIT2
-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
+check_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
endif
Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
@@ -747,7 +747,7 @@
DISTCLEANFILES += \
Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
-noinst_DATA += \
+check_DATA += \
Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
--
1.8.3.2

95
net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
View file

@ -1,95 +0,0 @@
Description: deadlock in gobject introspection
Bug-Dyson: http://osdyson.org/issues/161
Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960
Stack:
25849: /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp
----------------- lwp# 1 / thread# 1 --------------------
fffffd7ffeeaf957 lwp_park (0, 0, 0)
fffffd7ffeea8036 mutex_lock_impl () + 156
fffffd7ffeea810b mutex_lock () + b
fffffd7ffee340fa _preexec_atfork_unload () + 3a
fffffd7ffee343ab _preexec_exit_handlers () + bb
fffffd7fff5ccf0d purge_exit_handlers () + 10d
fffffd7fff5cec18 remove_hdl () + ce8
fffffd7fff5c8895 dlclose_core () + c5
fffffd7fff5c88e5 dlclose_intn () + 15
fffffd7fff5c89bb dlclose_check () + 7b
fffffd7fff5c8a21 dlclose () + 41
fffffd7ffaa03c41 px_module_manager_load () + 191
fffffd7ffaa03cf6 px_module_manager_load_dir () + 66
fffffd7ffaa050d7 px_proxy_factory_new () + 107
fffffd7ffb201671 ???????? ()
fffffd7feca30eca g_type_create_instance () + 16a
fffffd7feca1597c ???????? ()
fffffd7feca17472 g_object_newv () + 792
fffffd7feca17aec g_object_new () + ec
fffffd7fece5d052 ???????? ()
fffffd7fece5d1d8 ???????? ()
fffffd7fc98659a5 ???????? ()
fffffd7feca173f6 g_object_newv () + 716
fffffd7feca17aec g_object_new () + ec
fffffd7fc986da24 soup_session_add_feature_by_type () + e4
fffffd7fc986fb43 ???????? ()
fffffd7feca17e00 g_object_set_valist () + 300
fffffd7feca186d7 g_object_set () + e7
fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7
fffffd7fc48da299 webkitExit() () + 9
fffffd7ffee33f56 _exithandle () + 66
fffffd7ffee1e191 exit () + 11
00000000004086af ???????? ()
000000000040724c _start () + 6c
----------------- lwp# 2 / thread# 2 --------------------
fffffd7ffeeaf957 lwp_park (0, 0, 0)
fffffd7ffeea94bf cond_wait_queue () + 4f
fffffd7ffeea9b12 __cond_wait () + b2
fffffd7ffeea9b42 cond_wait () + 22
fffffd7ffeea9b79 pthread_cond_wait () + 9
fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b
fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138
fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19
fffffd7ffeeaf617 _thrp_setup () + 77
fffffd7ffeeaf910 _lwp_start ()
----------------- lwp# 3 / thread# 3 --------------------
fffffd7ffeeaf957 lwp_park (0, 0, 0)
fffffd7ffeea8036 mutex_lock_impl () + 156
fffffd7ffeea810b mutex_lock () + b
fffffd7ffee33e17 atexit_locks () + 17
fffffd7ffee58ce9 libc_prepare_atfork () + 9
fffffd7ffee34533 _prefork_handler () + 33
fffffd7ffee9fc85 forkx () + 275
fffffd7ffee9fcab fork () + b
fffffd7fec68aacb ???????? ()
fffffd7fec68b2a7 g_spawn_sync () + 167
fffffd7fec68b994 g_spawn_command_line_sync () + 74
fffffd7feceb2748 ???????? ()
fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9
fffffd7fecebd11e ???????? ()
fffffd7fecec4643 g_bus_get_sync () + 63
fffffd7ffc60700b ???????? ()
fffffd7ffc60714f ???????? ()
fffffd7fec648ad0 g_main_context_dispatch () + 130
fffffd7fec648e40 ???????? ()
fffffd7fec648f08 g_main_context_iteration () + 38
fffffd7ffc606f65 ???????? ()
fffffd7fec66d50d ???????? ()
fffffd7ffeeaf617 _thrp_setup () + 77
fffffd7ffeeaf910 _lwp_start ()
Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp
===================================================================
--- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-02 00:06:10.504150531 +0400
+++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-03 14:08:05.956932011 +0400
@@ -564,6 +564,14 @@
WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
+ // http://osdyson.org/issues/161
+ // WebKitGTK FTBFS when building GObject introspection due to deadlock.
+ // When gobject introspection is done, a simple program call exit()
+ // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session()
+ // -> ResourceHandle::defaultSession() => default session doesn't exist! AND
+ // we try to create it! Thus deadlock. So, create default session earlier:
+ (void) webkit_get_default_session();
+
atexit(webkitExit);
}

20
net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
View file

@ -1,20 +0,0 @@
Index: webkitgtk/Source/WTF/wtf/Platform.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/Platform.h
+++ webkitgtk/Source/WTF/wtf/Platform.h
@@ -72,6 +72,15 @@
#define WTF_CPU_BIG_ENDIAN 1
#endif
+/* CPU(HPPA) - HP PARISC */
+#if defined(__hppa__)
+#define WTF_CPU_HPPA 1
+#define WTF_CPU_BIG_ENDIAN 1
+#define ENABLE_JIT 0
+#define ENABLE_YARR_JIT 0
+#define ENABLE_ASSEMBLER 0
+#endif
+
/* CPU(IA64) - Itanium / IA-64 */
#if defined(__ia64__)
#define WTF_CPU_IA64 1

20
net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
View file

@ -1,20 +0,0 @@
Description: Fix wide pointer issues on ia64 (closes: #642750).
Author: Stephan Schreiber <info@fs-driver.org>
Index: webkitgtk/Source/WTF/wtf/Platform.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/Platform.h
+++ webkitgtk/Source/WTF/wtf/Platform.h
@@ -705,6 +705,13 @@
#define ENABLE_JIT 1
#endif
+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
+ some memory barriers are missing in the thread-unsafe code around the
+ pagemap_cache_ object. */
+#if CPU(IA64) || CPU(IA64_32)
+#define USE_SYSTEM_MALLOC 1
+#endif
+
/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
#if !defined(ENABLE_JIT) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \

12
net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
View file

@ -1,12 +0,0 @@
--- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100
+++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100
@@ -79,6 +79,9 @@
#if !defined(__LP64__)
#define WTF_CPU_IA64_32 1
#endif
+#define ENABLE_JIT 0
+#define ENABLE_YARR_JIT 0
+#define ENABLE_ASSEMBLER 0
#endif
/* CPU(MIPS) - MIPS 32-bit */

23
net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
View file

@ -1,23 +0,0 @@
$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
https://bugs.webkit.org/show_bug.cgi?id=86835
Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
--- Source/WTF/wtf/Atomics.h.orig Sat Aug 3 18:10:38 2013
+++ Source/WTF/wtf/Atomics.h Sun Oct 20 11:06:14 2013
@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
+#elif COMPILER(GCC) && CPU(SPARC64)
+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+
+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
+
+inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
+inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
+
#endif
#if OS(WINDOWS)

304
net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
View file

@ -1,304 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild,v 1.10 2014/03/09 12:03:40 pacho Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
HOMEPAGE="http://www.webkitgtk.org/"
SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="2"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
# bugs 372493, 416331
REQUIRED_USE="
geoloc? ( introspection )
introspection? ( gstreamer )
gles2? ( egl )
webgl? ( ^^ ( gles2 opengl ) )
!webgl? ( ?? ( gles2 opengl ) )
"
# use sqlite, svg by default
RDEPEND="
dev-libs/libxml2:2
dev-libs/libxslt
media-libs/harfbuzz:=[icu(+)]
media-libs/libwebp:=
virtual/jpeg:0=
>=media-libs/libpng-1.4:0=
>=x11-libs/cairo-1.10:=[X]
>=dev-libs/glib-2.36.0:2
>=dev-libs/icu-3.8.1-r1:=
>=net-libs/libsoup-2.42.0:2.4[introspection?]
dev-db/sqlite:3=
>=x11-libs/pango-1.30.0.0
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/gtk+-2.24.10:2
egl? ( media-libs/mesa[egl] )
geoloc? ( app-misc/geoclue:0 )
gles2? ( media-libs/mesa[gles2] )
gstreamer? (
>=media-libs/gstreamer-1.2:1.0
>=media-libs/gst-plugins-base-1.2:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
libsecret? ( app-crypt/libsecret )
opengl? ( virtual/opengl )
spell? ( >=app-text/enchant-0.22:= )
webgl? (
x11-libs/cairo[opengl]
x11-libs/libXcomposite
x11-libs/libXdamage )
"
# paxctl needed for bug #407085
# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-lang/perl
|| (
virtual/rubygems[ruby_targets_ruby20]
virtual/rubygems[ruby_targets_ruby21]
virtual/rubygems[ruby_targets_ruby19]
virtual/rubygems[ruby_targets_ruby18] )
>=dev-libs/atk-2.8.0
>=dev-util/gtk-doc-am-1.10
dev-util/gperf
>=sys-devel/bison-2.4.3
>=sys-devel/flex-2.5.33
|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
sys-devel/gettext
>=sys-devel/make-3.82-r4
virtual/pkgconfig
introspection? ( jit? ( sys-apps/paxctl ) )
test? (
dev-lang/python:2.7
dev-python/pygobject:3[python_targets_python2_7]
x11-themes/hicolor-icon-theme
jit? ( sys-apps/paxctl ) )
"
S="${WORKDIR}/${MY_P}"
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
# nvidia_check || die #463960
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
fi
if ! test-flag-CXX -std=c++11; then
die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
fi
}
pkg_setup() {
# nvidia_check || die #463960
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
replace-flags -ggdb -g
ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
ewarn "large for current binutils releases (bug #432784) and has very"
ewarn "high temporary build space and memory requirements."
ewarn "If you really want to build ${PN} with \"-ggdb\", add"
ewarn "WEBKIT_GTK_GGDB=yes"
ewarn "to your make.conf file."
fi
einfo "You need to have at least 18GB of temporary build space available"
einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
einfo "not be enough, as the total space requirements depend on the flags"
einfo "(-ggdb vs -g1) and enabled features."
check-reqs_pkg_setup
fi
[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/textrel.patch
DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
# intermediate MacPorts hack while upstream bug is not fixed properly
# https://bugs.webkit.org/show_bug.cgi?id=28727
use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
# Don't force -O2
sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die
# Build-time segfaults under PaX with USE="introspection jit", bug #404215
#if use introspection && use jit; then
# epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
# cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
#fi
# We need to reset some variables to prevent permissions problems and failures
# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
gnome2_environment_reset
# Failing tests
# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
# * keyevents is interactive
# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
# * webdatasource test needs a network connection and intermittently fails with icedtea-web
# * webplugindatabase intermittently fails with icedtea-web, bug #????
sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-i Source/WebKit/gtk/GNUmakefile.am || die
# Respect CC, otherwise fails on prefix #395875
tc-export CC
# bug #459978, upstream bug #113397
epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
# Do not build unittests unless requested, upstream bug #128163
epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
# Deadlock causing infinite compilations with nvidia-drivers:
# https://bugs.gentoo.org/show_bug.cgi?id=463960
# http://osdyson.org/issues/161
# https://bugs.webkit.org/show_bug.cgi?id=125651
epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
# Debian patches to fix support for some arches
# https://bugs.webkit.org/show_bug.cgi?id=129540
epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
# https://bugs.webkit.org/show_bug.cgi?id=129542
epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch
# OpenBSD patches to fix support for some arches
# https://bugs.webkit.org/show_bug.cgi?id=86835
epatch "${FILESDIR}"/${PN}-2.2.5-sparc64-build.patch
# Prevent maintainer mode from being triggered during make
AT_M4DIR=Source/autotools eautoreconf
}
src_configure() {
# Arches without JIT support also need this to really disable it in all places
use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
# It doesn't compile on alpha without this in LDFLAGS, bug #???
use alpha && append-ldflags "-Wl,--no-relax"
# Sigbuses on SPARC with mcpu and co., bug #???
use sparc && filter-flags "-mvis"
# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
use ppc64 && append-flags "-mminimal-toc"
# Try to use less memory, bug #469942 (see Fedora .spec for reference)
# --no-keep-memory doesn't work on ia64, bug #502492
if ! use ia64; then
append-ldflags "-Wl,--no-keep-memory"
fi
if ! $(tc-getLD) --version | grep -q "GNU gold"; then
append-ldflags "-Wl,--reduce-memory-overheads"
fi
local myconf=""
if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
myconf="${myconf} RUBY=$(type -P ruby21)"
elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
myconf="${myconf} RUBY=$(type -P ruby20)"
elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
myconf="${myconf} RUBY=$(type -P ruby19)"
else
myconf="${myconf} RUBY=$(type -P ruby18)"
fi
# TODO: Check Web Audio support
# should somehow let user select between them?
#
# * dependency-tracking is required so parallel builds won't fail
econf \
$(use_enable coverage) \
$(use_enable debug) \
$(use_enable egl) \
$(use_enable geoloc geolocation) \
$(use_enable gles2) \
$(use_enable gstreamer video) \
$(use_enable gstreamer web-audio) \
$(use_enable introspection) \
$(use_enable jit) \
$(use_enable libsecret credential_storage) \
$(use_enable opengl glx) \
$(use_enable spell spellcheck) \
$(use_enable webgl) \
$(use_enable webgl accelerated-compositing) \
--with-gtk=2.0 \
--disable-webkit2 \
--enable-dependency-tracking \
--disable-gtk-doc \
$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
${myconf}
}
src_test() {
# Tests expect an out-of-source build in WebKitBuild
ln -s . WebKitBuild || die "ln failed"
# Prevents test failures on PaX systems
use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
unset DISPLAY
# Tests need virtualx, bug #294691, bug #310695
# Parallel tests sometimes fail
Xemake -j1 check
}
src_install() {
# https://bugs.webkit.org/show_bug.cgi?id=129242
MAKEOPTS="${MAKEOPTS} -j1" default
newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
prune_libtool_files
# Prevents crashes on PaX systems
use jit && pax-mark m "${ED}usr/bin/jsc-1"
# File collisions with slot 3
# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
rm -rf "${ED}usr/share/gtk-doc" || die
}
#nvidia_check() {
# if [[ ${MERGE_TYPE} != "binary" ]] &&
# use introspection &&
# has_version '=x11-drivers/nvidia-drivers-325*' &&
# [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
# then
# eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
# eerror "used as the system OpenGL library."
# eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
# eerror "Mesa as the system OpenGL library:"
# eerror " # eselect opengl set xorg-x11"
# eerror "See https://bugs.gentoo.org/463960 for more details."
# eerror
# return 1
# fi
#}