From 0041695a69029511b004aec9cb7ec39fc10d2fe4 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Wed, 12 Nov 2014 14:31:29 +0000 Subject: [PATCH] drop old versions, bump 1.5.9; increase vala version to fix dep warning Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xAABEFD55 --- app-i18n/ibus/ChangeLog | 14 +- app-i18n/ibus/Manifest | 48 +-- .../ibus-1.4.0-machine-id-fallback.patch | 19 - app-i18n/ibus/files/ibus-1.4.1-gir.patch | 11 - .../files/ibus-1.4.1-libxslt-1.1.27.patch | 85 ---- app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch | 29 -- .../ibus/files/ibus-1.5.1-queue-events.patch | 367 ------------------ app-i18n/ibus/files/ibus-1.5.1-setup.patch | 30 -- ...bus-1.5.1-use-system-keyboard-layout.patch | 85 ---- app-i18n/ibus/files/ibus-gconf-2.m4.patch | 49 --- app-i18n/ibus/ibus-1.4.1.ebuild | 163 -------- app-i18n/ibus/ibus-1.4.2.ebuild | 142 ------- app-i18n/ibus/ibus-1.5.5.ebuild | 4 +- app-i18n/ibus/ibus-1.5.8-r1.ebuild | 4 +- app-i18n/ibus/ibus-1.5.9.ebuild | 175 +++++++++ app-i18n/ibus/metadata.xml | 1 - 16 files changed, 211 insertions(+), 1015 deletions(-) delete mode 100644 app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch delete mode 100644 app-i18n/ibus/files/ibus-1.4.1-gir.patch delete mode 100644 app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch delete mode 100644 app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch delete mode 100644 app-i18n/ibus/files/ibus-1.5.1-queue-events.patch delete mode 100644 app-i18n/ibus/files/ibus-1.5.1-setup.patch delete mode 100644 app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch delete mode 100644 app-i18n/ibus/files/ibus-gconf-2.m4.patch delete mode 100644 app-i18n/ibus/ibus-1.4.1.ebuild delete mode 100644 app-i18n/ibus/ibus-1.4.2.ebuild create mode 100644 app-i18n/ibus/ibus-1.5.9.ebuild diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog index 670cbc616004..5cb599390e06 100644 --- a/app-i18n/ibus/ChangeLog +++ b/app-i18n/ibus/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-i18n/ibus # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.150 2014/08/18 08:33:51 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.151 2014/11/12 14:31:12 dlan Exp $ + +*ibus-1.5.9 (12 Nov 2014) + + 12 Nov 2014; Yixun Lan -ibus-1.4.1.ebuild, + -ibus-1.4.2.ebuild, ibus-1.5.5.ebuild, ibus-1.5.8-r1.ebuild, + +ibus-1.5.9.ebuild, -files/ibus-1.4.0-machine-id-fallback.patch, + -files/ibus-1.4.1-gir.patch, -files/ibus-1.4.1-libxslt-1.1.27.patch, + -files/ibus-1.4.1-no-gconf.patch, -files/ibus-1.5.1-queue-events.patch, + -files/ibus-1.5.1-setup.patch, + -files/ibus-1.5.1-use-system-keyboard-layout.patch, + -files/ibus-gconf-2.m4.patch, metadata.xml: + drop old versions, bump 1.5.9; increase vala version to fix dep warning 18 Aug 2014; Yixun Lan ibus-1.5.8-r1.ebuild: rework dconf sed operation diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index b22b19165a8b..80bb67760856 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,38 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX ibus-1.4.0-machine-id-fallback.patch 750 SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed SHA512 7ed7d36ad3bd369d68aa628a364a6b78421489834d70bb76cbb9f8630b69d0bf58b6cf88c409ebbc100201054efd956aa0199d3395f396bf8932e96159f8d221 WHIRLPOOL 4e8495e611f92b0321c11c6343dcabfe5652e4c1e7613b4f315b8a72d88b58c76a1eec31960bbb709fcf639bf5b26890c53d4de44a6e25e1d0e02d050b2d9b0a -AUX ibus-1.4.1-gir.patch 482 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275 SHA512 bec6b63bc5e518fa83c077684365354df9402e70ed7b9c7757b56cd778e0f64b9fa391a7cc6c3e22a2197e6389c58232c3748616758f98bd477f665912674f0c WHIRLPOOL 9261329877eb1221c63eb6568b0e075bc8e7fe188164e06ccfa3ece8ad0c190ff31a2ee5e528550b9c3ad65416a72ceae90ec53d17470c9d54e8a63ffd1c21d1 -AUX ibus-1.4.1-libxslt-1.1.27.patch 3413 SHA256 47c0135a406e450676a06e7d6de24b99a972134f9217bb174bea7b5c3e6737c9 SHA512 983e01eec74eaba037d3cde1dc3485615984ab953d4edeffcf2f1e6eefa833055780a381b772fb296f6d625cc0d94bec75e430f7d72b7e23a5cfae03b0e661fb WHIRLPOOL 8b4385f35aef20fb3489c6a45ab1f4ac9f71abacea9f47acc13fcafbe130c5d74db1522dcbabb541254ea8505009dbe438cf0c5022989ca3dd05811497ccb9b9 -AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2 SHA512 168fefe6d5bb5efdf5e6212ca2ac72ab8a58789cf813c0c280dbbc3788cb70a0d344f9d837e8903b04fed57cdfa98e36f7ca40961b405b969554c384e783a6dd WHIRLPOOL 1fb6f44d7cb24aeaf215c0064bf527af19cd4cf8b0fd767f8ed939103ba3ed1904fd70c591f8f533ec4cc1bc6b6313faf5de7387ec703259639306458fff5206 -AUX ibus-1.5.1-queue-events.patch 13061 SHA256 5ccadbd28e76138f7dfe23fcc87e73d1ba434eae7b0b281172a3921e954e1577 SHA512 e9c0726ff2ff75704cc25af239e59683cf40a9068945f4953e3eb8529bf82ea662917e51bb56aaa3f2cf32966e8824607ad42f187d80a19eec5703f2b76561ae WHIRLPOOL 3ac69997b6f345d34e6e6065a35d064faeb81d51ef2e06d5748a4fee8144ee6a21d6c25738c48a56954ceed6fe2f2ba7bda6f7da5d15a65c1e671812fe490596 -AUX ibus-1.5.1-setup.patch 951 SHA256 9bd2e40af53c165ce5ecee4fdf65fda4b2b754f12302e53cb54a35628eae9b2e SHA512 72f2a3235f679d4c1b541ae7eb4a64c93c01f62f1440b0533d59ea2d1b31afdcf1d9c1965e9200a20dcf2248edf360d14e62df549b0ff4790f49cf1cfaccc1e1 WHIRLPOOL 406a55d81335a62ea6fdfb9d9738265da551188cefd8465fd4d3ccf58c1116a0f43e90aab0926ee88f603fb7a3c4b6d66d5483585533f755c9671e6bbbd8a674 -AUX ibus-1.5.1-use-system-keyboard-layout.patch 3265 SHA256 2b5f28ac04dcb5225f6c26717e7692d2b47bddffd9658dff29b418b0519d5053 SHA512 dfbe7afa955c33edc0735e915f0205fb745ae1354479d345e8493b32e2e5b71e1f92e0d1239a625cc7288db136859b89a1eb7c5d73453fbe8dbea0e4272e5dc2 WHIRLPOOL 320af37e567560822ba5e5ab0451acde3d461459e0a79095117307d9318418374539ac92de79ba02aa823ce7ae745a85fa5a263df614309ee414985346488574 -AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952 -DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf -DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78 -EBUILD ibus-1.4.1.ebuild 4073 SHA256 9db71a96c8bfb8cd8cdfd1286d5a6ba19b7e6b82a3d86221b7dffd67bcd77c83 SHA512 b827c108e5ab4630a546d61406691f58faa771ecd36114123520cdcb8a2650435afc4d2eb433256a1c9040d9beb6bca2f7252dd152018d0da5f3371f1779d68e WHIRLPOOL 9ffcef18d4371a2e0e477a0d384d67394a41b555c40055b5e0759d26db043a90c460ce670821755840fd83bc6848b21b2ede8ba38a5ea174a35e074305de2979 -EBUILD ibus-1.4.2.ebuild 3443 SHA256 a5be7819f46e95e533a4198089f4a83de2d4735919fcb40d7a6ce5f832122478 SHA512 6a85b1f6df59cf70084cdef5c1905b0e63f86b2851c9bac5f77fedd05ba9a97d932f7299a29690a42c4c4f5857a703a66b08b2caa218c88b86a6efd9b99e084d WHIRLPOOL ca5eba00ce47c86cb44123cb60bd68f7da64d7befd4c703f45961e2666995deb19a865f5cc56bf463ca3a0526d3f901f38fee75b2b5d2b75819c81bd11c38310 -EBUILD ibus-1.5.5.ebuild 4431 SHA256 436a947e81d05fdbcc6dcaba8cd4992fe3070a1b9624baa75afef2bc7aa3c714 SHA512 90b1c94ff53f844ec560a014f7b19645dc079b026269df095d01a376f6186d7f9a0241d30bae86682d48aa0111da9c1de09678fc3e366b8e9c1d3a6e4861d314 WHIRLPOOL a6ecf14074769a06a5f3a46c1cb0aaa36146ada01dd6b36a7b6af49567f7a1e98a99157c0ac2ca4e4a54399740533fc35c71e079d6f6d83b53f8c0efc323d08b -EBUILD ibus-1.5.8-r1.ebuild 4363 SHA256 29b10a2af0292cfe9495d323dd9369c04a91d8d64e8b967410476b2a75803b5a SHA512 484edd4c766bf71ec394a05da1439bdbc8ebb8f55b4f049c0d29a1c54306349f7152d5b84ced1369c1fd9acaf06140b8d3b5488ecee4cae85fa852cda855870a WHIRLPOOL 4843b3f6fa377214b414a0fc79dd70c3ea296ae65379da4d7c9b394c1dfb7e4cb93ceb1ed767d029ff37522bc259df5459f428b5737b20275b620f9826da672f -MISC ChangeLog 23008 SHA256 907143b0d00403b133f8b8669ef5b40bb4e042ee906fb5818fdd5631f5fe102b SHA512 7283ca0036bbfbb705467e14d805bc37670c3d50e73588d5d3d678e6ba7a33c726f3ce0cab53251f0064ba9e357a40a4920c9482d2a7bddb0abc375c6c371d86 WHIRLPOOL 0347e36562511bc1d22431d32ea3e7a4e044bb3b0aa3c942331202e82f0dd86e6b9573d4d9a95865fd254f765f5ec676ac6962ce6ae7cd65b57c28831991cd6d -MISC metadata.xml 984 SHA256 3fc098fc1705fd2415044e6fdba35555bdecad080c056ec418c7d53ddb8738c4 SHA512 b768faa0466a08629bd416b575c35b0e7868972d16878e7da79da5837549cbe4a5e5772a06117e7536f3b3b2d2c417afac14e7639747a9a2a1d220b297adffc3 WHIRLPOOL a3050b1d6a123b7a82d067d6fbdb35c941ac6fd902d58ccbb0a4a339f319e67b2dc8ad2f3fc1af521dd981fc3af41c9c4242a15235847856c1feb1f03e4bdc61 +DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221 +EBUILD ibus-1.5.5.ebuild 4429 SHA256 6fc409c6a94eabbae87d069285ac8bd89471975613284c1534b824ce3ce6b868 SHA512 0fed1d0748d34fddef7823ea6d0286c496a1eef12fc0469821cfc3f6d0b54d0f30ed8380a93ad6cf6a323c3d4ae33c83260a8efa11a098183ae5173b80a4daf2 WHIRLPOOL 30503d8d401f80899c40c416866d2190d77c50a952a6f342108a4020a85cd7abeae1e06ad262e6ba7ee65b4b75a4490612eff998205c2bf2ad9b8055b7845e2d +EBUILD ibus-1.5.8-r1.ebuild 4363 SHA256 621c0763552dc28fecd2cb5912ef8d3d13a4885ab0f39f209f36e31648533c44 SHA512 053c147844559354a5d841fe5fced2d5082cfc0f9a06273074c6dc84d6b0f28de1d3709e663021093a863b56b38782151937fd69334bedaab70e118e542bb3ee WHIRLPOOL e96973d988a25df48f31a49326a3e7c52a8d80511afe03ff25427179d989d2b87767c6598e84f403a5ddfae4ad9ffbde6d1e3dcb55bc72ece7055018b6c04c80 +EBUILD ibus-1.5.9.ebuild 4360 SHA256 dc6e53fb76f217ae6822aca80ccd072c595b978825f983adc09116f76bae16ab SHA512 d6b3436aad5fa1972b2b1ca21a05b6974c70615d579735a8649025a9733a542304627d045343024d0f27eca9c1e8d327d96e44e6f5b7d4a665687e6be453d584 WHIRLPOOL 9f3e2a55fd9f51fc1eaf5b6682b5396288b268a469dba54b0b510de69853762d0e36797bdf88d623486afee78d7d146b851964de5756ffbf3b93173902939f98 +MISC ChangeLog 23581 SHA256 20915b5fa239799fcad9030a9c268fb2cb5360610c3ed42e424437e37065ee48 SHA512 0878f0a948086f0f2b40f353567bdba2175fd26a5206aba616460fb2e49fb51476397e4055de5508ddffb4ae0ac33ae075c680edfb2aec15478eaeaf4c83d35a WHIRLPOOL 356b98daa6a5294ede3ad98abf09253be4f7970f67ab9e281b98cfa93ce1ce2dc78c1748573590fc5f7a26b5c63fab2e898e2a72bf5c69222b865a46762df5a7 +MISC metadata.xml 907 SHA256 568c340b720f7300fc7fe240c3e374333315a56875fafd73f02a387709bfeaa7 SHA512 db257d82bf2f810da847b74f1770137288b89c8d6b827e46181d5d2ac8798c5acbdb1bb5ab0d82204f421426242abca912c6ab8ac0c1a4049a8c5944b2c7dd8b WHIRLPOOL 7f5f53519558eb5ee3d2f3db3bf08d1e490c1b5d84d5d76965fda838158facfe18168a32e95eaff1574ca62fde44f6ca95a1bfce3a86af200c8d4d5679054ddd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT8bmrAAoJEJIMDbyqvv1VhlcQAJQmRoWb4PBsk+OqaeUaJxF0 -T73U3qu15iHr2EY1oFJqPZbCbxuvCvki60EJCPYJV3ZO3eap88sshEFWAN+P8Sdj -MyreI8YhjcyaGzMmHB6/BQNJVoLoN+m60I7QEWEDbVdgJ2/KOFM0YHELD5CJyqIR -RY2rp/7vy5kKXeBmt17oYUquCGCwSmtzpxzTT8yf9wbD8rwl+AduN1MmPfcMXSJH -c2JW6WVf9TxsmJUVVem9K4IGUFhW/uIxHujP7BYBnVKG4ZWPxhD3NDGLPd8OSGUh -4gkQLqOFH0KwyxnPd4AFxxh9aJTFCb2iujzxHPZAMpPWYzdEQPnwDGXwcYOToEWS -SJM9m7buCgzqarxEBWlUoIx2JFAiz2o7p5rQq/Nv3rOGgPTvs+oou7cNNScsZi4C -QVSKKDg7+WYqToSjLywMP6NAUhf3SmazPH1+3alFA8kmixiTFr/FhVSTDOj2uZhC -sRS+iIye6gOsh3NXxzBSsgLM8nNYNkC7Tn72evYeamGkDzFIFtMSV3K7WIG3RBqT -wlQfw4o1jTryfc+/F6jfGrMyh1qQHGJOh2D1qMZWOqec4CEBnB1xM86magRjy/Ff -C50Gj3Pjy1o5bY2RVLbueaY+kF/dbgg8TwGVcbgJh+X2EfOXC82eWAtfxEyVMp6L -8vAtOE1DL3KpNDzukymG -=fRAs +iQIcBAEBCAAGBQJUY28+AAoJEJIMDbyqvv1VVicP/1QkKEMMzOiBf0NdmF1IAQDw +kvDe9pvldgRORYg1B509vpzDQm0kjeSiLrs/5q8z//7vcZ8py96u7a/z90dc9yJH +tdUe2L2LXoXJhmxZ7YIiiKw800JOQf+NYqcno6OdOQ8ZuVCTtWr65WTcqWnG3rL9 +N8N8GxrWUqjPO4bUZhy6XiHEkwXd+LWeLuH0mq1pxkUveGaudvgQaqStvW3p7PER +IMCsAQcB5/cLDuXJlZVqWRoa0fHuiFc5zUiXbYmfATmwyOBwsoyj6bjP1vjrXgS7 +/B5vISq4TuEmTV4gWwBt17B3/KF6pfu4odA4MraNj3ZsgMU83f5vykblaszBgH+I +4rgBkJP9HHJwVsDp5M/Abiwp/rT4SHAPJhLeOrRz0B2YFnFz3fLDY+arpRGwhJpc +WRJ7gLkyCBymKTZuGci404yYfmvp14aPZDDIWgnG4CuIVV+JNoVzNG+n1txcpSiD +ktsYpjbmIkLMEzmZ9sPmM+3sYyS5Y3r3uJbaCeShGifaVNhnXotH+IQX7fYX9j0C +a3l6kqRbd6RvAUTx1y7J+QvkAnQXNkZNXkpon9Y6AOX1JNJAuEPPe2y2K8VL9Le8 +08GPxsvxrxkPWi5SRuhMrzbpjkaa1lq6SGkiMMl5YVQ8+fB4G7S7i775C3kviuaf +zEqLOJTV9GkzzPPxbTy6 +=rLSP -----END PGP SIGNATURE----- diff --git a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch b/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch deleted file mode 100644 index 6932e4cda02e..000000000000 --- a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4 - -http://bugs.gentoo.org/390463 - ---- src/ibusshare.c -+++ src/ibusshare.c -@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void) - - if (machine_id == NULL) { - GError *error = NULL; -- if (!g_file_get_contents ("/var/lib/dbus/machine-id", -+ if (!g_file_get_contents ("/etc/machine-id", -+ &machine_id, -+ NULL, -+ NULL) && -+ !g_file_get_contents ("/var/lib/dbus/machine-id", - &machine_id, - NULL, - &error)) { diff --git a/app-i18n/ibus/files/ibus-1.4.1-gir.patch b/app-i18n/ibus/files/ibus-1.4.1-gir.patch deleted file mode 100644 index 91f06c6768b4..000000000000 --- a/app-i18n/ibus/files/ibus-1.4.1-gir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -170,7 +170,7 @@ introspection_files = \ - ibusenumtypes.h \ - $(NULL) - IBus-1.0.gir: $(libibus) Makefile --IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS) -+IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS) - IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0 - IBus_1_0_gir_LIBS = $(libibus) - IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files)) diff --git a/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch b/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch deleted file mode 100644 index 4b135bfd9ad0..000000000000 --- a/app-i18n/ibus/files/ibus-1.4.1-libxslt-1.1.27.patch +++ /dev/null @@ -1,85 +0,0 @@ -Fixes building documents. -https://bugs.gentoo.org/442904 - ---- ibus-1.4.2.orig/docs/reference/ibus/ibus-docs.sgml.in -+++ ibus-1.4.2/docs/reference/ibus/ibus-docs.sgml.in -@@ -74,8 +74,10 @@ - - - -+ - - -+ - - - Configuration -@@ -92,9 +94,6 @@ - Communication - Here lists the service communication functions. - -- -- -- - - - -@@ -104,11 +103,18 @@ - Definition and functions for IBus internal use. - - -- - -- - - - -+ -+ Index -+ -+ -+ -+ Index of deprecated symbols -+ -+ -+ - - ---- ibus-1.4.2.orig/src/ibusobservedpath.h -+++ ibus-1.4.2/src/ibusobservedpath.h -@@ -75,6 +75,7 @@ struct _IBusObservedPath { - IBusSerializable parent; - /* instance members */ - -+ /*< public >*/ - gchar *path; - glong mtime; - gboolean is_dir; ---- ibus-1.4.2.orig/src/ibusproperty.h -+++ ibus-1.4.2/src/ibusproperty.h -@@ -124,15 +124,15 @@ typedef struct _IBusPropListClass IBusPr - - /** - * IBusProperty: -- * @key: Unique Identity for the IBusProperty. -- * @icon: Icon file for the IBusProperty. -- * @label: Text shown in UI. -- * @tooltip: Message shown if mouse hovered the IBusProperty. -- * @sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event. -- * @visible: Whether the IBusProperty is visible. -- * @type: IBusPropType of IBusProperty. -- * @state: IBusPropState of IBusProperty. -- * @sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually -+ * key: Unique Identity for the IBusProperty. -+ * icon: Icon file for the IBusProperty. -+ * label: Text shown in UI. -+ * tooltip: Message shown if mouse hovered the IBusProperty. -+ * sensitive: Whether the IBusProperty is sensitive to keyboard and mouse event. -+ * visible: Whether the IBusProperty is visible. -+ * type: IBusPropType of IBusProperty. -+ * state: IBusPropState of IBusProperty. -+ * sub_props: IBusPropList that contains sub IBusProperties. These IBusProperties are usually - * shown as sub menu item. - * - * UI component for input method engine property. - diff --git a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch deleted file mode 100644 index bdc1f206a2d0..000000000000 --- a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac ---- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900 -+++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900 -@@ -259,23 +259,8 @@ - ) - AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"]) - --if test x"$enable_gconf" = x"yes"; then -- # check gconf -- PKG_CHECK_MODULES(GCONF, -- [gconf-2.0 >= 2.12], -- ) -- -- AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -- if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -- fi -- -- AM_GCONF_SOURCE_2 -- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2 --else -- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) -- enable_gconf="no (disabled, use --enable-gconf to enable)" --fi -+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) -+enable_gconf="no (disabled, use --enable-gconf to enable)" - - # --enable-memconf option. - AC_ARG_ENABLE(memconf, diff --git a/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch b/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch deleted file mode 100644 index 38c3fe9865a9..000000000000 --- a/app-i18n/ibus/files/ibus-1.5.1-queue-events.patch +++ /dev/null @@ -1,367 +0,0 @@ -From 62cd0492e3459416e1775aedc327bced53f66828 Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Wed, 9 Jan 2013 10:14:55 -0500 -Subject: [PATCH] client: Queue events while the IBus context isn't ready - -There are actually 3 patches here. - ---- -client: Queue events while the IBus context isn't ready - -We may lose events that ought to be processed while the IBus context -isn't ready or if the connection to IBus isn't fully established yet. - -To avoid that, enqueue events to be processed later when the IBus -context creation finishes. - ---- -client: Don't cancel an ongoing create input context on another request - -This would only add more delays. - ---- -client: Cancel any ongoing create input context request on finalize - -BUG= - -Review URL: https://codereview.appspot.com/6988047 -Patch from Rui Matos . ---- - client/gtk2/ibusimcontext.c | 220 ++++++++++++++++++++++++++----------------- - 1 file changed, 133 insertions(+), 87 deletions(-) - -diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c -index 011676f..94005b7 100644 ---- a/client/gtk2/ibusimcontext.c -+++ b/client/gtk2/ibusimcontext.c -@@ -40,6 +40,8 @@ - # define IDEBUG(a...) - #endif - -+#define MAX_QUEUED_EVENTS 20 -+ - struct _IBusIMContext { - GtkIMContext parent; - -@@ -63,6 +65,7 @@ struct _IBusIMContext { - - /* cancellable */ - GCancellable *cancellable; -+ GQueue *events_queue; - }; - - struct _IBusIMContextClass { -@@ -154,6 +157,8 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - static GtkIMContextClass *parent_class = NULL; - - static IBusBus *_bus = NULL; -+static guint _daemon_name_watch_id = 0; -+static gboolean _daemon_is_running = FALSE; - - void - ibus_im_context_register_type (GTypeModule *type_module) -@@ -261,6 +266,46 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - gdk_event_free ((GdkEvent *)event); - } - -+static gboolean -+_process_key_event (IBusInputContext *context, -+ GdkEventKey *event) -+{ -+ guint state = event->state; -+ gboolean retval = FALSE; -+ -+ if (event->type == GDK_KEY_RELEASE) { -+ state |= IBUS_RELEASE_MASK; -+ } -+ -+ if (_use_sync_mode) { -+ retval = ibus_input_context_process_key_event (context, -+ event->keyval, -+ event->hardware_keycode - 8, -+ state); -+ } -+ else { -+ ibus_input_context_process_key_event_async (context, -+ event->keyval, -+ event->hardware_keycode - 8, -+ state, -+ -1, -+ NULL, -+ _process_key_event_done, -+ gdk_event_copy ((GdkEvent *) event)); -+ -+ retval = TRUE; -+ } -+ -+ if (retval) { -+ event->state |= IBUS_HANDLED_MASK; -+ } -+ else { -+ event->state |= IBUS_IGNORED_MASK; -+ } -+ -+ return retval; -+} -+ - - /* emit "retrieve-surrounding" glib signal of GtkIMContext, if - * context->caps has IBUS_CAP_SURROUNDING_TEXT and the current IBus -@@ -387,38 +432,7 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - ibusimcontext->time = event->time; - } - -- guint state = event->state; -- if (event->type == GDK_KEY_RELEASE) { -- state |= IBUS_RELEASE_MASK; -- } -- -- if (_use_sync_mode) { -- retval = ibus_input_context_process_key_event ( -- ibuscontext, -- event->keyval, -- event->hardware_keycode - 8, -- state); -- } -- else { -- ibus_input_context_process_key_event_async ( -- ibuscontext, -- event->keyval, -- event->hardware_keycode - 8, -- state, -- -1, -- NULL, -- _process_key_event_done, -- gdk_event_copy ((GdkEvent *) event)); -- retval = TRUE; -- -- } -- -- if (retval) { -- event->state |= IBUS_HANDLED_MASK; -- } -- else { -- event->state |= IBUS_IGNORED_MASK; -- } -+ retval = _process_key_event (ibuscontext, event); - - if (ibusimcontext != NULL) { - /* unref ibusimcontext could call ibus_im_context_finalize here -@@ -450,6 +464,23 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - } - - static void -+daemon_name_appeared (GDBusConnection *connection, -+ const gchar *name, -+ const gchar *owner, -+ gpointer data) -+{ -+ _daemon_is_running = TRUE; -+} -+ -+static void -+daemon_name_vanished (GDBusConnection *connection, -+ const gchar *name, -+ gpointer data) -+{ -+ _daemon_is_running = FALSE; -+} -+ -+static void - ibus_im_context_class_init (IBusIMContextClass *class) - { - IDEBUG ("%s", __FUNCTION__); -@@ -533,6 +564,14 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - /* always install snooper */ - if (_key_snooper_id == 0) - _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); -+ -+ _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, -+ IBUS_SERVICE_IBUS, -+ G_BUS_NAME_WATCHER_FLAGS_NONE, -+ daemon_name_appeared, -+ daemon_name_vanished, -+ NULL, -+ NULL); - } - - static void -@@ -543,6 +582,8 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - gtk_key_snooper_remove (_key_snooper_id); - _key_snooper_id = 0; - } -+ -+ g_bus_unwatch_name (_daemon_name_watch_id); - } - - /* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421. -@@ -602,6 +643,7 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - ibusimcontext->caps = IBUS_CAP_PREEDIT_TEXT | IBUS_CAP_FOCUS; - #endif - -+ ibusimcontext->events_queue = g_queue_new (); - - // Create slave im context - ibusimcontext->slave = gtk_im_context_simple_new (); -@@ -651,6 +693,13 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - - g_signal_handlers_disconnect_by_func (_bus, G_CALLBACK (_bus_connected_cb), obj); - -+ if (ibusimcontext->cancellable != NULL) { -+ /* Cancel any ongoing create input context request */ -+ g_cancellable_cancel (ibusimcontext->cancellable); -+ g_object_unref (ibusimcontext->cancellable); -+ ibusimcontext->cancellable = NULL; -+ } -+ - if (ibusimcontext->ibuscontext) { - ibus_proxy_destroy ((IBusProxy *)ibusimcontext->ibuscontext); - } -@@ -670,6 +719,9 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - pango_attr_list_unref (ibusimcontext->preedit_attrs); - } - -+ g_queue_free_full (ibusimcontext->events_queue, -+ (GDestroyNotify)gdk_event_free); -+ - G_OBJECT_CLASS(parent_class)->finalize (obj); - } - -@@ -681,65 +733,56 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - - IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context); - -- if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) { -- /* If context does not have focus, ibus will process key event in sync mode. -- * It is a workaround for increase search in treeview. -- */ -- gboolean retval = FALSE; -- -- if (event->state & IBUS_HANDLED_MASK) -- return TRUE; -+ if (!_daemon_is_running) -+ return gtk_im_context_filter_keypress (ibusimcontext->slave, event); - -- if (event->state & IBUS_IGNORED_MASK) -- return gtk_im_context_filter_keypress (ibusimcontext->slave, event); -+ /* If context does not have focus, ibus will process key event in -+ * sync mode. It is a workaround for increase search in treeview. -+ */ -+ if (!ibusimcontext->has_focus) -+ return gtk_im_context_filter_keypress (ibusimcontext->slave, event); - -- /* XXX it is a workaround for some applications do not set client window. */ -- if (ibusimcontext->client_window == NULL && event->window != NULL) -- gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, event->window); -+ if (event->state & IBUS_HANDLED_MASK) -+ return TRUE; - -- _request_surrounding_text (ibusimcontext); -+ if (event->state & IBUS_IGNORED_MASK) -+ return gtk_im_context_filter_keypress (ibusimcontext->slave, event); - -- if (ibusimcontext != NULL) { -- ibusimcontext->time = event->time; -- } -+ /* XXX it is a workaround for some applications do not set client -+ * window. */ -+ if (ibusimcontext->client_window == NULL && event->window != NULL) -+ gtk_im_context_set_client_window ((GtkIMContext *)ibusimcontext, -+ event->window); - -- guint state = event->state; -- if (event->type == GDK_KEY_RELEASE) { -- state |= IBUS_RELEASE_MASK; -- } -+ _request_surrounding_text (ibusimcontext); - -- if (_use_sync_mode) { -- retval = ibus_input_context_process_key_event ( -- ibusimcontext->ibuscontext, -- event->keyval, -- event->hardware_keycode - 8, -- state); -- } -- else { -- ibus_input_context_process_key_event_async ( -- ibusimcontext->ibuscontext, -- event->keyval, -- event->hardware_keycode - 8, -- state, -- -1, -- NULL, -- _process_key_event_done, -- gdk_event_copy ((GdkEvent *) event)); -- retval = TRUE; -- } -+ ibusimcontext->time = event->time; - -- if (retval) { -- event->state |= IBUS_HANDLED_MASK; -+ if (ibusimcontext->ibuscontext) { -+ if (_process_key_event (ibusimcontext->ibuscontext, event)) - return TRUE; -- } -- else { -- event->state |= IBUS_IGNORED_MASK; -- return gtk_im_context_filter_keypress (ibusimcontext->slave, event); -- } -+ else -+ return gtk_im_context_filter_keypress (ibusimcontext->slave, -+ event); - } -- else { -- return gtk_im_context_filter_keypress (ibusimcontext->slave, event); -+ -+ /* At this point we _should_ be waiting for the IBus context to be -+ * created or the connection to IBus to be established. If that's -+ * the case we queue events to be processed when the IBus context -+ * is ready. */ -+ g_return_val_if_fail (ibusimcontext->cancellable != NULL || -+ ibus_bus_is_connected (_bus) == FALSE, -+ FALSE); -+ g_queue_push_tail (ibusimcontext->events_queue, -+ gdk_event_copy ((GdkEvent *)event)); -+ -+ if (g_queue_get_length (ibusimcontext->events_queue) > MAX_QUEUED_EVENTS) { -+ g_warning ("Events queue growing too big, will start to drop."); -+ gdk_event_free ((GdkEvent *) -+ g_queue_pop_head (ibusimcontext->events_queue)); - } -+ -+ return TRUE; - } - - static void -@@ -1482,6 +1525,14 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - ibus_input_context_focus_in (ibusimcontext->ibuscontext); - _set_cursor_location_internal (ibusimcontext); - } -+ -+ if (!g_queue_is_empty (ibusimcontext->events_queue)) { -+ GdkEventKey *event; -+ while (event = g_queue_pop_head (ibusimcontext->events_queue)) { -+ _process_key_event (context, event); -+ gdk_event_free ((GdkEvent *)event); -+ } -+ } - } - - g_object_unref (ibusimcontext); -@@ -1494,12 +1545,7 @@ static void _slave_preedit_end_cb (GtkIMContext *slave, - - g_assert (ibusimcontext->ibuscontext == NULL); - -- if (ibusimcontext->cancellable != NULL) { -- /* Cancel previous create input context request */ -- g_cancellable_cancel (ibusimcontext->cancellable); -- g_object_unref (ibusimcontext->cancellable); -- ibusimcontext->cancellable = NULL; -- } -+ g_return_if_fail (ibusimcontext->cancellable == NULL); - - ibusimcontext->cancellable = g_cancellable_new (); - --- -1.7.10 - diff --git a/app-i18n/ibus/files/ibus-1.5.1-setup.patch b/app-i18n/ibus/files/ibus-1.5.1-setup.patch deleted file mode 100644 index 54d0f35a2e72..000000000000 --- a/app-i18n/ibus/files/ibus-1.5.1-setup.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8ac534fc002356b93e2015a8866f1ea89e3895f9 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Sat, 15 Dec 2012 17:40:18 +0900 -Subject: [PATCH] Use Variant.unpack() instead of Variant.dup_strv(). - -Variant.dup_strv() returns a tuple in pygobject 3.2, e.g. (['space'], 1L), and a list in pygobject 3.4, e.g. ['space'] . - -BUG=RH#887153 - -Review URL: https://codereview.appspot.com/6941051 ---- - setup/main.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup/main.py b/setup/main.py -index a8acc7a..707faa4 100644 ---- a/setup/main.py -+++ b/setup/main.py -@@ -87,7 +87,7 @@ def __init_hotkey(self): - label = 'switch_engine' - variant = self.__config.get_value('general/hotkey', name) - if variant != None: -- shortcuts = variant.dup_strv() -+ shortcuts = variant.unpack() - else: - shortcuts = ['space'] - --- -1.7.10 - diff --git a/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch b/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch deleted file mode 100644 index 56d99a0b9478..000000000000 --- a/app-i18n/ibus/files/ibus-1.5.1-use-system-keyboard-layout.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in -index dbb6da8..54ccb4c 100644 ---- a/data/ibus.schemas.in -+++ b/data/ibus.schemas.in -@@ -224,7 +224,7 @@ - /desktop/ibus/general/use_system_keyboard_layout - ibus - bool -- true -+ false - - Use system keyboard layout - Use system keyboard (XKB) layout -diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala -index 24e6b2e..18ef5c0 100644 ---- a/ui/gtk3/panel.vala -+++ b/ui/gtk3/panel.vala -@@ -48,6 +48,7 @@ class Panel : IBus.PanelService { - private Gtk.AboutDialog m_about_dialog; - private Gtk.CssProvider m_css_provider; - private int m_switcher_delay_time = 400; -+ private bool m_use_system_keyboard_layout = false; - private const string ACCELERATOR_SWITCH_IME_FOREWARD = "space"; - - private GLib.List m_keybindings = new GLib.List(); -@@ -265,6 +266,22 @@ class Panel : IBus.PanelService { - } - } - -+ private void set_use_system_keyboard_layout(Variant? variant) { -+ Variant var_use_system_kbd_layout = variant; -+ -+ if (var_use_system_kbd_layout == null) { -+ var_use_system_kbd_layout = m_config.get_value( -+ "general", -+ "use_system_keyboard_layout"); -+ } -+ -+ if (var_use_system_kbd_layout == null) { -+ return; -+ } -+ -+ m_use_system_keyboard_layout = var_use_system_kbd_layout.get_boolean(); -+ } -+ - public void set_config(IBus.Config config) { - if (m_config != null) { - m_config.value_changed.disconnect(config_value_changed_cb); -@@ -278,9 +295,13 @@ class Panel : IBus.PanelService { - m_config.watch("general", "preload_engines"); - m_config.watch("general", "engines_order"); - m_config.watch("general", "switcher_delay_time"); -+ m_config.watch("general", "use_system_keyboard_layout"); - m_config.watch("general/hotkey", "triggers"); - m_config.watch("panel", "custom_font"); - m_config.watch("panel", "use_custom_font"); -+ // Update m_use_system_keyboard_layout before update_engines() -+ // is called. -+ set_use_system_keyboard_layout(null); - update_engines(m_config.get_value("general", "preload_engines"), - m_config.get_value("general", "engines_order")); - unbind_switch_shortcut(); -@@ -352,7 +373,9 @@ class Panel : IBus.PanelService { - return; - } - // set xkb layout -- exec_setxkbmap(engine); -+ if (!m_use_system_keyboard_layout) { -+ exec_setxkbmap(engine); -+ } - } - - private void config_value_changed_cb(IBus.Config config, -@@ -380,6 +403,11 @@ class Panel : IBus.PanelService { - set_switcher_delay_time(variant); - return; - } -+ -+ if (section == "general" && name == "use_system_keyboard_layout") { -+ set_use_system_keyboard_layout(variant); -+ return; -+ } - } - - private void handle_engine_switch(Gdk.Event event, bool revert) { diff --git a/app-i18n/ibus/files/ibus-gconf-2.m4.patch b/app-i18n/ibus/files/ibus-gconf-2.m4.patch deleted file mode 100644 index 266a2bf61339..000000000000 --- a/app-i18n/ibus/files/ibus-gconf-2.m4.patch +++ /dev/null @@ -1,49 +0,0 @@ -http://bugs.gentoo.org/395239 - ---- m4/gconf-2.m4 -+++ m4/gconf-2.m4 -@@ -0,0 +1,44 @@ -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl -+ -+AC_DEFUN([AM_GCONF_SOURCE_2], -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi -+ -+ AC_ARG_WITH([gconf-source], -+ AC_HELP_STRING([--with-gconf-source=sourceaddress], -+ [Config database for installing schema files.]), -+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) -+ -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ fi -+ -+ AC_ARG_WITH([gconf-schema-file-dir], -+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], -+ [Directory for installing schema files.]), -+ [GCONF_SCHEMA_FILE_DIR="$withval"],) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ -+ AC_ARG_ENABLE(schemas-install, -+ AC_HELP_STRING([--disable-schemas-install], -+ [Disable the schemas installation]), -+ [case ${enableval} in -+ yes|no) ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; -+ esac]) -+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+]) diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild deleted file mode 100644 index c05570d662a7..000000000000 --- a/app-i18n/ibus/ibus-1.4.1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.15 2013/05/14 06:05:49 naota Exp $ - -EAPI=4 -PYTHON_DEPEND="python? 2:2.5" - -inherit eutils gnome2-utils multilib python autotools vala - -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" -IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala +X" -REQUIRED_USE="|| ( gtk gtk3 X )" #342903 - -RDEPEND=">=dev-libs/glib-2.26 - dconf? ( >=gnome-base/dconf-0.7.5 ) - gconf? ( >=gnome-base/gconf-2.12:2 ) - gnome-base/librsvg - sys-apps/dbus[X?] - app-text/iso-codes - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - X? ( - x11-libs/libX11 - x11-libs/gtk+:2 - ) - introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) - python? ( - dev-python/notify-python - >=dev-python/dbus-python-0.83 - ) - nls? ( virtual/libintl ) - vala? ( $(vala_depend) )" -# X? ( x11-libs/libX11 ) -# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) -DEPEND="${RDEPEND} - >=dev-lang/perl-5.8.1 - dev-util/intltool - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.9 ) - nls? ( >=sys-devel/gettext-0.16.1 )" -RDEPEND="${RDEPEND} - x11-apps/setxkbmap - python? ( - dev-python/pygtk - dev-python/pyxdg - )" - -RESTRICT="test" - -DOCS="AUTHORS ChangeLog NEWS README" - -update_gtk_immodules() { - local GTK2_CONFDIR="/etc/gtk-2.0" - # bug #366889 - if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then - GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)" - fi - mkdir -p "${EPREFIX}${GTK2_CONFDIR}" - - if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then - "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" - fi -} - -update_gtk3_immodules() { - if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then - "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache - fi -} - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - >py-compile #397497 - echo ibus/_config.py >> po/POTFILES.skip - use vala && vala_src_prepare - - epatch \ - "${FILESDIR}"/${PN}-gconf-2.m4.patch \ - "${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \ - "${FILESDIR}"/${PN}-1.4.1-gir.patch \ - "${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch - - eautoreconf -} - -src_configure() { - # We cannot call $(PYTHON) if we haven't called python_pkg_setup - use python && PYTHON=$(PYTHON) || PYTHON= - econf \ - $(use_enable dconf) \ - $(use_enable doc gtk-doc) \ - $(use_enable doc gtk-doc-html) \ - $(use_enable introspection) \ - $(use_enable gconf) \ - $(use_enable gtk gtk2) \ - $(use_enable gtk xim) \ - $(use_enable gtk3) \ - $(use_enable nls) \ - $(use_enable python) \ - $(use_enable vala) \ - $(use_enable X xim) \ - PYTHON="${PYTHON}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - insinto /etc/X11/xinit/xinput.d - newins xinput-ibus ibus.conf - - keepdir /usr/share/ibus/{engine,icons} #289547 -} - -pkg_preinst() { - use gconf && gnome2_gconf_savelist - gnome2_icon_savelist -} - -pkg_postinst() { - use gconf && gnome2_gconf_install - use gtk && update_gtk_immodules - use gtk3 && update_gtk3_immodules - use python && python_mod_optimize /usr/share/${PN} - gnome2_icon_cache_update - - elog "To use ibus, you should:" - elog "1. Get input engines from sunrise overlay." - elog " Run \"emerge -s ibus-\" in your favorite terminal" - elog " for a list of packages we already have." - elog - elog "2. Setup ibus:" - elog - elog " $ ibus-setup" - elog - elog "3. Set the following in your user startup scripts" - elog " such as .xinitrc, .xsession or .xprofile:" - elog - elog " export XMODIFIERS=\"@im=ibus\"" - elog " export GTK_IM_MODULE=\"ibus\"" - elog " export QT_IM_MODULE=\"xim\"" - elog " ibus-daemon -d -x" -} - -pkg_postrm() { - use gtk && update_gtk_immodules - use gtk3 && update_gtk3_immodules - use python && python_mod_cleanup /usr/share/${PN} - gnome2_icon_cache_update -} diff --git a/app-i18n/ibus/ibus-1.4.2.ebuild b/app-i18n/ibus/ibus-1.4.2.ebuild deleted file mode 100644 index 88f7a88a72a4..000000000000 --- a/app-i18n/ibus/ibus-1.4.2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.7 2013/05/14 06:05:49 naota Exp $ - -EAPI=4 -PYTHON_DEPEND="python? 2:2.5" - -inherit eutils gnome2-utils multilib python autotools vala - -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala +X" -REQUIRED_USE="|| ( gtk gtk3 X )" #342903 - -RDEPEND=">=dev-libs/glib-2.26 - dconf? ( >=gnome-base/dconf-0.7.5 ) - gconf? ( >=gnome-base/gconf-2.12:2 ) - gnome-base/librsvg - sys-apps/dbus[X?] - app-text/iso-codes - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - X? ( - x11-libs/libX11 - x11-libs/gtk+:2 - ) - introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) - python? ( - dev-python/notify-python - >=dev-python/dbus-python-0.83 - ) - nls? ( virtual/libintl ) - vala? ( $(vala_depend) )" -# X? ( x11-libs/libX11 ) -# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) -DEPEND="${RDEPEND} - >=dev-lang/perl-5.8.1 - dev-util/intltool - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.9 ) - nls? ( >=sys-devel/gettext-0.16.1 )" -RDEPEND="${RDEPEND} - x11-apps/setxkbmap - python? ( - dev-python/pygtk - dev-python/pyxdg - )" - -RESTRICT="test" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - >py-compile #397497 - echo ibus/_config.py >> po/POTFILES.skip - use vala && vala_src_prepare - - epatch \ - "${FILESDIR}"/${PN}-gconf-2.m4.patch \ - "${FILESDIR}"/${PN}-1.4.1-libxslt-1.1.27.patch - - eautoreconf -} - -src_configure() { - # We cannot call $(PYTHON) if we haven't called python_pkg_setup - use python && PYTHON=$(PYTHON) || PYTHON= - econf \ - $(use_enable dconf) \ - $(use_enable doc gtk-doc) \ - $(use_enable doc gtk-doc-html) \ - $(use_enable introspection) \ - $(use_enable gconf) \ - $(use_enable gtk gtk2) \ - $(use_enable gtk xim) \ - $(use_enable gtk3) \ - $(use_enable nls) \ - $(use_enable python) \ - $(use_enable vala) \ - $(use_enable X xim) \ - PYTHON="${PYTHON}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - insinto /etc/X11/xinit/xinput.d - newins xinput-ibus ibus.conf - - keepdir /usr/share/ibus/{engine,icons} #289547 -} - -pkg_preinst() { - use gconf && gnome2_gconf_savelist - gnome2_icon_savelist -} - -pkg_postinst() { - use gconf && gnome2_gconf_install - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use python && python_mod_optimize /usr/share/${PN} - gnome2_icon_cache_update - - elog "To use ibus, you should:" - elog "1. Get input engines from sunrise overlay." - elog " Run \"emerge -s ibus-\" in your favorite terminal" - elog " for a list of packages we already have." - elog - elog "2. Setup ibus:" - elog - elog " $ ibus-setup" - elog - elog "3. Set the following in your user startup scripts" - elog " such as .xinitrc, .xsession or .xprofile:" - elog - elog " export XMODIFIERS=\"@im=ibus\"" - elog " export GTK_IM_MODULE=\"ibus\"" - elog " export QT_IM_MODULE=\"xim\"" - elog " ibus-daemon -d -x" -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use python && python_mod_cleanup /usr/share/${PN} - gnome2_icon_cache_update -} diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild index f9ee1b70da47..16bf2f55be2a 100644 --- a/app-i18n/ibus/ibus-1.5.5.ebuild +++ b/app-i18n/ibus/ibus-1.5.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.7 2014/08/01 08:28:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.8 2014/11/12 14:31:12 dlan Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -VALA_MIN_API_VERSION="0.18" +VALA_MIN_API_VERSION="0.20" VALA_USE_DEPEND="vapigen" # Vapigen is needed for the vala binding # Valac is needed when building from git for the engine diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild index 3c088720b2f6..939e5218f081 100644 --- a/app-i18n/ibus/ibus-1.5.8-r1.ebuild +++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.2 2014/08/18 08:33:51 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.3 2014/11/12 14:31:12 dlan Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) -VALA_MIN_API_VERSION="0.18" +VALA_MIN_API_VERSION="0.20" VALA_USE_DEPEND="vapigen" # Vapigen is needed for the vala binding # Valac is needed when building from git for the engine diff --git a/app-i18n/ibus/ibus-1.5.9.ebuild b/app-i18n/ibus/ibus-1.5.9.ebuild new file mode 100644 index 000000000000..c8c0a1b5dcd1 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.9.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild,v 1.1 2014/11/12 14:31:12 dlan Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +VALA_MIN_API_VERSION="0.20" +VALA_USE_DEPEND="vapigen" +# Vapigen is needed for the vala binding +# Valac is needed when building from git for the engine + +inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="http://code.google.com/p/ibus/" +SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +REQUIRED_USE="|| ( gtk gtk3 X ) + deprecated? ( python ) + python? ( + ${PYTHON_REQUIRED_USE} + || ( deprecated ( gtk3 introspection ) ) )" #342903 + +COMMON_DEPEND=" + >=dev-libs/glib-2.26:2 + gnome-base/librsvg:2 + sys-apps/dbus[X?] + app-text/iso-codes + >=gnome-base/dconf-0.13.4 + x11-libs/libnotify + + gconf? ( >=gnome-base/gconf-2.12:2 ) + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + python? ( ${PYTHON_DEPS} ) + X? ( + x11-libs/libX11 + x11-libs/gtk+:2 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) + nls? ( virtual/libintl ) + wayland? ( dev-libs/wayland )" +RDEPEND="${COMMON_DEPEND} + x11-apps/setxkbmap + python? ( + dev-python/pyxdg + deprecated? ( + >=dev-python/dbus-python-0.83 + dev-python/pygobject:2 + dev-python/pygtk:2 ) + gtk3? ( + dev-python/pygobject:3 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-libs/gtk+:3[introspection] ) + )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5.8.1 + dev-util/gtk-doc-am + dev-util/intltool + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.16.1 ) + vala? ( $(vala_depend) ) + gnome-base/gconf" + +# stress test in bus/ fails +# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed +RESTRICT="test" + +DOCS="AUTHORS ChangeLog NEWS README" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="To use ibus, you should: +1. Get input engines from sunrise overlay. +Run \"emerge -s ibus-\" in your favorite terminal +for a list of packages we already have. + +2. Setup ibus: +$ ibus-setup + +3. Set the following in your user startup scripts +such as .xinitrc, .xsession or .xprofile: + +export XMODIFIERS=\"@im=ibus\" +export GTK_IM_MODULE=\"ibus\" +export QT_IM_MODULE=\"xim\" +ibus-daemon -d -x +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations + sed -e 's/dconf update/:/' \ + -i data/dconf/Makefile.{am,in} || die + use vala && vala_src_prepare +} + +src_configure() { + local python_conf + if use python; then + python_conf="PYTHON=${PYTHON} + $(use_enable deprecated python-library) + $(use_enable gtk3 setup)" + else + python_conf="--disable-python-library --disable-setup" + fi + econf \ + --enable-dconf \ + $(use_enable introspection) \ + $(use_enable gconf) \ + $(use_enable gtk gtk2) \ + $(use_enable gtk xim) \ + $(use_enable gtk3) \ + $(use_enable gtk3 ui) \ + $(use_enable nls) \ + $(use_enable test tests) \ + $(use_enable X xim) \ + $(use_enable vala) \ + $(use_enable wayland) \ + ${python_conf} +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + Xemake check || die +} + +src_install() { + default + + prune_libtool_files --all + + mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" + rm -rf "${ED}"/usr/share/bash-completion || die + newbashcomp "${T}"/ibus.bash ${PN} + insinto /etc/X11/xinit/xinput.d + newins xinput-ibus ibus.conf + + keepdir /usr/share/ibus/{engine,icons} #289547 + + use deprecated && python_optimize + use python && use gtk3 && python_optimize + + readme.gentoo_create_doc +} + +pkg_preinst() { + use gconf && gnome2_gconf_savelist + gnome2_schemas_savelist + gnome2_icon_savelist +} + +pkg_postinst() { + use gconf && gnome2_gconf_install + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + gnome2_schemas_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + use gconf && gnome2_schemas_update + gnome2_schemas_savelist + gnome2_icon_cache_update +} diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml index 8aff7428d371..aa28d00b9544 100644 --- a/app-i18n/ibus/metadata.xml +++ b/app-i18n/ibus/metadata.xml @@ -8,7 +8,6 @@ full featured and user friendly input method user interface. It also may help developers to develop input method easily. - Enable support for gnome-base/dconf Enable support for gnome-base/gconf Enable support for gtk+3 Enable support for dev-lang/vala -- 2.26.2