diff options
640 files changed, 15421 insertions, 593 deletions
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 233c721ff7..f553d03a51 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -5,11 +5,17 @@ OPENMOKO_RELEASE ?= "OM-2007.2" OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" def openmoko_two_get_license(d): - openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") + if bb.data.getVar('SECTION', d, 1).find("/") != -1 : + openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") + else : + section = bb.data.getVar('SECTION', d, 1) return "LGPL GPL".split()[section != "libs"] def openmoko_two_get_subdir(d): - openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") + if bb.data.getVar('SECTION', d, 1).find("/") != -1 : + openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") + else : + section = bb.data.getVar('SECTION', d, 1) if section == 'base': return "" elif section == 'libs': return "libraries" elif section in 'apps tools pim'.split(): return "applications" @@ -26,6 +32,3 @@ SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=$ S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" - -SVNREV = "r${SRCREV}" -#SVNREV = "${SRCDATE}" diff --git a/conf/checksums.ini b/conf/checksums.ini index acb7fef1b2..6b5a1b467b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1846,6 +1846,10 @@ sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50 md5=44e18d01857f9dfeb8628e317e786f31 sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042 +[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.4.1.tar.bz2] +md5=76ca1c6e1d8904d2d885f81f7332eba6 +sha256=08069e1b7dd0e357c1ac7fa63aadcae094dc131d2a578eb1600a9bd16b8fde19 + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2] md5=2acf46c814a27c40acd3e448ed17fee3 sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec @@ -1854,6 +1858,10 @@ sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec md5=420e6cdf38bb771ec8b00228bf09e8ff sha256=15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962 +[http://xorg.freedesktop.org/releases/individual/app/appres-1.0.2.tar.bz2] +md5=6f2f5d9f41669d498b56d73dc3206951 +sha256=37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/appres-X11R7.0-1.0.0.tar.bz2] md5=3327357fc851a49e8e5dc44405e7b862 sha256=bbc15785d609c7f26176b91d26354ca7bfcc5d9fe72d15a78f2809eeba1cb6b0 @@ -3046,6 +3054,10 @@ sha256=83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc md5=98200c358e5401d648b980564d9ae39d sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41 +[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.4.tar.bz2] +md5=7d0c1ac193be2491c72a91ccf37ef18e +sha256=2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2] md5=bbb3df097821d3edb4d5a4b2ae731de6 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219 @@ -4554,6 +4566,10 @@ sha256=e77e1cb6cdeb30367f75accf62a7b94598ece4400c42eb9d8181b7da4fc87f82 md5=9f99bee77ff3c565b4898663810fbef5 sha256=11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541 +[http://xorg.freedesktop.org/releases/individual/app/constype-1.0.2.tar.bz2] +md5=83f623f961400ecc56ff52a716308173 +sha256=70375ea6b3e17cabc35492f87b5b138295c8f0258d65b0fbba998e3ff69bb634 + [http://projects.o-hand.com/sources/contacts/contacts-0.4.tar.gz] md5=7d72fac4f0d6e1c771c37e4e80093e70 sha256=e090ab64a02e4918f78312df19715bc2008aae7d44f6b0913c2a46a13d1881c4 @@ -5930,6 +5946,10 @@ sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df md5=a25f931cc6c8d03daaed434f5db5df2d sha256=a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae +[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.4.tar.bz2] +md5=1800dda934ebb7c588ea686278a10e9f +sha256=d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/editres-X11R7.0-1.0.1.tar.bz2] md5=a9dc7f3b0cb59f08ab1e6554a5e60721 sha256=1373ded7c35c38e479122ac1fd8a85682a533612538645c79d09992abcbaab10 @@ -7126,6 +7146,10 @@ sha256=168b326dbad59381d0e0a9544d26f1fb8bd23d3b5478fcc426f7ce470ee8a2f7 md5=aa7ff4bd20b961afda9c15d103b972a5 sha256=e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc +[http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.2.tar.bz2] +md5=ad945b19b2db64dec3a19507848ff63b +sha256=8c5f2752e44af6219c1b4cfc178f9721f6dd573039e973f61029136c2756e233 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2] md5=db1cc2f707cffd08a461f093b55ced5e sha256=0ba76231d9af3422376d9c1652ab3f8614bdd52acc2e2a839d911e1a54b5d5b6 @@ -7206,6 +7230,10 @@ sha256=8d55580d9cf032127bd17b8d4a6bdcdb09392e76fe8ec075ce7472bc3de8e5d6 md5=ad43cf739b3d46ba1e7dc778a0608a52 sha256=7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644 +[http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-1.0.1.tar.bz2] +md5=664df71cb510b744b4a10e778445c37b +sha256=1ce72f84a6c4df7f0e949f915346026ebfeaa5b2e47f7bbc29117ebbf3a7a7c8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-ttf-X11R7.0-1.0.0.tar.bz2] md5=53b984889aec3c0c2eb07f8aaa49dba9 sha256=a268245101a49b1e4c2785a9d809d43fe8564b8243dcf7898a37f25abf4d9edf @@ -7214,6 +7242,10 @@ sha256=a268245101a49b1e4c2785a9d809d43fe8564b8243dcf7898a37f25abf4d9edf md5=46588b22678e440741d6220bc3945cbf sha256=5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b +[http://xorg.freedesktop.org/releases/individual/font/font-bh-type1-1.0.1.tar.bz2] +md5=374d954c61363206c93d1ce7e9445c31 +sha256=da3b5f26c6cde0baf3831f50c79a7a107806f885e0205073855bfbc5a357bb45 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bh-type1-X11R7.0-1.0.0.tar.bz2] md5=302111513d1e94303c0ec0139d5ae681 sha256=f7cede14e92d83d6c3d36eeb9d3d66fdd60372c39e8571cb9ae40a7d8c5182d5 @@ -7246,6 +7278,10 @@ sha256=71b1b6416e0018ad954225f53c0c9f2eaf8d663e1084657f3cb9b930073b7f6b md5=1399dc18aeb9571b0951d9570ea1059d sha256=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6 +[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.1.tar.bz2] +md5=5b1856a24b1b46414950febc63880307 +sha256=3d231566856c754f48f568f41c15376730d45d9c3ffd37e1d2476097519f22b8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2] md5=068c78ce48e5e6c4f25e0bba839a6b7a sha256=f44bc571753fd04c09eac7b266d1e0256db9efd0d40ab834920b9dfbb4297d52 @@ -7254,6 +7290,10 @@ sha256=f44bc571753fd04c09eac7b266d1e0256db9efd0d40ab834920b9dfbb4297d52 md5=6610475e2e231242f8f2122a709c3695 sha256=4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903 +[http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.1.tar.bz2] +md5=a4e8e229a051c0ede9eb525e4006d93a +sha256=51027cc1d49140153620c1a2b653f1773fe92cb694b221396d68265343e113ab + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2] md5=f4881a7e28eaeb7580d5eaf0f09239da sha256=f6f09d398a89595bec5825043d36056c0a080aa2d47ae3e52c01a7258119fd6d @@ -7310,6 +7350,10 @@ sha256=e7ee982884f0c1fca409b6b9a946493afb23c9e61d33ac84ec29819717a66b75 md5=8e8733051371e2b51123376b49f5d3ea sha256=30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e +[http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-1.0.1.tar.bz2] +md5=1646179ff224b3e2c9b1e7f59042897f +sha256=887ea895cc0fdd5c50d4960aee7cb6ed813cf90f53b53ce0e0e068dd606cc919 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-ibm-type1-X11R7.0-1.0.0.tar.bz2] md5=fab2c49cb0f9fcee0bc0ac77e510d4e5 sha256=534210f571a2166f3b6d4d8e1c37f74574c0130a4a1ed4c7d37b50a98fc95cfc @@ -7366,6 +7410,10 @@ sha256=e332497fe6220c019c411912653a96d26c8706c03456ac8ff3ff5ef38b1cc77c md5=0b271fc617087d77560bdca20c0cdbb0 sha256=58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141 +[http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.1.tar.bz2] +md5=4c88c79b8e5d47af90b21e948d42755f +sha256=bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2] md5=190738980705826a27fbf4685650d3b9 sha256=04025084b8f4e7559e34938cab9a70b28cad8174ef5f5f6103abd633b54048d9 @@ -7374,6 +7422,10 @@ sha256=04025084b8f4e7559e34938cab9a70b28cad8174ef5f5f6103abd633b54048d9 md5=ccb212a7badf7aefdc9f9a92af428d32 sha256=c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924 +[http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.1.tar.bz2] +md5=345f1a78312e30cd2c41d24ea3f3276f +sha256=5366d7a0f38a189e504676a9cddd8430113f9957919f0a3dc181bcaaaed92618 + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-meltho-X11R7.0-1.0.0.tar.bz2] md5=8812c57220bcd139b4ba6266eafbd712 sha256=cacbf0c055b95db07e4e61716a549195f6ed054ba98d0b443879f57876ca253d @@ -7494,6 +7546,10 @@ sha256=ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d md5=d7e965776c7f0c30b0f09742176fb77a sha256=8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341 +[http://xorg.freedesktop.org/releases/individual/font/font-xfree86-type1-1.0.2.tar.bz2] +md5=a966f5a8aade9e63af86d8a6bf3e8586 +sha256=7a026aeaafe5a619b2c1b35cd361125b169b2212eaf0f2f5ce796038b1cf06cd + [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2] md5=27a6bbf5c8bbe998ff7e8537929ccbc8 sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f @@ -7502,6 +7558,10 @@ sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f md5=60df6b625074a9790e28543dcea71651 sha256=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9 +[http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2] +md5=a8a50e5e995bfacb0359575faf7f6906 +sha256=1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontcacheproto-X11R7.0-0.1.2.tar.bz2] md5=116997d63cf6f65b75593ff5ae7afecb sha256=72a6200a586f27c55b837cc6e537f15499a2f07783a826521c9ad2eaf35a6461 @@ -12170,6 +12230,10 @@ sha256=754038a9eb8f1d0d6559d5b124a68e1e530a76366cff251d79536ec89e2fda21 md5=7ab8b64edf0212a9d9a3c8129901a450 sha256=06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb +[http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.3.tar.bz2] +md5=975ade3f238c1eb10705da0a91e6e8e7 +sha256=abca3ff6c9f2da2600a474f0e92ae5e62c43914f7bd3d948b91b0a7f9117d81e + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/iceauth-X11R7.0-1.0.1.tar.bz2] md5=92035bd69b4c9aba47607ba0efcc8530 sha256=46a02c0dddbe80fbd802da47d0a9eac03002deb538b109dae804553fbbdfa7bd @@ -13318,6 +13382,10 @@ sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8 md5=9d5045a5c76b1fe360221b967a5aa0e9 sha256=e2e757986724a5d2ee299aa7616a3d9985af45e363021b486b7abbcac4ca01c2 +[http://xorg.freedesktop.org/releases/individual/app/lbxproxy-1.0.2.tar.bz2] +md5=0aa9284354552ce6700485a36d2803c3 +sha256=7ec5dee387bb6f3125392c0faca1c9712898b31e1410de9767e0d933b21cb679 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/lbxproxy-X11R7.0-1.0.1.tar.bz2] md5=d9c05283660eae742a77dcbc0091841a sha256=35360dd6160d94a981d923486a026fe91dfc3e0db2f5923aeb782b7e9c5e606f @@ -13426,6 +13494,10 @@ sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e md5=d58b5a03ba36c661ff48f38048c2edd3 sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160 +[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.4.0.tar.bz2] +md5=75e27245bc15aed845fe0505f4f21ca6 +sha256=c8e92616ad465ce2ae86360ff216a9711bdd1156dbb06af6d86009c6773e1c82 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2] md5=8af30932ebc278835375fca34a2790f5 sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5 @@ -13438,6 +13510,10 @@ sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde md5=81521249353fa33be7a4bb0062c2fbb9 sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5 +[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.2.tar.bz2] +md5=ecf2d6a27da053500283e803efa2a808 +sha256=af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2] md5=12d2d89e7eb6ab0eb5823c3296f4e7a5 sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1 @@ -13514,6 +13590,10 @@ sha256=efde1a974723b9a0bf3c731903766bce9dd1ead3d0550eb2a4f2396d7b402e17 md5=337b379fd00a67345b083100c4e6ba95 sha256=6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a +[http://xorg.freedesktop.org/releases/individual/lib/libWindowsWM-1.0.1.tar.bz2] +md5=274b2b5620a524fd7bb739edb97317f5 +sha256=25f07cf847cbe91d36c20f348b4b9494c4504fe02966e8cdf65cf56316a70edc + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libWindowsWM-X11R7.0-1.0.0.tar.bz2] md5=d94f0389cd655b50e2987d5b988b82a5 sha256=76ccdb6adfc51a4c40e90fe66f599ee4de4787fca44860b851dd4bbf97f7889d @@ -14094,6 +14174,10 @@ sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10 md5=b54600573daf9d1a29b952e8d35b389e sha256=1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb +[http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.5.tar.bz2] +md5=16c3a11add14979beb7510e44623cac6 +sha256=0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXvMC-X11R7.0-1.0.1.tar.bz2] md5=c3eb4f526f08862489355a99e3eda1bd sha256=fa18853a6cb877e59433fdc1455e5b7fde9bd47c617d97208c7e3e32ff84d774 @@ -17642,6 +17726,10 @@ sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c md5=b01e4f71c20fc1c79ed727759c1df40c sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7 +[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.4.tar.bz2] +md5=4e45233e310d72dce307709761cf241b +sha256=d11cd500975f652060f89d79cb8034011d99ee9aa6c82951680fc0621ecb8252 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2] md5=30428b8ff783a0cfd61dab05a17cfaa7 sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee @@ -18042,6 +18130,10 @@ sha256=16ff3ea972065925338da1a1f37322dc4d8774f6d34d2dde2ce85121c08c99e0 md5=90f5f3b987497a481b94d49372f17dce sha256=0a4a0d4e2613b0cd4321e55fd4741788b728736fc8a517996e2015fa49862e61 +[http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.gz] +md5=905bfeb1a59929d950e5d638fbadcf39 +sha256=008e6e117372e04cdc9a72ffc7dfae2e2d6617c9b399e052ae12dc2a1a03079a + [http://xorg.freedesktop.org/releases/X11R7.0/src/util/makedepend-X11R7.0-1.0.0.tar.bz2] md5=7494c7ff65d8c31ef8db13661487b54c sha256=1caf464a967ff9335a040f2d3ffe050c881efda13c14531be49cf1aa8dabda92 @@ -18662,6 +18754,10 @@ sha256=7fbadfa5cb38f7d754214b792854c4a0cb32fd1c9b5ae8ff05434cb3b3acbe01 md5=912e6305998441c26852309403742bec sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294 +[http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.1.tar.bz2] +md5=25b774e1b64833d0cdc00663931efc73 +sha256=c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf + [http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.tar.bz2] md5=c8237b4aea1ae0c15441deab6b12c5c0 sha256=8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb @@ -23522,6 +23618,10 @@ sha256=b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752 md5=99aea04a27197056368a4431f30f9cdb sha256=02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596 +[http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.3.tar.bz2] +md5=e09c14cf1ac78260f95a9aa45bccab4c +sha256=d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2] md5=6f33a1bd8e99372b7544ddfcad456369 sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c @@ -24102,6 +24202,10 @@ sha256=7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc md5=839e968d7197b9563f0fd8a5a3aac2e3 sha256=23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802 +[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.5.tar.bz2] +md5=00e834c3cbfd990e9d7d5ddc834242df +sha256=3308fbd0018d53bb818fee9de1cde484965b740073d5d240efa4cfc881c9d1a9 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/sessreg-X11R7.0-1.0.0.tar.bz2] md5=8289a5b947165449c23bdfad9af02b4c sha256=3769ad5059a2841a8ee28fc8a7d3a3ca8eb59f4fd46d0bd629829f3841202734 @@ -24166,6 +24270,10 @@ sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508 md5=6fab3bb176be9e510c5613d054ef1ca4 sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac +[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.1.0.tar.bz2] +md5=2f902e0a89aaf2b19e06e7f26c6efb3a +sha256=932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2] md5=28b141ab0b1c44a5e90d31ad73bd1078 sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b @@ -27182,6 +27290,10 @@ sha256=00b2384e225d6a1cbda4994c63103ac229269bb2946537e9357655e5c5b84333 md5=ed5416cf7e2ba6e66641c88f12768c0c sha256=780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151 +[http://xorg.freedesktop.org/releases/individual/proto/windowswmproto-1.0.4.tar.bz2] +md5=e74b2ff3172a6117f2a62b655ef99064 +sha256=c05bb0edb627554fe97aa1516aed44accf6566b1db0e50332689a24afcebd26b + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/windowswmproto-X11R7.0-1.0.3.tar.bz2] md5=ea2f71075f68371fec22eb98a6af8074 sha256=e575dc15f7ac3bd4dd4241be617bd88806506cf6ff1fc9332a42ae2275a5118c @@ -27558,6 +27670,10 @@ sha256=019578691e8ab02532e35033331e275b658b360033e9e34dfdecf4774d161e3c md5=8d2731e6e95f173f41a0ddc875d55804 sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8 +[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.1.tar.bz2] +md5=3e39eec6d0fd5c587ca6d55aa7bb8fe1 +sha256=5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2 + [http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2] md5=51b4a1c0ae2b3bd77417306fd78a3e94 sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4 @@ -27654,6 +27770,10 @@ sha256=8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d md5=2c6ecedb10dc51adbb64c95f22fd99c2 sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc +[http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.0.tar.bz2] +md5=113eccea3ee73a1ef7b43d2291ca1e09 +sha256=de0f37c7bf69c3aac3362bc0cbe470a622c2a85b62c5483c113ea88512232710 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclipboard-X11R7.0-1.0.1.tar.bz2] md5=a661b0f922cbdc62514bfd3e700d00fd sha256=74e949dc0fc1d275b60a170975a9bb99a12153687f2a3478b963b1ae4c607d96 @@ -27666,6 +27786,10 @@ sha256=ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d md5=2b1a3d030d87e62a591db8ee4c0072e6 sha256=10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f +[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.4.tar.bz2] +md5=bb9fd5e00d39c348a0078b97fdf8258f +sha256=69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclock-X11R7.0-1.0.1.tar.bz2] md5=00444fed4bf5cd51624476ee11dd1fab sha256=eb93d5278f5e46f8d7ff5b53a10a03fef09326e72966c3a0b8faa255436ee6b9 @@ -27702,6 +27826,10 @@ sha256=6e1cdf207ca998acd4e1cc991bde47fcf9d01d24ba733f9d3afe3c64843ef838 md5=3eb1c2b7a6ceaec4ee872cb06d202d91 sha256=4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884 +[http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.5.tar.bz2] +md5=bf8faa8c540bfdcd0252801d8f16d868 +sha256=bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571 + [http://xorg.freedesktop.org/releases/individual/app/xconsole-1.0.2.tar.bz2] md5=8678ddd23573022d68dcd883ae239be8 sha256=45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377 @@ -27726,6 +27854,10 @@ sha256=e0dd4b753690c650c6bfbb5af9d190fa6bb3d889a491c8553a34ba397ede8bbc md5=014bad415e64c49994679cdb71a97e37 sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0 +[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.2.tar.bz2] +md5=e8929a1bb4d98d1a3991fd340d0b5f09 +sha256=5f798c2f1d2794c09fa0a40700c40359b725107608012866828015dca47514d6 + [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2] md5=c39afeae55a7d330297b2fec3d113634 sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813 @@ -27822,6 +27954,10 @@ sha256=6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d md5=cc1816bc62a3722ad509373b0b7f30fe sha256=e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9 +[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.9.tar.bz2] +md5=030ae4bd9b8d428749d68bfdf56ce8a5 +sha256=e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdm-X11R7.0-1.0.1.tar.bz2] md5=9ac363721dbb8cd39aa1064b260624a6 sha256=9bf8895b98fb35ee38ac713ce83c80abdd8e33de278e1ddf982a293c31b56b81 @@ -27870,6 +28006,10 @@ sha256=9049146404b9596d70f77a0250d26aff93ba7ba6f42e99f7ee2302a757dfd362 md5=c56160e93c24ddf17e69891ed50deb72 sha256=2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df +[http://xorg.freedesktop.org/releases/individual/app/xedit-1.1.2.tar.bz2] +md5=67193be728414d45a1922911e6437991 +sha256=a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xedit-X11R7.0-1.0.1.tar.bz2] md5=19f607d033f62fb1ee5965f4236b19d4 sha256=cfbea0872e9963ae3ff61b07000f92d840b65244eec0e1a9750a58a03d70db93 @@ -27930,6 +28070,10 @@ sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b md5=033f14f7c4e30d1f4edbb22d5ef86883 sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029 +[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.991.tar.bz2] +md5=ba1b886bd6104018fe78ab431d83ce4d +sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2] md5=3ffafa7f222ea799bcd9fcd85c60ab98 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2 @@ -27946,6 +28090,10 @@ sha256=07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a md5=2d6596b2b0cfa527b5ed4df2014684bf sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.4.0.tar.bz2] +md5=51247dc0d73185e35bec326283bc49a5 +sha256=48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2] md5=b35b1756579ebe296801622bdf063ab1 sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea @@ -27962,6 +28110,10 @@ sha256=3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a md5=2aa75313ea5652a8cf93581c65ee6493 sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.3.0.tar.bz2] +md5=ae3ec07aff6c156cf5307f53feb6b293 +sha256=b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2] md5=9ee5109ef33e281ce0784ad077f26cee sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e @@ -27998,6 +28150,10 @@ sha256=26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe md5=4e254fcefb3bea55772e63c12570f6d9 sha256=1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2] +md5=8cad35da16ea4688ebb74533ccc7f190 +sha256=6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2] md5=62b5405d337bc055bc9345565cc0da8c sha256=fbac5de06334b6757d91fcc2abc08e2c56c7a57dcba1abdb5c99133decf7f795 @@ -28138,6 +28294,10 @@ sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9 md5=21dac6461379d67ee3b333c77f63e7bf sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.1.tar.bz2] +md5=e56ce4424b89b2409c6e73e007a85da7 +sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2] md5=d982c6f185f4c75a4b65703ceed7be06 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 @@ -28158,6 +28318,10 @@ sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8 md5=0f3e013d5ff58e0aba3d9e1d18830291 sha256=87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2] +md5=e5bfda480f25121e3c4222e5e1eb5880 +sha256=d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2] md5=fc0e11fefc322623914a2d819d5b6d51 sha256=8f131c2b26b1e0e16e9dfacc73d457bb16cf6e455a1dbdc382f4a3e3b219c703 @@ -28174,6 +28338,10 @@ sha256=d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493 md5=175c1e1ad668ebbbe212c1e975dd14f9 sha256=689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2] +md5=c50d0da3206d18d9d94f720e3688eca5 +sha256=e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2] md5=0c4f2a6390e3045e4c48a48b47b6332c sha256=708011ed8fdb6d321e7ca91787ff06c7bcb011cc4a3b5d6c0c02562222da7ef4 @@ -28210,6 +28378,14 @@ sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce md5=e48b99e55093525ebb7811a014391a0b sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.4.99.2.tar.bz2] +md5=29cce86738411c9f8de04375090bbbec +sha256=7224e93a8560362d454a104e8bb481213dcb559b41516c7b883c0881e25252bb + +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.5.0.tar.bz2] +md5=79b20f86d1b2e625ae65e35c3457027f +sha256=718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2] md5=9e3ba60836f4c1d2e4cebc63a28321b4 sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489 @@ -28346,6 +28522,10 @@ sha256=cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea md5=50711d390d2867e3fa7e06b59b2d575b sha256=214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2] +md5=f28998cdfae2a4c41589299a4ee1f459 +sha256=53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2] md5=4758e667bfbba517df2a58d51270cfe2 sha256=f46f328c9d8ef4dd6fe118121831ff4cd34ea9f06b198f548af4c703a1aab771 @@ -28382,6 +28562,10 @@ sha256=fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a md5=24594c0222e631fedccc7c540c420b03 sha256=9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.0.tar.bz2] +md5=d5f1395b2dcefc7533ff5580e63f2066 +sha256=8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2] md5=065b1cf862864741aebcfefcc7c09539 sha256=314492cea0998182623f2a67461d64df00b910acd052c3a50f9349ead740151a @@ -28426,6 +28610,10 @@ sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8 md5=939f1c831c5cd3a6f027e982592dfc5b sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.0.tar.bz2] +md5=2cf0a2b0b3006bcfcd85bb77d966244a +sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c + [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2] md5=be8a4bd474ad6c85b93f66dd6fcfa6ee sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 @@ -28482,6 +28670,10 @@ sha256=b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4 md5=862c230f5f6e0c545f232b4c0fa9537a sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.3.0.tar.bz2] +md5=53bdac9ca56418f4675810ed8a78b3e8 +sha256=e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2] md5=c7ae53dee1f3e95fa5ce9659b34d8446 sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e @@ -28498,6 +28690,10 @@ sha256=09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec md5=4f78650d79656dc803a720049d65682e sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.2.tar.bz2] +md5=48441a19aaf015570b267f2a8e67d8ab +sha256=678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2] md5=323911ab16a6147d3cabceff9336a3d2 sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78 @@ -28514,6 +28710,10 @@ sha256=e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7 md5=6826c556ebe9a1248cbc7f7edd44f956 sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.2.tar.bz2] +md5=4745f5c722b030962cc56eb2443894a0 +sha256=db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2] md5=342937e275dbc92f437417a3186a8222 sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548 @@ -28530,10 +28730,18 @@ sha256=b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8 md5=b415bf3259ad0acdaf62e3dde76e3289 sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.89.9.tar.bz2] +md5=619f6ff15db869be3800bb001d5b0468 +sha256=880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401 + [http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2] md5=ac1595de8397efd740038994b1e9ef67 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.12.4.tar.bz2] +md5=e662348f6f957fcedf52818d668ab9f5 +sha256=cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2] md5=102b781f543213852401f3422b18ccc7 sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae @@ -28570,6 +28778,10 @@ sha256=16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494 md5=0fec6bee65383790485d917247a61629 sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.2.tar.bz2] +md5=a3969c28c3b36ab2caa852a9324e9b70 +sha256=ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2] md5=90f23505faceac30d3f46ab94f7293e1 sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352 @@ -28626,6 +28838,10 @@ sha256=46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910 md5=3d96297556846bee02a74166ffb5d052 sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.2.tar.bz2] +md5=2a6f1f07462fbe336865068cd69c8593 +sha256=9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2] md5=462654f9be7e3022f97147e3390db97a sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698 @@ -28686,6 +28902,10 @@ sha256=a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419 md5=6d7afdac0a26cf201c3f3b417c31c5e1 sha256=161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.4.tar.bz2] +md5=960df34e129faa411e58c0d6b56d79a3 +sha256=5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2] md5=f14c2f1696c05760207adcaac856e5e5 sha256=d5b4cb7b490edc3be57c40a00299002b60b8060396b3c902b2bf92090fcbd940 @@ -28714,6 +28934,10 @@ sha256=62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7 md5=3b170a6df5114420cd4021a057918a09 sha256=49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.3.tar.bz2] +md5=a597e8efeec6ab8bc6ba6d87fceb2dba +sha256=4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2] md5=078eed8c3673488ee618dfc7a3ef101b sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a @@ -28730,6 +28954,10 @@ sha256=b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5 md5=d0e5a805c546b29b1dd3b55a68d16dc4 sha256=59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.2.tar.bz2] +md5=4ac1318788f62159965f15131c869e7a +sha256=48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2] md5=625448b13ebe2a13b7defad1efec05c4 sha256=b0f2f2dd17bd01018fa91d042214b596f9d2303a81a0b86de102400b00f87d09 @@ -28790,6 +29018,10 @@ sha256=95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 md5=6081b8fa50c689d51f85c2fbaf93867e sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2] +md5=6c0522b2b72a0a47c48d718443616651 +sha256=b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.1.tar.bz2] md5=ba373233a7d13084d14046a17b02e248 sha256=5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564 @@ -28802,6 +29034,10 @@ sha256=c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6 md5=11066b84b949cd04300ec819c9c51532 sha256=d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.100.tar.bz2] +md5=3e80cfb84b62866d2f94774ecbf3e46c +sha256=e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.99.tar.bz2] md5=29785ff1de2b0f7b7f1c48350449447c sha256=82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c @@ -28822,6 +29058,10 @@ sha256=d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86 md5=a72f57fca4f4dff9a2c82eb1fe7456f4 sha256=96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.4.tar.bz2] +md5=2d722ee9b9fe8da49109f280689c9c25 +sha256=434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2] md5=ffe9015678a41e97bdbd2825066bb47b sha256=cfaa594be277cd2a1bf9d796bb398e07319e9b34cff306b408145a37925dc97f @@ -28834,6 +29074,10 @@ sha256=2f3ba4a6775c66de2b269179a219bf1fcfee85c74db273c85784d80209e1ce81 md5=2bd8e5b9ea68e0dcd80dfcaca0eff82c sha256=66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2] +md5=923baa1ee0429f03ed19ec0be6a4f62b +sha256=e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2] md5=d74d9896d57c3caf224ba3472630d874 sha256=88d4b58efd0dca626e926ce6dc531026c8a10e7126f2e6544e31a2fc00001c67 @@ -28866,6 +29110,10 @@ sha256=97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e md5=42f12a36d7afc26c817e8e8f5c8b7274 sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.15.tar.bz2] +md5=1b22188bd9012a148206940708b52ea6 +sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2] md5=f9b38e24157c3aac6014119ac18d76da sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952 @@ -28898,14 +29146,26 @@ sha256=f645da4120b3ad5356b46269ae13ef8e2315bbb443a8c147e05c611f7fa21df7 md5=c0820787e89958c9114d359b6a3cd464 sha256=b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.904.tar.bz2] +md5=f2481d98ef54febf5bffbb88a2a2426d +sha256=c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.0.tar.bz2] md5=007bec0c6b07d9d3aeca4da18e561efb sha256=5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2] +md5=2b90854a62a4d45d652062f582dc8d13 +sha256=517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.2.0.tar.bz2] md5=6a932ec17da9ce5a6d9000c1649c3a7e sha256=87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.3.0.tar.bz2] +md5=7b6641aa9d836f1621b9b220ad6771b8 +sha256=5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.1.3.tar.bz2] md5=a8b97feccb32184820d5856fe78d34db sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408 @@ -28914,6 +29174,10 @@ sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408 md5=7c03de3804d4c4f6ff59f74050d24b2b sha256=b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.3.tar.bz2] +md5=9a0a916fe1e7b5c81cd4c80a08e646cc +sha256=9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2] md5=f1a25db74a148dea45115e813027b932 sha256=4ad42c65f60bc7f3f37f636eae5ae5a9049cdd4df5c546f93f201fdf16213f48 @@ -28930,6 +29194,10 @@ sha256=4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97 md5=d05e7c3cb044437eda8663e174ba913c sha256=ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2] +md5=5eb06d88533fb327d067928faeb20860 +sha256=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2] md5=83b9e8a9b8fc1c49bda2811358e5007c sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103 @@ -28942,6 +29210,10 @@ sha256=b9b9abdd80c00782ca2e1313016c3d3904dc10a1de1c94d29cd4efafeb1f52f3 md5=4a293047e988d4ea1e9e96d3b5793f43 sha256=9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2] +md5=6517bbbf808c700502d51acdc44662f8 +sha256=1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.9.1.tar.bz2] md5=a91c73285ef67ee7cd9e2da28acb6cc4 sha256=cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822 @@ -28966,6 +29238,10 @@ sha256=f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5 md5=62b8aba48b54eaefeae87df502bf219c sha256=adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.1.tar.bz2] +md5=66c319f610e3699c3de0f3ef630abb32 +sha256=2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2] md5=6b638dd500d10dba1822d3ea5061fc65 sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98 @@ -28982,6 +29258,10 @@ sha256=54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7 md5=a8419a8ed17b02b2a6dd4d30d5e94b00 sha256=cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.3.tar.bz2] +md5=29fb322cd3adab52cc7f1ac86f9315bb +sha256=ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2] md5=957de4e2a3c687dbb2e9e18582397804 sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f @@ -28998,6 +29278,10 @@ sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40 md5=9f57c2f5ccbd8340db32da1c74083771 sha256=11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.2.tar.bz2] +md5=f04baa307e49e9f0e5a5c3d2e89a5576 +sha256=3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2] md5=e35d817fa4ee7beb6cd5aa744b9c0783 sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6 @@ -29026,6 +29310,10 @@ sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a md5=42069e70578bf3fb353cdacad186f6c0 sha256=b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.3.tar.bz2] +md5=be59e9c2d9458cee0b5006549c14a95d +sha256=1df9a90ecc31d5fb63de7c970555f166dab24c0f633b54aaac4ee82fa7b49bb2 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2] md5=781d726a0ca54b65521e383ab99043c8 sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3 @@ -29050,6 +29338,10 @@ sha256=aa656c99ff6ba9c1013b6060c92bbcda2c30ceff72ecc49139c65eb935844f43 md5=9e25784e912cb2f0493b87431fd60773 sha256=1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2] +md5=8e4bd0a6b155cb861356e7430d667aee +sha256=cb43007920394b000be98ea0eac16a1cc16b4ca7ea8532b5d803a0c7574720d8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2] md5=8f3a734d02ae716415f9c6344fa661bd sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d @@ -29062,6 +29354,10 @@ sha256=f9a1ee987c554607c6fed4ae27adbf75c825d628fe522802a717429a85327487 md5=b9cb8cfb6a4234bebc434f744af53208 sha256=3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2] +md5=bb6c4def5cfb0959b72dccb661473d4a +sha256=d56fe98c34f2af1b6424e3fcaa22a31402a4b59d63679f0e5fdfb1d2ea878419 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2] md5=799a54cef1f4435e00fa94a1d97d056f sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866 @@ -29074,6 +29370,10 @@ sha256=9be5402d4f8f32154c01065f7b01a99e61c2deff959715eb8656259c63195adb md5=aa6b7836fe6ccc99994bf15ff2b74e86 sha256=d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2] +md5=bc9904a9129aaf73408568ae1e2fa65f +sha256=d1216c7c2be78d1dafad0cd46e464e9fa08f5e04544b76d9a0c547374c85801f + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2] md5=2227f3fb86b02148f347e002662e53c8 sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea @@ -29090,6 +29390,10 @@ sha256=f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029 md5=816842de26bce8a935f3c9c3cfedbc42 sha256=59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2] +md5=1bb374fe5ab3ed780d353b2b12ba6255 +sha256=fd377af6e366e8e3a77c8ff825a009138c8343c0007bbf070ad605a649577e11 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sunffb-X11R7.0-1.0.1.3.tar.bz2] md5=bb5182e3b74b3baa6fee245ac8bbf09a sha256=318bd61c8da6e938d5c707a0c70ba3ada1c053ff3172a918f821a1a015b7b6ce @@ -29118,6 +29422,10 @@ sha256=6c7339466d5b3cfc3c6ea3ca4ec4bad2f16666f1c472efc4f3048c1f711c67d4 md5=779a31151e44d2fd2a5ee1794f836889 sha256=72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2] +md5=b064a8d2f3d481ec36ef9ac17e13a77d +sha256=543115c4b3a8603dcc9d7a3030c9e7ce20baf6e3976d92ff951cfea80b54981e + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2] md5=74d6ba5e55afdfebff84db08b6589e26 sha256=38eb95f2991fab51c3442022bcef258de508ebfa0c631024edbdf55a1c4f24fd @@ -29134,6 +29442,10 @@ sha256=6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624 md5=b13132f24683ef759bfb0c1db5096496 sha256=c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.3.tar.bz2] +md5=8161bbf2b100c21b609163f0010766b3 +sha256=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2] md5=0201415230bf0454384c3bad099520d2 sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504 @@ -29150,6 +29462,10 @@ sha256=50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b md5=f3bddf0a64932ca9bd72041ccd3b5501 sha256=a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.1.tar.bz2] +md5=bcbceda78395de74544c83b46a7700cd +sha256=70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tga-X11R7.0-1.0.0.5.tar.bz2] md5=fa67bf34454888d38e15708395cfed87 sha256=96b071b4e12dcfd027402621b897c6d73818aada4d66f77a8802cc46b9efe206 @@ -29170,6 +29486,10 @@ sha256=f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d md5=e89799579d0cf3858362bd751469e0bf sha256=a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.3.tar.bz2] +md5=47f3c5da1942017218355f178f02ef84 +sha256=6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2] md5=69f28afc7b585d01bb06b1e2f872f8ea sha256=b7958afb0204bb1d3c8a33e7a56b94a6d4f09426dbcd141ef327e28f523d42eb @@ -29186,6 +29506,10 @@ sha256=c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e md5=f98fc22142a009dc3a6cdf930c95203f sha256=1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.3.tar.bz2] +md5=79f63999c88477801ae54dc486272ad6 +sha256=0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2] md5=981f46914c1e54742418f0444ea2e092 sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6 @@ -29226,6 +29550,10 @@ sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165 md5=9a86b683f73f3806f55d05cd804a6f4a sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.1.tar.bz2] +md5=61a1dc9a22991bd04d0ff98f800775c1 +sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2] md5=049ada4df1abb5aa2b6633ba90353e78 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452 @@ -29274,6 +29602,10 @@ sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89 md5=6d78c82ea7c2bb0fcb587d7bb4e8f60a sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.8.tar.bz2] +md5=25287a202c986b33bd79fbe379c96a16 +sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2] md5=4df79349e26add4c23f6be8bec347ad4 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a @@ -29290,6 +29622,10 @@ sha256=3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c md5=7c681d9b57f5e1f798263fc1a9d99245 sha256=b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.3.tar.bz2] +md5=c164effcc839eca1fc1d43a42f4086db +sha256=025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2] md5=e00cc814ebdb3f3067e075bc93b26199 sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a @@ -29302,14 +29638,26 @@ sha256=35409b42f843ac3b352e344253f3075b2d9c8ae2ac5af02962fd67575427e066 md5=c159af867a9af3abc4da332189213a76 sha256=39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.3.0.tar.bz2] +md5=d6b5d25dfd61fa5113216d10a6dcbb50 +sha256=78bdb6d397869dbd8560ae1f0ee65473977d19ca5afc9fa7638c35057284989e + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.0.tar.bz2] md5=08529fd015191be9244f598aa0894aa6 sha256=5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.1.tar.bz2] +md5=65a8d94d360b51690f8d4b2e7bfa036a +sha256=cb19f5287f9d345fc4fe15ba7c9344a3be2d8395ebf19a139899d1566d7c9e18 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.3.tar.bz2] md5=c541152aee693fad743ef7cbf75a7ffc sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgixp-1.7.99.4.tar.bz2] +md5=0e7d0df07528c57304900da3acafc1a2 +sha256=ee0a178c89ff10d679e6f174d2a2e5cc7b89c7c7d5c115d48e9c75942f487395 + [http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2] md5=a318c1e86123832d7b0c95fc7d47ef35 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124 @@ -29674,6 +30022,10 @@ sha256=5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353 md5=f10717e45535b64eb45226aac571dac2 sha256=34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482 +[http://xorg.freedesktop.org/releases/individual/app/xfs-1.1.0.tar.bz2] +md5=5cfc06a320f74f07a0aa73da62307e9a +sha256=47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfs-X11R7.0-1.0.1.tar.bz2] md5=a297da3d906110e9c29ec56c5ea578a8 sha256=5d9df9048863f6d281fc1b71601ff7d31d5075eceeba462b3a32dd4734440c6a @@ -29782,6 +30134,10 @@ sha256=ec744335f06c070d30f7f256262f6326c2cfff35a0ed6178e7be18ad44ad8a86 md5=72fc8dd68f585000c0a542eba0264571 sha256=7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093 +[http://xorg.freedesktop.org/releases/individual/app/xgc-1.0.2.tar.bz2] +md5=fec79887ca14575bef4c757b4e95a693 +sha256=fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xgc-X11R7.0-1.0.1.tar.bz2] md5=8cd01cf558c3eed738115abcf720277d sha256=6151d08a12e7a9874738c46119c6ffe8383d1fe6c5d10ffc9d88e2adc8e454e8 @@ -29862,6 +30218,14 @@ sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999 md5=9144097186c3d2454beffe8ac3b53c6e sha256=c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590 +[http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.1.tar.bz2] +md5=93c73705ed9eb1e1a6b6938405672f2b +sha256=b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785 + +[http://xorg.freedesktop.org/releases/individual/app/xinit-1.2.0.tar.bz2] +md5=fe1696cab2fbed6fa059d0cd1c53ac13 +sha256=ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2] md5=6d2df59fa328cbc99c0de98bc2e14597 sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02 @@ -29878,6 +30242,10 @@ sha256=330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45 md5=58e619576cbf4b6057eebb7a97fe2ddf sha256=3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b +[http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.0.tar.bz2] +md5=3e8a5f1faccc8ab00c6190e5a34e0a45 +sha256=a84728e34bb5edd36ecc1b5489f48ad1467ad5aab1f74f1b7789f826a1ffcaf9 + [http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2] md5=2fbcae1323c266edf5b6c61751f2e343 sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716 @@ -29938,6 +30306,10 @@ sha256=86ab048045dcd1de690de0b040235040f496c686730ad557c912e0f40edf5c4a md5=b98ae2d8b21c545b7b322d0b302efefa sha256=008dffea5b213880cb3ebd40d0b9bf0cc10392fb0349831efdebf2a428dd2e17 +[http://xorg.freedesktop.org/releases/individual/app/xkbprint-1.0.2.tar.bz2] +md5=3d3eb10466442354d6b73b503b9829db +sha256=2e51b3c2d33da885be6d955007ae7e025b8f8b21f7fe6d21387690d9f5cadb92 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbprint-X11R7.0-1.0.1.tar.bz2] md5=6235c39690968d0a9a4c1b1c16c8905a sha256=d2e9c3c28e23010441ce40c48bda7adabd338a256cb9b99848be6ed937fc10e7 @@ -29966,6 +30338,10 @@ sha256=921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1 md5=f66d76abb0f75514ca32272e23cca757 sha256=77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de +[http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.2.tar.bz2] +md5=dca031355b4afcf8517a8258eeb730c3 +sha256=532df0398d3f4eab1cba8d0367c02a293ca74f2d89a27ef014854a2bde9a5a27 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkill-X11R7.0-1.0.1.tar.bz2] md5=35f47fd58d75c1ea5f414b21a10bdbf3 sha256=fe59dfdcd43faf8efa778f9b2390525a606a62dcd7a70774982bc19301f6a3ce @@ -29998,6 +30374,10 @@ sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131 md5=69adcda848479acc3b82b3928812d191 sha256=456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a +[http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.0.2.tar.bz2] +md5=dc8b420bbfa35091ea30edf57c952ec2 +sha256=d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsatoms-X11R7.0-1.0.1.tar.bz2] md5=737b4d7893aa886e8e4181c94380a421 sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3 @@ -30034,6 +30414,10 @@ sha256=1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02 md5=7c6a783e42c88360ac31d259a864a19d sha256=51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43 +[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.3.tar.bz2] +md5=32f7ed4c089365cadb9382f6fbd750a9 +sha256=0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmag-X11R7.0-1.0.1.tar.bz2] md5=38ac487ac1b75be0253fe7f973947386 sha256=d039d857c6d334d481452c20f5e419b1e120e03e6c9af709f071d9c00ffd9cd1 @@ -30066,6 +30450,10 @@ sha256=00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2 md5=3d3a4b310a65ccce82472ef83acbbf97 sha256=38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a +[http://xorg.freedesktop.org/releases/individual/app/xman-1.1.0.tar.bz2] +md5=5e5b3351bac26cc1f8490faf1c1402bb +sha256=9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xman-X11R7.0-1.0.1.tar.bz2] md5=a4f21547120952aeb8e5663ebd72e843 sha256=3d159c703ba901657d9633b239d39b21c8de68a2c3358fd1aa4175d20359ef87 @@ -30174,6 +30562,10 @@ sha256=d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818 md5=f96f44b87132afd2fff677a8c89166dd sha256=4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8 +[http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.gz] +md5=bca2403beb209952d66dc57be5a2f789 +sha256=9a5e3533a4156a0e308ced437bde722cb291becc2276bdd0952e30b3b5060e92 + [http://xorg.freedesktop.org/releases/X11R7.0/src/util/xorg-cf-files-X11R7.0-1.0.1.tar.bz2] md5=f2dd453c37386293fb207431b4a073dd sha256=019ba3dbfe2f23e5847cc839a26c630cea20fe8d62df4775a21087176908b9d7 @@ -30254,6 +30646,10 @@ sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf md5=dda7842467cda6018fdc87e6002e4db1 sha256=a58c0de29cbd2b7d1a1ac5ee70a94ad1ed2a085132803c0ca83f2dd8513b4c20 +[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.2.tar.bz2] +md5=5c087e0f555203065fd90d02ef5f736e +sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159 + [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2] md5=0e7527480fb845a3c2e333bd0f47ff50 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47 @@ -30430,6 +30826,10 @@ sha256=0a9930e2ed7501d638cd90c948278b4f20e225c78c92cf2619e2b55a024e890e md5=d28007a50976204960fc1fc07b4ca093 sha256=c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc +[http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2] +md5=9de22ca1522008c28fb03dfc41ba2d30 +sha256=7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2 + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2] md5=977ee3fd1525418aaa8bfc55ffbf6fc9 sha256=f3c25042dfd332c3aee22176b3bcd244a99bc475112a97d9d4cc03505fe7b48f @@ -30506,6 +30906,10 @@ sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 md5=5f65e24f8a225e255beb2059e33d6b37 sha256=a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4 +[http://xorg.freedesktop.org/releases/individual/app/xrx-1.0.3.tar.bz2] +md5=c121945afcfc84e99af17158fda68be9 +sha256=9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrx-X11R7.0-1.0.1.tar.bz2] md5=9de3b04392c98df59c79a34fd51c385f sha256=2a177a9f36c92fdc109260a7c04980db6920fb9d3529d79e9bc019ae7f5a310e @@ -30862,6 +31266,10 @@ sha256=55fc617d536e58f088c694e71e1a02d3019c887c9abd2222574f84866b145d5e md5=6e3c5d0297d88e890b6f5df31f73dd60 sha256=d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c +[http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.2.tar.bz2] +md5=20bc5d85634964d4ceee77cdfcd131ed +sha256=84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwud-X11R7.0-1.0.1.tar.bz2] md5=e08d2ee04abb89a6348f47c84a1ff3ed sha256=a10c7950ad632f07426ea9516b3743c562da8403f0da0cc678277031020f1586 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 3098101d7f..b3021a7981 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -9,7 +9,6 @@ PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.1" PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" -PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" @@ -21,8 +20,6 @@ PREFERRED_VERSION_libtool = "2.2.6a" PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" -PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.4" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" @@ -36,11 +33,8 @@ PREFERRED_VERSION_udev = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" -PREFERRED_VERSION_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc new file mode 100644 index 0000000000..c505032201 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc @@ -0,0 +1,126 @@ +#Fri Oct 30 10:44:28 CET 2009 +#app +PREFERRED_VERSION_appres ?= "1.0.2" +PREFERRED_VERSION_beforelight ?= "1.0.3" +PREFERRED_VERSION_bitmap ?= "1.0.4" +PREFERRED_VERSION_constype ?= "1.0.2" +PREFERRED_VERSION_editres ?= "1.0.4" +PREFERRED_VERSION_fonttosfnt ?= "1.0.4" +PREFERRED_VERSION_fslsfonts ?= "1.0.2" +PREFERRED_VERSION_fstobdf ?= "1.0.3" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_mkcfm ?= "1.0.1" +PREFERRED_VERSION_mkcomposecache ?= "1.2.1" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rendercheck ?= "1.3" +PREFERRED_VERSION_rgb ?= "1.0.3" +PREFERRED_VERSION_rstart ?= "1.0.3" +PREFERRED_VERSION_scripts ?= "1.0.1" +PREFERRED_VERSION_showfont ?= "1.0.2" +PREFERRED_VERSION_twm ?= "1.0.4" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" +PREFERRED_VERSION_xcalc ?= "1.0.2" +PREFERRED_VERSION_xclipboard ?= "1.1.0" +PREFERRED_VERSION_xclock ?= "1.0.4" +PREFERRED_VERSION_xcompmgr ?= "1.1.4" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.9" +PREFERRED_VERSION_xedit ?= "1.1.2" +PREFERRED_VERSION_xeyes ?= "1.0.991" +PREFERRED_VERSION_xf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.2" +PREFERRED_VERSION_xfs ?= "1.1.0" +PREFERRED_VERSION_xfsinfo ?= "1.0.2" +PREFERRED_VERSION_xfwp ?= "1.0.1" +PREFERRED_VERSION_xgc ?= "1.0.1" +PREFERRED_VERSION_xinit ?= "1.1.1" +PREFERRED_VERSION_xkbprint ?= "1.0.1" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsfonts ?= "1.0.2" +PREFERRED_VERSION_xmag ?= "1.0.3" +PREFERRED_VERSION_xman ?= "1.1.0" +PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmh ?= "1.0.1" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xrx ?= "1.0.3" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" +#data +PREFERRED_VERSION_xkbdata ?= "1.0.1" +#doc +#driver +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3" +PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" +PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" +PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" +PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +#font +PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1" +#lib +PREFERRED_VERSION_libxtrap ?= "1.0.0" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxfontcache ?= "1.0.5" +PREFERRED_VERSION_libxp ?= "1.0.0" +PREFERRED_VERSION_libxprintapputil ?= "1.0.1" +PREFERRED_VERSION_libxprintutil ?= "1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "1.0.2" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_liboldx ?= "1.0.1" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_pixman ?= "0.16.2" +#proto +PREFERRED_VERSION_evieext ?= "1.1.0" +PREFERRED_VERSION_fontcacheproto ?= "0.1.3" +PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" +PREFERRED_VERSION_printproto ?= "1.0.4" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_xf86miscproto ?= "0.9.3" +PREFERRED_VERSION_xf86rushproto ?= "1.1.2" +PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" +#util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_lndir ?= "1.0.1" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" +#xserver diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index 6f891c47fd..766afe486a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -1,5 +1,5 @@ # see http://www.x.org/wiki/Releases/7.5 -# WORK IN PROGRESS, 7.5 will be released on 2009-XX-XX +# 7.5 was released on 2009-10-26 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" @@ -32,215 +32,258 @@ PREFERRED_PROVIDER_xrandr ?= "xrandr" PREFERRED_PROVIDER_xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" -PREFERRED_VERSION_task-xorg ?= "X11R7.4" +PREFERRED_VERSION_task-xorg ?= "X11R7.5" # app -PREFERRED_VERSION_appres ?= "1.0.1" -PREFERRED_VERSION_bitmap ?= "1.0.3" -PREFERRED_VERSION_iceauth ?= "1.0.2" -PREFERRED_VERSION_luit ?= "1.0.3" -PREFERRED_VERSION_mkfontdir-native ?= "1.0.4" -PREFERRED_VERSION_mkfontdir ?= "1.0.4" -PREFERRED_VERSION_mkfontscale ?= "1.0.5" -PREFERRED_VERSION_sessreg ?= "1.0.4" -PREFERRED_VERSION_setxkbmap ?= "1.0.4" -PREFERRED_VERSION_smproxy ?= "1.0.2" -PREFERRED_VERSION_x11perf ?= "1.5" -PREFERRED_VERSION_xauth ?= "1.0.3" -PREFERRED_VERSION_xbacklight ?= "1.1" -PREFERRED_VERSION_xcmsdb ?= "1.0.1" -PREFERRED_VERSION_xcursorgen ?= "1.0.2" -PREFERRED_VERSION_xdpyinfo ?= "1.0.3" -PREFERRED_VERSION_xdriinfo ?= "1.0.2" -PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xgamma ?= "1.0.2" -PREFERRED_VERSION_xhost ?= "1.0.2" -PREFERRED_VERSION_xinput ?= "1.3.0" -PREFERRED_VERSION_xkbcomp ?= "1.0.5" -PREFERRED_VERSION_xkbevd ?= "1.0.2" -PREFERRED_VERSION_xkbutils ?= "1.0.1" -PREFERRED_VERSION_xkill ?= "1.0.1" -PREFERRED_VERSION_xlsatoms ?= "1.0.1" -PREFERRED_VERSION_xlsclients ?= "1.0.1" -PREFERRED_VERSION_xmodmap ?= "1.0.3" -PREFERRED_VERSION_xpr ?= "1.0.2" -PREFERRED_VERSION_xprop ?= "1.0.4" -PREFERRED_VERSION_xrandr ?= "1.2.3" -PREFERRED_VERSION_xrdb ?= "1.0.5" -PREFERRED_VERSION_xrefresh ?= "1.0.2" -PREFERRED_VERSION_xset ?= "1.0.4" -PREFERRED_VERSION_xsetmode ?= "1.0.0" -PREFERRED_VERSION_xsetroot ?= "1.0.2" -PREFERRED_VERSION_xvinfo ?= "1.0.2" -PREFERRED_VERSION_xwd ?= "1.0.2" -PREFERRED_VERSION_xwininfo ?= "1.0.4" -PREFERRED_VERSION_xwud ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "1.0.2" +PREFERRED_VERSION_bdftopcf-native ?= "1.0.2" +PREFERRED_VERSION_iceauth ?= "1.0.3" +PREFERRED_VERSION_luit ?= "1.0.4" +PREFERRED_VERSION_mkfontdir ?= "1.0.5" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.5" +PREFERRED_VERSION_mkfontscale ?= "1.0.7" +PREFERRED_VERSION_mkfontscale-native ?= "1.0.7" +PREFERRED_VERSION_sessreg ?= "1.0.5" +PREFERRED_VERSION_setxkbmap ?= "1.1.0" +PREFERRED_VERSION_smproxy ?= "1.0.3" +PREFERRED_VERSION_x11perf ?= "1.5.1" +PREFERRED_VERSION_xauth ?= "1.0.4" +PREFERRED_VERSION_xbacklight ?= "1.1.1" +PREFERRED_VERSION_xcmsdb ?= "1.0.2" +PREFERRED_VERSION_xcursorgen ?= "1.0.3" +PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" +PREFERRED_VERSION_xdpyinfo ?= "1.1.0" +PREFERRED_VERSION_xdriinfo ?= "1.0.3" +PREFERRED_VERSION_xev ?= "1.0.4" +PREFERRED_VERSION_xgamma ?= "1.0.3" +PREFERRED_VERSION_xhost ?= "1.0.3" +PREFERRED_VERSION_xinput ?= "1.5.0" +PREFERRED_VERSION_xkbcomp ?= "1.1.1" +PREFERRED_VERSION_xkbcomp-native ?= "1.1.1" +PREFERRED_VERSION_xkbevd ?= "1.1.0" +PREFERRED_VERSION_xkbutils ?= "1.0.2" +PREFERRED_VERSION_xkill ?= "1.0.2" +PREFERRED_VERSION_xlsatoms ?= "1.0.2" +PREFERRED_VERSION_xlsclients ?= "1.0.2" +PREFERRED_VERSION_xmodmap ?= "1.0.4" +PREFERRED_VERSION_xpr ?= "1.0.3" +PREFERRED_VERSION_xprop ?= "1.1.0" +PREFERRED_VERSION_xrandr ?= "1.3.2" +PREFERRED_VERSION_xrdb ?= "1.0.6" +PREFERRED_VERSION_xrefresh ?= "1.0.3" +PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xsetroot ?= "1.0.3" +PREFERRED_VERSION_xvinfo ?= "1.1.0" +PREFERRED_VERSION_xwd ?= "1.0.3" +PREFERRED_VERSION_xwininfo ?= "1.0.5" +PREFERRED_VERSION_xwud ?= "1.0.2" +#driver # data -PREFERRED_VERSION_xbitmaps ?= "1.0.1" -PREFERRED_VERSION_xcursor-themes ?= "1.0.1" +PREFERRED_VERSION_xbitmaps ?= "1.1.0" +PREFERRED_VERSION_xcursor-themes ?= "1.0.2" # doc -PREFERRED_VERSION_xorg-docs ?= "1.4" -PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" +PREFERRED_VERSION_xorg-docs ?= "1.5" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3" # driver -PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2" -PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1" -PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" -PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2" -PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1" -PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" -PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1" -PREFERRED_VERSION_xf86-input-void ?= "1.1.1" -PREFERRED_VERSION_xf86-video-apm ?= "1.2.0" -PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" -PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" -PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" -PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" +PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.4.99.2" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" +PREFERRED_VERSION_xf86-input-void ?= "1.3.0" +PREFERRED_VERSION_xf86-video-apm ?= "1.2.2" +PREFERRED_VERSION_xf86-video-ark ?= "0.7.2" +PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ati ?= "6.12.4" +PREFERRED_VERSION_xf86-video-chips ?= "1.2.2" PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" -PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" -PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" -PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1" -PREFERRED_VERSION_xf86-video-glide ?= "1.0.1" -PREFERRED_VERSION_xf86-video-glint ?= "1.2.1" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1" -PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0" -PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.6.3" -PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0" -PREFERRED_VERSION_xf86-video-mga ?= "1.4.9" -PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1" -PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.12" -PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903" -PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0" -PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0" -PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0" -PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1" -PREFERRED_VERSION_xf86-video-savage ?= "2.2.1" -PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0" -PREFERRED_VERSION_xf86-video-sis ?= "0.10.0" -PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0" -PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.6" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" +PREFERRED_VERSION_xf86-video-intel ?= "2.9.1" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.11" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.15" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4" +PREFERRED_VERSION_xf86-video-savage ?= "2.3.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3" +PREFERRED_VERSION_xf86-video-sis ?= "0.10.2" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1" PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" -PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" -PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0" -PREFERRED_VERSION_xf86-video-tga ?= "1.2.0" -PREFERRED_VERSION_xf86-video-trident ?= "1.3.0" -PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.1" +PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" -PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" -PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5" -PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0" -PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1" -PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0" -PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3" +PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" # font -PREFERRED_VERSION_encodings ?= "1.0.2" -PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" -PREFERRED_VERSION_font-util-native ?= "1.0.1" -PREFERRED_VERSION_font-util ?= "1.0.1" -PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1" +PREFERRED_VERSION_encodings ?= "1.0.3" +PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2" +PREFERRED_VERSION_font-alias ?= "1.0.2" +PREFERRED_VERSION_font-arabic-misc ?= "1.0.1" +PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-ttf ?= "1.0.1" +PREFERRED_VERSION_font-bh-type1 ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1" +PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-cursor-misc ?= "1.0.1" +PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1" +PREFERRED_VERSION_font-dec-misc ?= "1.0.1" +PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1" +PREFERRED_VERSION_font-isas-misc ?= "1.0.1" +PREFERRED_VERSION_font-jis-misc ?= "1.0.1" +PREFERRED_VERSION_font-micro-misc ?= "1.0.1" +PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1" +PREFERRED_VERSION_font-misc-meltho ?= "1.0.1" +PREFERRED_VERSION_font-misc-misc ?= "1.1.0" +PREFERRED_VERSION_font-mutt-misc ?= "1.0.1" +PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2" +PREFERRED_VERSION_font-sony-misc ?= "1.0.1" +PREFERRED_VERSION_font-sun-misc ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.1.1" +PREFERRED_VERSION_font-util-native ?= "1.1.1" +PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2" # lib -PREFERRED_VERSION_diet-x11 ?= "1.1.5" -PREFERRED_VERSION_libapplewm ?= "1.0.0" -PREFERRED_VERSION_libdmx ?= "1.0.2" -PREFERRED_VERSION_libfs ?= "1.0.1" -PREFERRED_VERSION_libice ?= "1.0.4" -PREFERRED_VERSION_libfontenc ?= "1.0.4" -PREFERRED_VERSION_libsm ?= "1.1.0" -PREFERRED_VERSION_libwindowswm ?= "1.0.0" -PREFERRED_VERSION_libx11 ?= "1.1.5" -PREFERRED_VERSION_libx11-native ?= "1.1.1" -PREFERRED_VERSION_libxau ?= "1.0.4" -PREFERRED_VERSION_libxaw ?= "1.0.4" -PREFERRED_VERSION_libxcomposite ?= "0.4.0" -PREFERRED_VERSION_libxcursor ?= "1.1.9" -PREFERRED_VERSION_libxdamage ?= "1.1.1" -PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" -PREFERRED_VERSION_libxdmcp ?= "1.0.2" -PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.4" -PREFERRED_VERSION_libxfixes ?= "4.0.3" -PREFERRED_VERSION_libxfont ?= "1.3.3" -PREFERRED_VERSION_libxfontcache ?= "1.0.4" -PREFERRED_VERSION_libxft ?= "2.1.13" -PREFERRED_VERSION_libxi ?= "1.2.0" -PREFERRED_VERSION_libxinerama ?= "1.0.3" -PREFERRED_VERSION_libxkbfile ?= "1.0.5" -PREFERRED_VERSION_libxmu ?= "1.0.4" -PREFERRED_VERSION_libxpm ?= "3.5.7" -PREFERRED_VERSION_libxrandr ?= "1.2.3" -PREFERRED_VERSION_libxrender ?= "0.9.4" -PREFERRED_VERSION_libxres ?= "1.0.3" -PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" -PREFERRED_VERSION_libxt ?= "1.0.5" -PREFERRED_VERSION_libxtst ?= "1.0.3" -PREFERRED_VERSION_libxv ?= "1.0.4" -PREFERRED_VERSION_libxvmc ?= "1.0.4" -PREFERRED_VERSION_libxxf86dga ?= "1.0.2" -PREFERRED_VERSION_libxxf86misc ?= "1.0.1" -PREFERRED_VERSION_libxxf86vm ?= "1.0.2" -PREFERRED_VERSION_xtrans ?= "1.2.1" - -# This should be here but is needed until bitbake can do -# versioned depends -PREFERRED_VERSION_mesa ?= "7.4" +PREFERRED_VERSION_libapplewm ?= "1.4.0" +PREFERRED_VERSION_libfs ?= "1.0.2" +PREFERRED_VERSION_libice ?= "1.0.6" +PREFERRED_VERSION_libice-native ?= "1.0.6" +PREFERRED_VERSION_libsm ?= "1.1.1" +PREFERRED_VERSION_libsm-native ?= "1.1.1" +PREFERRED_VERSION_libwindowswm ?= "1.0.1" +PREFERRED_VERSION_libx11 ?= "1.3.2" +PREFERRED_VERSION_libx11-native ?= "1.3.2" +PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" +PREFERRED_VERSION_libxau ?= "1.0.5" +PREFERRED_VERSION_libxau-native ?= "1.0.5" +PREFERRED_VERSION_libxaw ?= "1.0.7" +PREFERRED_VERSION_libxcomposite ?= "0.4.1" +PREFERRED_VERSION_libxcursor ?= "1.1.10" +PREFERRED_VERSION_libxcursor-native ?= "1.1.10" +PREFERRED_VERSION_libxdamage ?= "1.1.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.3" +PREFERRED_VERSION_libxext ?= "1.1.1" +PREFERRED_VERSION_libxext-native ?= "1.1.1" +PREFERRED_VERSION_libxfixes ?= "4.0.4" +PREFERRED_VERSION_libxfixes-native ?= "4.0.4" +PREFERRED_VERSION_libxfont ?= "1.4.1" +PREFERRED_VERSION_libxfont-native ?= "1.4.1" +PREFERRED_VERSION_libxft ?= "2.1.14" +PREFERRED_VERSION_libxi ?= "1.3" +PREFERRED_VERSION_libxinerama ?= "1.1" +PREFERRED_VERSION_libxmu ?= "1.0.5" +PREFERRED_VERSION_libxpm ?= "3.5.8" +PREFERRED_VERSION_libxrandr ?= "1.3.0" +PREFERRED_VERSION_libxrender ?= "0.9.5" +PREFERRED_VERSION_libxrender-native ?= "0.9.5" +PREFERRED_VERSION_libxres ?= "1.0.4" +PREFERRED_VERSION_libxt ?= "1.0.7" +PREFERRED_VERSION_libxt-native ?= "1.0.7" +PREFERRED_VERSION_libxtst ?= "1.1.0" +PREFERRED_VERSION_libxv ?= "1.0.5" +PREFERRED_VERSION_libxvmc ?= "1.0.5" +PREFERRED_VERSION_libxxf86dga ?= "1.1.1" +PREFERRED_VERSION_libxxf86vm ?= "1.1.0" +PREFERRED_VERSION_libdmx ?= "1.1.0" +PREFERRED_VERSION_libfontenc ?= "1.0.5" +PREFERRED_VERSION_libfontenc-native ?= "1.0.5" +PREFERRED_VERSION_libpciaccess ?= "0.10.9" +PREFERRED_VERSION_libxkbfile ?= "1.0.6" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" +PREFERRED_VERSION_xtrans ?= "1.2.5" +PREFERRED_VERSION_xtrans-native ?= "1.2.5" # proto -PREFERRED_VERSION_applewmproto ?= "1.0.3" -PREFERRED_VERSION_bigreqsproto ?= "1.0.2" -PREFERRED_VERSION_compositeproto ?= "0.4" -PREFERRED_VERSION_damageproto ?= "1.1.0" -PREFERRED_VERSION_dmxproto ?= "2.2.2" -PREFERRED_VERSION_fixesproto ?= "4.0" -PREFERRED_VERSION_fontcacheproto ?= "0.1.2" -PREFERRED_VERSION_fontsproto ?= "2.0.2" -PREFERRED_VERSION_glproto ?= "1.4.9" -PREFERRED_VERSION_inputproto ?= "1.5.0" -PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_VERSION_recordproto ?= "1.13.2" -PREFERRED_VERSION_renderproto ?= "0.9.3" -PREFERRED_VERSION_resourceproto ?= "1.0.2" -PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" -PREFERRED_VERSION_dri2proto ?= "2.0" -PREFERRED_VERSION_trapproto ?= "3.4.3" -PREFERRED_VERSION_videoproto ?= "2.2.2" -PREFERRED_VERSION_windowswmproto ?= "1.0.3" -PREFERRED_VERSION_xmiscproto ?= "1.1.2" -PREFERRED_VERSION_xextproto ?= "7.0.3" -PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xf86driproto ?= "2.0.4" -PREFERRED_VERSION_xf86miscproto ?= "0.9.2" -PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" -PREFERRED_VERSION_xinemaroproto ?= "1.1.2" -PREFERRED_VERSION_xproto-native ?= "7.0.13" -PREFERRED_VERSION_xproto ?= "7.0.13" +PREFERRED_VERSION_applewmproto ?= "1.4.1" +PREFERRED_VERSION_bigreqsproto ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" +PREFERRED_VERSION_compositeproto ?= "0.4.1" +PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_dmxproto ?= "2.3" +PREFERRED_VERSION_dri2proto ?= "2.1" +PREFERRED_VERSION_fixesproto ?= "4.1.1" +PREFERRED_VERSION_fixesproto-native ?= "4.1.1" +PREFERRED_VERSION_fontsproto ?= "2.1.0" +PREFERRED_VERSION_fontsproto-native ?= "2.1.0" +PREFERRED_VERSION_glproto ?= "1.4.10" +PREFERRED_VERSION_inputproto ?= "2.0" +PREFERRED_VERSION_inputproto-native ?= "2.0" +PREFERRED_VERSION_kbproto ?= "1.0.4" +PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_randrproto ?= "1.3.1" +PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_renderproto ?= "0.11" +PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" +PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_windowswmproto ?= "1.0.4" +PREFERRED_VERSION_xcmiscproto ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xextproto ?= "7.1.1" +PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.1" +PREFERRED_VERSION_xf86driproto ?= "2.1.0" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" +PREFERRED_VERSION_xineramaproto ?= "1.2" +PREFERRED_VERSION_xproto ?= "7.0.16" +PREFERRED_VERSION_xproto-native ?= "7.0.16" # util -PREFERRED_VERSION_gccmakedep ?= "1.0.2" -PREFERRED_VERSION_imake ?= "1.0.2" -PREFERRED_VERSION_makedepend ?= "1.0.1" -PREFERRED_VERSION_util-macros-native ?= "1.2.1" -PREFERRED_VERSION_util-macros ?= "1.2.1" -PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" +PREFERRED_VERSION_makedepend ?= "1.0.2" +PREFERRED_VERSION_makedepend-native ?= "1.0.2" +PREFERRED_VERSION_util-macros ?= "1.3.0" +PREFERRED_VERSION_util-macros-native ?= "1.3.0" # xserver -PREFERRED_VERSION_xserver-kdrive ?= "1.4" -PREFERRED_VERSION_xserver-xorg ?= "1.5.3" +PREFERRED_VERSION_xserver-xorg ?= "1.7.1" # Unreleased packages SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" + +require conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc new file mode 100644 index 0000000000..0c3c53e40f --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -0,0 +1,353 @@ +#Sun Nov 29 09:04:41 CET 2009 +#app +PREFERRED_VERSION_appres ?= "1.0.2" +PREFERRED_VERSION_bdftopcf ?= "1.0.2" +PREFERRED_VERSION_bdftopcf-native ?= "1.0.2" +PREFERRED_VERSION_beforelight ?= "1.0.3" +PREFERRED_VERSION_bitmap ?= "1.0.4" +PREFERRED_VERSION_constype ?= "1.0.2" +PREFERRED_VERSION_editres ?= "1.0.4" +PREFERRED_VERSION_fonttosfnt ?= "1.0.4" +PREFERRED_VERSION_fslsfonts ?= "1.0.2" +PREFERRED_VERSION_fstobdf ?= "1.0.3" +PREFERRED_VERSION_iceauth ?= "1.0.3" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.2" +PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_luit ?= "1.0.4" +PREFERRED_VERSION_mkcfm ?= "1.0.1" +PREFERRED_VERSION_mkcomposecache ?= "1.2.1" +PREFERRED_VERSION_mkfontdir ?= "1.0.5" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.5" +PREFERRED_VERSION_mkfontscale ?= "1.0.7" +PREFERRED_VERSION_mkfontscale-native ?= "1.0.7" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rendercheck ?= "1.3" +PREFERRED_VERSION_rgb ?= "1.0.3" +PREFERRED_VERSION_rstart ?= "1.0.3" +PREFERRED_VERSION_scripts ?= "1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.5" +PREFERRED_VERSION_setxkbmap ?= "1.1.0" +PREFERRED_VERSION_showfont ?= "1.0.2" +PREFERRED_VERSION_smproxy ?= "1.0.3" +PREFERRED_VERSION_twm ?= "1.0.4" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_x11perf ?= "1.5.1" +PREFERRED_VERSION_xauth ?= "1.0.4" +PREFERRED_VERSION_xbacklight ?= "1.1.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" +PREFERRED_VERSION_xcalc ?= "1.0.2" +PREFERRED_VERSION_xclipboard ?= "1.1.0" +PREFERRED_VERSION_xclock ?= "1.0.4" +PREFERRED_VERSION_xcmsdb ?= "1.0.2" +PREFERRED_VERSION_xcompmgr ?= "1.1.5" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xcursorgen ?= "1.0.3" +PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.9" +PREFERRED_VERSION_xdpyinfo ?= "1.1.0" +PREFERRED_VERSION_xdriinfo ?= "1.0.3" +PREFERRED_VERSION_xedit ?= "1.1.2" +PREFERRED_VERSION_xev ?= "1.0.4" +PREFERRED_VERSION_xeyes ?= "1.0.991" +PREFERRED_VERSION_xf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.2" +PREFERRED_VERSION_xfs ?= "1.1.0" +PREFERRED_VERSION_xfsinfo ?= "1.0.2" +PREFERRED_VERSION_xfwp ?= "1.0.1" +PREFERRED_VERSION_xgamma ?= "1.0.3" +PREFERRED_VERSION_xgc ?= "1.0.2" +PREFERRED_VERSION_xhost ?= "1.0.3" +PREFERRED_VERSION_xinit ?= "1.2.0" +PREFERRED_VERSION_xinput ?= "1.5.0" +PREFERRED_VERSION_xkbcomp ?= "1.1.1" +PREFERRED_VERSION_xkbcomp-native ?= "1.1.1" +PREFERRED_VERSION_xkbevd ?= "1.1.0" +PREFERRED_VERSION_xkbprint ?= "1.0.2" +PREFERRED_VERSION_xkbutils ?= "1.0.2" +PREFERRED_VERSION_xkill ?= "1.0.2" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsatoms ?= "1.0.2" +PREFERRED_VERSION_xlsclients ?= "1.0.2" +PREFERRED_VERSION_xlsfonts ?= "1.0.2" +PREFERRED_VERSION_xmag ?= "1.0.3" +PREFERRED_VERSION_xman ?= "1.1.0" +PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmh ?= "1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.4" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xpr ?= "1.0.3" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xprop ?= "1.1.0" +PREFERRED_VERSION_xrandr ?= "1.3.2" +PREFERRED_VERSION_xrdb ?= "1.0.6" +PREFERRED_VERSION_xrefresh ?= "1.0.3" +PREFERRED_VERSION_xrx ?= "1.0.3" +PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsetroot ?= "1.0.3" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" +PREFERRED_VERSION_xvinfo ?= "1.1.0" +PREFERRED_VERSION_xwd ?= "1.0.3" +PREFERRED_VERSION_xwininfo ?= "1.0.5" +PREFERRED_VERSION_xwud ?= "1.0.2" +#data +PREFERRED_VERSION_xbitmaps ?= "1.1.0" +PREFERRED_VERSION_xcursor-themes ?= "1.0.2" +PREFERRED_VERSION_xkbdata ?= "1.0.1" +#doc +PREFERRED_VERSION_xorg-docs ?= "1.5" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3" +#driver +PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.1" +PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" +PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" +PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" +PREFERRED_VERSION_xf86-input-void ?= "1.3.0" +PREFERRED_VERSION_xf86-video-apm ?= "1.2.2" +PREFERRED_VERSION_xf86-video-ark ?= "0.7.2" +PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ati ?= "6.12.4" +PREFERRED_VERSION_xf86-video-chips ?= "1.2.2" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.6" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" +PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" +PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.9.1" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" +PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.15" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" +PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4" +PREFERRED_VERSION_xf86-video-savage ?= "2.3.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3" +PREFERRED_VERSION_xf86-video-sis ?= "0.10.2" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.1" +PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" +PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" +#font +PREFERRED_VERSION_encodings ?= "1.0.3" +PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2" +PREFERRED_VERSION_font-alias ?= "1.0.2" +PREFERRED_VERSION_font-arabic-misc ?= "1.0.1" +PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-ttf ?= "1.0.1" +PREFERRED_VERSION_font-bh-type1 ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1" +PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-cursor-misc ?= "1.0.1" +PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1" +PREFERRED_VERSION_font-dec-misc ?= "1.0.1" +PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1" +PREFERRED_VERSION_font-isas-misc ?= "1.0.1" +PREFERRED_VERSION_font-jis-misc ?= "1.0.1" +PREFERRED_VERSION_font-micro-misc ?= "1.0.1" +PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1" +PREFERRED_VERSION_font-misc-meltho ?= "1.0.1" +PREFERRED_VERSION_font-misc-misc ?= "1.1.0" +PREFERRED_VERSION_font-mutt-misc ?= "1.0.1" +PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2" +PREFERRED_VERSION_font-sony-misc ?= "1.0.1" +PREFERRED_VERSION_font-sun-misc ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.1.1" +PREFERRED_VERSION_font-util-native ?= "1.1.1" +PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2" +#lib +PREFERRED_VERSION_libapplewm ?= "1.4.0" +PREFERRED_VERSION_libfs ?= "1.0.2" +PREFERRED_VERSION_libice ?= "1.0.6" +PREFERRED_VERSION_libice-native ?= "1.0.6" +PREFERRED_VERSION_libsm ?= "1.1.1" +PREFERRED_VERSION_libsm-native ?= "1.1.1" +PREFERRED_VERSION_libwindowswm ?= "1.0.1" +PREFERRED_VERSION_libx11 ?= "1.3.2" +PREFERRED_VERSION_libx11-native ?= "1.3.2" +PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" +PREFERRED_VERSION_libxtrap ?= "1.0.0" +PREFERRED_VERSION_libxau ?= "1.0.5" +PREFERRED_VERSION_libxau-native ?= "1.0.5" +PREFERRED_VERSION_libxaw ?= "1.0.7" +PREFERRED_VERSION_libxcomposite ?= "0.4.1" +PREFERRED_VERSION_libxcursor ?= "1.1.10" +PREFERRED_VERSION_libxcursor-native ?= "1.1.10" +PREFERRED_VERSION_libxdamage ?= "1.1.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.3" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.1.1" +PREFERRED_VERSION_libxext-native ?= "1.1.1" +PREFERRED_VERSION_libxfixes ?= "4.0.4" +PREFERRED_VERSION_libxfixes-native ?= "4.0.4" +PREFERRED_VERSION_libxfont ?= "1.4.1" +PREFERRED_VERSION_libxfont-native ?= "1.4.1" +PREFERRED_VERSION_libxfontcache ?= "1.0.5" +PREFERRED_VERSION_libxft ?= "2.1.14" +PREFERRED_VERSION_libxi ?= "1.3" +PREFERRED_VERSION_libxinerama ?= "1.1" +PREFERRED_VERSION_libxmu ?= "1.0.5" +PREFERRED_VERSION_libxp ?= "1.0.0" +PREFERRED_VERSION_libxpm ?= "3.5.8" +PREFERRED_VERSION_libxprintapputil ?= "1.0.1" +PREFERRED_VERSION_libxprintutil ?= "1.0.1" +PREFERRED_VERSION_libxrandr ?= "1.3.0" +PREFERRED_VERSION_libxrender ?= "0.9.5" +PREFERRED_VERSION_libxrender-native ?= "0.9.5" +PREFERRED_VERSION_libxres ?= "1.0.4" +PREFERRED_VERSION_libxt ?= "1.0.7" +PREFERRED_VERSION_libxt-native ?= "1.0.7" +PREFERRED_VERSION_libxtst ?= "1.1.0" +PREFERRED_VERSION_libxv ?= "1.0.5" +PREFERRED_VERSION_libxvmc ?= "1.0.5" +PREFERRED_VERSION_libxxf86dga ?= "1.1.1" +PREFERRED_VERSION_libxxf86misc ?= "1.0.2" +PREFERRED_VERSION_libxxf86vm ?= "1.1.0" +PREFERRED_VERSION_libdmx ?= "1.1.0" +PREFERRED_VERSION_libfontenc ?= "1.0.5" +PREFERRED_VERSION_libfontenc-native ?= "1.0.5" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_liboldx ?= "1.0.1" +PREFERRED_VERSION_libpciaccess ?= "0.10.9" +PREFERRED_VERSION_libxkbfile ?= "1.0.6" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_pixman ?= "0.17.2" +PREFERRED_VERSION_xtrans ?= "1.2.5" +PREFERRED_VERSION_xtrans-native ?= "1.2.5" +#proto +PREFERRED_VERSION_applewmproto ?= "1.4.1" +PREFERRED_VERSION_bigreqsproto ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" +PREFERRED_VERSION_compositeproto ?= "0.4.1" +PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_dmxproto ?= "2.3" +PREFERRED_VERSION_dri2proto ?= "2.1" +PREFERRED_VERSION_evieext ?= "1.1.0" +PREFERRED_VERSION_fixesproto ?= "4.1.1" +PREFERRED_VERSION_fixesproto-native ?= "4.1.1" +PREFERRED_VERSION_fontcacheproto ?= "0.1.3" +PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" +PREFERRED_VERSION_fontsproto ?= "2.1.0" +PREFERRED_VERSION_fontsproto-native ?= "2.1.0" +PREFERRED_VERSION_glproto ?= "1.4.10" +PREFERRED_VERSION_inputproto ?= "2.0" +PREFERRED_VERSION_inputproto-native ?= "2.0" +PREFERRED_VERSION_kbproto ?= "1.0.4" +PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_printproto ?= "1.0.4" +PREFERRED_VERSION_randrproto ?= "1.3.1" +PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_renderproto ?= "0.11" +PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_windowswmproto ?= "1.0.4" +PREFERRED_VERSION_xcmiscproto ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xextproto ?= "7.1.1" +PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.1" +PREFERRED_VERSION_xf86driproto ?= "2.1.0" +PREFERRED_VERSION_xf86miscproto ?= "0.9.3" +PREFERRED_VERSION_xf86rushproto ?= "1.1.2" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" +PREFERRED_VERSION_xineramaproto ?= "1.2" +PREFERRED_VERSION_xproto ?= "7.0.16" +PREFERRED_VERSION_xproto-native ?= "7.0.16" +PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" +#util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_lndir ?= "1.0.1" +PREFERRED_VERSION_makedepend ?= "1.0.2" +PREFERRED_VERSION_makedepend-native ?= "1.0.2" +PREFERRED_VERSION_util-macros ?= "1.3.0" +PREFERRED_VERSION_util-macros-native ?= "1.3.0" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" +#xserver +PREFERRED_VERSION_xserver-xorg ?= "1.7.2" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9210ef7fe6..6f163f2481 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -196,7 +196,8 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "1096" +SRCREV_pn-navit ?= "2809" +SRCREV_pn-navit-icons ?= "2618" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "2" SRCREV_pn-net-snmp ?= "17367" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index cd83a7b5a6..da464761ad 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -20,6 +20,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PCMCIA_MANAGER ?= "pcmciautils" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index dde1bd1499..b8e008ebe2 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -29,5 +29,7 @@ UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" # xserver-kdrive 1.3.0.0 is still the only working version: -XSERVER = "xserver-kdrive-1300-fbdev" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" +#XSERVER = "xserver-kdrive-1300-fbdev" +#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" +XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" diff --git a/contrib/patchwork/pw-am.sh b/contrib/patchwork/pw-am.sh index 1c64aa5d64..4707c99a4f 100755 --- a/contrib/patchwork/pw-am.sh +++ b/contrib/patchwork/pw-am.sh @@ -9,7 +9,7 @@ for patchnumber in $@; do - wget -nv http://patchwork.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch + wget -nv http://patchwork.dev.bearstech.com/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch git am -s pw-am-$patchnumber.patch rm pw-am-$patchnumber.patch done diff --git a/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh b/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh new file mode 100755 index 0000000000..07fa914ee2 --- /dev/null +++ b/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh @@ -0,0 +1,75 @@ +#!/bin/bash +DATE=`date +%Y%m%d` +SCRDIR=`dirname $0` +DIR=${SCRDIR}/${DATE} +PREFIX=http://www.x.org/releases/X11R7.5/src/ +GRPS="app data doc driver font lib proto util xserver" +OETREE=${SCRDIR}/../.. +PREFS_LIVE=${OETREE}/conf/distro/include/preferred-xorg-versions-X11R7.5-live.inc +BBS=${OETREE}/recipes/xorg- +OUT_LOG=${DIR}.log +OUT_CMD=${DIR}.cmd + +export LC_ALL=c + +mkdir -p ${DIR} + +function latest { + IN=$1 + OUT=$2 + echo "Parsing latest from ${IN} to ${OUT}" + sed "s/<a href=\"/\nPKG=/g" ${IN} | grep "^PKG=" | sed "s/^\([^\"]*\)\">.*$/\1/g" | grep "bz2$" | sort -V > ${IN}.tmp + for PKG in `sed "s/^\(.*\)-\([^-]*\)$/\1/g" ${IN}.tmp | sort -u`; do + grep ${PKG} ${IN}.tmp | tail -n 1 | sed 's/xorg-server/xserver-xorg/g' >> ${OUT}; + done +} + +function updateVersions { + PKG=$1 + GRP=$2 + VER=$3 + BB_VER=`ls -1 ${BBS}${GRP}/${PKG}_*.bb 2>/dev/null | sed "s%${BBS}${GRP}/${PKG}_%%g; s%.bb$%%g" | grep -v X11R7.0 | grep -v cvs | grep -v git | grep -v svn | sort -V | tail -n 1` + #echo ${GRP}/${PKG}/${VER} ${PREF_VER} ${BB_VER} + if ls -1 ${BBS}${GRP}/${PKG}_*.bb >/dev/null 2>/dev/null ; then + echo "PREFERRED_VERSION_${PKG} ?= \"${VER}\"" >> ${PREFS_LIVE} + fi + if [[ -n ${BB_VER} && ${BB_VER} != ${VER} ]] ; then + echo "bump: $GRP ${PKG} ${BB_VER} -> ${VER}" | tee -a ${OUT_LOG} + echo "cp ${BBS}${GRP}/${PKG}_${BB_VER}.bb ${BBS}${GRP}/${PKG}_${VER}.bb" >> ${OUT_CMD} + fi + if [[ -z ${BB_VER} ]] ; then + echo "new ${GRP} ${PKG}/${VER}" | tee -a ${OUT_LOG} + fi +} + +for GRP in ${GRPS}; do + if [[ ! -e ${DIR}/${GRP}.html ]] ; then + wget ${PREFIX}/${GRP} -O ${DIR}/${GRP}.html + fi + latest ${DIR}/${GRP}.html ${DIR}/${GRP}.txt + echo "#${GRP}" >> ${DIR}/latest.txt + sed "s/PKG=/${GRP}\//g; s/-\([^-]*\).tar.bz2$/\/\1/g;" ${DIR}/${GRP}.txt | gawk '{ print tolower($0) }' >> ${DIR}/latest.txt +done + +sort -u ${DIR}/latest.txt > ${DIR}/latest.sort.txt + +echo "#`date`" > ${PREFS_LIVE} + +echo "#`date`" > ${OUT_LOG} +echo "#`date`" > ${OUT_CMD} + +cat ${DIR}/latest.txt | while read LINE; do + if [[ ${LINE} =~ \#.* ]]; then + echo ${LINE} >> ${PREFS_LIVE} + continue + fi + #echo ${LINE}; + PKG=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\2%g;"` + GRP=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\1%g;"` + VER=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\3%g;"` + updateVersions ${PKG} ${GRP} ${VER} + updateVersions ${PKG}-native ${GRP} ${VER} +done + +echo "Check ${OUT_LOG} if there is something new and interesting" +echo "You can update prefs or copy bbfiles with commands from ${OUT_CMD}" diff --git a/contrib/source-checker/bump.preferred-xorg-versions-live.sh b/contrib/source-checker/bump.preferred-xorg-versions-live.sh new file mode 100755 index 0000000000..63ae0f4b28 --- /dev/null +++ b/contrib/source-checker/bump.preferred-xorg-versions-live.sh @@ -0,0 +1,75 @@ +#!/bin/bash +DATE=`date +%Y%m%d` +SCRDIR=`dirname $0` +DIR=${SCRDIR}/${DATE} +PREFIX=http://xorg.freedesktop.org/releases/individual/ +GRPS="app data doc driver font lib proto util xserver" +OETREE=${SCRDIR}/../.. +PREFS_LIVE=${OETREE}/conf/distro/include/preferred-xorg-versions-live.inc +BBS=${OETREE}/recipes/xorg- +OUT_LOG=${DIR}.log +OUT_CMD=${DIR}.cmd + +export LC_ALL=c + +mkdir -p ${DIR} + +function latest { + IN=$1 + OUT=$2 + echo "Parsing latest from ${IN} to ${OUT}" + sed "s/<a href=\"/\nPKG=/g" ${IN} | grep "^PKG=" | sed "s/^\([^\"]*\)\">.*$/\1/g" | grep "bz2$" | sort -V > ${IN}.tmp + for PKG in `sed "s/^\(.*\)-\([^-]*\)$/\1/g" ${IN}.tmp | sort -u`; do + grep ${PKG} ${IN}.tmp | tail -n 1 | sed 's/xorg-server/xserver-xorg/g' >> ${OUT}; + done +} + +function updateVersions { + PKG=$1 + GRP=$2 + VER=$3 + BB_VER=`ls -1 ${BBS}${GRP}/${PKG}_*.bb 2>/dev/null | sed "s%${BBS}${GRP}/${PKG}_%%g; s%.bb$%%g" | grep -v X11R7.0 | grep -v cvs | grep -v git | grep -v svn | sort -V | tail -n 1` + #echo ${GRP}/${PKG}/${VER} ${PREF_VER} ${BB_VER} + if ls -1 ${BBS}${GRP}/${PKG}_*.bb >/dev/null 2>/dev/null ; then + echo "PREFERRED_VERSION_${PKG} ?= \"${VER}\"" >> ${PREFS_LIVE} + fi + if [[ -n ${BB_VER} && ${BB_VER} != ${VER} ]] ; then + echo "bump: $GRP ${PKG} ${BB_VER} -> ${VER}" | tee -a ${OUT_LOG} + echo "cp ${BBS}${GRP}/${PKG}_${BB_VER}.bb ${BBS}${GRP}/${PKG}_${VER}.bb" >> ${OUT_CMD} + fi + if [[ -z ${BB_VER} ]] ; then + echo "new ${GRP} ${PKG}/${VER}" | tee -a ${OUT_LOG} + fi +} + +for GRP in ${GRPS}; do + if [[ ! -e ${DIR}/${GRP}.html ]] ; then + wget ${PREFIX}/${GRP} -O ${DIR}/${GRP}.html + fi + latest ${DIR}/${GRP}.html ${DIR}/${GRP}.txt + echo "#${GRP}" >> ${DIR}/latest.txt + sed "s/PKG=/${GRP}\//g; s/-\([^-]*\).tar.bz2$/\/\1/g;" ${DIR}/${GRP}.txt | gawk '{ print tolower($0) }' >> ${DIR}/latest.txt +done + +sort -u ${DIR}/latest.txt > ${DIR}/latest.sort.txt + +echo "#`date`" > ${PREFS_LIVE} + +echo "#`date`" > ${OUT_LOG} +echo "#`date`" > ${OUT_CMD} + +cat ${DIR}/latest.txt | while read LINE; do + if [[ ${LINE} =~ \#.* ]]; then + echo ${LINE} >> ${PREFS_LIVE} + continue + fi + #echo ${LINE}; + PKG=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\2%g;"` + GRP=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\1%g;"` + VER=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\3%g;"` + updateVersions ${PKG} ${GRP} ${VER} + updateVersions ${PKG}-native ${GRP} ${VER} +done + +echo "Check ${OUT_LOG} if there is something new and interesting" +echo "You can update prefs or copy bbfiles with commands from ${OUT_CMD}" diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb index 3b4cf79f93..bf88cb5959 100644 --- a/recipes/alsa/alsa-scenario_0.2.bb +++ b/recipes/alsa/alsa-scenario_0.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" PR = "r0" -PE = "1" +PE = "2" SRC_URI = "http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2" diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb index edc77d2bbc..8bc8ef6fe1 100644 --- a/recipes/alsa/alsa-scenario_git.bb +++ b/recipes/alsa/alsa-scenario_git.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" PR = "r0" -PE = "1" +PE = "2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/avahi/mango-lassi_git.bb b/recipes/avahi/mango-lassi_git.bb index c2250d8781..b0131d3136 100644 --- a/recipes/avahi/mango-lassi_git.bb +++ b/recipes/avahi/mango-lassi_git.bb @@ -2,7 +2,8 @@ ESCRIPTION = "Input sharing, the avahi way" DEPENDS = "avahi-ui libglade libnotify" SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" diff --git a/recipes/blipomoko/blipomoko_git.bb b/recipes/blipomoko/blipomoko_git.bb index 82f190a73c..22a34077ce 100644 --- a/recipes/blipomoko/blipomoko_git.bb +++ b/recipes/blipomoko/blipomoko_git.bb @@ -8,7 +8,7 @@ SECTION = "x11/applications" SRC_URI = "git://github.com/dos1/blipomoko.git;protocol=http" S = "${WORKDIR}/git" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PR = "r0" inherit distutils diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb index e658e3256f..8375f4dd5b 100644 --- a/recipes/blktool/blktool_4.bb +++ b/recipes/blktool/blktool_4.bb @@ -1,8 +1,11 @@ DESCRIPTION = "Display or change block device settings" LICENSE = "GPLv2" +DEPENDS = "glib-2.0" +PR = "r2" + SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz" S = "${WORKDIR}/${PN}-${PV}.orig" -inherit autotools
\ No newline at end of file +inherit pkgconfig autotools diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb index 226faa9b98..1bc9d8520f 100644 --- a/recipes/bt-configure/bt-configure_git.bb +++ b/recipes/bt-configure/bt-configure_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python python-pygtk bluez4" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" PR = "r1" ARCH_bt-configure = "all" diff --git a/recipes/calc/calc_git.bb b/recipes/calc/calc_git.bb index 9914d23717..e64bf655a4 100644 --- a/recipes/calc/calc_git.bb +++ b/recipes/calc/calc_git.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" RDEPENDS = "python-elementary python python-edbus" SECTION = "x11/application" SRCREV ?= "1c17792094eb" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/clutter/clutter-gtk-0.6_git.bb b/recipes/clutter/clutter-gtk-0.6_git.bb index 89f2592bfc..9575c110d0 100644 --- a/recipes/clutter/clutter-gtk-0.6_git.bb +++ b/recipes/clutter/clutter-gtk-0.6_git.bb @@ -1,6 +1,6 @@ require clutter-gtk.inc -PV = "0.6.0+git${SRCREV}" +PV = "0.6.0+gitr${SRCPV}" DEPENDS += "clutter-0.6" diff --git a/recipes/clutter/clutter-gtk-0.8_git.bb b/recipes/clutter/clutter-gtk-0.8_git.bb index 3fb0cff8aa..f0e3c61e1f 100644 --- a/recipes/clutter/clutter-gtk-0.8_git.bb +++ b/recipes/clutter/clutter-gtk-0.8_git.bb @@ -1,6 +1,6 @@ require clutter-gtk.inc -PV = "0.8.0+git${SRCREV}" +PV = "0.8.0+gitr${SRCPV}" DEPENDS += "clutter" diff --git a/recipes/clutter/clutter-gtk.inc b/recipes/clutter/clutter-gtk.inc index bbecee548c..9d0efc9ac4 100644 --- a/recipes/clutter/clutter-gtk.inc +++ b/recipes/clutter/clutter-gtk.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" DEPENDS = "gtk+" +PE = "1" FILESPATH = "${FILE_DIRNAME}/clutter-gtk" diff --git a/recipes/clutter/clutter-gtk_git.bb b/recipes/clutter/clutter-gtk_git.bb index a3e3767f90..75b443b529 100644 --- a/recipes/clutter/clutter-gtk_git.bb +++ b/recipes/clutter/clutter-gtk_git.bb @@ -1,6 +1,6 @@ require clutter-gst.inc -PV = "0.9.0+git${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc index 55980eda02..371544de00 100644 --- a/recipes/clutter/clutter.inc +++ b/recipes/clutter/clutter.inc @@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" -DEPENDS = "${STDDEPENDS} mesa" +DEPENDS = "${STDDEPENDS} virtual/libgl" EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" diff --git a/recipes/clutter/moblin-proto_git.bb b/recipes/clutter/moblin-proto_git.bb index 3f61f496c5..b6667f512a 100644 --- a/recipes/clutter/moblin-proto_git.bb +++ b/recipes/clutter/moblin-proto_git.bb @@ -1,8 +1,8 @@ DEPENDS = "clutter-box2d" -PV = "0.0+gitr${SRCREV}" -PR = "r1" -PE = "1" +PV = "0.0+gitr${SRCPV}" +PR = "r0" +PE = "2" SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \ file://paths.patch;patch=1" diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index eb7aa1ab52..5b2f0cc409 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -54,7 +54,7 @@ python populate_packages_prepend() { PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-scripts" +PACKAGES += "${PN}-scripts ${PN}-test-utils" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ @@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" +FILES_${PN}-test-utils += "${libdir}/connman/test/*" + FILES_${PN}-scripts += "${libdir}/connman/scripts" FILES_${PN}-dbg += "${libdir}/connman/*/.debug" FILES_${PN}-dev += "${libdir}/connman/*/*.la" diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb index 26b7b82798..cfcab384ce 100644 --- a/recipes/connman/connman_0.46.bb +++ b/recipes/connman/connman_0.46.bb @@ -1,6 +1,6 @@ require connman.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ --disable-gtk-doc \ @@ -32,6 +32,7 @@ EXTRA_OECONF += "\ SRC_URI = "\ http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://no_system_user_perms.patch;patch=1 \ file://connman \ " diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 523d39ba2f..c0cb890e20 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -20,12 +20,14 @@ EXTRA_OECONF = " \ --enable-fake \ " +EXTRA_OECONF_append_shr += "--disable-tools" + require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r0" +PR = "r2" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/connman/files/no_system_user_perms.patch b/recipes/connman/files/no_system_user_perms.patch new file mode 100644 index 0000000000..e02bd30625 --- /dev/null +++ b/recipes/connman/files/no_system_user_perms.patch @@ -0,0 +1,14 @@ +diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf +index 2be3764..b4d4acd 100644 +--- a/src/connman-dbus.conf ++++ b/src/connman-dbus.conf +@@ -6,9 +6,6 @@ + <allow send_destination="org.moblin.connman"/> + <allow send_interface="org.moblin.connman.Agent"/> + </policy> +- <policy user="system"> +- <allow send_destination="org.moblin.connman"/> +- </policy> + <policy at_console="true"> + <allow send_destination="org.moblin.connman"/> + </policy> diff --git a/recipes/connman/files/shr/connman b/recipes/connman/files/shr/connman new file mode 100755 index 0000000000..708b1b4cd1 --- /dev/null +++ b/recipes/connman/files/shr/connman @@ -0,0 +1,42 @@ +#!/bin/sh + +DAEMON="/usr/sbin/connmand -I usb0" +PIDFILE=/var/run/connmand.pid +DESC="Connection Manager" + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +set -e + +do_start() { + $DAEMON +} + +do_stop() { + start-stop-daemon --stop --name connmand --quiet +} + +case "$1" in + start) + echo "Starting $DESC" + do_start + ;; + stop) + echo "Stopping $DESC" + do_stop + ;; + restart|force-reload) + echo "Restarting $DESC" + do_stop + sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb index 10b57ecbe4..d8d9f17213 100644 --- a/recipes/disko/disko_git.bb +++ b/recipes/disko/disko_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB" LICENSE = "GPL" -PV = "1.6.1+gitr${SRCREV}" +PV = "1.6.1+gitr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/dri/glamo-dri-tests_git.bb b/recipes/dri/glamo-dri-tests_git.bb index 81e0146e90..0e6d731bb2 100644 --- a/recipes/dri/glamo-dri-tests_git.bb +++ b/recipes/dri/glamo-dri-tests_git.bb @@ -1,6 +1,6 @@ DEPENDS = "libdrm virtual/libx11 libxext" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master" diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb new file mode 100644 index 0000000000..1a09e1a0fb --- /dev/null +++ b/recipes/dri/libdrm_git.bb @@ -0,0 +1,24 @@ +SECTION = "x11/base" +LICENSE = "MIT" +SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master" +SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo" + +PROVIDES = "drm" +DEPENDS = "libpthread-stubs virtual/kernel" + +PE = "1" +PV = "2.4.15+gitr${SRCPV}" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_om-gta02 = "1" + +S = "${WORKDIR}/git" + +EXTRA_OECONF_append_om-gta02 = " --enable-glamo-experimental-api --disable-intel" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch b/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch new file mode 100644 index 0000000000..b01c35beff --- /dev/null +++ b/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch @@ -0,0 +1,152 @@ +>From 7b4ed34a4d0ea7576d5b54ef580b30e16f802444 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Trevi=C3=B1o=20-=203v1n0?= <mail@3v1n0.net> +Date: Tue, 9 Jun 2009 01:33:33 +0200 +Subject: [PATCH 2/2] Add press delay support to illume + Use the e_fm2 single_click_delay option in illume e_fm2 to allow to + configure from the launcher settings a click delay to prevent + un-wanted clicks + +--- + src/modules/illume/e_cfg.c | 58 +++++++++++++++++++++++++++++++++++++++- + src/modules/illume/e_cfg.h | 1 + + src/modules/illume/e_mod_win.c | 1 + + 3 files changed, 59 insertions(+), 1 deletions(-) + +diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c +index 7ae6213..3b52918 100644 +--- a/src/modules/illume/e_cfg.c ++++ b/src/modules/illume/e_cfg.c +@@ -42,6 +42,7 @@ e_cfg_init(E_Module *m) + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.mode, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.icon_size, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.single_click, INT); ++ E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.single_click_delay, INT); + + E_CONFIG_VAL(conf_edd, Illume_Cfg, power.auto_suspend, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, power.auto_suspend_delay, INT); +@@ -80,6 +81,7 @@ e_cfg_init(E_Module *m) + illume_cfg->launcher.mode = 0; + illume_cfg->launcher.icon_size = 120; + illume_cfg->launcher.single_click = 1; ++ illume_cfg->launcher.single_click_delay = 150; + + illume_cfg->power.auto_suspend = 1; + illume_cfg->power.auto_suspend_delay = 1; +@@ -170,6 +172,14 @@ _e_cfg_launcher_change(void *data, Evas_Object *obj, void *event_info) { + _e_cfg_launcher_change_timer = ecore_timer_add(0.5, _e_cfg_launcher_change_timeout, data); + } + ++Evas_Object *delay_label, *delay_slider; ++static void ++_e_cfg_launcher_click_change(void *data, Evas_Object *obj, void *event_info) { ++ e_widget_disabled_set(delay_label, !illume_cfg->launcher.single_click); ++ e_widget_disabled_set(delay_slider, !illume_cfg->launcher.single_click); ++ _e_cfg_launcher_change(data, obj, event_info); ++} ++ + static void * + _e_cfg_launcher_create(E_Config_Dialog *cfd) + { // alloc cfd->cfdata +@@ -179,6 +189,7 @@ _e_cfg_launcher_create(E_Config_Dialog *cfd) + static void + _e_cfg_launcher_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) + { // free cfd->cfdata ++ _e_mod_win_cfg_update(); // Reload on exit (to apply the slider value) + } + + static Evas_Object * +@@ -221,7 +232,16 @@ _e_cfg_launcher_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata) + frame = e_widget_framelist_add(e, "Launch Action", 0); + o = e_widget_check_add(e, "Single press", &(illume_cfg->launcher.single_click)); + e_widget_framelist_object_append(frame, o); +- evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_change, NULL); ++ evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_click_change, NULL); ++ o = e_widget_label_add(e, "Press delay:"); ++ delay_label = o; ++ e_widget_disabled_set(o, !illume_cfg->launcher.single_click); ++ e_widget_framelist_object_append(frame, o); ++ o = e_widget_slider_add(e, 1, 0, "%1.0f ms", 0, 350, 1, 0, NULL, &(illume_cfg->launcher.single_click_delay), 150); ++ delay_slider = o; ++ //evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_change, NULL); //works ?? ++ e_widget_disabled_set(o, !illume_cfg->launcher.single_click); ++ e_widget_framelist_object_append(frame, o); + e_widget_list_object_append(list, frame, 1, 0, 0.0); // fill, expand, align + + return list; +@@ -1374,6 +1394,40 @@ _dbcb_launcher_single_click_set(E_DBus_Object *obj, DBusMessage *msg) + return reply; + } + ++// illume_cfg->launcher.single_click_delay ++static DBusMessage * ++_dbcb_launcher_single_click_delay_get(E_DBus_Object *obj, DBusMessage *msg) ++{ ++ DBusMessage *reply; ++ DBusMessageIter iter; ++ ++ reply = dbus_message_new_method_return(msg); ++ dbus_message_iter_init_append(reply, &iter); ++ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &(illume_cfg->launcher.single_click_delay)); ++ return reply; ++} ++ ++static DBusMessage * ++_dbcb_launcher_single_click_delay_set(E_DBus_Object *obj, DBusMessage *msg) ++{ ++ DBusMessageIter iter; ++ DBusMessage *reply; ++ int val; ++ ++ dbus_message_iter_init(msg, &iter); ++ dbus_message_iter_get_basic(&iter, &(val)); ++ if (val >= 0) ++ { ++ illume_cfg->launcher.single_click_delay = val; ++ _e_cfg_launcher_change(NULL, NULL, NULL); ++ return dbus_message_new_method_return(msg); ++ } ++ reply = dbus_message_new_error(msg, ++ "org.enlightenment.DBus.InvalidArgument", ++ "Parameter must be greater than 0"); ++ return reply; ++} ++ + // e_config->screensaver_timeout 0(off)-3600 + static DBusMessage * + _dbcb_screensaver_timeout_get(E_DBus_Object *obj, DBusMessage *msg) +@@ -1967,6 +2021,8 @@ static const DB_Method methods[] = + {"LauncherIconSizeSet", "i", "", _dbcb_launcher_icon_size_set}, + {"LauncherSingleClickGet", "", "i", _dbcb_launcher_single_click_get}, + {"LauncherSingleClickSet", "i", "", _dbcb_launcher_single_click_set}, ++ {"LauncherSingleClickDelayGet", "", "i", _dbcb_launcher_single_click_delay_get}, ++ {"LauncherSingleClickDelaySet", "i", "", _dbcb_launcher_single_click_delay_set}, + {"ScreensaverTimeoutGet", "", "i", _dbcb_screensaver_timeout_get}, + {"ScreensaverTimeoutSet", "i", "", _dbcb_screensaver_timeout_set}, + {"AutosuspendTimeoutGet", "", "i", _dbcb_autosuspend_timeout_get}, +diff --git a/src/modules/illume/e_cfg.h b/src/modules/illume/e_cfg.h +index 4350ca0..e3b2080 100644 +--- a/src/modules/illume/e_cfg.h ++++ b/src/modules/illume/e_cfg.h +@@ -14,6 +14,7 @@ struct _Illume_Cfg + int mode; + int icon_size; + int single_click; ++ int single_click_delay; + } launcher; + + struct { +diff --git a/src/modules/illume/e_mod_win.c b/src/modules/illume/e_mod_win.c +index ec873ec..40fa13d 100644 +--- a/src/modules/illume/e_mod_win.c ++++ b/src/modules/illume/e_mod_win.c +@@ -992,6 +992,7 @@ _apps_fm_config(Evas_Object *o) + fmc.view.open_dirs_in_place = 1; + fmc.view.selector = 0; + fmc.view.single_click = illume_cfg->launcher.single_click; ++ fmc.view.single_click_delay = illume_cfg->launcher.single_click_delay; + fmc.view.no_subdir_jump = 1; + fmc.icon.extension.show = 0; + fmc.icon.icon.w = illume_cfg->launcher.icon_size * e_scale / 2.0; +-- +1.6.3.rc0 + diff --git a/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch b/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch new file mode 100644 index 0000000000..5101034a88 --- /dev/null +++ b/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch @@ -0,0 +1,84 @@ +diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c +index 7b58e56..a47b26c 100644 +--- a/src/bin/e_fm.c ++++ b/src/bin/e_fm.c +@@ -389,7 +389,7 @@ static int _e_fm2_cb_live_timer(void *data); + static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + +-static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp); ++static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event); + + static void _e_fm2_client_spawn(void); + static E_Fm2_Client *_e_fm2_client_get(void); +@@ -6331,11 +6331,24 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event) + + /* FIXME: prototype */ + static void +-_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp) ++_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event) + { ++ Evas_Event_Mouse_Down *ed = NULL; ++ Evas_Event_Mouse_Up *eu = NULL; ++ Evas_Modifier *modifiers; + int multi_sel = 0, range_sel = 0, sel_change = 0; + static unsigned int down_timestamp = 0; + ++ if (!evas_event) return; ++ ++ if (!up) { ++ ed = evas_event; ++ modifiers = ed->modifiers; ++ } else { ++ eu = evas_event; ++ modifiers = eu->modifiers; ++ } ++ + if (ic->sd->config->selection.windows_modifiers) + { + if (evas_key_modifier_is_set(modifiers, "Shift")) +@@ -6446,11 +6459,16 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigne + (ic->sd->config->view.single_click) + ) + { +- if (!up && ic->sd->config->view.single_click_delay) +- down_timestamp = timestamp; +- if (up) { +- if ((timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) +- evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ if (ed && ic->sd->config->view.single_click_delay) ++ down_timestamp = ed->timestamp; ++ ++ if (eu && (eu->timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) { ++ int icon_pos_x = ic->x + ic->sd->x - ic->sd->pos.x; ++ int icon_pos_y = ic->y + ic->sd->y - ic->sd->pos.y; ++ ++ if (eu->output.x >= icon_pos_x && eu->output.x <= (icon_pos_x + ic->w) && ++ eu->output.y >= icon_pos_y && eu->output.y <= (icon_pos_y + ic->h)) ++ evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); + } + } + } +@@ -6492,11 +6510,11 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf + ic->drag.dnd = 0; + ic->drag.src = 1; + } +- _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); ++ _e_fm2_mouse_1_handler(ic, 0, ev); + } + else if (ev->button == 3) + { +- if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); ++ if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev); + _e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp); + } + } +@@ -6516,7 +6534,7 @@ _e_fm2_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) + if ((ev->button == 1) && (!ic->drag.dnd)) + { + if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)) +- _e_fm2_mouse_1_handler(ic, 1, ev->modifiers, ev->timestamp); ++ _e_fm2_mouse_1_handler(ic, 1, ev); + ic->drag.start = 0; + ic->drag.dnd = 0; + ic->drag.src = 0; diff --git a/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch b/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch new file mode 100644 index 0000000000..369b6d5df1 --- /dev/null +++ b/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch @@ -0,0 +1,100 @@ +>From bb0df2798a630ece5ff19704831a6b170d0df274 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Trevi=C3=B1o=20-=203v1n0?= <mail@3v1n0.net> +Date: Tue, 9 Jun 2009 00:24:05 +0200 +Subject: [PATCH 1/2] e_fm2 single-click delay support + This patch allows to set a delay to select an item in the e_fm2 if + it is using the single-click mode. Thanks to this, it could be needed + a longer pressure to select an item in the file-manager; useful for + embedded/touch-based systems. + +--- + src/bin/e_fm.c | 20 +++++++++++++------- + src/bin/e_fm.h | 1 + + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c +index 07f9a2c..7b58e56 100644 +--- a/src/bin/e_fm.c ++++ b/src/bin/e_fm.c +@@ -389,7 +389,7 @@ static int _e_fm2_cb_live_timer(void *data); + static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + +-static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers); ++static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp); + + static void _e_fm2_client_spawn(void); + static E_Fm2_Client *_e_fm2_client_get(void); +@@ -894,6 +894,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) + sd->config->view.open_dirs_in_place = 1; + sd->config->view.selector = 1; + sd->config->view.single_click = 0; ++ sd->config->view.single_click_delay = 0; + sd->config->view.no_subdir_jump = 0; + sd->config->icon.icon.w = 128; + sd->config->icon.icon.h = 128; +@@ -6330,9 +6331,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event) + + /* FIXME: prototype */ + static void +-_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers) ++_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp) + { + int multi_sel = 0, range_sel = 0, sel_change = 0; ++ static unsigned int down_timestamp = 0; + + if (ic->sd->config->selection.windows_modifiers) + { +@@ -6444,8 +6446,12 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers) + (ic->sd->config->view.single_click) + ) + { +- if (up) +- evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ if (!up && ic->sd->config->view.single_click_delay) ++ down_timestamp = timestamp; ++ if (up) { ++ if ((timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) ++ evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ } + } + } + +@@ -6486,11 +6492,11 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf + ic->drag.dnd = 0; + ic->drag.src = 1; + } +- _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); ++ _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); + } + else if (ev->button == 3) + { +- if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); ++ if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); + _e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp); + } + } +@@ -6510,7 +6516,7 @@ _e_fm2_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) + if ((ev->button == 1) && (!ic->drag.dnd)) + { + if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)) +- _e_fm2_mouse_1_handler(ic, 1, ev->modifiers); ++ _e_fm2_mouse_1_handler(ic, 1, ev->modifiers, ev->timestamp); + ic->drag.start = 0; + ic->drag.dnd = 0; + ic->drag.src = 0; +diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h +index 1bbd7c4..170dfb9 100644 +--- a/src/bin/e_fm.h ++++ b/src/bin/e_fm.h +@@ -71,6 +71,7 @@ struct _E_Fm2_Config + unsigned char always_order; + unsigned char link_drop; + unsigned char fit_custom_pos; ++ unsigned int single_click_delay; + } view; + /* display of icons */ + struct { +-- +1.6.3.rc0 + diff --git a/recipes/e17/e-wm/illume-flow.patch b/recipes/e17/e-wm/illume-flow.patch new file mode 100644 index 0000000000..df719cc8ea --- /dev/null +++ b/recipes/e17/e-wm/illume-flow.patch @@ -0,0 +1,76 @@ +Index: e/src/modules/illume/e_kbd_int.c +=================================================================== +--- e/src/modules/illume/e_kbd_int.c (revision 1) ++++ e/src/modules/illume/e_kbd_int.c (working copy) +@@ -440,6 +440,16 @@ + static void + _e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir) + { ++ /* If the keyboard direction is RTL switch dir 3 and 1 ++ * i.e, make forward backwards and the other way around */ ++ if (ki->layout.direction == E_KBD_INT_DIRECTION_RTL) ++ { ++ if (dir == 3) ++ dir = 1; ++ else if (dir == 1) ++ dir = 3; ++ } ++ + if (dir == 4) // up + { + _e_kbd_int_layout_next(ki); +@@ -897,6 +907,10 @@ + if (!f) return; + ki->layout.directory = ecore_file_dir_get(layout); + ki->layout.file = eina_stringshare_add(layout); ++ ++ /* Make the default direction LTR */ ++ ki->layout.direction = E_KBD_INT_DIRECTION_LTR; ++ + while (fgets(buf, sizeof(buf), f)) + { + int len; +@@ -924,6 +938,17 @@ + sscanf(buf, "%*s %i\n", &(ki->layout.fuzz)); + continue; + } ++ if (!strcmp(str, "direction")) ++ { ++ char direction[4]; ++ sscanf(buf, "%*s %3s\n", direction); ++ /* If rtl mark as rtl, otherwise make it ltr */ ++ if (!strcmp(direction, "rtl")) ++ ki->layout.direction = E_KBD_INT_DIRECTION_RTL; ++ else ++ ki->layout.direction = E_KBD_INT_DIRECTION_LTR; ++ continue; ++ } + if (!strcmp(str, "key")) + { + ky = calloc(1, sizeof(E_Kbd_Int_Key)); +Index: e/src/modules/illume/e_kbd_int.h +=================================================================== +--- e/src/modules/illume/e_kbd_int.h (revision 1) ++++ e/src/modules/illume/e_kbd_int.h (working copy) +@@ -15,6 +15,13 @@ + E_KBD_INT_TYPE_PASSWORD = (1 << 6) + } E_Kbd_Int_Type; + ++/* The natural text direction of the keyboard */ ++typedef enum _E_kbd_Int_Direction ++{ ++ E_KBD_INT_DIRECTION_LTR = (1 << 0), ++ E_KBD_INT_DIRECTION_RTL = (1 << 1) ++} E_Kbd_Int_Direction; ++ + typedef struct _E_Kbd_Int E_Kbd_Int; + typedef struct _E_Kbd_Int_Key E_Kbd_Int_Key; + typedef struct _E_Kbd_Int_Key_State E_Kbd_Int_Key_State; +@@ -34,6 +41,7 @@ + const char *file; + int w, h; + int fuzz; ++ int direction; + E_Kbd_Int_Type type; + Eina_List *keys; + E_Kbd_Int_Key *pressed; diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index fe65620852..f31253be9e 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -12,12 +12,14 @@ SRC_URI += "\ file://applications.menu \ file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \ file://fix-profiles.diff;patch=1;maxrev=39889 \ + file://illume-flow.patch;patch=0;maxrev=43852 \ " SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1" - -SRC_URI_append_shr = " \ - file://illume-disable-screensaver.patch;patch=1 \ +SRC_URI_append_shr = " file://illume-disable-screensaver.patch;patch=1 \ + file://e_fm2-single-click-delay-support.patch;patch=1;maxrev=41127 \ + file://Add-press-delay-support-to-illume.patch;patch=1;maxrev=41128 \ + file://e_fm2-avoid-invalid-clicks-2.patch;patch=1;maxrev=41127 \ file://wizard-module-skipping.patch;patch=1 \ " diff --git a/recipes/efl1/e-wm-illume-dict-pl_git.bb b/recipes/efl1/e-wm-illume-dict-pl_git.bb index a5cf1938c4..edb1058989 100644 --- a/recipes/efl1/e-wm-illume-dict-pl_git.bb +++ b/recipes/efl1/e-wm-illume-dict-pl_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Polish dictionary for Illume keyboard" SECTION = "x11/data" -PV = "1.0-gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb index c5733be8a1..ce0d2c4baa 100644 --- a/recipes/efl1/emotion_svn.bb +++ b/recipes/efl1/emotion_svn.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" PV = "0.1.0.042+svnr${SRCPV}" -PR = "r4" +PR = "r5" inherit efl @@ -12,3 +12,7 @@ EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDI PACKAGES =+ "emotion-backend-gstreamer" FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" RRECOMMENDS_${PN} = "emotion-backend-gstreamer" + +do_compile_append() { + sed -i "s/${@"${PKG_CONFIG_SYSROOT_DIR}".replace('/','\/')}\/usr\/local\/lib/\$\{libdir\}/" ${S}/emotion.pc +} diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb index fcc01c905a..900c745fe5 100644 --- a/recipes/efl1/illume-keyboard-arabic_git.bb +++ b/recipes/efl1/illume-keyboard-arabic_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Mohammad Fahmi / Tom Hacohen" DESCRIPTION = "Illume keyboard with arabic layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb index b9f5e750d1..4eda497c4c 100644 --- a/recipes/efl1/illume-keyboard-browse_git.bb +++ b/recipes/efl1/illume-keyboard-browse_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with a layout optimized for browsing" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb index b824a9e9d9..5a042d9c6b 100644 --- a/recipes/efl1/illume-keyboard-danish_git.bb +++ b/recipes/efl1/illume-keyboard-danish_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Esben Damgaard" DESCRIPTION = "Illume keyboard with danish layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb index 4ceca530ae..f367f11f79 100644 --- a/recipes/efl1/illume-keyboard-default-alt_git.bb +++ b/recipes/efl1/illume-keyboard-default-alt_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative default layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb index 15d0022de8..2eb137db85 100644 --- a/recipes/efl1/illume-keyboard-dutch_git.bb +++ b/recipes/efl1/illume-keyboard-dutch_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with dutch layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb index 61c58b406b..dd6b96c31e 100644 --- a/recipes/efl1/illume-keyboard-dvorak_git.bb +++ b/recipes/efl1/illume-keyboard-dvorak_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Gabor Adam TOTH" DESCRIPTION = "Illume keyboard with dvorak layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb index 5e957e98e1..8c8041a9b1 100644 --- a/recipes/efl1/illume-keyboard-french_git.bb +++ b/recipes/efl1/illume-keyboard-french_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Illume keyboard with french layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb index 7120dea750..a1ad5481df 100644 --- a/recipes/efl1/illume-keyboard-german_git.bb +++ b/recipes/efl1/illume-keyboard-german_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Florian Hackenberger" DESCRIPTION = "Illume keyboard with german layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb index cbd47eaad3..e7cda399f2 100644 --- a/recipes/efl1/illume-keyboard-hebrew_git.bb +++ b/recipes/efl1/illume-keyboard-hebrew_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Tom Hacohen" DESCRIPTION = "Illume keyboard with hebrew layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb index 8abfb8f020..92090d925d 100644 --- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb +++ b/recipes/efl1/illume-keyboard-numeric-alt_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative numeric layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb index b625e937c2..7b126bbf09 100644 --- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb +++ b/recipes/efl1/illume-keyboard-russian-terminal_git.bb @@ -1,6 +1,6 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout for the Terminal" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb index ed0644ee58..c067871848 100644 --- a/recipes/efl1/illume-keyboard-russian_git.bb +++ b/recipes/efl1/illume-keyboard-russian_git.bb @@ -1,6 +1,6 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/efl1/libeflvala_git.bb index 9040bbd10a..68c2897ff4 100644 --- a/recipes/freesmartphone/libeflvala_git.bb +++ b/recipes/efl1/libeflvala_git.bb @@ -3,8 +3,9 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" -PV = "0.0.1.0+gitr${SRCREV}" +PV = "0.0.1.0+gitr${SRCPV}" PR = "r0" +PE = "1" SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb index d9bc651908..14b6d9f17e 100644 --- a/recipes/efl1/libefso_svn.bb +++ b/recipes/efl1/libefso_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EFL FSO wrapper library" SECTION = "e/libs" LICENSE = "GPLv2" -DEPENDS = "ecore edbus" +DEPENDS = "ecore edbus efreet" PV = "0.0.1+svnr${SRCPV}" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso" diff --git a/recipes/epdfview/epdfview_svn.bb b/recipes/epdfview/epdfview_svn.bb new file mode 100644 index 0000000000..1c8e9e9453 --- /dev/null +++ b/recipes/epdfview/epdfview_svn.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "A minimal PDF viewer based on gtk and poppler" +HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" +LICENSE = "GPLv2" +SECTION = "x11/applications" +DEPENDS = "poppler gtk+ cups" + +PV = "0.1.7+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "svn://svn.emma-soft.com/epdfview;module=trunk;proto=svn \ + " +SRC_URI_append_shr = "file://acroread.png \ + " + +S = "${WORKDIR}/trunk" + +inherit autotools + +do_configure_prepend() { + sh autogen.sh +} + +do_compile_append () { + sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop +} + +do_compile_append_shr () { + sed -i 's/Icon=.*/Icon=acroread/' data/epdfview.desktop +} + +do_install_append_shr () { + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/acroread.png ${D}${datadir}/pixmaps/ +} + +FILES_${PN}_append_shr = "${datadir}/pixmaps/acroread.png \ + " diff --git a/recipes/epdfview/files/acroread.png b/recipes/epdfview/files/acroread.png Binary files differnew file mode 100644 index 0000000000..0189fe3072 --- /dev/null +++ b/recipes/epdfview/files/acroread.png diff --git a/recipes/epdfview/files/poppler8.diff b/recipes/epdfview/files/poppler8.diff new file mode 100644 index 0000000000..e4c4790c6d --- /dev/null +++ b/recipes/epdfview/files/poppler8.diff @@ -0,0 +1,10395 @@ +diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac +--- epdfview-0.1.6-svn/configure.ac 2008-07-13 12:57:47.593198000 +0200 ++++ epdfview/configure.ac 2008-07-13 12:55:55.143198000 +0200 +@@ -27,7 +27,7 @@ + + dnl Check for libraries + POPPLER_REQUIRED=0.5.0 +-GLIB_REQUIRED=2.6.0 ++GLIB_REQUIRED=2.8.0 + GTK2_REQUIRED=2.6.0 + + PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED]) +@@ -44,6 +44,14 @@ + if test "x$have_poppler_052" = "xyes"; then + AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.]) + fi ++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes]) ++if test "x$have_poppler_060" = "xyes"; then ++ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.]) ++fi ++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes]) ++if test "x$have_poppler_080" = "xyes"; then ++ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.]) ++fi + + EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) + AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") +diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml +--- epdfview-0.1.6-svn/data/epdfview-ui.xml 2008-07-13 12:57:47.093198000 +0200 ++++ epdfview/data/epdfview-ui.xml 2008-07-13 12:55:54.263198000 +0200 +@@ -11,6 +11,9 @@ + <menu action="EditMenu"> + <menuitem name="Find" action="Find"/> + <separator /> ++ <menuitem name="PageModeScroll" action="PageModeScroll"/> ++ <menuitem name="PageModeText" action="PageModeText"/> ++ <separator /> + <menuitem name="Preferences" action="Preferences"/> + </menu> + <menu action="ViewMenu"> +@@ -38,7 +41,7 @@ + <menuitem name="About" action="About"/> + </menu> + </menubar> +- ++ + <toolbar name="ToolBar"> + <toolitem name="OpenFile" action="OpenFile"/> + <separator/> +@@ -49,7 +52,12 @@ + <toolitem name="ZoomOut" action="ZoomOut"/> + <toolitem name="ZoomFit" action="ZoomFit"/> + <toolitem name="ZoomWidth" action="ZoomWidth"/> ++ <separator/> ++ <toolitem name="PageModeScroll" action="PageModeScroll"/> ++ <toolitem name="PageModeText" action="PageModeText"/> + </toolbar> + + <accelerator name="SlashAccelerator" action="Slash"/> ++ <accelerator name="KPAddAccelerator" action="KPAdd"/> ++ <accelerator name="KPSubtractAccelerator" action="KPSubtract"/> + </ui> +diff -Nurd epdfview-0.1.6-svn/m4/Makefile.am epdfview/m4/Makefile.am +--- epdfview-0.1.6-svn/m4/Makefile.am 2008-07-13 12:57:43.883198000 +0200 ++++ epdfview/m4/Makefile.am 2008-07-13 12:55:50.603198000 +0200 +@@ -1,2 +1,2 @@ + # Process this file with automake to produce a Makefile.in file. +-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4 ++EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 pkg.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4 +diff -Nurd epdfview-0.1.6-svn/m4/pkg.m4 epdfview/m4/pkg.m4 +--- epdfview-0.1.6-svn/m4/pkg.m4 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/m4/pkg.m4 2008-07-13 12:55:50.593198000 +0200 +@@ -0,0 +1,157 @@ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES +diff -Nurd epdfview-0.1.6-svn/po/ca.po epdfview/po/ca.po +--- epdfview-0.1.6-svn/po/ca.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/ca.po 2008-07-13 12:55:55.073198000 +0200 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.4\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" + "PO-Revision-Date: 2006-04-12 21:17+0200\n" + "Last-Translator: Jordi Fita <jordi@emma-soft.com>\n" + "Language-Team: Catalan <ca@dodds.net>\n" +@@ -76,11 +76,11 @@ + msgid "Unknown error (%d)." + msgstr "Error desconegut (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FITXER] - mostra documents PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Viso de PDF" + +@@ -94,7 +94,7 @@ + msgid "Loading file %s..." + msgstr "Obrint fitxer %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "de %d" +@@ -104,39 +104,47 @@ + msgid "Saving document to %s..." + msgstr "Desant el document a %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Error carregant fitxer" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "La contrsenya que heu donat no és và lida per aquest fitxer." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Error desant fitxer" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Carregant..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Escala de gris" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Desocupada" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Parada" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Processada" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Desconegut" + +@@ -153,246 +161,262 @@ + msgid "Find:" + msgstr "Cercar:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Fitxer" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edita" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Visualitza" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "Vé_s" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "A_juda" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Obre" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Obre un document PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Actualitza" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Torna a obrir el document actual" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Desa una còpia..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Desa una còpia del document actual" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Imprimeix" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "Imprimeix el document actual" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Tanca" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Tanca aquesta finestra" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Cerca" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Cerca una paraula en el document" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Preferències" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Canvia les preferències de l'aplicació" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "_Amplia" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Amplia el document" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "_Redueix" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Redueix el document" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Gira a la _dreta" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Gira el document 90 graus en el sentit de les agulles del rellotge" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Gira a l'es_querra" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "" + "Gira el document 90 grays en el sentit contrari al de les agulles del " + "rellotge" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Primera pà gina" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Va a la primera pà gina" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Següent pà gina" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Va a la següent pà gina" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Pà gina _anterior" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Va a la pà gina anterior" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Darreta pà gina" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Va a la darrera pà gina" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Quant a" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Mostra els crèdits de l'aplicació" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" + msgstr "" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Mostra la barra d'_eines" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Mostra o amaga la barra d'eines" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Mostra la barra d'e_stat" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Mostra o amaga la barra d'estat" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Mostra l'Ã_ndex" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Mostra o amaga l'Ãndex del document" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "En_caixa" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Fa que el document ompli la finestra" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Encaixa l'a_mplada" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Fa que el document ompli l'amplada de la finestra" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Obre un fitxer PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "Fitxers en Format de Document Portable (PDF)" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Tots els fitxers" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Contrasenya" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Desa un fitxer PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Pà gina" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "de 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Ãndex" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Error construïnt l'administrado de UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Un visor de PDF lleuger" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -404,7 +428,7 @@ + "publicada per la Free Software Foundation; ja sigui la versió 2 de la\n" + "Llicència o bé (si ho preferiu) qualsevol altra versió posterior.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -416,7 +440,7 @@ + "COMERCIABILITAT o ADEQUACIÓ PER UN PROPÃ’SIT PARTICULAR. Vegeu la\n" + "Llicència Pública General GNU per obtenir-ne més detalls.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -426,11 +450,11 @@ + "juntament amb ePDFView; en cas contrari, escriviu a la Free Software\n" + "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "Jordi Fita <jordi@emma-soft.com>" + +diff -Nurd epdfview-0.1.6-svn/po/cs.po epdfview/po/cs.po +--- epdfview-0.1.6-svn/po/cs.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/cs.po 2008-07-13 12:55:55.043198000 +0200 +@@ -0,0 +1,604 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR Emma's Software ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.6\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2008-04-09 14:06+0100\n" ++"Last-Translator: Dragonlord <dragonlord@seznam.cz>\n" ++"Language-Team: Czech <none@none.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Nebyly nalezeny žádné výsledky!" ++ ++#: src/FindPter.cxx:195 ++#, fuzzy, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Hledám na stranÄ› od %d do %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Žádná chyba." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Soubor nenalezen." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Nelze naÄÃst katalog stran." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF soubor je poÅ¡kozen a nelze jej opravit." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "Soubor je zakódovaný a heslo nebylo správnÄ› nebo vůbec vloženo." ++ ++#: src/IDocument.cxx:97 ++#, fuzzy ++msgid "Nonexistent or invalid highlight file." ++msgstr "Soubor zvýraznÄ›nà neexistuje nebo je neplatný." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Neplatná tiskárna." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Chyba bÄ›hem tisku." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF soubor nedovoluje tuto operaci." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Chybný poÄet stran." ++ ++#: src/IDocument.cxx:112 ++#, fuzzy ++msgid "File I/O error." ++msgstr "I/O chyba souboru." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Neznámá chyba (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[SOUBOR] - prohlÞet PDF dokumenty" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "ProhlÞeÄ PDF souborů" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Nahrávám znovu soubor %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "NaÄÃtám soubor %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, fuzzy, c-format ++msgid "of %d" ++msgstr "z %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Ukládám soubor do %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Chyba naÄÃtánà souboru" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "Vložené heslo nenà platné pro tento soubor." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Chyba ukládánà souboru" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "NaÄÃtám..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "OdstÃny Å¡edi" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "ZahálejÃcÃ" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Zastavený" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Zpracovávám" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Neznámý" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Chyba naÄÃtánà dokumentu '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Hledat:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Soubor" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Editovat" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Pohled" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_JÃt na" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "_NápovÄ›da" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_OtevÅ™Ãt" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "OtevÅ™Ãt PDF dokument" ++ ++#: src/gtk/MainView.cxx:99 ++#, fuzzy ++msgid "_Reload" ++msgstr "_Aktualizovat" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Aktualizuje souÄasný dokument" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Uložit jako..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Uložà kopii souÄasného dokumentu" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "_Tisk..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Vytiskne souÄasný dokument" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_ZavÅ™Ãt" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "ZavÅ™e toto okno" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Hledat" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Hledánà zadaných výrazů v dokumentu" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "NastavenÃ..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "ZmÄ›ny v nastavenà aplikace" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "Z_vÄ›tÅ¡it" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "ZvÄ›tÅ¡Ã náhled dokumentu" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "Z_menÅ¡it" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "ZmenÅ¡Ã náhled dokumentu" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "OtoÄit vp_ravo" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "OtoÄà dokument o 90 stupňů po smÄ›ru hodinových ruÄiÄek" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "OtoÄit v_levo" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "OtoÄà dokument o 90 stupňů proti smÄ›ru hodinových ruÄiÄek" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Prvnà stranu" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "PÅ™eskoÄit na prvnà stranu" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_DalÅ¡Ã stranu" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "PÅ™ejde na dalÅ¡Ã stranu" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "PÅ™_edchozà stranu" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "PÅ™ejde na pÅ™edchozà stranu" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "Po_slednà stranu" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "PÅ™eskoÄà na poslednà stranu" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_O programu" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Zobrazà informace o aplikaci" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "Na celou obrazovku" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "PÅ™epne použità celé obrazovky" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Zobrazit panel i_kon" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Zobrazà nebo skryje panel s ikonami" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Zobrazit _informaÄnà panel" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Zobrazà nebo skryje spodnà informaÄnà panel" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Zobrazit os_novu" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Zobrazà nebo skryje osnovu dokumentu" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "PÅ™izpůsobit _do okna" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "PÅ™izpůsobà zvÄ›tÅ¡enà dokumentu velikosti okna" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "PÅ™izpůsobit Å¡ÃÅ™_ce okna" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "PÅ™izpůsobà zvÄ›tÅ¡enà dokumentu Å¡ÃÅ™ce okna" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "OtevÅ™Ãt PDF soubor" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Soubory PDF (Portable Document Format)" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "VÅ¡echny soubory" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Heslo" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Uložit PDF soubor" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Strana" ++ ++#: src/gtk/MainView.cxx:868 ++#, fuzzy ++msgid "of 0" ++msgstr "z 0" ++ ++#: src/gtk/MainView.cxx:921 ++#, fuzzy ++msgid "Index" ++msgstr "Osnova" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, fuzzy, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Chyba sestavenà UI manažera: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "NenároÄný prohlÞeÄ PDF souborů" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"ePDFView je svobodný software; může být distribuován a/nebo modifikován\n" ++"za podmÃnek GNU vÅ¡eobecné veÅ™ejné licence podle znÄ›nà publikovaného\n" ++"Free Software Foundation; buÄ ve verzi 2 této licence, nebo\n" ++"(podle vlastnÃho uváženÃ) jakékoliv novÄ›jÅ¡Ã verze.\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"ePDFView je distribuován s úmyslem být užiteÄný,\n" ++"ovÅ¡em BEZ JAKÉKOLI ZÃRUKY; stejnÄ› tak bez zahrnuté záruky\n" ++"PRODEJNOSTI nebo VHODNOSTI NA URÄŒITà ÚKOL. Podrobnosti\n" ++"lze nalézt v GNU vÅ¡eobecné veÅ™ejné licenci.\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"S ePDFView musà být dodávána kopie GNU vÅ¡eobecné veÅ™ejné licence;\n" ++"pokud tomu tak nenÃ, obraÅ¥te se na Free Software Foundation,Inc.,\n" ++"59 temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++#, fuzzy ++msgid "translator-credits" ++msgstr "Dragonlord <dragonlord@seznam.cz>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Konfigurace" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Externà pÅ™Ãkazy" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "We_bový prohlÞeÄ:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Poznámka: <i>%s</i> bude nahrazeno URI." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Tisk" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Tiskárna" ++ ++#: src/gtk/PrintView.cxx:74 ++#, fuzzy ++msgid "Job" ++msgstr "Úkol" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "PapÃr" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Tisk oblasti<b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "VÅ¡_e" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "VýbÄ›_r:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Sada stran<b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "VÅ¡ech_ny" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "L_iché strany" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "S_udé strany" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Kopie<b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "_PoÄet kopiÃ:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "SeÅ™adi_t" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>PapÃr a rozmÃstÄ›nÃ<b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Velikost papÃru:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientace strany:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "Ro_zmÃstÄ›nÃ:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>Výstup<b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Mód:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_RozliÅ¡enÃ:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Stav" ++ ++#: src/gtk/PrintView.cxx:677 ++#, fuzzy ++msgid "Jobs" ++msgstr "Úkoly" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "UmÃstÄ›nÃ" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Jednoduché" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 strany na list" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 strany na list" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "NajÃt _dalÅ¡Ã" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "NajÃt _pÅ™edchozÃ" +diff -Nurd epdfview-0.1.6-svn/po/de.po epdfview/po/de.po +--- epdfview-0.1.6-svn/po/de.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/de.po 2008-07-13 12:55:55.083198000 +0200 +@@ -2,15 +2,16 @@ + # Copyright (C) 2006 Emma's Software + # This file is distributed under the same license as the epdfview package. + # Moritz Heiber <moe@xfce.org>, 2006. ++# Enrico Tröger <enrico.troeger@uvena.de>, 2007. + # + msgid "" + msgstr "" +-"Project-Id-Version: ePDFView 0.1.4\n" ++"Project-Id-Version: ePDFView 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-05-13 00:40+0100\n" +-"Last-Translator: Moritz Heiber <moe@xfce.org>\n" +-"Language-Team: German <none@none.org>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-16 15:33+0100\n" ++"Last-Translator: Enrico Tröger <enrico.troeger@uvena.de>\n" ++"Language-Team: German\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -75,11 +76,11 @@ + msgid "Unknown error (%d)." + msgstr "Unbekannter Fehler (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[DATEI] - PDF Dateien anschauen" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PDF Betrachter" + +@@ -93,53 +94,59 @@ + msgid "Loading file %s..." + msgstr "Lade Datei %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 +-#, fuzzy, c-format ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format + msgid "of %d" +-msgstr "%d von %d" ++msgstr "von %d" + + #: src/MainPter.cxx:588 + #, c-format + msgid "Saving document to %s..." +-msgstr "" ++msgstr "Speiche Dokument als %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Fehler beim Laden der Datei" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Das angegebene Passwort ist ungültig für dieses Dokument." + +-#: src/MainPter.cxx:947 +-#, fuzzy ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "Fehler beim Laden der Datei" ++msgstr "Fehler beim Speichern der Datei." + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Lade..." + +-#: src/PrintPter.cxx:295 +-msgid "Grayscale" ++#: src/PrintPter.cxx:252 ++msgid "A4" + msgstr "" + +-#: src/PrintPter.cxx:395 +-#, fuzzy ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Graustufen" ++ ++#: src/PrintPter.cxx:409 + msgid "Idle" +-msgstr "Inhalt" ++msgstr "Untätig" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" +-msgstr "" ++msgstr "Angehalten" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" +-msgstr "" ++msgstr "Drucke" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" +-msgstr "" ++msgstr "Unbekannt" + + #: src/PDFDocument.cxx:272 + #, c-format +@@ -154,248 +161,260 @@ + msgid "Find:" + msgstr "Suche:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Datei" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Bearbeiten" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Ansicht" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Gehe zu" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Hilfe" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Öffnen" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Öffne ein PDF Dokument" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Neu laden" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Lade das Dokument neu" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." +-msgstr "" ++msgstr "_Kopie speichern unter" + +-#: src/gtk/MainView.cxx:102 +-#, fuzzy ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "Lade das Dokument neu" ++msgstr "Speichert eine Kopie des Dokuments" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." +-msgstr "" ++msgstr "_Drucken..." + +-#: src/gtk/MainView.cxx:107 +-#, fuzzy ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "Lade das Dokument neu" ++msgstr "Druckt das Dokument" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Schließen" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Schließe dieses Fenster" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Suche" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Sucht im Dokument nach einem Wort" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." +-msgstr "" ++msgstr "Einstellungen..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" +-msgstr "" ++msgstr "Ändert die Programmeinstellungen" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "Heranzoomen" ++msgstr "Hera_nzoomen" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Dokument vergrößern" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "Herauszoomen" ++msgstr "Hera_uszoomen" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Dokument verkleinern" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "Nach rechts rotieren" ++msgstr "Nach _rechts rotieren" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Das Dokument um 90 Grad im Uhrzeigersinn drehen" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "Nach links rotieren" ++msgstr "Nach _links rotieren" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Das Dokument um 90 Grad gegen den Uhrzeigersinn drehen" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Erste Seite" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Gehe zur ersten Seite" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Nächste Seite" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Gehe zur ersten Seite" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "_Vorherige Seite" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Gehe zur vorherigen Seite" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Letzte Seite" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Gehe zur letzten Seite" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Ãœber" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Credits anzeigen" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "_Vollbild" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "In Vollbildmodus umschalten" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" +-msgstr "Werkzeugleiste anzeigen" ++msgstr "_Werkzeugleiste anzeigen" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Werkzeugleiste anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "Statusleiste anzeigen" ++msgstr "_Statusleiste anzeigen" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Statusleiste anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" +-msgstr "Ãœbersicht anzeigen" ++msgstr "Ãœ_bersicht anzeigen" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Ãœbersicht des Dokuments anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" +-msgstr "Zoom zur Fenstergröße" ++msgstr "Zoom zur _Fenstergröße" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Zoome das Dokument bis zur Größe des Fensters heran" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" +-msgstr "Zoom zur Fensterweite" ++msgstr "Zoom zur F_ensterweite" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Zoome das Dokument heran, bis es die Fensterbreite füllt" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "PDF Datei öffnen" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" +-msgstr "" ++msgstr "Portable Document Format (PDF) Dateien" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" +-msgstr "" ++msgstr "Alle Dateien" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Passwort" + +-#: src/gtk/MainView.cxx:386 +-#, fuzzy ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "PDF Datei öffnen" ++msgstr "PDF Datei speichern" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Seite" + +-#: src/gtk/MainView.cxx:826 +-#, fuzzy ++#: src/gtk/MainView.cxx:868 + msgid "of 0" +-msgstr "0 von 0" ++msgstr "von 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Inhalt" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Fehler beim Erstellen des UI Managers: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Ein kleiner, schneller PDF Betrachter" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -407,7 +426,7 @@ + "Lizenz, wie von der Free Software Foundation herausgegeben,\n" + "beachten; Entweder Version 2 oder jede nächsthöhere Version.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -420,7 +439,7 @@ + "FUNKTION mit ein. Für Details wird auf die GNU General Public Lizenz\n" + "verwiesen.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -434,152 +453,153 @@ + "Boston, MA 02111-1307\n" + "USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" +-msgstr "Moritz Heiber <moe@xfce.org>" ++msgstr "" ++"Moritz Heiber <moe@xfce.org>,\n" ++"Enrico Tröger <enrico.troeger@uvena.de>" + + #: src/gtk/PreferencesView.cxx:32 + msgid "Preferences" +-msgstr "" ++msgstr "Einstellungen" + + #: src/gtk/PreferencesView.cxx:46 + msgid "External Commands" +-msgstr "" ++msgstr "Externe Befehle" + + #: src/gtk/PreferencesView.cxx:105 + msgid "Web _Browser:" +-msgstr "" ++msgstr "_Webbrowser:" + + #: src/gtk/PreferencesView.cxx:118 + #, c-format + msgid "Note: <i>%s</i> will be replaced by the URI." +-msgstr "" ++msgstr "Hinweis: <i>%s</i> wird durch die URL ersetzt." + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "" ++msgstr "Drucken" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +-msgstr "" ++msgstr "Drucker" + + #: src/gtk/PrintView.cxx:74 + msgid "Job" +-msgstr "" ++msgstr "Auftrag" + + #: src/gtk/PrintView.cxx:79 +-#, fuzzy + msgid "Paper" +-msgstr "Seite" ++msgstr "Papier" + + #: src/gtk/PrintView.cxx:359 + msgid "<b>Print Range</b>" +-msgstr "" ++msgstr "<b>Druckbereich</b>" + + #: src/gtk/PrintView.cxx:377 + msgid "_All pages" +-msgstr "" ++msgstr "_Alle Seiten" + + #: src/gtk/PrintView.cxx:380 + msgid "_Range:" +-msgstr "" ++msgstr "_Bereich:" + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "" ++msgstr "<b>Seiteneinstellungen</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "" ++msgstr "A_lle Seiten" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "" ++msgstr "_Ungerade Seiten" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "" ++msgstr "_Gerade Seiten" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +-msgstr "" ++msgstr "<b>Kopien</b>" + + #: src/gtk/PrintView.cxx:437 + msgid "N_umber of copies:" +-msgstr "" ++msgstr "An_zahl der Kopien:" + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "Kopien _sortieren" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +-msgstr "" ++msgstr "<b>Papier und Anordnung</b>" + + #: src/gtk/PrintView.cxx:482 + msgid "Paper _Size:" +-msgstr "" ++msgstr "_Papiergröße:" + + #: src/gtk/PrintView.cxx:508 + msgid "Page _orientation:" +-msgstr "" ++msgstr "_Seitenausrichtung:" + + #: src/gtk/PrintView.cxx:539 + msgid "_Layout:" +-msgstr "" ++msgstr "A_nordnung:" + + #: src/gtk/PrintView.cxx:568 + msgid "<b>Output</b>" +-msgstr "" ++msgstr "<b>Ausgabe</b>" + + #: src/gtk/PrintView.cxx:585 + msgid "_Mode:" +-msgstr "" ++msgstr "_Modus: " + + #: src/gtk/PrintView.cxx:613 + msgid "_Resolution:" +-msgstr "" ++msgstr "A_uflösung:" + + #: src/gtk/PrintView.cxx:668 + msgid "State" +-msgstr "" ++msgstr "Status" + + #: src/gtk/PrintView.cxx:677 + msgid "Jobs" +-msgstr "" ++msgstr "Aufträge" + + #: src/gtk/PrintView.cxx:686 + msgid "Location" +-msgstr "" ++msgstr "Standort" + + #: src/gtk/PrintView.cxx:717 + msgid "Plain" +-msgstr "" ++msgstr "Einfach" + + #: src/gtk/PrintView.cxx:723 + msgid "2 pages in 1" +-msgstr "" ++msgstr "2 Seiten auf Eine" + + #: src/gtk/PrintView.cxx:729 + msgid "4 pages in 1" +-msgstr "" ++msgstr "4 Seiten auf Eine" + + #: src/gtk/PrintView.cxx:744 + msgid "Portrait" +-msgstr "" ++msgstr "Hochformat" + + #: src/gtk/PrintView.cxx:750 + msgid "Landscape" +-msgstr "" ++msgstr "Querformat" + + #: src/gtk/StockIcons.cxx:40 + msgid "Find _Next" +-msgstr "Suche vorwärts" ++msgstr "Suche _vorwärts" + + #: src/gtk/StockIcons.cxx:41 + msgid "Find _Previous" +-msgstr "Suche rückwärts" ++msgstr "Suche _rückwärts" +diff -Nurd epdfview-0.1.6-svn/po/el.po epdfview/po/el.po +--- epdfview-0.1.6-svn/po/el.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/el.po 2008-07-13 12:55:55.083198000 +0200 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" + "PO-Revision-Date: 2006-11-10 16:55+0200\n" + "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n" + "Language-Team: Greek <nls@tux.hellug.gr>\n" +@@ -77,11 +77,11 @@ + msgid "Unknown error (%d)." + msgstr "Άγνωστο σφάλμα (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[ΑΡΧΕΙΟ] - Ï€Ïοβολή εγγÏάφου PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "ΕφαÏμογή Î Ïοβολής PDF" + +@@ -95,7 +95,7 @@ + msgid "Loading file %s..." + msgstr "ΦόÏτωση αÏχείου %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "από %d" +@@ -105,39 +105,47 @@ + msgid "Saving document to %s..." + msgstr "Αποθήκευση εγγÏάφου στο %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Σφάλμα φόÏτωσης αÏχείου" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Ο κωδικός Ï€Ïόσβασης που εισάγατε δεν είναι ÎγκυÏος γι' αυτό το αÏχείο." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Σφάλμα αποθήκευσης αÏχείου" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Γίνεται φόÏτωση..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Κλίμακα του γκÏι" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "ΑδÏανής" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Διακόπηκε" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "ΕπεξεÏγασία" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Άγνωστο" + +@@ -154,244 +162,260 @@ + msgid "Find:" + msgstr "ΕÏÏεση:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_ΑÏχείο" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_ΕπεξεÏγασία" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Î Ïοβολή" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Μετάβαση" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Βοήθεια" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "Άν_οιγμα" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Άνοιγμα εγγÏάφου PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "Α_νανÎωση" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "ΑνανÎωση Ï„ÏÎχοντος εγγÏάφου" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "Απο_θήκευση ενός αντιγÏάφου..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Αποθήκευση ενός αντιγÏάφου για το Ï„ÏÎχον ÎγγÏαφο" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_ΕκτÏπωση..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "ΕκτÏπωση Ï„ÏÎχοντος εγγÏάφου" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Κλείσιμο" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Κλείσιμο Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… παÏαθÏÏου" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_ΕÏÏεση" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "ΕÏÏεση μια λÎξης στο ÎγγÏαφο" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Î Ïοτιμήσεις..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Αλλαγή Ï€Ïοτιμήσεων της εφαÏμογής" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "_ΜεγÎθυνση" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "ΜεγÎθυνση εγγÏάφου" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "Σ_μίκÏυνση" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "ΣμίκÏυνση εγγÏάφου" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "ΠεÏιστÏοφή _δεξιά" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "ΠεÏιστÏοφή του εγγÏάφου 90 μοίÏες δεξιόστÏοφα" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "ΠεÏιστÏοφή _αÏιστεÏά" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "ΠεÏιστÏοφή του εγγÏάφου 90 μοίÏες αÏιστεÏόστÏοφα" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "Î _Ïώτη σελίδα" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Μετάβαση στην Ï€Ïώτη σελίδα" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Επόμενη Σελίδα" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Μετάβαση στην επόμενη σελίδα" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Î Ïοη_γοÏμενη Σελίδα" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Μετάβαση στην Ï€ÏοηγοÏμενη σελίδα" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Τε_λευταία Σελίδα" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Μετάβαση στην τελευταία σελίδα" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_ΠεÏί" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Εμφάνιση μνείας των δημιουÏγών της εφαÏμογής" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" + msgstr "_ΠλήÏης Οθόνη" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "Εναλλαγή της λειτουÏγία πλήÏους οθόνης" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Εμφάνιση _εÏγαλειοθήκης" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Εμφάνιση ή απόκÏυψη της εÏγαλειοθήκης" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Εμφάνιση _γÏαμμής κατάστασης" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Εμφάνιση ή απόκÏυψη της γÏαμμής κατάστασης" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Εμφάνιση _πεÏιεχομÎνων" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Î Ïοβολή ή απόκÏυψη του πεÏιγÏάμματος του εγγÏάφου" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "ΣμίκÏυνση στην _σελίδα" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Î ÏοσαÏμογή του Ï„ÏÎχοντος εγγÏάφου στο παÏάθυÏο" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Î ÏοσαÏμογή στο _πλάτος της σελίδας" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "ΤαίÏιασμα του Ï„ÏÎχοντος εγγÏάφου στο πλάτος του παÏαθÏÏου" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Άνοιγμα αÏχείου PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "ΑÏχεία PDF" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Όλα τα αÏχεία" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Κωδικός Ï€Ïόσβασης" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Αποθήκευση αÏχείου PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Σελίδα" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "από 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Κατάλογος" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Σφάλμα δημιουÏγίας διαχειÏιστή UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "ΕλαφÏιά εφαÏμογή Ï€Ïοβολής PDF" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -404,7 +428,7 @@ + " Free Software Foundation, Îκδοση 2 , ή \n" + "(Ï€ÏοαιÏετικά) οποιαδήποτε νεότεÏη 'Îκδοση.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -415,7 +439,7 @@ + "αλλά ΧΩΡΙΣ ΚΑΜΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ για συγκεκÏιμÎνο σκοπό.\n" + "Δείτε για πεÏισσότεÏες λεπτομÎÏειες την GNU General Public License .\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -425,11 +449,11 @@ + "μαζί με το Îαυτίλο. Αν όχι γÏάψτε στο Free Software Foundation, Inc., \n" + "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "ΣταÏÏος ΓιαννοÏÏης <stavrosg2002@freemail.gr>" + +diff -Nurd epdfview-0.1.6-svn/po/es.po epdfview/po/es.po +--- epdfview-0.1.6-svn/po/es.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/es.po 2008-07-13 12:55:55.043198000 +0200 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.4\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" + "PO-Revision-Date: 2006-04-12 21:17+0200\n" + "Last-Translator: Jordi Fita <jordi@emma-soft.com>\n" + "Language-Team: Spanish <es@li.org>\n" +@@ -76,11 +76,11 @@ + msgid "Unknown error (%d)." + msgstr "Error desconocido (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[ARCHIVO] - muestra documentos PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Visor de PDF" + +@@ -94,7 +94,7 @@ + msgid "Loading file %s..." + msgstr "Abriendo archivo %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "de %d" +@@ -104,41 +104,49 @@ + msgid "Saving document to %s..." + msgstr "Guardando el documento en %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Error Cargando el Archivo" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "" + "La contraseña que has proporcionado no es una contraseña válida para este " + "archivo." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Error Guardando el Archivo" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Cargando..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Escala de grises" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Desocupada" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Parada" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Procesando" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Desconocido" + +@@ -155,245 +163,261 @@ + msgid "Find:" + msgstr "Buscar:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Archivo" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edición" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Ver" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Ir" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "A_yuda" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Abrir" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Abre un documento PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Recargar" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Abre de nuevo el documento actual" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Guardar una copia..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Guarda una copia de el documento actual" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Imprimir" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "Imprime el documento actual" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Cerrar" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Cierra esta ventana" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Buscar" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Busca una palabra en el documento" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Preferencias..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Cambia las preferencia de la applicación" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "A_mpliar" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Amplia el documento" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "_Reducir" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Reduce el documento" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Girar a la _derecha" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Gira el document 90 grados en la dirección de las agujas del reloj" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Gira a la _izquierda" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "" + "Gira el documento 90 grados en la dirección contraria a las agujas del reloj" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Primera página" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Va hacia la primera página" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Siguiente página" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Va hacia la siguiente página" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Página _anterior" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Va hacia la página anterior" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Ú_ltima página" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Va hacia la última página" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Acerca de" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Muestra los créditos de la aplicación" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" + msgstr "" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Muestr al barra de _herramientas" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Muestra o esconda la barra de herramientas" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Muestra la barra de _estado" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Muestra o esconde la barra de estado" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Muestra el Ã_ndice" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Muestra o esconde el Ãndice del documento" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Ajuste ó_ptimo" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Hace que el documento llene la ventana" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Ajustar al _ancho de página" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Hace que el documento llene el ancho de la ventana" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Abre un archivo PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "Archivos en Formato de Documento Transportable (PDF)" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Todos los archivos" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Contraseña" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Guarda un archivo PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Página" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "de 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Ãndice" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Error construiendo el administrador de IU: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Un visor de PDF ligero" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -405,7 +429,7 @@ + "la Free Software Foundation; ya sea en su versión 2 ó (a su criterio)\n" + "en una versión posterior.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -417,7 +441,7 @@ + "COMERCIALIDAD o IDONEIDAD PARA UN FIN DETERMINADO. Mire la \n" + "Licencia General GNU para más detalles.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -428,11 +452,11 @@ + "Inc.,\n" + "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "Jordi Fita <jordi@emma-soft.com>" + +diff -Nurd epdfview-0.1.6-svn/po/fr.po epdfview/po/fr.po +--- epdfview-0.1.6-svn/po/fr.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/fr.po 2008-07-13 12:55:55.043198000 +0200 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.4\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" + "PO-Revision-Date: 2006-04-19 02:00+0200\n" + "Last-Translator: <mr.moustache@laposte.net>\n" + "Language-Team: French <@>\n" +@@ -74,11 +74,11 @@ + msgid "Unknown error (%d)." + msgstr "Erreur inconnue (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FICHIER] - Visualiser des documents PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Visualisateur de PDF" + +@@ -92,7 +92,7 @@ + msgid "Loading file %s..." + msgstr "Chargement du fichier %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "sur %d" +@@ -102,39 +102,47 @@ + msgid "Saving document to %s..." + msgstr "Enregistrement du document sous %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Erreur au chargement du fichier" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Le mot de passe que vous avez fourni est incorrect pour ce fichier." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "Erreur au chargement du fichier" ++msgstr "Erreur pendant la sauvegarde du fichier" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Chargement..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Niveau de gris" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "En attente" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Arrêté" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Traitement en cours" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Inconnu" + +@@ -151,244 +159,260 @@ + msgid "Find:" + msgstr "Rechercher :" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Fichier" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edition" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Afficher" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "A_ller à " + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "Ai_de" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Ouvrir" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Ouvrir un document PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Recharger" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Recharger le document courant" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Enregistrer sous..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "Recharger le document courant" ++msgstr "Sauvegarder le document courant" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Imprimer" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "Recharger le document courant" ++msgstr "Imprimer le document courant" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Fermer" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Fermer cette fenêtre" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Rechercher" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Rechercher un mot dans le document" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Préférences" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Changer les préférences de l'application" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "_Agrandir" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Elargir le document" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "_Réduire" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Réduire le document" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Rotation à _droite" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Rotation de 90 degrés dans le sens horaire" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Rotation à _gauche" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Rotation de 90 degrés dans le anti-horaire" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Première page" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Aller à la première page" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "Page _suivante" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Aller à la page suivante" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Page p_récédente" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Aller à la page précédente" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Dernière page" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Aller à la dernière page" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_A propos" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Afficher les informations sur l'application" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" + msgstr "" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Afficher la barre d'_outils" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Afficher/Cacher la barre d'outils" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Afficher la _barre d'état" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Afficher/Cacher la barre d'état" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Afficher l'_index" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Afficher/Cacher l'index du document" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Ajuster le document _dans la fenêtre" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Ajuster le document dans la fenêtre" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Ajuster à la largeur de la _fenêtre" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Ajuster à la largeur de la fenêtre" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Ouvrir un fichier PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "Fichiers Portable Document Format (PDF)" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Tous les fichiers" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Mot de passe" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "Ouvrir un fichier PDF" ++msgstr "Enregistrer un fichier PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Page" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "sur 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Index" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Erreur à la création du gestionnaire d'UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Un visualisateur léger de PDF" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -401,7 +425,7 @@ + "Free Software Foundation; (version 2 ou bien toute autre version ultérieure\n" + "choisie par vous).\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -414,7 +438,7 @@ + "spécifique. Reportez-vous à la Licence Publique Générale GNU pour\n" + "plus de détails.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -425,11 +449,11 @@ + "Free Software Foundation, Inc.\n" + "59 Temple Place, Suite 330, Boston, MA 02111-1307, États-Unis.\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "Mr_Moustache <mr.moustache@laposte.net>" + +diff -Nurd epdfview-0.1.6-svn/po/it.po epdfview/po/it.po +--- epdfview-0.1.6-svn/po/it.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/it.po 2008-07-13 12:55:55.073198000 +0200 +@@ -0,0 +1,592 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.6\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-03-18 20:33+0100\n" ++"PO-Revision-Date: 2008-03-18 00:00+0100\n" ++"Last-Translator: Fabio Vergnani <monghitri@aruba.it>\n" ++"Language-Team: Italian\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Nessuna corrispondenza trovata!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Ricerca in corso in pagina %d di %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nessun errore." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "File non trovato" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Non riesco a leggere il catalogo della pagina." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "Il file PDF è danneggiato e non può essere recuperato." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "" ++"Il file è criptato e la password è sbagliata oppure non è stata fornita" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "Il file highlight non esiste oppure non è valido" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Stampante non valida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Errore durante la stampa" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "Il file PDF non permette questa operazione." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Numero di pagina non valido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Errore di Input/Output nel file." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Errore sconosciuto (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FILE] - visualizza documenti PDF" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizzatore PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Ricaricamento file %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Caricamento file %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "di %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Salvataggio documento in %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Errore nel caricamento del file" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "La password fornita non è corretta per questo file." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Errore nel salvataggio del file" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Caricamento in corso..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Scala di grigi" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "In attesa" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Fermata" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Stampa in corso" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Sconosciuto" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Errore nel caricamento del documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Trova:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_File" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Modifica" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Visualizza" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "V_ai" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "A_iuto" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Apri" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Apre un documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Ricarica" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Ricarica il documento corrente" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Salva una copia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Salva una copia del documento corrente" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "Stam_pa..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Stampa il documento corrente" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Chiudi" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Chiudi questa finestra" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Trova" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Trova una parola nel documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferenze..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Cambia le preferenze dell'applicazione" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "_Aumenta" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Ingrandisci il documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "_Riduci" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Rimpicciolisci il documento" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Ruota a _destra" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Ruota il documento di 90 gradi in senso orario" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Ruota a _sinistra" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Ruota il documento di 90 gradi in senso antiorario" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Prima Pagina" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Va alla prima pagina" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "P_rossima Pagina" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Va alla prossima pagina" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "P_agina Precedente" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Va alla pagina precedente" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "_Ultima Pagina" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Va all'ultima pagina" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "I_nformazioni" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Crediti" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "S_chermo intero" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Visualizza a schermo intero" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostra _barra degli strumenti" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostra o nasconde la barra degli strumenti" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "_Mostra barra di stato" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostra o nasconde la barra di stato" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostra _indice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostra o nasconde l'indice del documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Zoom ada_tta" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Adatta il documento alla grandezza della finestra" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Zoom _larghezza" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Adatta il documento alla larghezza della finestra" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Scorri" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Mouse scorre la pagina" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Seleziona testo" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "Mouse seleziona testo" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Apri file PDF" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Portable Document Format (PDF) Files" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Tutti i file" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Password" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Salva file PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Pagina" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "di 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Indice" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Errore nella costruzione del gestore UI: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Un visualizzatore PDF semplice e leggero" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"ePDFView è software libero; è possibile redistribuirlo e/o modificarlo\n" ++"entro i termini della licenza GNU General Public License come pubblicata\n" ++"dalla Free Software Foundation; versione 2 della Licenza, o\n" ++"(a propria scelta) ogni versione successiva.\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"ePDFView è distribuito nella speranza che possa essere utile,\n" ++"ma SENZA ALCUNA GARANZIA; senza neanche l'implicita garanzia di\n" ++"COMMERCIABILITÀ o IDONEITÀ AD UNO SCOPO PARTICOLARE. Consultare la\n" ++"GNU General Public License per maggiori dettagli.\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"Insieme a ePDFView dovreste aver ricevuto una copia della GNU\n" ++"General Public License; in caso contrario scrivete a: Free Software " ++"Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "Fabio Vergnani <monghitri@aruba.it>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferenze" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandi Esterni" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "_Navigatore Web" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: <i>%s</i> sarà rimpiazzato dall'URI" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Stampa" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Stampante" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Lavoro" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Carta" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Intervallo di stampa</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Tutte le pagine" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervallo:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Gruppi di pagine</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "T_utte le pagine" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Pagine _dispari" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Pagine p_ari" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Copie</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "Nu_mero di copie:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "Ra_gruppa" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Carta e disposizione</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Dimensione carta" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientamento pagina" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "D_isposizione_" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>Uscita</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Metodo" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Risoluzione" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Stato" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Lavori" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Posizione" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Normale" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 pagine in 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 pagine in 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Verticale" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Orizzontale" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Trova _Prossimo" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Trova P_recedente" +diff -Nurd epdfview-0.1.6-svn/po/ja.po epdfview/po/ja.po +--- epdfview-0.1.6-svn/po/ja.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/ja.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Japanese translations for ePDFView package ++# ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.6\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2006-04-12 21:17+0200\n" ++"Last-Translator: Jonny <jonny@csc.jp>\n" ++"Language-Team: nyu <nyu_8804@yahoo.co.jp>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "%d/%d を検索ä¸..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "エラーã¯ã‚ã‚Šã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "ページカタãƒã‚°ã‚’èªã‚ã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF ファイルãŒå£Šã‚Œã¦ã„ã¦ä¿®æ£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "ファイルã¯æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™ãŒã€æ£ã—ã„パスワードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ã—ã¦ã„ãªã„ã‹ä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "プリンタãŒä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "å°åˆ·ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF ファイルã¯ã“ã®æ“作を許å¯ã—ã¦ã„ã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "ページ番å·ãŒä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "ファイル I/O エラー。" ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[ファイル] - PDF ドã‚ュメントを表示ã™ã‚‹" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF ビューア" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "ファイル %s ã‚’æ›´æ–°ã—ã¦ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "ファイル %s ã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "/%d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "ドã‚ュメントを %s ã«ä¿å˜ã—ã¦ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "ファイルèªã¿è¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "入力ã—ãŸãƒ‘スワードã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ç”¨ã®ãƒ‘スワードã§ã¯ãªã„よã†ã§ã™ã€‚" ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "ファイルä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "èªã¿è¾¼ã¿ä¸..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "グレースケール" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "アイドリング" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "ä¸æ¢" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "処ç†ä¸" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "ä¸æ˜Ž" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"ドã‚ュメント '%s' ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "検索:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "ファイル(_F)" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "編集(_E)" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "表示(_V)" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "移動(_G)" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "ヘルプ(_H)" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "é–‹ã(_O)" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "PDF ドã‚ュメントを開ã" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "æ›´æ–°(_R)" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "ドã‚ュメントを更新ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "別åã§ä¿å˜(_S)..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "ドã‚ュメントã®ã‚³ãƒ”ーをä¿å˜ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "å°åˆ·(_P)..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "ドã‚ュメントをå°åˆ·ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "é–‰ã˜ã‚‹(_C)" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "ウィンドウを閉ã˜ã‚‹" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "検索(_F)" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "ドã‚ュメントä¸ã®å˜èªžã‚’検索ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "è¨å®š..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "アプリケーションã®è¨å®šã‚’変更ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "拡大(_I)" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’拡大ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "縮å°(_O)" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’縮å°ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "å³ã«å›žè»¢(_R)" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’時計回り㫠90°回転ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "å·¦ã«å›žè»¢(_L)" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’å時計回り㫠90°回転ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "最åˆã®ãƒšãƒ¼ã‚¸(_F)" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "最åˆã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "次ã®ãƒšãƒ¼ã‚¸(_N)" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "次ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "å‰ã®ãƒšãƒ¼ã‚¸(_P)" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "å‰ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "最後ã®ãƒšãƒ¼ã‚¸(_L)" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "最後ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "æƒ…å ±(_A)" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "アプリケーションã®ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’表示ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "全画é¢è¡¨ç¤º(_U)" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "全画é¢è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "ツールãƒãƒ¼ã‚’表示(_T)" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "ツールãƒãƒ¼ã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "ステータスãƒãƒ¼ã‚’表示(_S)" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "ステータスãƒãƒ¼ã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "インデックスを表示(_N)" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "ドã‚ュメントアウトラインã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "フィット(_F)" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’ウィンドウ全体ã«åˆã‚ã›ã‚‹" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "å¹…ã«åˆã‚ã›ã‚‹(_W)" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’ウィンドウ幅ã«åˆã‚ã›ã‚‹" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "スクãƒãƒ¼ãƒ«" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "マウスã§ãƒšãƒ¼ã‚¸ã‚’スクãƒãƒ¼ãƒ«" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "æ–‡å—列é¸æŠž" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr " マウスã§æ–‡å—列をé¸æŠž" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "PDF ファイルを開ã" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "ãƒãƒ¼ã‚¿ãƒ–ルドã‚ュメントフォーマット（PDF) ファイル" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "パスワード" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "PDF ファイルをä¿å˜" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "ページ" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "/0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "インデックス" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "UI 生æˆãƒžãƒãƒ¼ã‚¸ãƒ£ã®ã‚¨ãƒ©ãƒ¼: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "è»½é‡ PDF ビューア" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"ePDFView ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚ã‚ãªãŸã¯ã“れをã€Free Software Foundation\n" ++"ã«ã‚ˆã£ã¦ç™ºè¡Œã•ã‚ŒãŸ GNU 一般公衆利用許諾契約書 (ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 2 ã‹ã€å¸Œæœ›\n" ++"ã«ã‚ˆã£ã¦ã¯ãれ以é™ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã†ã¡ã©ã‚Œã‹) ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§å†é ’布\n" ++"ã¾ãŸã¯æ”¹å¤‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"ePDFView ã¯æœ‰ç”¨ã§ã‚ã‚‹ã“ã¨ã‚’願ã£ã¦é ’布ã•ã‚Œã¾ã™ãŒã€å…¨ãã®ç„¡ä¿è¨¼\n" ++"ã§ã™ã€‚商æ¥å¯èƒ½æ€§ã®ä¿è¨¼ã‚„特定ã®ç›®çš„ã¸ã®é©åˆæ€§ã¯ã€è¨€å¤–ã«ç¤ºã•ã‚ŒãŸ\n" ++"ã‚‚ã®ã‚‚å«ã‚å…¨ãå˜åœ¨ã—ã¾ã›ã‚“。詳ã—ã㯠GNU 一般公衆利用許諾契約書\n" ++"ã‚’ã”覧ãã ã•ã„。\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"ã‚ãªãŸã¯ ePDFView ã¨å…±ã«ã€GNU 一般公衆利用許諾契約書ã®è¤‡è£½ç‰©ã‚’一部å—ã‘å–ã£" ++"ãŸ\n" ++"ã¯ãšã§ã™ã€‚ã‚‚ã—å—ã‘å–ã£ã¦ã„ãªã‘ã‚Œã°ã€the Free Software Foundation,Inc., 59\n" ++"Temple Place, Suite 330, Boston, MA 02111-1307 USA ã¾ã§è«‹æ±‚ã—ã¦ãã ã•ã„。\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "nyu <nyu_8804 at yahoo dot co dot jp>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "è¨å®š" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "外部コマンド" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "ウェブブラウザ(_B)" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Note: <i>%s</i> 㯠URI ã§ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "å°åˆ·" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "プリンタ" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "ジョブ" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "用紙" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>å°åˆ·ã™ã‚‹ç¯„囲</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "全ページ(_A)" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "範囲(_R):" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>ページセット</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "全ページ(_L)" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "奇数ページ(_D)" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "å¶æ•°ãƒšãƒ¼ã‚¸(_E)" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>コピー</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "コピーã®æ•°(_U):" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "ページをæƒãˆã‚‹(_O)" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>用紙ã¨ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆ</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "用紙サイズ(_S):" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "用紙ã®å‘ã(_O):" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "レイアウト(_L):" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>出力</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "モード(_M):" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "解åƒåº¦(_R):" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "状態" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "ジョブ" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "å ´æ‰€" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "通常" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "1 ç”»é¢ã« 2 ページ" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "1 ç”»é¢ã« 4 ページ" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "縦置ã" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "横置ã" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "次を検索(_N)" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "å‰ã‚’検索(_P)" +diff -Nurd epdfview-0.1.6-svn/po/LINGUAS epdfview/po/LINGUAS +--- epdfview-0.1.6-svn/po/LINGUAS 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/LINGUAS 2008-07-13 12:55:55.073198000 +0200 +@@ -1,2 +1,2 @@ + # Set of available languages. +-ca de el es fr pl ru vi zh_TW ++ca cs de el es fr ja it pl pt_BR pt_PT ru sv vi zh_CN zh_TW +diff -Nurd epdfview-0.1.6-svn/po/pl.po epdfview/po/pl.po +--- epdfview-0.1.6-svn/po/pl.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/pl.po 2008-07-13 12:55:55.073198000 +0200 +@@ -1,19 +1,22 @@ ++# translation of pl.po to + # epdfview Polish translation + # Copyright (C) 2006 Emma's Software + # This file is distributed under the same license as the epdfview package. + # Wojciech Myrda <vojcek@tlen.pl>, 2006. ++# Piotr Pacholak <obi.gts@o2.pl>, 2007. + # + msgid "" + msgstr "" +-"Project-Id-Version: ePDFView 0.1.5\n" ++"Project-Id-Version: pl\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-05-13 00:40+0100\n" +-"Last-Translator: Wojciech Myrda <vojcek@tlen.pl>\n" +-"Language-Team: Polish <none@none.org>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-06-25 16:05+0200\n" ++"Last-Translator: Piotr Pacholak <obi.gts@gmail.com>\n" ++"Language-Team: <pl@li.org>\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + + #: src/FindPter.cxx:187 + msgid "No Results Found!" +@@ -38,7 +41,7 @@ + + #: src/IDocument.cxx:91 + msgid "The PDF file is damaged and can't be repaired." +-msgstr "Plik PDF jest uszkodzony i niemoże zostać naprawiony.." ++msgstr "Plik PDF jest uszkodzony i nie może zostać naprawiony.." + + #: src/IDocument.cxx:94 + msgid "The file is encrypted and the password was incorrect or not supplied." +@@ -47,7 +50,7 @@ + + #: src/IDocument.cxx:97 + msgid "Nonexistent or invalid highlight file." +-msgstr "Zaznaczony plik niestnieje lub jest nieprawidÅ‚owy." ++msgstr "Zaznaczony plik nie istnieje lub jest nieprawidÅ‚owy." + + #: src/IDocument.cxx:100 + msgid "Invalid printer." +@@ -74,11 +77,11 @@ + msgid "Unknown error (%d)." + msgstr "Nieznany bÅ‚Ä…d (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[PLIK] - przeglÄ…dnij pliki PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PrzeglÄ…darka PDF" + +@@ -92,7 +95,7 @@ + msgid "Loading file %s..." + msgstr "Wczytywanie pliku %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "z %d" +@@ -102,39 +105,47 @@ + msgid "Saving document to %s..." + msgstr "Zapisywanie dokumentu do %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "BÅ‚Ä…d w wczytywaniu pliku" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Podane przez ciebie hasÅ‚o do tego pliku jest nieprawidÅ‚owe." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "BÅ‚Ä…d w zapisywaniu pliku" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Wczytywanie..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Skala szaroÅ›ci" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Bezczynny" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Zatrzymany" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Przetwarzanie" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Nieznany" + +@@ -144,251 +155,267 @@ + "Failed to load document '%s'.\n" + "%s\n" + msgstr "" +-"Niemożna wczytać dokumentu '%s'.\n" ++"Nie można wczytać dokumentu '%s'.\n" + "%s\n" + + #: src/gtk/FindView.cxx:51 + msgid "Find:" + msgstr "Znajdź:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Plik" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edytuj" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Widok" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" +-msgstr "_Przejdź" ++msgstr "P_rzejdź" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" +-msgstr "_Pomoc" ++msgstr "Pomo_c" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Otwórz" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Otwórz dokument PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_PrzeÅ‚aduj" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "PrzeÅ‚aduj obecny dokument" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Zapisz KopiÄ™..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Zapisz kopiÄ™ obecnego dokumentu" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Drukuj..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "Wydrukuj obecny dokument" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" +-msgstr "_Zamknij" ++msgstr "Za_mknij" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Zamknij to okno" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Znajdź" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Znajdź sÅ‚owo w tym dokumencie" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Ustawienia" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "ZmieÅ„ ustawienia aplikacji" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "_Zbliż" ++msgstr "Po_wiÄ™ksz" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "PowiÄ™ksz dokument" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "_Oddal" ++msgstr "Po_mniejsz" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Zmniejsz dokument" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "Obruć w _prawo" ++msgstr "Obróć w _prawo" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" +-msgstr "Obruć dokument o 90 stopni zgodnie z wskazówkami zegara" ++msgstr "Obróć dokument o 90 stopni zgodnie z wskazówkami zegara" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "Obruć w _lewo" ++msgstr "Obróć w _lewo" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" +-msgstr "Obruć dokument o 90 stopni przeciwnie do wskazówek zegara" ++msgstr "Obróć dokument o 90 stopni przeciwnie do wskazówek zegara" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" +-msgstr "_Pierwsza Strona" ++msgstr "Pie_rwsza Strona" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Przejdź do strony pierwszej" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_NastÄ™pna Strona" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Przejdź do strony nastÄ™pnej" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "_Poprzednia Strona" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Przejdź do strony poprzedniej" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Ostatnia Strona" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Przejdź do strony ostatniej" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_O programie" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Pokaż informacjÄ™ o programie" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "_PeÅ‚ny ekran" ++msgstr "PeÅ‚ny _ekran" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "PeÅ‚ny ekran" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Pokaż pasek _narzÄ™dzi" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Pokaż lub ukryj pasek narzÄ™dzi" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "Pokaż pasek stanu" ++msgstr "Pokaż pasek s_tanu" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Pokaż lub ukryj pasek stanu" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Pokaż I_ndex" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Pokaż lub ukryj Index dokumentu" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "_Dopasuj do okna" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "PowiÄ™ksza obecny dokument do rozmiaru okna" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Dopasuj do _szerokoÅ›ci" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "PowiÄ™ksza obecny dokument do szerokoÅ›ci okna" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Otwórz plik PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "Pliki (PDF)" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Wszystkie Pliki" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "HasÅ‚o" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Zapisz Plik PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Strona" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "z 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Index" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "BÅ‚Ä…d podczas wczytywania menadżera UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Lekka przeglÄ…darka plików PDF" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -400,7 +427,7 @@ + "opublikowanymi poprzez Free Software Foundation; zarówno wesjÄ… drugÄ… " + "Licencji,lub (wedle wÅ‚asnego uznania) wersjami późniejszymi.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -412,7 +439,7 @@ + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.PrzeglÄ…dnij GNU General " + "Public License by dowiedzieć siÄ™ wiÄ™cej.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -424,11 +451,11 @@ + "Boston, MA 02111-1307\n" + "USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "" + +@@ -451,7 +478,7 @@ + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "Drukuj" ++msgstr "Wydrukuj" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +@@ -479,19 +506,19 @@ + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "<b>Wybrane Strony</b>" ++msgstr "<b>Wybrane strony</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "_Wszystkie strony" ++msgstr "W_szystkie strony" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "Strony _Nieparzyste" ++msgstr "Strony _nieparzyste" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "Strony parzyste" ++msgstr "Strony pa_rzyste" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +@@ -503,7 +530,7 @@ + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "_Posegregowane" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +diff -Nurd epdfview-0.1.6-svn/po/pt_BR.po epdfview/po/pt_BR.po +--- epdfview-0.1.6-svn/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/pt_BR.po 2008-07-13 12:55:55.043198000 +0200 +@@ -0,0 +1,597 @@ ++# Spanish translations for ePDFView package ++# Traducciones al español para el paquete ePDFView. ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.4\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2008-05-28 12:13-0300\n" ++"Last-Translator: \n" ++"Language-Team: Spanish <es@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Não foram encontrados resultados!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Localizando na página %d de %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nenhum erro." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Arquivo não encontrado." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Catálogo de página não pode ser lido." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "O arquivo PDF está corrompido e não pode ser recuperado." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "O arquivo está encriptado e a senha incorreta" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "O arquivo não existe ou é inválido." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Impressora inválida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Erro durante a impressão." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "O arquivo PDF não permite esta operação." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Número de página inválido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Erro I/O do arquivo." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Erro desconhecido (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[ARQUIVO] - mostra documentos PDF" ++ ++#: src/main.cxx:72 ++#: src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizador de PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Recarregando arquivo %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Carregando arquivo %s..." ++ ++#: src/MainPter.cxx:413 ++#: src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "de %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Salvando documento em %s..." ++ ++#: src/MainPter.cxx:832 ++#: src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Erro ao carregar" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "Senha incorreta para este arquivo." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Erro ao Salvar Arquivo" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Carregando..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Escala de cinza" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Escondido" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Parado" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Processando" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Falha ao abrir o documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Localizar:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Arquivo" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Editar" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Ver" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_Ir" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "A_juda" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Abrir" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Abrir documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Recarregar" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Recarregar arquivo PDF atual" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Salvar cópia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Salvar cópia do documento atual" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "_Imprimir" ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Imprimir documento atual" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Fechar" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Fechar esta janela" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "Locali_zar" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Localizar uma palavra no documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferências..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Alterar preferências do aplicativo" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "Au_mentar" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Aumentar o documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "Diminui_r" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Diminuir o documento" ++ ++#: src/gtk/MainView.cxx:133 ++#: src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Girar para a _direita" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Girar o documento 90 graus em sentido horário" ++ ++#: src/gtk/MainView.cxx:137 ++#: src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Girar para a _esquerda" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Girar o documento 90 graus em sentido anti-horário" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Primeira página" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Ir para a primeira página" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Próxima página" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Ir para a próxima página" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "Página _anterior" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Ir para a página anterior" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "Ú_ltima página" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Ir para a última página" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Sobre" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Mostrar créditos do aplicativo" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "T_ela cheia" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Mudar para janela cheia" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostrar barras de _ferramentas" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostrar ou esconder a barra de ferramentas" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Mostrar barra de _status" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostrar ou esconder a barra de status" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostrar Ã_ndice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostrar ou esconder o Ãndice do documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Aj_ustar à janela" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Ajustar documento à janela" ++ ++#: src/gtk/MainView.cxx:195 ++#: src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Ajustar à _largura da página" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Ajustar documento à largura da página" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Rolar" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Mouse rolar página" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Selecionar Texto" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr " Mouse selecionar texto" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Abrir arquivo PDF" ++ ++#: src/gtk/MainView.cxx:340 ++#: src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Arquivos em Portable Document Format (PDF)" ++ ++#: src/gtk/MainView.cxx:352 ++#: src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Todos os arquivos" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Senha" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Salvar arquivo PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Página" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "de 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Ãndice" ++ ++#: src/gtk/MainView.cxx:991 ++#: src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Erro ao construir o administrador de IU: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Visualizador leve de PDF" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "O ePDFView é um software livre; você pode redistribuÃ-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU (GPL) como publicada pela Fundação do Software Livre; seja a versão 2 da Licença ou (se preferir) qualquer versão mais recente.\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "O ePDFView é distribuÃdo na esperança de que seja útil, mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GPL) para mais detalhes.\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "Você deve ter recebido uma cópia da Licença Pública Geral GNU (GPL) junto com o ePDFView; se não, escreva para a Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "Fábio Antunes" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferências" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandos Externos" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Navegador da _Web:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: O parámetro <i>%s</i> deve ser substituÃdo pela URL." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Imprimir" ++ ++#: src/gtk/PrintView.cxx:69 ++#: src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Impressora" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Trabalho" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Página" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Escala de impressão</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "Tod_as as páginas" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Escala:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Conjunto de páginas</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Páginas _Ãmpares" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Páginas pare_s" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Cópias</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "_Número de cópias:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "O_rganizar" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Página e disposição</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Tamanho da página:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientação:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Disposição:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>SaÃda</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Modo:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Resolução:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Estado" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Trabalhos" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Local" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Plano" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Retrato" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Paisagem" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Localizar _Próxima" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Localizar _Anterior" ++ +diff -Nurd epdfview-0.1.6-svn/po/pt_PT.po epdfview/po/pt_PT.po +--- epdfview-0.1.6-svn/po/pt_PT.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/pt_PT.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Portuguese translation for ePDFView package ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.6\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2008-01-06 18:48+0100\n" ++"Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n" ++"Language-Team: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Nenhum Resultado Encontrado!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Procurando na página %d de %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nenhum erro." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Ficheiro não encontrado." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Catálogo de página não pode ser lido." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "O ficheiro PDF está corrompido e não pode ser reparado." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "" ++"O ficheiro está encriptado e a senha está incorrecta ou não foi fornecida." ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "O ficheiro não existe ou é inválido." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Impressora inválida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Erro durante a impressão." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "O ficheiro PDF não permite esta operação." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Número de página inválido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Erro E/S do ficheiro." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Erro desconhecido (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FICHEIRO] - mostra documentos PDF" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizador de PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Recarregando ficheiro %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Carregando ficheiro %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "de %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Gravando documento em %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Erro ao Carregar Ficheiro" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "A senha que indicou não é inválida para este ficheiro." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Erro ao Gravar Ficheiro" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Carregando..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Escala de cinza" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Ocioso" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Parado" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Processando" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Falha ao abrir o documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Procurar:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Ficheiro" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Editar" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Ver" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_Ir" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "_Ajuda" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Abrir" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Abrir um documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Recarregar" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Recarregar documento actual" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Gravar uma Cópia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Gravar uma cópia do documento actual" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "_Imprimir..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Imprimir o documento actual" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Fechar" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Fechar esta janela" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Procurar" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Localizar uma palavra no documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferências..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Alterar preferências da aplicação" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "A_mpliar" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Amplia o documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "_Reduzir" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Reduz o documento" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Girar para a _direita" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Girar o documento 90 graus em sentido horário" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Girar para a _esquerda" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Girar o documento 90 graus em sentido anti-horário" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Primeira Página" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Ir para a primeira página" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Próxima Página" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Ir para a próxima página" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "Página _Anterior" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Ir para a página anterior" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "Ú_ltima Página" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Ir para a última página" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Sobre" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Mostrar créditos da aplicação" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "Ecrã inteiro" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Mudar para ecrã completo" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostrar barras de _ferramentas" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostra ou esconde a barra de ferramentas" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Mostrar barra de _estado" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostra ou esconde a barra de estado" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostrar Ã_ndice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostra ou esconde o Ãndice do documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Aj_ustar à janela" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Ajusta documento à janela" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Ajustar à _largura da página" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Ajusta documento à largura da página" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Deslocamento" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Deslocamento de página com rato" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Seleccionar Texto" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr " Seleccionar texto com rato" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Abrir Ficheiro PDF" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Ficheiros em Portable Document Format (PDF)" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Todos os Ficheiros" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Senha" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Gravar ficheiro PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Página" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "de 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Ãndice" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Erro ao construir o gestor de IU: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Um visualizador leve de PDF" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"O ePDFView é software livre; pode redistribuÃ-lo e/ou modificá-lo\n" ++"sob os termos da Licença Pública Geral GNU (GPL) como publicada\n" ++"pela Free Software Foundation; seja a versão 2 da Licença ou\n" ++"(se preferir) qualquer versão mais recente.\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"O ePDFView é distribuÃdo na esperança de que seja útil,\n" ++"mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de\n" ++"COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a\n" ++"Licença Pública Geral GNU (GPL) para mais detalhes.\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"Deve ter recebido uma cópia da Licença Pública Geral GNU (GPL)\n" ++"junto com o ePDFView; se não, escreva para a Free Software Foundation, Inc.\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "Nuno Miguel <nunis@netcabo.pt>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferências" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandos Externos" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Navegador _Web:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: O parâmetro <i>%s</i> deve ser substituÃdo pelo URI." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Imprimir" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Impressora" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Trabalho" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Página" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Intervalo de impressão</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervalo:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Conjunto de páginas</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Páginas Ã_mpares" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Páginas _pares" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Cópias</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "_Número de cópias:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "O_rganizar" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Página e Disposição</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Tamanho do Papel:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientação de Página:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Disposição:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>SaÃda</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Modo:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Resolução:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Estado" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Trabalhos" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Local" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Plano" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Retrato" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Paisagem" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Procurar _Próxima" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Localizar _Anterior" +diff -Nurd epdfview-0.1.6-svn/po/ru.po epdfview/po/ru.po +--- epdfview-0.1.6-svn/po/ru.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/ru.po 2008-07-13 12:55:55.083198000 +0200 +@@ -1,144 +1,152 @@ + # Russian translations for ePDFView package +-# áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ ePDFView. ++# ÐнглийÑкие переводы Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° ePDFView. + # Copyright (C) 2006 Emma's Software + # This file is distributed under the same license as the ePDFView package. + # <igor_vagulin@mail.ru>, 2006. + # + msgid "" + msgstr "" +-"Project-Id-Version: ePDFView 0.1.5\n" ++"Project-Id-Version: ePDFView 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-07-08 13:31+0400\n" +-"Last-Translator: <igor_vagulin@mail.ru>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-23 15:56+0300\n" ++"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n" + "Language-Team: Russian <ru@li.org>\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=KOI8-R\n" ++"Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" + "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + + #: src/FindPter.cxx:187 + msgid "No Results Found!" +-msgstr "òÅÚÕÌØÔÁÔÙ ÎÅ ÎÁÊÄÅÎÙ!" ++msgstr "Результаты не найдены!" + + #: src/FindPter.cxx:195 + #, c-format + msgid "Searching in page %d of %d..." +-msgstr "ðÏÉÓË ÎÁ ÓÔÒÁÎÉÃÅ %d ÉÚ %d..." ++msgstr "ПоиÑк на Ñтранице %d из %d..." + + #: src/IDocument.cxx:82 + msgid "No error." +-msgstr "âÅÚ ÏÛÉÂÏË." ++msgstr "Без ошибок." + + #: src/IDocument.cxx:85 + msgid "File not found." +-msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ." ++msgstr "Файл не найден." + + #: src/IDocument.cxx:88 + msgid "Couldn't read the page catalog." +-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÉÎÆÏÒÍÁÃÉÉ Ï ÓÔÒÁÎÉÃÁÈ." ++msgstr "Ошибка при чтении информации о Ñтраницах." + + #: src/IDocument.cxx:91 + msgid "The PDF file is damaged and can't be repaired." +-msgstr "PDF ÆÁÊÌ ÐÏ×ÒÅÖÄ£Î É ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ." ++msgstr "PDF файл повреждён и не может быть воÑÑтановлен." + + #: src/IDocument.cxx:94 + msgid "The file is encrypted and the password was incorrect or not supplied." +-msgstr "æÁÊÌ ÚÁÛÉÆÒÏ×ÁÎ. ðÁÒÏÌØ ÎÅ×ÅÒÅÎ ÉÌÉ ÎÅ ××ÅÄ£Î." ++msgstr "Файл зашифрован. Пароль неверен или не введён." + + #: src/IDocument.cxx:97 + msgid "Nonexistent or invalid highlight file." +-msgstr "æÁÊÌ ÐÏÄÓ×ÅÔËÉ(highlight file) ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÉÌÉ × Î£Í ÏÛÉÂËÉ." ++msgstr "Файл подÑветки(highlight file) не ÑущеÑтвует или в нём ошибки." + + #: src/IDocument.cxx:100 + msgid "Invalid printer." +-msgstr "ðÒÉÎÔÅÒ ÎÅ ÎÁÊÄÅÎ" ++msgstr "Принтер не найден" + + #: src/IDocument.cxx:103 + msgid "Error during printing." +-msgstr "ïÛÉÂËÁ ÐÅÞÁÔÉ." ++msgstr "Ошибка печати." + + #: src/IDocument.cxx:106 + msgid "The PDF file doesn't allow that operation." +-msgstr "ïÐÅÒÁÃÉÑ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÓÕÝÅÓÔ×ÌÅÎÁ ÄÌÑ ÜÔÏÇÏ PDF ÆÁÊÌÁ." ++msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ может быть оÑущеÑтвлена Ð´Ð»Ñ Ñтого PDF файла." + + #: src/IDocument.cxx:109 + msgid "Invalid page number." +-msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÔÒÁÎÉÃÙ." ++msgstr "Ðеверный номер Ñтраницы." + + #: src/IDocument.cxx:112 + msgid "File I/O error." +-msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ" ++msgstr "Ошибка ввода/вывода." + + #: src/IDocument.cxx:115 + #, c-format + msgid "Unknown error (%d)." +-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ (%d)." ++msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" +-msgstr "[æáêì] - ÐÒÏÓÍÏÔÒ PDF ÄÏËÕÍÅÎÔÁ" ++msgstr "[ФÐЙЛ] - проÑмотр PDF документа" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" +-msgstr "ðÒÏÓÍÏÔÒ PDF" ++msgstr "ПроÑмотр PDF" + + #: src/MainPter.cxx:233 + #, c-format + msgid "Reloading file %s..." +-msgstr "ðÅÒÅÚÁÇÒÕÚËÁ ÆÁÊÌÁ %s..." ++msgstr "Перезагрузка файла %s..." + + #: src/MainPter.cxx:237 + #, c-format + msgid "Loading file %s..." +-msgstr "úÁÇÒÕÚËÁ ÆÁÌÁ %s..." ++msgstr "Загрузка фала %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" +-msgstr "ÉÚ %d" ++msgstr "из %d" + + #: src/MainPter.cxx:588 + #, c-format + msgid "Saving document to %s..." +-msgstr "äÏËÕÍÅÎÔ ÓÏÈÒÁÎÑÅÔØÓÑ × %s..." ++msgstr "Документ ÑохранÑетÑÑ Ð² %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" +-msgstr "ïÛÉÂËÁ ðÒÉ úÁÇÒÕÚËÅ æÁÊÌÁ" ++msgstr "Ошибка При Загрузке Файла" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." +-msgstr "÷×ÅÄ£ÎÙÊ ×ÁÍÉ ÐÁÒÏÌØ ÎÅ×ÅÒÅÎ ÄÌÑ ÜÔÏÇÏ ÆÁÊÌÁ" ++msgstr "Введёный вами пароль неверен Ð´Ð»Ñ Ñтого файла" + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "ïÛÉÂËÁ ðÒÉ óÏÈÒÁÎÅÎÉÉ æÁÊÌÁ" ++msgstr "Ошибка При Сохранении Файла" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." +-msgstr "úÁÇÒÕÖÁÅÔØÓÑ..." ++msgstr "ЗагружаетÑÑ..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" +-msgstr "ïÔÔÅÎËÉ ÓÅÒÏÇÏ" ++msgstr "Оттенки Ñерого" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" +-msgstr "ïÖÉÄÁÎÉÅ" ++msgstr "Ожидание" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" +-msgstr "ïÓÔÁÎÏ×ÌÅÎ" ++msgstr "ОÑтановлен" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" +-msgstr "ïÂÒÁÂÏÔËÁ" ++msgstr "Обработка" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" +-msgstr "îÅÉÚ×ÅÓÔÎÏ" ++msgstr "ÐеизвеÑтно" + + #: src/PDFDocument.cxx:272 + #, c-format +@@ -146,435 +154,452 @@ + "Failed to load document '%s'.\n" + "%s\n" + msgstr "" +-"ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÄÏËÕÍÅÎÔÁ '%s'.\n" ++"Ошибка при загрузке документа '%s'.\n" + "%s\n" + + #: src/gtk/FindView.cxx:51 + msgid "Find:" +-msgstr "îÁÊÔÉ:" ++msgstr "Ðайти:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" +-msgstr "_æÁÊÌ" ++msgstr "_Файл" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" +-msgstr "_ðÒÁ×ËÁ" ++msgstr "_Правка" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" +-msgstr "_÷ÉÄ" ++msgstr "_Вид" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" +-msgstr "ð_ÅÒÅÊÔÉ" ++msgstr "П_ерейти" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" +-msgstr "ð_ÏÍÏÝØ" ++msgstr "П_омощь" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" +-msgstr "_ïÔËÒÙÔØ" ++msgstr "_Открыть" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" +-msgstr "ïÔËÒÙÔØ PDF ÄÏËÕÍÅÎÔ" ++msgstr "Открыть PDF документ" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" +-msgstr "_ðÅÒÅÚÁÇÒÕÚÉÔØ" ++msgstr "_Перезагрузить" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" +-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ" ++msgstr "Перезагрузить текущий документ" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." +-msgstr "_óÏÈÒÁÎÉÔØ ëÏÐÉÀ" ++msgstr "_Сохранить Копию" + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÔÅËÕÝÅÇÏ ÄÏËÕÍÅÎÔÁ" ++msgstr "Сохранить копию текущего документа" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." +-msgstr "_ðÅÞÁÔØ" ++msgstr "_Печать" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "òÁÓÐÅÞÁÔÁÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ" ++msgstr "РаÑпечатать текущий документ" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" +-msgstr "_úÁËÒÙÔØ" ++msgstr "_Закрыть" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" +-msgstr "úÁËÒÙÔØ ÏËÎÏ" ++msgstr "Закрыть окно" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" +-msgstr "_îÁÊÔÉ" ++msgstr "_Ðайти" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" +-msgstr "îÁÊÔÉ ÓÌÏ×Ï × ÄÏËÕÍÅÎÔÅ" ++msgstr "Ðайти Ñлово в документе" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." +-msgstr "îÁÓÔÒÏÊËÉ..." ++msgstr "ÐаÑтройки..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" +-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÐÒÉÌÏÖÅÎÉÑ" ++msgstr "Редактировать наÑтройки приложениÑ" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "õ×ÅÌÉÞÉÔØ ÍÁÓÛÔÁÂ" ++msgstr "Увеличить" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" +-msgstr "õ×ÅÌÉÞÉÔØ ÄÏËÕÍÅÎÔ" ++msgstr "Увеличить документ" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "õÍÅÎØÛÉÔØ ÍÁÓÛÔÁÂ" ++msgstr "Уменьшить" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" +-msgstr "õÍÅÎØÛÉÔØ ÄÏËÕÍÅÎÔ" ++msgstr "Уменьшить документ" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÐÒÁ×Ï" ++msgstr "Повернуть направо" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" +-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÏ ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÅ" ++msgstr "Повернуть документ на 90 градуÑов по чаÑовой Ñтрелке" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÌÅ×Ï" ++msgstr "Повернуть налево" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" +-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÒÏÔÉ× ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÉ" ++msgstr "Повернуть документ на 90 градуÑов против чаÑовой Ñтрелки" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" +-msgstr "ðÅÒ×ÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ÐŸÐµÑ€Ð²Ð°Ñ Ñтраница" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на первую Ñтраницу" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" +-msgstr "óÌÅÄÕÀÝÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "СледующаÑ" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÓÌÅÄÕÀÝÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на Ñледующую Ñтраницу" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" +-msgstr "ðÒÅÄÙÄÕÝÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ПредыдущаÑ" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на предыдущую Ñтраницу" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" +-msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ПоÑледнÑÑ Ñтраница" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄΠÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на поÑледнбб Ñтраницу" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" +-msgstr "ï ÐÒÏÇÒÁÍÍÅ" ++msgstr "О программе" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" +-msgstr "ðÏËÁÚÁÔØ ÏÐÉÓÁÎÉÅ ÐÒÏÇÒÁÍÍÙ" ++msgstr "Показать опиÑание программы" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "Полный Ñкран" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "Переключить полноÑкранный режим" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" +-msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×" ++msgstr "Показать панель инÑтрументов" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×" ++msgstr "Показать или Ñкрыть панель инÑтрументов" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ" ++msgstr "Показать Ñтроку ÑоÑтоÑниÑ" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ" ++msgstr "Показать или Ñкрыть Ñтроку ÑоÑтоÑниÑ" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" +-msgstr "ðÏËÁÚÁÔØ ÏÇÌÁ×ÌÅÎÉÅ" ++msgstr "Показать оглавление" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÏÇÌÁ×ÌÅÎÉÅ" ++msgstr "Показать или Ñкрыть оглавление" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" +-msgstr "ðÏ ÷ÙÓÏÔÅ" ++msgstr "По Ð’Ñ‹Ñоте" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" +-msgstr "íÁÓÛÔÁ ÐÏ ÒÁÚÍÅÒÕ ÓÔÒÁÎÉÃÙ" ++msgstr "МаÑштаб по размеру Ñтраницы" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" +-msgstr "ðÏ ûÉÒÉÎÅ" ++msgstr "По Ширине" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" +-msgstr "íÁÓÛÔÁ ÐÏ ÛÉÒÉÎÅ ÓÔÒÁÎÉÃÙ" ++msgstr "МаÑштаб по ширине Ñтраницы" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" +-msgstr "ïÔËÒÙÔØ PDF ÆÁÊÌ" ++msgstr "Открыть PDF файл" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" +-msgstr "PDF ÆÁÊÌÙ" ++msgstr "PDF файлы" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" +-msgstr "÷ÓÅ æÁÊÌÙ" ++msgstr "Ð’Ñе Файлы" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" +-msgstr "ðÁÒÏÌØ" ++msgstr "Пароль" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "óÏÈÒÁÎÉÔØ PDF æÁÊÌ" ++msgstr "Сохранить PDF Файл" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" +-msgstr "óÔÒÁÎÉÃÁ" ++msgstr "Страница" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" +-msgstr "ÉÚ 0" ++msgstr "из 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" +-msgstr "ïÇÌÁ×ÌÅÎÉÅ" ++msgstr "Оглавление" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" +-msgstr "ïÛÉÂËÁ ÐÒÉ ÉÎÃÉÁÌÉÚÁÃÉÉ: %s\n" ++msgstr "Ошибка при инциализации: %s\n" + +-#: src/gtk/MainView.cxx:1056 +-#, fuzzy ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" +-msgstr "ì£ÇËÁÑ ÐÒÏÇÒÁÍÍÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ PDF ÆÁÊÌÏ×" ++msgstr "БыÑÑ‚Ñ€Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра PDF файлов" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + msgstr "" +-"ePDFView Ñ×ÌÑÅÔÓÑ Ó×ÏÂÏÄÎÙÍ ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ. \n" +-"÷Ù ×ÐÒÁ×Å ÒÁÓÐÒÏÓÔÒÁÎÑÔØ Å£ É/ÉÌÉ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó\n" +-"ÕÓÌÏ×ÉÑÍÉ ×ÅÒÓÉÉ 2 ÌÉÂÏ ÐÏ ×ÁÛÅÍÕ ×ÙÂÏÒÕ Ó ÕÓÌÏ×ÉÑÍÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ\n" +-"×ÅÒÓÉÉ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU, ÏÐÕÂÌÉËÏ×ÁÎÎÏÊ\n" ++"ePDFView ÑвлÑетÑÑ Ñвободным программным обеÑпечением. \n" ++"Ð’Ñ‹ вправе раÑпроÑтранÑÑ‚ÑŒ её и/или модифицировать в ÑоответÑтвии Ñ\n" ++"уÑловиÑми верÑии 2 либо по вашему выбору Ñ ÑƒÑловиÑми более поздней\n" ++"верÑии Стандартной ОбщеÑтвенной Лицензии GNU, опубликованной\n" + "Free Software Foundation. \n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n" + msgstr "" +-"íÙ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍ ÄÁÎÎÕÀ ÐÒÏÇÒÁÍÍÕ × ÎÁÄÅÖÄÅ ÎÁ ÔÏ, ÞÔÏ ÏÎÁ\n" +-"ÂÕÄÅÔ ×ÁÍ ÐÏÌÅÚÎÏÊ, ÏÄÎÁËÏ îå ðòåäïóôá÷ìñåí îá îå³\n" +-"îéëáëéè çáòáîôéê, × ÔÏÍ ÞÉÓÌÅ çáòáîôéé ôï÷áòîïçï\n" +-"óïóôïñîéñ ðòé ðòïäáöå É ðòéçïäîïóôé äìñ\n" +-"éóðïìøúï÷áîéñ ÷ ëïîëòåôîùè ãåìñè. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ\n" +-"ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÏÚÎÁËÏÍØÔÅÓØ ÓÏ óÔÁÎÄÁÒÔÎÏÊ\n" +-"ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÅÊ GNU.\n" ++"Мы раÑпроÑтранÑем данную программу в надежде на то, что она\n" ++"будет вам полезной, однако ÐЕ ПРЕДОСТÐВЛЯЕМ ÐÐ ÐЕÐ\n" ++"ÐИКÐКИХ ГÐÐ ÐÐТИЙ, в том чиÑле ГÐÐ ÐÐТИИ ТОВÐÐ ÐОГО\n" ++"СОСТОЯÐИЯ ПРИ ПРОДÐЖЕ и ПРИГОДÐОСТИ ДЛЯ\n" ++"ИСПОЛЬЗОВÐÐИЯ Ð’ КОÐКРЕТÐЫХ ЦЕЛЯХ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ\n" ++"подробной информации ознакомьтеÑÑŒ Ñо Стандартной\n" ++"ОбщеÑтвенной Лицензией GNU.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" + "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + msgstr "" +-"÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU\n" +-"×ÍÅÓÔÅ Ó ePDFView; ÅÓÌÉ ÎÅÔ, ÎÁÐÉÛÉÔÅ ÐÉÓØÍÏ × Free Software Foundation," ++"Ð’Ñ‹ должны были получить копию Стандартной ОбщеÑтвенной Лицензии GNU\n" ++"вмеÑте Ñ ePDFView; еÑли нет, напишите пиÑьмо в Free Software Foundation," + "Inc.,\n" +-"ÎÁ ÁÄÒÅÓ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++"на Ð°Ð´Ñ€ÐµÑ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" +-msgstr "" ++msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" +-msgstr "Igor Vagulin <igor_vagulin@mail.ru>" ++msgstr "" ++"Igor Vagulin <igor_vagulin@mail.ru>\n" ++"Sergey Starosek <sergey.starosek@gmail.com>" + + #: src/gtk/PreferencesView.cxx:32 + msgid "Preferences" +-msgstr "îÁÓÔÒÏÊËÉ" ++msgstr "ÐаÑтройки" + + #: src/gtk/PreferencesView.cxx:46 + msgid "External Commands" +-msgstr "÷ÎÅÛÎÉÅ ðÒÏÇÒÁÍÍÙ" ++msgstr "Внешние Программы" + + #: src/gtk/PreferencesView.cxx:105 + msgid "Web _Browser:" +-msgstr "éÎÔÅÒÎÅÔ âÒÁÕÚÅÒ" ++msgstr "Интернет Браузер" + + #: src/gtk/PreferencesView.cxx:118 + #, c-format + msgid "Note: <i>%s</i> will be replaced by the URI." +-msgstr "úÁÍÅÔËÁ: <i>%s</i> ÂÕÄÅÔ ÚÁÍÅÎÅÎÏ ÎÁ URI." ++msgstr "Заметка: <i>%s</i> будет заменено на URI." + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "ðÅÞÁÔØ" ++msgstr "Печать" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +-msgstr "ðÒÉÎÔÅÒ" ++msgstr "Принтер" + + #: src/gtk/PrintView.cxx:74 + msgid "Job" +-msgstr "úÁÄÁÎÉÅ" ++msgstr "Задание" + + #: src/gtk/PrintView.cxx:79 + msgid "Paper" +-msgstr "âÕÍÁÇÁ" ++msgstr "Бумага" + + #: src/gtk/PrintView.cxx:359 + msgid "<b>Print Range</b>" +-msgstr "<b>äÉÁÐÁÚÏÎ ðÅÞÁÔÉ</b>" ++msgstr "<b>Диапазон Печати</b>" + + #: src/gtk/PrintView.cxx:377 + msgid "_All pages" +-msgstr "_÷ÓÅ ÓÔÒÁÎÉÃÙ" ++msgstr "_Ð’Ñе Ñтраницы" + + #: src/gtk/PrintView.cxx:380 + msgid "_Range:" +-msgstr "_äÉÁÐÁÚÏÎ" ++msgstr "_Диапазон" + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "" ++msgstr "<b>Ðабор Ñтраниц</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "" ++msgstr "Ð’Ñе Ñтраницы" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "" ++msgstr "Ðечетные" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "" ++msgstr "Четные" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +-msgstr "<b>ëÏÐÉÉ</b>" ++msgstr "<b>Копии</b>" + + #: src/gtk/PrintView.cxx:437 + msgid "N_umber of copies:" +-msgstr "ëÏÌÉÞÅÓÔ×Ï ËÏÐÉÊ:" ++msgstr "КоличеÑтво копий:" + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "УпорÑдочить" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +-msgstr "<b>óÔÒÁÎÉÃÁ É ÒÁÚÍÅÝÅÎÉÅ</b>" ++msgstr "<b>Страница и макет</b>" + + #: src/gtk/PrintView.cxx:482 + msgid "Paper _Size:" +-msgstr "òÁÚÍÅÒ ÂÕÍÁÇÉ" ++msgstr "Размер бумаги" + + #: src/gtk/PrintView.cxx:508 + msgid "Page _orientation:" +-msgstr "" ++msgstr "ОриентациÑ:" + + #: src/gtk/PrintView.cxx:539 + msgid "_Layout:" +-msgstr "òÁÚÍÅÔËÁ:" ++msgstr "Макет:" + + #: src/gtk/PrintView.cxx:568 + msgid "<b>Output</b>" +-msgstr "<b>÷Ù×ÏÄ</b>" ++msgstr "<b>Вывод</b>" + + #: src/gtk/PrintView.cxx:585 + msgid "_Mode:" +-msgstr "òÅÖÉÍ:" ++msgstr "Режим:" + + #: src/gtk/PrintView.cxx:613 + msgid "_Resolution:" +-msgstr "òÁÚÒÅÛÅÎÉÅ" ++msgstr "Разрешение" + + #: src/gtk/PrintView.cxx:668 + msgid "State" +-msgstr "óÏÓÔÏÑÎÉÅ" ++msgstr "СоÑтоÑние" + + #: src/gtk/PrintView.cxx:677 + msgid "Jobs" +-msgstr "úÁÄÁÎÉÑ" ++msgstr "ЗаданиÑ" + + #: src/gtk/PrintView.cxx:686 + msgid "Location" +-msgstr "" ++msgstr "РаÑположение" + + #: src/gtk/PrintView.cxx:717 + msgid "Plain" +-msgstr "" ++msgstr "Обычный" + + #: src/gtk/PrintView.cxx:723 + msgid "2 pages in 1" +-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1" ++msgstr "2 Ñтраницы на 1" + + #: src/gtk/PrintView.cxx:729 + msgid "4 pages in 1" +-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1" ++msgstr "4 Ñтраницы на 1" + + #: src/gtk/PrintView.cxx:744 + msgid "Portrait" +-msgstr "ëÎÉÖÎÙÊ" ++msgstr "Книга" + + #: src/gtk/PrintView.cxx:750 + msgid "Landscape" +-msgstr "áÌØÂÏÍÎÙÊ" ++msgstr "Ðльбом" + + #: src/gtk/StockIcons.cxx:40 + msgid "Find _Next" +-msgstr "îÁÊÔÉ _ÓÌÅÄÕÀÝÅÅ" ++msgstr "Ðайти _Ñледующее" + + #: src/gtk/StockIcons.cxx:41 + msgid "Find _Previous" +-msgstr "îÁÊÔÉ _ÐÒÅÄÙÄÕÝÅÅ" ++msgstr "Ðайти _предыдущее" +diff -Nurd epdfview-0.1.6-svn/po/sv.po epdfview/po/sv.po +--- epdfview-0.1.6-svn/po/sv.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/sv.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Swedish translation for ePDFView. ++# Copyright (C) 2007 Free Software Foundation, Inc. ++# This file is distributed under the same license as the epdfview package. ++# Daniel Nylander <po@danielnylander.se>, 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFviewer\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-06-10 16:45+0100\n" ++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" ++"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Inga sökträffar hittades!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Söker pÃ¥ sida %d av %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Inga fel." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Filen hittades inte." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Kunde inte läsa sidkatalogen." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF-filen är skadad och kan inte repareras." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "Filen är krypterad och lösenordet var felaktigt eller angavs inte." ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "Icke-existerande eller ogiltig markeringsfil." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Ogiltig skrivare." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Fel vid utskrift." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF-filen tillÃ¥ter inte den Ã¥tgärden." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Ogiltigt sidnummer." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "In/ut-fel." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Okänt fel (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FIL] - visa PDF-dokument" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF-visare" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Läser om filen %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Läs in filen %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "av %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Sparar dokumentet till %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Fel vid inläsning av fil" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "" ++"Lösenordet som du angav är inte ett giltigt lösenord för den här filen." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Fel vid sparning av fil" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Läser in..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "GrÃ¥skala" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Inaktiv" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Stoppad" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Behandlar" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Okänt" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Misslyckades med att läsa in dokumentet \"%s\".\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Sök:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Arkiv" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "R_edigera" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Visa" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_GÃ¥" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "_Hjälp" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Öppna" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Öppna ett PDF-dokument" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Uppdatera" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Läs in det aktuella dokumentet igen" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Spara en kopia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Spara en kopia av det aktuella dokumentet" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "Skriv _ut..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Skriv ut aktuellt dokument" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Stäng" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Stäng det här fönstret" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Sök" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Hitta ett ord i dokumentet" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Inställningar..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Ändra programmets inställningar" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "Zooma _in" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Förstora dokumentet" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "Zooma _ut" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Förminska dokumentet" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Rotera Ã¥t _höger" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Rotera dokumentet 90 grader medsols" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Rotera Ã¥t _vänster" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Rotera dokumentet 90 grader motsols" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Första sidan" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "GÃ¥ till första sidan" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Nästa sida" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "GÃ¥ till nästa sida" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "_FöregÃ¥ende sida" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "GÃ¥ till föregÃ¥ende sida" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "_Sista sidan" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "GÃ¥ till sista sidan" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Om" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Visa information om programmet" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "_Helskärm" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Växla helskärmsläge" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Visa _verktygsrad" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Visa eller dölj verktygsraden" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Visa _statusrad" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Visa eller dölj statusraden" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Visa i_ndex" ++ ++# Kontur? ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Visa eller dölj dokumentets sammandrag" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Zooma till hela _fönstret" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Gör sÃ¥ att det aktuella dokumentet fyller fönstret" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Zooma till hela fönstrets _bredd" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Gör sÃ¥ att det aktuella dokumentet fyller fönstrets bredd" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Öppna PDF-fil" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Portable Document Format-filer (PDF)" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Alla filer" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Lösenord" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Spara PDF-fil" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Sida" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "av 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Index" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Fel vid byggandet av gränssnittshanteraren: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "En resurssnÃ¥l PDF-visare" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"ePDFView är fri programvara. Du kan distribuera det och/eller\n" ++"modifiera det under villkoren i GNU General Public License, publicerad\n" ++"av Free Software Foundation, antingen version 2 eller (om du sÃ¥ vill)\n" ++"nÃ¥gon senare version.\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"ePDFView distribueras i hopp om att det ska vara användbart,\n" ++"men UTAN NÃ…GON SOM HELST GARANTI, även utan underförstÃ¥dd garanti\n" ++"om SÄLJBARHET eller LÄMPLIGHET FÖR NÃ…GOT SPECIELLT ÄNDAMÃ…L. Se GNU\n" ++"General Public License för ytterligare information.\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"Du bör ha fÃ¥tt en kopia av GNU General Public License tillsammans\n" ++"med detta program. Om inte, skriv till Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "Daniel Nylander <po@danielnylander.se>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Inställningar" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Externa kommandon" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Webb_läsare:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Observera: <i>%s</i> kommer att ersättas av URI:n." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Skriv ut" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Skrivare" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Jobb" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Papper" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Utskriftsintervall</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Alla sidor" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervall:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Sidinställningar</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "A_lla sidor" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "U_dda sidnummer" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "_Jämna sidnummer" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Kopior</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "An_tal kopior:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "S_ortera" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Papper och layout</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "Pappersto_rlek:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "Sid_orientering:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Layout:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>Utmatning</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Läge:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Upplösning:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "TillstÃ¥nd" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Jobb" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Plats" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Vanligt" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 sidor pÃ¥ 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 sidor pÃ¥ 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "StÃ¥ende" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Liggande" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Sök _nästa" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Sök _föregÃ¥ende" +diff -Nurd epdfview-0.1.6-svn/po/vi.po epdfview/po/vi.po +--- epdfview-0.1.6-svn/po/vi.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/vi.po 2008-07-13 12:55:55.073198000 +0200 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.5\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" + "PO-Revision-Date: 2006-06-14 20:11+0100\n" + "Last-Translator: VnPenguin <vnpenguin@gmail.com>\n" + "Language-Team: Vietnamese <i18n@vnoss.org>\n" +@@ -74,11 +74,11 @@ + msgid "Unknown error (%d)." + msgstr "Lá»—i không xác định (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FILE] - xem tà i liệu PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Trình xem PDF" + +@@ -92,7 +92,7 @@ + msgid "Loading file %s..." + msgstr "Tải file %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "của %d" +@@ -102,39 +102,47 @@ + msgid "Saving document to %s..." + msgstr "Äang ghi tà i liệu và o %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Lá»—i tải file" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Máºt mã mà bạn cung cấp là không hợp lệ cho file nà y." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Lá»—i ghi file" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Äang tải ..." + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "Kiểu Ä‘en trắng" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Nghỉ" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Dừng" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Äang xá» lý" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Không xác định" + +@@ -151,244 +159,260 @@ + msgid "Find:" + msgstr "Tìm kiếm:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_File" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Sá»a đổi" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Xem" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Chuyển trang" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Trợ giúp" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Mở file" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Mở má»™t tà i liệu PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Tải lại" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Tải lại tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_LÆ°u má»™t bản..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "LÆ°u má»™t bản của tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_In ra..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "In tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Äóng" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Äóng cá»a sổ nà y" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Tìm" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Tìm má»™t từ trong tà i liệu" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Xác láºp..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Thay đổi các xác láºp của ứng dụng" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "Phóng _to" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Phóng to tà i liệu" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "Thu _nhá»" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Thu nhá» tà i liệu" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Quay _phải" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Quay tà i liệu hiện tại 90 Ä‘á»™ theo chiá»u kim đồng hồ" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Quay _trái" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Quay tà i liệu hiện tại 90 Ä‘á»™ theo ngược chiá»u kim đồng hồ" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Trang đầu tiên" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Äi đến trang đầu tiên" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "Trang _kế" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Äi đến trang kế tiếp" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Trang trÆ°á»›c" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Äi đến trang trÆ°á»›c" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Trang cuối" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Äi đến trang cuối" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Vá»..." + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Hiển thị danh sách đóng góp" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" + msgstr "" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Hiển thị thanh công cụ" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Hiển thị hoặc dấu thanh công cụ" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Hiển thị thanh trạng thái" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Hiển thị hoặc dấu thanh trạng thái" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Hiển thị chỉ mục" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Hiển thị hoặc dấu hình dáng bên ngoà i của tà i liệu" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Hiệu chỉnh _hợp vá»›i cá»a sổ" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Hiệu chỉnh tà i liệu hiện tại lấp đầy cá»a sổ" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "Hiệu chỉnh theo bá» _rá»™ng trang" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Hiệu chỉnh tà i liệu hiện tại hợp vá»›i bá» rá»™ng trang" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "Mở file PDF" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "file PDF" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "Tất cả các file" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Máºt mã" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "LÆ°u file PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Trang" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "0/0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Chỉ mục" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "Lá»—i khi tạo quản lý giao diện ngÆ°á»i dùng: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Má»™t trình xem PDF nhá» gá»n" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -400,7 +424,7 @@ + "bởi Free Software Foundation; phiên bản 2 hoặc (theo lá»±a chá»n của bạn)\n" + " bất kì phiên bản má»›i nà o.\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -412,7 +436,7 @@ + "ngay cả cho MERCHANTABILITY hoặc FITNESS FOR A PARTICULAR PURPOSE.\n" + " Xem giấy phép GNU GPL để biết thêm chi tiết.\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -422,11 +446,11 @@ + "ePDFView; nếu không, thì hãy liên lạc Free Software Foundation, Inc., 59 " + "Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "VnPenguin <vnpenguin@gmail.com>" + +diff -Nurd epdfview-0.1.6-svn/po/zh_CN.po epdfview/po/zh_CN.po +--- epdfview-0.1.6-svn/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/zh_CN.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,593 @@ ++# Simplified Chinese Messages for epdfview. ++# Copyright (C) 2007 Free Software Foundation, Inc. ++# This file is distributed under the same license as the epdfview package. ++# Changyan Xie <panchoat@gmail.com>, 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: epdfview 0.1.5\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2006-06-19 10:47+0800\n" ++"Last-Translator: Changyan Xie <panchoat@gmail.com>\n" ++"Language-Team: Changyan Xie <panchoat@gmail.com>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "找ä¸åˆ°ä»»ä½•ç»“æžœï¼" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "æ£åœ¨æŸ¥æ‰¾ %2$d 页ä¸çš„第 %1$d 页…" ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "没有错误。" ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "找ä¸åˆ°æ–‡ä»¶ã€‚" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "æ— æ³•è¯»å–页é¢åˆ†ç±»ã€‚" ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF 文件å—æŸè€Œä¸”æ— æ³•ä¿®å¤ã€‚" ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "æ–‡ä»¶å·²åŠ å¯†è€Œä¸”å¯†ç 是ä¸æ£ç¡®æˆ–æ˜¯æ— æ³•æ供的。" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "ä¸å˜åœ¨æˆ–æ— æ•ˆçš„é«˜äº®åº¦æ–‡ä»¶ã€‚" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "æ— æ•ˆçš„æ‰“å°æœºã€‚" ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "打å°æ—¶å‘生错误" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF 文件ä¸å…许该项æ“作。" ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "æ— æ•ˆçš„é¡µç 。" ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "文件 I/O 错误。" ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "ä¸æ˜Žçš„错误 (%d)。" ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FILE] - æµè§ˆ PDF 文件" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF æµè§ˆå™¨" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "æ£åœ¨é‡æ–°è£…载文件 %s…" ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "装载文件 %s…" ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "之于 %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "ä¿å˜æ–‡ä»¶è‡³ %s…" ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "装载文件时å‘生错误" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "您æ供的密ç 对于æ¤æ–‡ä»¶æ— 效。" ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "ä¿å˜æ–‡ä»¶æ—¶å‘生错误" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "装载…" ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "ç°åº¦" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "闲置" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "å·²åœæ¢" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "处ç†ä¸" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "未知" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"装载文件 '%s' 时失败。\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "查找：" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "文件(_F)" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "编辑(_E)" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "æµè§ˆ(_V)" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "å‰å¾€(_G)" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "帮助(_H)" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "打开(_O)" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "打开 PDF 文件" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "é‡æ–°è£…è½½(_R)" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "é‡æ–°è£…载当å‰æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "ä¿å˜å‰¯æœ¬(_S)…" ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "ä¿å˜å½“å‰æ–‡ä»¶çš„副本" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "打å°(_P)…" ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "打å°å½“å‰æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "å…³é—(_C)" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "å…³é—æ¤çª—å£" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "查找(_F)" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "在文件ä¸æŸ¥æ‰¾å—è¯" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "å好设定…" ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "改å˜åº”用软件的å好设定" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "放大(_I)" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "放大文件" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "缩å°(_O)" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "缩å°æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "å‘å³æ—‹è½¬(_R)" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "顺时针旋转文件 90 度" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "å‘左旋转(_L)" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "逆时针旋转文件 90 度" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "第一页(_F)" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "å‰å¾€ç¬¬ä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "下一页(_N)" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "å‰å¾€ä¸‹ä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "上一页(_P)" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "å‰å¾€ä¸Šä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "最åŽä¸€é¡µ(_L)" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "å‰å¾€æœ€åŽä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "关于(_A)" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "显示应用程åºçš„æ„Ÿè°¢" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "å…¨å±(_F)" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "开关全å±æ¨¡å¼" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "显示工具æ (_T)" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "显示或éšè—工具æ " ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "显示状æ€æ (_S)" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "显示或éšè—状æ€æ " ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "显示索引(_N)" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "显示或éšè—文件外框" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "符åˆçª—å£(_F)" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "将当å‰æ–‡ä»¶å¡«æ»¡çª—å£" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "符åˆå®½åº¦(_W)" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "将当å‰æ–‡ä»¶ç¬¦åˆçª—å£å®½åº¦" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "打开 PDF 文件" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "å¯æºå¼æ–‡ä»¶æ ¼å¼ (PDF) 文件" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "所有文件" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "密ç " ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "ä¿å˜ PDF 文件" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "页é¢" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "之于 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "索引" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "建立 UI 管ç†å‘˜æ—¶å‘生错误：%s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "è½»é‡çº§çš„ PDF æµè§ˆå™¨" ++ ++#: src/gtk/MainView.cxx:1111 ++msgid "" ++"ePDFView is free software; you can redistribute it and/or modify\n" ++"it under the terms of the GNU General Public License as published by\n" ++"the Free Software Foundation; either version 2 of the License, or\n" ++"(at your option) any later version.\n" ++msgstr "" ++"ePDFView 为自由软件；您å¯ä¾æ®è‡ªç”±è½¯ä»¶åŸºé‡‘会所å‘表的 GNU 通用公共授æƒ\n" ++"æ¡æ¬¾è§„定，就本程åºé‡æ–°åˆ†å‘与ï¼æˆ–ä¿®æ”¹ï¼›æ— è®ºæ‚¨ä¾æ®çš„是本授æƒçš„第二版或\n" ++"（您自行选择的）任何ç¨åŽå‘行的版本。\n" ++ ++#: src/gtk/MainView.cxx:1115 ++msgid "" ++"ePDFView is distributes in the hope that it will be useful,\n" ++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++"GNU General Public License for more details.\n" ++msgstr "" ++"ePDFView ç³»åŸºäºŽä½¿ç”¨ç›®çš„è€ŒåŠ ä»¥åˆ†å‘，然而ä¸è´Ÿä»»ä½•æ‹…ä¿è´£ä»»ï¼›äº¦æ— 对适售性\n" ++"或特定目的适用性所为的默示性担ä¿ã€‚详情请å‚ç…§ GNU 通用公共授æƒã€‚\n" ++ ++#: src/gtk/MainView.cxx:1119 ++msgid "" ++"You should have received a copy of the GNU General Public License\n" ++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" ++"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++msgstr "" ++"您应已收到附éšäºŽ ePDFView çš„ GNU 通用公共授æƒçš„å‰¯æœ¬ï¼›å¦‚æ— ï¼Œè¯·å†™ä¿¡è‡³\n" ++"自由软件基金会: \n" ++"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "è°¢é•¿é› <panchoat@gmail.com>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "å好设定" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "外部命令" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "网页æµè§ˆå™¨(_B)：" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "注æ„：<i>%s</i> 将会被 URI 所å–代。" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "打å°" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "打å°æœº" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "工作" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "çº¸å¼ " ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>打å°èŒƒå›´</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "所有页é¢(_A)" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "范围(_R)：" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>页é¢è®¾å®š</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "所有页é¢(_L)" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "奇数页é¢(_D)" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "å¶æ•°é¡µé¢(_E)" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>份数</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "副本的数é‡ï¼š" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "自动分页(_O)" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>çº¸å¼ å’Œç‰ˆé¢</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "çº¸å¼ å¤§å°(_S)：" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "çº¸å¼ æ–¹å‘(_O)：" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "版é¢(_L)" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>输出</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "模å¼(_M)：" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "分辨率(_R)：" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "状æ€" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "工作" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "ä½ç½®" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "普通" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "两页åˆä¸€" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "四页åˆä¸€" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "纵å‘" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "横å‘" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "查找下一个(_N)" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "查找上一个(_P)" +diff -Nurd epdfview-0.1.6-svn/po/zh_TW.po epdfview/po/zh_TW.po +--- epdfview-0.1.6-svn/po/zh_TW.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/zh_TW.po 2008-07-13 12:55:55.083198000 +0200 +@@ -1,14 +1,13 @@ + # Traditional Chinese Messages for epdfview. +-# Copyright (C) 2006 Free Software Foundation, Inc. + # This file is distributed under the same license as the epdfview package. +-# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006. ++# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006, 07. + # + msgid "" + msgstr "" +-"Project-Id-Version: epdfview 0.1.5\n" ++"Project-Id-Version: epdfview 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-06-19 10:47+0800\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-20 12:47+0800\n" + "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n" + "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" + "MIME-Version: 1.0\n" +@@ -74,11 +73,11 @@ + msgid "Unknown error (%d)." + msgstr "ä¸æ˜Žçš„錯誤 (%d)。" + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FILE] - 檢視 PDF 文件" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PDF 檢視器" + +@@ -92,7 +91,7 @@ + msgid "Loading file %s..." + msgstr "載入檔案 %s…" + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "之於 %d" +@@ -102,39 +101,47 @@ + msgid "Saving document to %s..." + msgstr "儲å˜æ–‡ä»¶è‡³ %s…" + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "載入檔案時發生錯誤" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "您æ供的密碼å°æ–¼æ¤æª”案無效。" + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "儲å˜æª”案時發生錯誤" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "載入…" + +-#: src/PrintPter.cxx:295 ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 + msgid "Grayscale" + msgstr "ç°éšŽ" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "é–’ç½®" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "å·²åœæ¢" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "處ç†ä¸" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "未知" + +@@ -151,244 +158,260 @@ + msgid "Find:" + msgstr "尋找：" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "檔案(_F)" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "編輯(_E)" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "檢視(_V)" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "å‰å¾€(_G)" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "求助(_H)" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "é–‹å•Ÿ(_O)" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "é–‹å•Ÿ PDF 文件" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "é‡æ–°è¼‰å…¥(_R)" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "é‡æ–°è¼‰å…¥ç›®å‰æ–‡ä»¶" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "儲å˜è¤‡æœ¬(_S)…" + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "儲å˜ç›®å‰æ–‡ä»¶çš„複本" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "列å°(_P)…" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "列å°ç›®å‰æ–‡ä»¶" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "關閉(_C)" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "關閉æ¤è¦–窗" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "尋找(_F)" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "在文件ä¸å°‹æ‰¾å—è©ž" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "å好è¨å®šâ€¦" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "改變應用軟體的å好è¨å®š" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "放大(_I)" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "放大文件" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "縮å°(_O)" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "收縮文件" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "å‘å³æ—‹è½‰(_R)" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "é †æ™‚é‡æ—‹è½‰æ–‡ä»¶ 90 度" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "å‘左旋轉(_L)" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "逆時é‡æ—‹è½‰æ–‡ä»¶ 90 度" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "首é (_F)" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "å‰å¾€ç¬¬ä¸€é " + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "下é (_N)" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "å‰å¾€ä¸‹ä¸€é " + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "上é (_P)" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "å‰å¾€ä¸Šä¸€é " + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "末é (_L)" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "å‰å¾€æœ€æœ«é " + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "關於(_A)" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "顯示應用程å¼çš„é³´è¬" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "全螢幕(_U)" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "切æ›åˆ°å…¨èž¢å¹•è¦–窗" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "顯示工具列(_T)" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "顯示或隱è—工具列" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "顯示狀態列(_S)" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "顯示或隱è—狀態列" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "顯示索引(_N)" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "顯示或隱è—文件外框" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "符åˆè¦–窗(_F)" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "將目å‰æ–‡ä»¶å¡«æ»¿è¦–窗" + +-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 + msgid "Zoom to _Width" + msgstr "符åˆå¯¬åº¦(_W)" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "將目å‰æ–‡ä»¶å¡«æ»¿è¦–窗寬度" + +-#: src/gtk/MainView.cxx:278 ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "" ++ ++#: src/gtk/MainView.cxx:320 + msgid "Open PDF File" + msgstr "é–‹å•Ÿ PDF 檔案" + +-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 + msgid "Portable Document Format (PDF) Files" + msgstr "å¯æ”œå¼æ–‡ä»¶æ ¼å¼ (PDF) 檔案" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" + msgstr "所有檔案" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "密碼" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "å„²å˜ PDF 檔案" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "é é¢" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "之於 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "索引" + +-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 + #, c-format + msgid "Error building UI manager: %s\n" + msgstr "建立 UI 管ç†å“¡æ™‚發生錯誤：%s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "輕é‡ç´šçš„ PDF 檢視器" + +-#: src/gtk/MainView.cxx:1059 ++#: src/gtk/MainView.cxx:1111 + msgid "" + "ePDFView is free software; you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" +@@ -399,7 +422,7 @@ + "æ¢æ¬¾è¦å®šï¼Œå°±æœ¬ç¨‹å¼å†ç‚ºæ•£å¸ƒèˆ‡ï¼æˆ–修改；無論您ä¾æ“šçš„是本授權的第二版或\n" + "（您自行é¸æ“‡çš„）任何ç¨å¾Œç™¼è¡Œçš„版本。\n" + +-#: src/gtk/MainView.cxx:1063 ++#: src/gtk/MainView.cxx:1115 + msgid "" + "ePDFView is distributes in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +@@ -409,7 +432,7 @@ + "ePDFView ä¿‚åŸºæ–¼ä½¿ç”¨ç›®çš„è€ŒåŠ ä»¥æ•£å¸ƒï¼Œç„¶è€Œä¸è² 任何擔ä¿è²¬ä»»ï¼›äº¦ç„¡å°é©å”®æ€§\n" + "或特定目的é©ç”¨æ€§æ‰€ç‚ºçš„默示性擔ä¿ã€‚詳情請åƒç…§ GNU 通用公共授權。\n" + +-#: src/gtk/MainView.cxx:1067 ++#: src/gtk/MainView.cxx:1119 + msgid "" + "You should have received a copy of the GNU General Public License\n" + "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" +@@ -419,11 +442,11 @@ + "自由軟體基金會: \n" + "59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" + msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" + msgstr "趙惟倫 <william.chao@ossii.com.tw>" + +diff -Nurd epdfview-0.1.6-svn/src/Config.cxx epdfview/src/Config.cxx +--- epdfview-0.1.6-svn/src/Config.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/Config.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -40,7 +40,6 @@ + + // Forward declarations. + gchar *getConfigFileName (void); +-void makeDirWithParents (const gchar *); + + /// + /// @brief Constructs a new Config object. +@@ -502,42 +501,9 @@ + { + gchar *configDir = + g_build_filename (g_get_user_config_dir (), PACKAGE, NULL); +- makeDirWithParents (configDir); ++ g_mkdir_with_parents (configDir, 0700); + gchar *configFile = g_build_filename (configDir, "main.conf", NULL); + g_free (configDir); + + return configFile; + } +- +-/// +-/// @brief Creates the directory and all its parent directories. +-/// +-/// If the directory already exists it does nothing. +-/// +-/// @param path The directory to create. +-/// +-void +-makeDirWithParents (const gchar *path) +-{ +- // Get the list of directories to create. +- GList *dirs = NULL; +- gchar *dirName = g_strdup (path); +- while ( !g_file_test (dirName, G_FILE_TEST_EXISTS) ) +- { +- dirs = g_list_prepend (dirs, dirName); +- dirName = g_path_get_dirname (dirName); +- } +- +- // Now create all of them. +- GList *dir = g_list_first (dirs); +- while ( NULL != dir ) +- { +- if ( -1 == g_mkdir ((gchar *)dir->data, 0700) ) +- { +- g_warning ("Couldn't make directory '%s'\n", (gchar *)dir->data); +- } +- g_free (dir->data); +- dir = g_list_next (dir); +- } +- g_list_free (dirs); +-} +diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.cxx epdfview/src/DocumentPage.cxx +--- epdfview-0.1.6-svn/src/DocumentPage.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/DocumentPage.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -17,6 +17,7 @@ + + #include <config.h> + #include <string.h> ++#include <gdk/gdk.h> + #include "epdfview.h" + + using namespace ePDFView; +@@ -28,6 +29,7 @@ + /// + DocumentPage::DocumentPage () + { ++ m_Selection = NULL; + m_Data = NULL; + m_HasSelection = FALSE; + m_Height = 0; +@@ -49,6 +51,9 @@ + delete link; + } + g_list_free (m_LinkList); ++ ++ if(m_Selection) ++ gdk_region_destroy(m_Selection); + } + + /// +@@ -79,6 +84,12 @@ + invertArea (m_SelectionX1, m_SelectionY1, m_SelectionX2, m_SelectionY2); + m_HasSelection = FALSE; + } ++ ++ if(NULL != m_Selection){ ++ invertRegion(m_Selection); ++ gdk_region_destroy(m_Selection); ++ m_Selection = NULL; ++ } + } + + /// +@@ -195,6 +206,20 @@ + } + } + ++void ++DocumentPage::invertRegion (GdkRegion* region) ++{ ++ int count; ++ GdkRectangle *rectangles; ++ gdk_region_get_rectangles(region, &rectangles, &count); ++ while(count--){ ++ GdkRectangle r = rectangles[count]; ++ invertArea(r.x, r.y, r.x + r.width, r.y + r.height); ++ } ++ g_free(rectangles); ++} ++ ++ + /// + /// @brief Allocates the memory for a new page. + /// +@@ -253,3 +278,13 @@ + + m_HasSelection = TRUE; + } ++ ++void ++DocumentPage::setSelection (GdkRegion *region) ++{ ++ clearSelection (); ++ ++ invertRegion (region); ++ ++ m_Selection = gdk_region_copy(region); ++} +diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.h epdfview/src/DocumentPage.h +--- epdfview-0.1.6-svn/src/DocumentPage.h 2008-07-13 12:57:45.123198000 +0200 ++++ epdfview/src/DocumentPage.h 2008-07-13 12:55:52.573198000 +0200 +@@ -18,6 +18,8 @@ + #if !defined (__DOCUMENT_PAGE_H__) + #define __DOCUMENT_PAGE_H__ + ++typedef struct _GdkRegion GdkRegion; ++ + namespace ePDFView + { + /// +@@ -41,6 +43,7 @@ + gint getWidth (void); + gboolean newPage (gint width, gint height); + void setSelection (DocumentRectangle &selection, gdouble scale); ++ void setSelection (GdkRegion *region); + + protected: + /// The page's image. +@@ -61,7 +64,10 @@ + gint m_Width; + /// The list of links from the page. + GList *m_LinkList; +- ++ /// Selection region ++ GdkRegion *m_Selection; ++ ++ void invertRegion (GdkRegion*); + void invertArea (gint x1, gint y1, gint x2, gint y2); + }; + } +diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.cxx epdfview/src/gtk/MainView.cxx +--- epdfview-0.1.6-svn/src/gtk/MainView.cxx 2008-07-13 12:57:44.223198000 +0200 ++++ epdfview/src/gtk/MainView.cxx 2008-07-13 12:55:50.923198000 +0200 +@@ -76,6 +76,8 @@ + static void main_window_zoom_in_cb (GtkWidget *, gpointer); + static void main_window_zoom_out_cb (GtkWidget *, gpointer); + static void main_window_zoom_width_cb (GtkToggleAction *, gpointer); ++static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer); ++static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); + + #if defined (HAVE_CUPS) + static void main_window_print_cb (GtkWidget *, gpointer); +@@ -128,11 +130,11 @@ + N_("Shrink the document"), + G_CALLBACK (main_window_zoom_out_cb) }, + +- { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, ++ { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright", + N_("Rotate the document 90 degrees clockwise"), + G_CALLBACK (main_window_rotate_right_cb) }, + +- { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, ++ { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft", + N_("Rotate the document 90 degrees counter-clockwise"), + G_CALLBACK (main_window_rotate_left_cb) }, + +@@ -158,7 +160,14 @@ + + // Accelerator keys. + { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, +- G_CALLBACK (main_window_find_cb) } ++ G_CALLBACK (main_window_find_cb) }, ++ ++ { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL, ++ G_CALLBACK (main_window_zoom_in_cb) }, ++ ++ { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", ++ NULL, ++ G_CALLBACK (main_window_zoom_out_cb) } + }; + + static GtkToggleActionEntry g_ToggleEntries[] = +@@ -185,10 +194,19 @@ + + { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL, + N_("Make the current document fill the window width"), +- G_CALLBACK (main_window_zoom_width_cb), FALSE } ++ G_CALLBACK (main_window_zoom_width_cb), FALSE }, ++}; + ++static GtkRadioActionEntry g_PageScrollEntries[] = ++{ ++ { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL, ++ N_("Mouse scroll page"), (int)PagePterModeScroll }, ++ ++ { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL, ++ N_(" Mouse select text"), (int)PagePterModeSelectText }, + }; + ++ + //////////////////////////////////////////////////////////////// + // Interface Methods. + //////////////////////////////////////////////////////////////// +@@ -238,6 +256,9 @@ + GtkWidget *pageViewPaned = createPageView (); + gtk_box_pack_start (GTK_BOX (m_MainBox), pageViewPaned, TRUE, TRUE, 0); + gtk_widget_show (pageViewPaned); ++ // By default set focus to page view so user can navigate pdf document with ++ // keyboard right away without need to click to page view first ++ gtk_widget_grab_focus (m_PageView->getTopWidget ()); + // Add the find bar. + m_FindView = new FindView (); + gtk_box_pack_start (GTK_BOX (m_MainBox), m_FindView->getTopWidget (), +@@ -247,6 +268,10 @@ + // look weird. + m_StatusBar = gtk_statusbar_new (); + gtk_box_pack_start (GTK_BOX (m_MainBox), m_StatusBar, FALSE, FALSE, 0); ++ ++ // Signal for Zooming into the page per ctrl + scroll-wheel. ++ g_signal_connect (G_OBJECT (m_PageView->getTopWidget ()), "scroll-event", ++ G_CALLBACK (main_window_page_scrolled_cb), pter); + } + + MainView::~MainView () +@@ -272,6 +297,23 @@ + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active); + } + ++void ++MainView::activePageModeScroll (gboolean active) ++{ ++ GtkAction *action = ++ gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeScroll"); ++ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); ++} ++ ++ ++void ++MainView::activePageModeText (gboolean active) ++{ ++ GtkAction *action = ++ gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeText"); ++ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); ++} ++ + gchar * + MainView::openFileDialog (const gchar *lastFolder) + { +@@ -935,6 +977,9 @@ + gtk_action_group_add_toggle_actions (actionGroup, g_ToggleEntries, + G_N_ELEMENTS (g_ToggleEntries), + m_Pter); ++ gtk_action_group_add_radio_actions (actionGroup, g_PageScrollEntries, ++ G_N_ELEMENTS (g_PageScrollEntries), 0, ++ G_CALLBACK(main_window_set_page_mode), m_Pter); + m_UIManager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0); + +@@ -1038,6 +1083,13 @@ + } + } + ++void ++MainView::copyTextToClibboard(const gchar* text) ++{ ++ GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); ++ gtk_clipboard_set_text(clipboard, text, -1); ++} ++ + //////////////////////////////////////////////////////////////// + // GTK+ Callbacks. + //////////////////////////////////////////////////////////////// +@@ -1416,3 +1468,29 @@ + MainPter *pter = (MainPter *)data; + pter->zoomWidthActivated (gtk_toggle_action_get_active (action)); + } ++ ++void ++main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer data) ++{ ++ g_assert ( NULL != data && "The data parameter is NULL."); ++ ++ MainPter *pter = (MainPter *)data; ++ PagePterMode mode = (PagePterMode)gtk_radio_action_get_current_value(action); ++ pter->setPageMode (mode); ++} ++ ++void ++main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) ++{ ++ g_assert ( NULL != data && "The data parameter is NULL."); ++ ++ MainPter *pter = (MainPter *)data; ++ // Only zoom when the CTRL-Button is down... ++ if ( !(event->state & GDK_CONTROL_MASK) ) return; ++ if ( event->direction == GDK_SCROLL_UP ) { ++ pter->zoomInActivated (); ++ } else if ( event->direction == GDK_SCROLL_DOWN ) { ++ pter->zoomOutActivated (); ++ } ++} ++ +diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.h epdfview/src/gtk/MainView.h +--- epdfview-0.1.6-svn/src/gtk/MainView.h 2008-07-13 12:57:44.233198000 +0200 ++++ epdfview/src/gtk/MainView.h 2008-07-13 12:55:50.923198000 +0200 +@@ -35,6 +35,8 @@ + + void activeZoomFit (gboolean active); + void activeZoomWidth (gboolean active); ++ void activePageModeScroll (gboolean active); ++ void activePageModeText (gboolean active); + gchar *openFileDialog (const gchar *lastFolder); + gchar *promptPasswordDialog (void); + gchar *saveFileDialog (const gchar *lastFolder, +@@ -68,6 +70,7 @@ + void setStatusBarText (const gchar *text); + void setZoomText (const gchar *text); + const gchar *getGoToPageText (void); ++ void copyTextToClibboard(const gchar* text); + IFindView *getFindView (void); + IPageView *getPageView (void); + IPreferencesView *getPreferencesView (void); +diff -Nurd epdfview-0.1.6-svn/src/gtk/PageView.cxx epdfview/src/gtk/PageView.cxx +--- epdfview-0.1.6-svn/src/gtk/PageView.cxx 2008-07-13 12:57:44.243198000 +0200 ++++ epdfview/src/gtk/PageView.cxx 2008-07-13 12:55:50.943198000 +0200 +@@ -184,6 +184,9 @@ + GdkCursor *cursor = NULL; + switch (cursorType) + { ++ case PAGE_VIEW_CURSOR_SELECT_TEXT: ++ cursor = gdk_cursor_new (GDK_XTERM); ++ break; + case PAGE_VIEW_CURSOR_LINK: + cursor = gdk_cursor_new (GDK_HAND2); + break; +@@ -524,6 +527,13 @@ + { + g_assert ( NULL != data && "The data parameter is NULL."); + ++ // don't scroll when the CRTL-Button is down, because then the page should ++ // actually be zoomed and not scrolled. Zooming is handelt by the MainView ++ // class. ++ if ( event->state & GDK_CONTROL_MASK ) ++ { ++ return FALSE; ++ } + PagePter *pter = (PagePter *)data; + GtkAdjustment *adjustment = + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); +@@ -553,11 +563,15 @@ + + GtkScrollType direction; + gboolean horizontal = FALSE; ++ gboolean returnValue = TRUE; + PagePter *pter = (PagePter *)data; + +- GtkAdjustment *adjustment = ++ GtkAdjustment *hadjustment = ++ gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (widget)); ++ gdouble hposition = gtk_adjustment_get_value (hadjustment); ++ GtkAdjustment *vadjustment = + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); +- gdouble position = gtk_adjustment_get_value (adjustment); ++ gdouble vposition = gtk_adjustment_get_value (vadjustment); + + if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) ) + { +@@ -568,51 +582,96 @@ + { + case GDK_Left: + case GDK_KP_Left: ++ case GDK_h: ++ if ( hposition == hadjustment->lower ) ++ { ++ pter->scrollToPreviousPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_LEFT; + horizontal = TRUE; + break; + + case GDK_Right: + case GDK_KP_Right: ++ case GDK_l: ++ if ( hposition == ( hadjustment->upper - hadjustment->page_size) ) ++ { ++ pter->scrollToNextPage (); ++ return TRUE; ++ } + horizontal = TRUE; + direction = GTK_SCROLL_STEP_RIGHT; + break; + + case GDK_Up: + case GDK_KP_Up: ++ case GDK_k: ++ if ( vposition == vadjustment->lower ) ++ { ++ pter->scrollToPreviousPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_UP; + break; + + case GDK_Down: + case GDK_KP_Down: ++ case GDK_j: ++ if ( vposition == ( vadjustment->upper - vadjustment->page_size) ) ++ { ++ pter->scrollToNextPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_DOWN; + break; + + case GDK_Page_Up: + case GDK_KP_Page_Up: +- if ( position == adjustment->lower ) ++ if ( vposition == vadjustment->lower ) + { + pter->scrollToPreviousPage (); + return TRUE; + } +- direction = GTK_SCROLL_START; ++ direction = GTK_SCROLL_PAGE_UP; + break; + ++ case GDK_space: ++ case GDK_KP_Space: + case GDK_Page_Down: + case GDK_KP_Page_Down: +- if ( position == ( adjustment->upper - adjustment->page_size) ) ++ if ( vposition == ( vadjustment->upper - vadjustment->page_size) ) + { + pter->scrollToNextPage (); + return TRUE; + } ++ direction = GTK_SCROLL_PAGE_DOWN; ++ break; ++ ++ case GDK_Home: ++ case GDK_KP_Home: ++ direction = GTK_SCROLL_START; ++ break; ++ ++ case GDK_End: ++ case GDK_KP_End: + direction = GTK_SCROLL_END; + break; + +- default: ++ case GDK_Return: ++ case GDK_KP_Enter: ++ pter->scrollToNextPage (); ++ direction = GTK_SCROLL_START; ++ ++ case GDK_BackSpace: ++ pter->scrollToNextPage (); ++ direction = GTK_SCROLL_START; ++ ++ default: + return FALSE; + } + + g_signal_emit_by_name(G_OBJECT(widget), "scroll-child", +- direction, horizontal); +- return TRUE; ++ direction, horizontal, &returnValue); ++ return returnValue; + } +diff -Nurd epdfview-0.1.6-svn/src/IDocument.h epdfview/src/IDocument.h +--- epdfview-0.1.6-svn/src/IDocument.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IDocument.h 2008-07-13 12:55:52.473198000 +0200 +@@ -21,12 +21,14 @@ + /// This is the definition of the GQuark used for Document's errors. + #define EPDFVIEW_DOCUMENT_ERROR ePDFView::IDocument::getErrorQuark () + ++typedef struct _GdkRegion GdkRegion; ++ + namespace ePDFView + { + // Forward declarations. + class DocumentIndex; + class IDocumentObserver; +- class DocumentPage; ++ class DocumentPage; + + /// + /// @brief Defines the possible errors loading a document. +@@ -263,6 +265,9 @@ + virtual gboolean saveFile (const gchar *filename, + GError **error) = 0; + ++ virtual GdkRegion* getTextRegion (DocumentRectangle *rect) = 0; ++ virtual void setTextSelection (DocumentRectangle *rect) = 0; ++ + void attach (const IDocumentObserver *observer); + void detach (const IDocumentObserver *observer); + +diff -Nurd epdfview-0.1.6-svn/src/IDocumentLink.h epdfview/src/IDocumentLink.h +--- epdfview-0.1.6-svn/src/IDocumentLink.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IDocumentLink.h 2008-07-13 12:55:52.483198000 +0200 +@@ -33,7 +33,7 @@ + class IDocumentLink + { + public: +- IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y1); ++ IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y2); + virtual ~IDocumentLink (void); + + virtual void activate (IDocument *document) = 0; +diff -Nurd epdfview-0.1.6-svn/src/IDocumentObserver.h epdfview/src/IDocumentObserver.h +--- epdfview-0.1.6-svn/src/IDocumentObserver.h 2008-07-13 12:57:45.023198000 +0200 ++++ epdfview/src/IDocumentObserver.h 2008-07-13 12:55:51.753198000 +0200 +@@ -150,6 +150,16 @@ + /// + virtual void notifySaveError (const GError *error) { } + ++ /// ++ /// @brief Someone select text in document. ++ /// ++ /// This function called when someone select some text ++ /// in document. ++ /// ++ /// @param text Selected text. ++ /// ++ virtual void notifyTextSelected (const gchar* text) { } ++ + protected: + /// + /// @brief Constructs a new IDocumentObserver object. +diff -Nurd epdfview-0.1.6-svn/src/IJob.cxx epdfview/src/IJob.cxx +--- epdfview-0.1.6-svn/src/IJob.cxx 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IJob.cxx 2008-07-13 12:55:52.483198000 +0200 +@@ -16,6 +16,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include "epdfview.h" ++#include <unistd.h> + + using namespace ePDFView; + +@@ -59,6 +60,7 @@ + delete job; + } + } ++ sleep(0); + } + + /// +diff -Nurd epdfview-0.1.6-svn/src/IMainView.h epdfview/src/IMainView.h +--- epdfview-0.1.6-svn/src/IMainView.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IMainView.h 2008-07-13 12:55:52.473198000 +0200 +@@ -576,6 +576,10 @@ + /// + virtual void setOutline (DocumentOutline *outline) = 0; + ++ virtual void copyTextToClibboard(const gchar* text) = 0; ++ virtual void activePageModeScroll (gboolean active) = 0; ++ virtual void activePageModeText (gboolean active) = 0; ++ + protected: + /// + /// @brief Constructs a new main view. +diff -Nurd epdfview-0.1.6-svn/src/IPageView.h epdfview/src/IPageView.h +--- epdfview-0.1.6-svn/src/IPageView.h 2008-07-13 12:57:45.123198000 +0200 ++++ epdfview/src/IPageView.h 2008-07-13 12:55:52.573198000 +0200 +@@ -32,6 +32,8 @@ + PAGE_VIEW_CURSOR_NORMAL, + /// Drag cursor. + PAGE_VIEW_CURSOR_DRAG, ++ /// Text selection cursor. ++ PAGE_VIEW_CURSOR_SELECT_TEXT, + /// Link cursor. + PAGE_VIEW_CURSOR_LINK + }; +diff -Nurd epdfview-0.1.6-svn/src/main.cxx epdfview/src/main.cxx +--- epdfview-0.1.6-svn/src/main.cxx 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/main.cxx 2008-07-13 12:55:52.483198000 +0200 +@@ -25,6 +25,27 @@ + + using namespace ePDFView; + ++struct LoadFileInfo ++{ ++ gchar *fileName; ++ MainPter *mainPter; ++ PDFDocument *document; ++}; ++ ++static int ++loadFileFromCommandLine (gpointer data) ++{ ++ LoadFileInfo *info = static_cast<LoadFileInfo *> (data); ++ ++ info->mainPter->setOpenState (info->fileName, FALSE); ++ info->document->load (info->fileName, NULL); ++ ++ g_free (info->fileName); ++ delete info; ++ ++ return FALSE; ++} ++ + int + main (int argc, char **argv) + { +@@ -56,13 +77,15 @@ + MainView *mainView = new MainView (mainPter); + // Let know to the presenter which is its view. + mainPter->setView (mainView); +- // Enter the main loop and wait for user interaction. */ + // Now check if we have additional parameters. Any additional parameter + // will be a file name to open. + if ( argc > 1 ) + { +- mainPter->setOpenState (argv[1], FALSE); +- document->load (argv[1], NULL); ++ LoadFileInfo *info = new LoadFileInfo; ++ info->mainPter = mainPter; ++ info->document = document; ++ info->fileName = g_strdup (argv[1]); ++ g_idle_add (loadFileFromCommandLine, info); + } + + gtk_main(); +@@ -74,6 +97,8 @@ + // Save the configuration. + Config::getConfig().save (); + ++ g_option_context_free (optionContext); ++ + // All done!. + return EXIT_SUCCESS; + } +diff -Nurd epdfview-0.1.6-svn/src/MainPter.cxx epdfview/src/MainPter.cxx +--- epdfview-0.1.6-svn/src/MainPter.cxx 2008-07-13 12:57:45.023198000 +0200 ++++ epdfview/src/MainPter.cxx 2008-07-13 12:55:51.753198000 +0200 +@@ -695,6 +695,12 @@ + } + } + ++void ++MainPter::setPageMode (PagePterMode mode) ++{ ++ m_PagePter->setMode(mode); ++} ++ + /// + /// @brief The "Zoom In" was activated. + /// +@@ -995,3 +1001,9 @@ + G_UNLOCK (fileSaved); + } + #endif // DEBUG ++ ++void ++MainPter::notifyTextSelected (const gchar* text) ++{ ++ getView ().copyTextToClibboard(text); ++} +diff -Nurd epdfview-0.1.6-svn/src/MainPter.h epdfview/src/MainPter.h +--- epdfview-0.1.6-svn/src/MainPter.h 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/MainPter.h 2008-07-13 12:55:52.473198000 +0200 +@@ -40,6 +40,8 @@ + MainPter (IDocument *document); + ~MainPter (void); + ++ void setPageMode(PagePterMode mode); ++ + void setInitialState (void); + void setOpenState (const gchar *fileName, gboolean reload); + IMainView &getView (void); +@@ -84,6 +86,7 @@ + void notifyReload (void); + void notifySave (void); + void notifySaveError (const GError *error); ++ void notifyTextSelected (const gchar* text); + + #if defined (DEBUG) + void waitForFileLoaded (void); +diff -Nurd epdfview-0.1.6-svn/src/PagePter.cxx epdfview/src/PagePter.cxx +--- epdfview-0.1.6-svn/src/PagePter.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PagePter.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -15,6 +15,7 @@ + // along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++#include <gdk/gdk.h> + #include "epdfview.h" + + using namespace ePDFView; +@@ -47,9 +48,9 @@ + /// The Y position of the pointer when the drag started. + gint y; + /// The horizontal position of the page view scroll when the drag started. +- gdouble scrollX; ++ int startX; + /// The vertical position of the page view scroll when the drag started. +- gdouble scrollY; ++ int startY; + }; + + // Global variables. +@@ -60,11 +61,13 @@ + /// + PagePter::PagePter (IDocument *document) + { ++ m_LastSelection = NULL; + m_Document = document; + m_Document->attach (this); + m_DragInfo = NULL; + m_NextPageScroll = PAGE_SCROLL_START; + m_PageView = NULL; ++ m_ScrollMode = PagePterModeScroll; + } + + /// +@@ -129,9 +132,12 @@ + m_DragInfo->y = y; + + IPageView &view = getView (); +- m_DragInfo->scrollX = view.getHorizontalScroll (); +- m_DragInfo->scrollY = view.getVerticalScroll (); +- view.setCursor (PAGE_VIEW_CURSOR_DRAG); ++ m_DragInfo->startX = x; ++ m_DragInfo->startY = y; ++ if(m_ScrollMode == PagePterModeScroll) ++ view.setCursor (PAGE_VIEW_CURSOR_DRAG); ++ else ++ view.setCursor (PAGE_VIEW_CURSOR_SELECT_TEXT); + } + } + } +@@ -149,8 +155,24 @@ + { + if ( 1 == button ) + { ++ if(m_LastSelection) ++ gdk_region_destroy(m_LastSelection); ++ m_LastSelection = NULL; ++ ++ if ( m_Document->isLoaded() && ++ m_ScrollMode == PagePterModeSelectText && ++ NULL != m_DragInfo ) ++ { ++ DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY, ++ m_DragInfo->x, m_DragInfo->y); ++ m_Document->setTextSelection(&rect); ++ } ++ + delete m_DragInfo; + m_DragInfo = NULL; ++ ++ refreshPage(PAGE_SCROLL_NONE, FALSE); ++ + getView ().setCursor (PAGE_VIEW_CURSOR_NORMAL); + } + } +@@ -181,10 +203,32 @@ + view.setCursor (PAGE_VIEW_CURSOR_NORMAL); + } + } +- else +- { +- view.scrollPage (m_DragInfo->scrollX, m_DragInfo->scrollY, +- x - m_DragInfo->x, y - m_DragInfo->y); ++ else{ ++ m_DragInfo->x = x; ++ m_DragInfo->y = y; ++ ++ if(m_ScrollMode == PagePterModeScroll){ ++ view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (), ++ x - m_DragInfo->startX, y - m_DragInfo->startY); ++ } ++ else{ ++ if(!m_Document->isLoaded()) ++ return ; ++ ++ DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY, ++ m_DragInfo->x, m_DragInfo->y); ++ ++ GdkRegion *region = m_Document->getTextRegion (&rect); ++ ++ if( !m_LastSelection || !gdk_region_equal(m_LastSelection, region)){ ++ if(m_LastSelection) ++ gdk_region_destroy(m_LastSelection); ++ m_LastSelection = gdk_region_copy(region); ++ DocumentPage *page = m_Document->getCurrentPage(); ++ if ( NULL != page ) ++ refreshPage (PAGE_SCROLL_NONE, FALSE); ++ } ++ } + } + } + +@@ -273,6 +317,8 @@ + if ( NULL != documentPage ) + { + g_WaitingForPage = FALSE; ++ if ( NULL != m_LastSelection ) ++ documentPage->setSelection(m_LastSelection); + view.showPage (documentPage, pageScroll); + } + else +@@ -364,6 +410,17 @@ + } + + /// ++/// @brief Sets the page mouse scroll mode ++/// ++/// @param mode Scroll mode to set. ++/// ++void ++PagePter::setMode (PagePterMode mode) ++{ ++ this->m_ScrollMode = mode; ++} ++ ++/// + /// @brief The page view has been resized. + /// + /// @param width The new with of the page view. +diff -Nurd epdfview-0.1.6-svn/src/PagePter.h epdfview/src/PagePter.h +--- epdfview-0.1.6-svn/src/PagePter.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/PagePter.h 2008-07-13 12:55:52.483198000 +0200 +@@ -23,6 +23,11 @@ + + namespace ePDFView + { ++ enum PagePterMode{ ++ PagePterModeScroll, ++ PagePterModeSelectText, ++ }; ++ + /// + /// @class PagePter. + /// @brief The page presenter. +@@ -53,6 +58,7 @@ + void setNextPageScroll (PageScroll next); + void setView (IMainView &view); + void viewResized (gint width, gint height); ++ void setMode(PagePterMode mode); + + protected: + /// The document whose page is shown. +@@ -63,7 +69,11 @@ + PageScroll m_NextPageScroll; + /// The page view. + IPageView *m_PageView; +- ++ /// Last text selection ++ GdkRegion *m_LastSelection; ++ /// What page presenter must do when user move mouse with button pressed. ++ PagePterMode m_ScrollMode; ++ + void refreshPage (PageScroll pageScroll, gboolean wasZoomed); + }; + } +diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.cxx epdfview/src/PDFDocument.cxx +--- epdfview-0.1.6-svn/src/PDFDocument.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PDFDocument.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -191,7 +191,7 @@ + /// @param filename The name of the file name to open. It must be an absolute + /// path. + /// @param password The password to use to open @a filename. +-/// @param error Location to store the error occurring or NULL to ignore ++/// @param error Location to store the error occurring or NULL to ignore + /// errors. + /// + /// @return TRUE if the file could be opened, FALSE otherwise. +@@ -257,7 +257,7 @@ + else + { + // OK, the glib's wrapper don't pass the error code directly +- // from Poppler. Instead returns G_FILE_ERROR_FAILED and a ++ // from Poppler. Instead returns G_FILE_ERROR_FAILED and a + // non translated string. + // Maybe I'm wrong (very probable) but that's a wrong way. + // So I'm reading the error code from the error string... +@@ -412,7 +412,7 @@ + poppler_page_get_size (popplerPage, NULL, &pageHeight); + // We'll already calculate the positions scaled. + gdouble scale = getZoom (); +- GList *pageLinks = poppler_page_get_link_mapping (popplerPage); ++ GList *pageLinks = poppler_page_get_link_mapping (popplerPage); + for (GList *pageLink = g_list_first (pageLinks) ; + NULL != pageLink ; + pageLink = g_list_next (pageLink) ) +@@ -440,7 +440,7 @@ + /// poppler_index_iter_new(). + /// + void +-PDFDocument::setOutline (DocumentOutline *outline, ++PDFDocument::setOutline (DocumentOutline *outline, + PopplerIndexIter *childrenList) + { + if ( NULL != childrenList ) +@@ -474,11 +474,11 @@ + #endif // HAVE_POPPLER_0_5_2 + + outline->addChild (child); +- PopplerIndexIter *childIter = ++ PopplerIndexIter *childIter = + poppler_index_iter_get_child (childrenList); + setOutline (child, childIter); + } +- } ++ } + while ( poppler_index_iter_next (childrenList) ); + + poppler_index_iter_free (childrenList); +@@ -490,7 +490,7 @@ + /// + /// Retrieves the width and height of a document's page before to scale, but + /// after rotation. +-/// ++/// + /// @param pageNum The page to get its size. + /// @param width The output pointer to save the page's width. + /// @param height The output pointer to save the page's height. +@@ -656,6 +656,107 @@ + return result; + } + ++static void ++repairEmpty(PopplerRectangle& rect) ++{ ++ //rect must have be least 1x1 ++ if(rect.y1 == rect.y2) ++ rect.y2++; ++ if(rect.x1 == rect.x2) ++ rect.x2++; ++} ++ ++void ++PDFDocument::setTextSelection (DocumentRectangle *rect) ++{ ++ g_assert(rect); ++ ++ PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1); ++ if(!page) ++ return; ++ ++ gdouble pageWidth, pageHeight; ++ poppler_page_get_size(page, &pageWidth, &pageHeight); ++ ++ //for get text we must exchange y coordinate, don't ask me where logic here. ++ PopplerRectangle textRect = { rect->getX1() / getZoom(), ++ (pageHeight - rect->getY2() / getZoom()), ++ rect->getX2() * getZoom() / getZoom(), ++ (pageHeight - rect->getY1() / getZoom())}; ++ repairEmpty(textRect); ++ ++#if defined (HAVE_POPPLER_0_6_0) ++ gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH, ++ &textRect); ++#else // !HAVE_POPPLER_0_6_0 ++ gchar *text = poppler_page_get_text(page, &textRect); ++#endif // HAVE_POPPLER_0_6_0 ++ if(!text) ++ goto cleanup; ++ ++ for ( GList *obs = g_list_first (m_Observers) ; ++ NULL != obs ; ++ obs = g_list_next (obs) ) ++ { ++ IDocumentObserver *observer = (IDocumentObserver*)obs->data; ++ observer->notifyTextSelected(text); ++ } ++ ++ cleanup: ++ if(page) ++ g_object_unref(page); ++ if(text) ++ g_free(text); ++} ++ ++GdkRegion* ++PDFDocument::getTextRegion (DocumentRectangle *r) ++{ ++ GdkRegion *res = NULL; ++ PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1); ++ if(!page) ++ return NULL; ++ ++ //calulate rect ++ PopplerRectangle rect; ++ rect.x1 = r->getX1() / getZoom(); ++ rect.y1 = r->getY1() / getZoom(); ++ rect.x2 = r->getX2() / getZoom(); ++ rect.y2 = r->getY2() / getZoom(); ++ repairEmpty(rect); ++ ++ //calc selection size ++#if defined (HAVE_POPPLER_0_8_0) ++ GList *selections = poppler_page_get_selection_region(page, getZoom(), ++ POPPLER_SELECTION_GLYPH, &rect); ++ res = gdk_region_new(); ++ for (GList *selection = g_list_first (selections) ; ++ NULL != selection ; selection = g_list_next (selection)) { ++ PopplerRectangle *rectangle = (PopplerRectangle *)selection->data; ++ GdkRectangle rect; ++ ++ rect.x = (gint)rectangle->x1; ++ rect.y = (gint)rectangle->y1; ++ rect.width = (gint) (rectangle->x2 - rectangle->x1); ++ rect.height = (gint) (rectangle->y2 - rectangle->y1); ++ ++ gdk_region_union_with_rect (res, &rect); ++ } ++ poppler_page_selection_region_free (selections); ++#elif defined (HAVE_POPPLER_0_6_0) ++ res = poppler_page_get_selection_region(page, getZoom(), ++ POPPLER_SELECTION_GLYPH, &rect); ++#else // !HAVE_POPPLER_0_6_0 ++ res = poppler_page_get_selection_region(page, getZoom(), &rect); ++#endif // HAVE_POPPLER_0_6_0 ++ ++ //free some local data ++ g_object_unref(page); ++ ++ return res; ++} ++ ++ + /// + /// @brief Gets the document's page layout from Poppler's page layout. + /// +diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.h epdfview/src/PDFDocument.h +--- epdfview-0.1.6-svn/src/PDFDocument.h 2008-07-13 12:57:45.063198000 +0200 ++++ epdfview/src/PDFDocument.h 2008-07-13 12:55:52.493198000 +0200 +@@ -54,6 +54,8 @@ + + DocumentPage *renderPage (gint pageNum); + gboolean saveFile (const gchar *fileName, GError **error); ++ GdkRegion* getTextRegion (DocumentRectangle* rect); ++ void setTextSelection (DocumentRectangle *rect); + + protected: + /// The PDF document. +diff -Nurd epdfview-0.1.6-svn/src/PrintPter.cxx epdfview/src/PrintPter.cxx +--- epdfview-0.1.6-svn/src/PrintPter.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PrintPter.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -230,20 +230,27 @@ + ppdFindOption (printerPPD, "PageSize"); + view.clearPageSizeList (); + int pageSizeToSelect = 0; +- ppd_choice_t *pageSizeChoice = pageSizeOption->choices; +- for ( int currentSize = 0 ; +- currentSize < pageSizeOption->num_choices ; +- ++currentSize, ++pageSizeChoice ) ++ if ( 0 != pageSizeOption ) + { +- const gchar *sizeName = pageSizeChoice->text; +- const gchar *sizeValue = pageSizeChoice->choice; +- +- view.addPageSize (_(sizeName), sizeValue); +- if ( pageSizeChoice->marked ) ++ ppd_choice_t *pageSizeChoice = pageSizeOption->choices; ++ for ( int currentSize = 0 ; ++ currentSize < pageSizeOption->num_choices ; ++ ++currentSize, ++pageSizeChoice ) + { +- pageSizeToSelect = currentSize; ++ const gchar *sizeName = pageSizeChoice->text; ++ const gchar *sizeValue = pageSizeChoice->choice; ++ ++ view.addPageSize (_(sizeName), sizeValue); ++ if ( pageSizeChoice->marked ) ++ { ++ pageSizeToSelect = currentSize; ++ } + } + } ++ else ++ { ++ view.addPageSize (_("A4"), "A4"); ++ } + view.selectPageSize (pageSizeToSelect); + + // Get the resolutions. +@@ -251,29 +258,36 @@ + ppdFindOption (printerPPD, "Resolution"); + view.clearResolutionList (); + int resolutionToSelect = 0; +- ppd_choice_t *resolutionChoice = resolutionOption->choices; +- for ( int currentRes = 0 ; +- currentRes < resolutionOption->num_choices ; +- ++currentRes, ++resolutionChoice ) ++ if ( 0 != resolutionOption ) + { +- const gchar *resName = resolutionChoice->text; +- const gchar *resValue = resolutionChoice->choice; +- +- view.addResolution (_(resName), resValue); +- if ( resolutionChoice->marked ) ++ ppd_choice_t *resolutionChoice = resolutionOption->choices; ++ for ( int currentRes = 0 ; ++ currentRes < resolutionOption->num_choices ; ++ ++currentRes, ++resolutionChoice ) + { +- resolutionToSelect = currentRes; ++ const gchar *resName = resolutionChoice->text; ++ const gchar *resValue = resolutionChoice->choice; ++ ++ view.addResolution (_(resName), resValue); ++ if ( resolutionChoice->marked ) ++ { ++ resolutionToSelect = currentRes; ++ } + } + } ++ else ++ { ++ view.addResolution (_("300 DPI"), "300x300dpi"); ++ } + view.selectResolution (resolutionToSelect); + + // Get the color models. + ppd_option_t *colorModelOption = + ppdFindOption (printerPPD, "ColorModel"); + view.clearColorModelList (); ++ int colorModelToSelect = 0; + if ( NULL != colorModelOption ) + { +- int colorModelToSelect = 0; + ppd_choice_t *colorModelChoice = colorModelOption->choices; + for ( int currentColor = 0 ; + currentColor < colorModelOption->num_choices ; +@@ -288,12 +302,12 @@ + colorModelToSelect = currentColor; + } + } +- view.selectColorModel (colorModelToSelect); + } + else + { + view.addColorModel (_("Grayscale"), "Gray"); + } ++ view.selectColorModel (colorModelToSelect); + ppdClose (printerPPD); + } + } +diff -Nurd epdfview-0.1.6-svn/THANKS epdfview/THANKS +--- epdfview-0.1.6-svn/THANKS 2008-07-13 12:57:47.583198000 +0200 ++++ epdfview/THANKS 2008-07-13 12:55:55.133198000 +0200 +@@ -1,16 +1,34 @@ + I would like to give thanks to the following for their support and + contributions: + +- - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch. +- - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation. ++ - Alex Dedul <rotmer@gmail.com>, for his patch. ++ - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others. ++ - Daniel Nylander <po@danielnylander.se>, for his Swedish translation. ++ - Dragonlord <dragonlord@seznam.cz>, for his Czech translation. ++ - Fábio Antunes <fabio.antunes@hotmail.com>, for his Brazilian Portuguese translation. ++ - Fabio Vergnani <monghitri@aruba.it>, for his Italion translation. ++ - Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, for his vim keybindings patch. ++ - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation and patches. ++ - Lester Godwin <lgodwin@pushcorp.com>, for his patches. + - LoneFox <>, for his patches. ++ - Michael Opitz <opitz.michael@gmail.com>, for his patches. + - Moritz Heiber <moe@xfce.org>, for his German translation. + - Mr_Moustache <mr.moustache@laposte.net>, for his French translation. ++ - Nuno Miguel <nunis@netcabo.pt>, for his European Portuguese translation. ++ - Nyu <nyu_8804@yahoo.co.jp>, for his Japanese translation. ++ - Panchoat <panchoat@gmail.com>, for his Simplified Chinese translation. ++ - Piotr Pacholak <obi_gl@o2.pl>, for corrections in the Polish translation. ++ - RafaÅ‚ MużyÅ‚o <galtgendo@o2.pl>, for his patches. ++ - Sergey Starosek <sergey.starosek@gmail.com>, for his Russian patches. + - Stavros Giannouris <stavrosg2002@freemail.gr>, for his Greek translation. ++ - Tilman Sauerbeck <tilman@code-monkey.de>, for his patches. + - tbm <tbm@home.nl>, for his patches. ++ - Valery Koval <Valery.Koval@innovinn.com>, for his patches. + - VnPenguin <vnpenguin@gmail.com>, for his Vietnamese translation. + - Wei-Lun Chao <chaoweilun@pcmail.com.tw>, for his Traditional Chinese translation. + - Wojciech Myrda <vojcek@tlen.pl>, for his Polish translation. + - Yuri Pankov <yuri.pankov@gmail.com>, for his patches. ++ - Yves-Alexis Perez <corsac@debian.org>, for his patches. ++ - zhou sf <sxzzsf@gmail.com>, for his patches. + + If you feel that you should be in this list and I didn't remember to add you in it, please send me an e-mail! :-) diff --git a/recipes/ezx/ezx-gen-blob_svn.bb b/recipes/ezx/ezx-gen-blob_svn.bb index 5841407ce3..45e92556a5 100644 --- a/recipes/ezx/ezx-gen-blob_svn.bb +++ b/recipes/ezx/ezx-gen-blob_svn.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob" LICENSE = "GPL" PROVIDES = "virtual/bootloader" DEPENDS = "virtual/kernel" -PV = "1.0.0+${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb index 7d6a2b044c..490d8b52d6 100644 --- a/recipes/fbreader/fbreader_0.8.2a.bb +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -4,7 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv" -PR = "r5" +PR = "r6" # The RESOLUTION is defined at compile time which makes # this package MACHINE specific. @@ -23,6 +23,9 @@ SRC_URI_append_akita = "\ SRC_URI_append_htcuniversal = "\ file://zaurus-VGA.patch;patch=1" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + # Set the defaults READER_RESOLUTION = "240x320" READER_ARCH = "openzaurus" diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index cdb3f7ee16..b9ed44247f 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -7,6 +7,8 @@ LICENSE = "LGPL" ARM_INSTRUCTION_SET = "arm" +PE = "2" + DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index b80fa8893b..609b792f65 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -2,7 +2,6 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" PR = "r5" DEFAULT_PREFERENCE = "1" diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index 1cfc3e2f89..3cf2aed398 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -2,8 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" -PV = "0.5.0+${PR}+gitr${SRCREV}" +PV = "0.5.0+${PR}+gitr${SRCPV}" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index b8cea5104e..82e5d43257 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -4,7 +4,6 @@ DEPENDS += "schroedinger libgsm" SRCREV = "20551" -PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" PR = "r0" diff --git a/recipes/ffmpeg/omapfbplay-xv_git.bb b/recipes/ffmpeg/omapfbplay-xv_git.bb index 3e676e92bb..11c5db087f 100644 --- a/recipes/ffmpeg/omapfbplay-xv_git.bb +++ b/recipes/ffmpeg/omapfbplay-xv_git.bb @@ -3,7 +3,8 @@ DEPENDS = "libxv bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" PR = "r1" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRCREV = "e66bf25df1f1ff085e6db102b282d90e7ceff4bf" SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb index afc3b2aa36..881cd5b2c6 100644 --- a/recipes/ffmpeg/omapfbplay_git.bb +++ b/recipes/ffmpeg/omapfbplay_git.bb @@ -4,7 +4,8 @@ LICENSE = "MIT" PR = "r18" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0" SRC_URI = "git://git.mansr.com/${PN};protocol=git \ diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb index ae7c0e1c95..d9c8c00a14 100644 --- a/recipes/fltk/fltk_1.1.4.bb +++ b/recipes/fltk/fltk_1.1.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.fltk.org" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "jpeg libpng mesa zlib" -PR = "r1" +DEPENDS = "jpeg libpng virtual/libgl zlib" +PR = "r2" SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz" diff --git a/recipes/freesmartphone/dbus-hlid_git.bb b/recipes/freesmartphone/dbus-hlid_git.bb index 508cf874c6..b0a5f629bc 100644 --- a/recipes/freesmartphone/dbus-hlid_git.bb +++ b/recipes/freesmartphone/dbus-hlid_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib" LICENSE = "GPL" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/dbus-hlid.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch new file mode 100644 index 0000000000..4dc5dd3a84 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch @@ -0,0 +1,27 @@ +--- a/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:44:53.000000000 +0200 ++++ b/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:42:43.000000000 +0200 +@@ -197,8 +197,7 @@ + class IncomingMessageTrigger(DBusTrigger): + #============================================================================# + """ +- A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage +- TODO: change to opimd interface ++ A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage + """ + + function_name = 'IncomingMessage' +@@ -207,10 +206,10 @@ + bus = dbus.SystemBus() + super(IncomingMessageTrigger, self).__init__( + bus, +- 'org.freesmartphone.ogsmd', +- '/org/freesmartphone/GSM/Device', +- 'org.freesmartphone.GSM.SIM', +- 'IncomingStoredMessage' ++ 'org.freesmartphone.opimd', ++ '/org/freesmartphone/PIM/Messages', ++ 'org.freesmartphone.PIM.Messages', ++ 'IncomingMessage' + ) + def on_signal(self, index): + logger.info("Receive IncomingMessage on index = %s" % index) diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 130fe55231..9059c608ca 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -1,11 +1,12 @@ DESCRIPTION = "The reference implementation of the freesmartphone.org framework APIs" HOMEPAGE = "http://www.freesmartphone.org" -AUTHOR = "FreeSmartphone.Org Development Team" +AUTHOR = "freesmartphone.org Development Team" SECTION = "console/network" -DEPENDS = "python-cython-native python-pyrex-native" +#DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.9.5.9+gitr${SRCREV}" +PV = "0.9.5.9+gitr${SRCPV}" PR = "r0" +PE = "1" inherit distutils update-rc.d @@ -16,6 +17,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ file://frameworkd \ file://frameworkd.conf \ " +SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1" + S = "${WORKDIR}/git" do_configure_append() { @@ -55,6 +58,8 @@ RDEPENDS_${PN} += "\ RRECOMMENDS_${PN} += "\ alsa-utils-amixer \ python-gst \ + python-phoneutils \ + python-vobject \ ppp \ " diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb index 4a9126e75c..d4ed6027fc 100644 --- a/recipes/freesmartphone/fso-abyss_git.bb +++ b/recipes/freesmartphone/fso-abyss_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib libgsm0710mux" LICENSE = "GPL" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index 18347978e5..869afb9c81 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -3,8 +3,9 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console" LICENSE = "GPLv2" +PE = "1" DEPENDS = "vala-native" -PV = "2.0.0+gitr${SRCREV}" +PV = "2.0.0+gitr${SRCPV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-gpsd_git.bb b/recipes/freesmartphone/fso-gpsd_git.bb index cde1bb65e3..80aba302ba 100644 --- a/recipes/freesmartphone/fso-gpsd_git.bb +++ b/recipes/freesmartphone/fso-gpsd_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "freesmartphone.org gpsd compatibility daemon" LICENSE = "GPL" SECTION = "network" DEPENDS = "dbus-glib" -PV = "0.8+gitr${SRCREV}" +PV = "0.8+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index 5ce1d1e846..e859be26ff 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gs SECTION = "console/network" DEPENDS = "dbus dbus-glib" LICENSE = "GPL" -PV = "0.9.3.1+gitr${SRCREV}" +PV = "0.9.3.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-monitord_git.bb b/recipes/freesmartphone/fso-monitord_git.bb index 80668015c3..52cc77972b 100644 --- a/recipes/freesmartphone/fso-monitord_git.bb +++ b/recipes/freesmartphone/fso-monitord_git.bb @@ -3,7 +3,8 @@ AUTHOR = "freesmartphone.org development team" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib" LICENSE = "GPL" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-sounds.bb b/recipes/freesmartphone/fso-sounds.bb index 3277692c57..7fa1a393d9 100644 --- a/recipes/freesmartphone/fso-sounds.bb +++ b/recipes/freesmartphone/fso-sounds.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A set of notification sounds" LICENSE = "CC" SECTION = "multimedia" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-specs_git.bb b/recipes/freesmartphone/fso-specs_git.bb index b346fb54cb..14c7f1f2be 100644 --- a/recipes/freesmartphone/fso-specs_git.bb +++ b/recipes/freesmartphone/fso-specs_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer" HOMEPAGE = "http://docs.freesmartphone.org" LICENSE = "BSD" SECTION = "devel/specifications" -PV = "0.0.1-gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/specs.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb index acb20cdb05..79f042ad41 100644 --- a/recipes/freesmartphone/fso-term_git.bb +++ b/recipes/freesmartphone/fso-term_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "dbus dbus-glib readline libfsoframework" LICENSE = "GPL" -PV = "0.0.0.0+gitr${SRCREV}" +PV = "0.0.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index de13bedc0a..cb2913291c 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" DEPENDS += "libxml2 mobile-broadband-provider-info" diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 3406806a6c..402bb4c356 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -4,7 +4,7 @@ inherit fso-plugin DEPENDS += "alsa-lib libcanberra libfsoresource" RDEPENDS += "libcanberra-alsa" RRECOMMENDS += "fso-alsa-data" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" PE = "1" PR = "${INC_PR}.5" diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb index 9186ab990b..0d627baa47 100644 --- a/recipes/freesmartphone/fsogsmd_git.bb +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.2.0+gitr${SRCREV}" +PV = "0.2.0+gitr${SRCPV}" +PE = "1" DEPENDS += "libfsoresource libgsm0710mux" diff --git a/recipes/freesmartphone/fsolocationd_git.bb b/recipes/freesmartphone/fsolocationd_git.bb index a70bf596f5..2046be7a93 100644 --- a/recipes/freesmartphone/fsolocationd_git.bb +++ b/recipes/freesmartphone/fsolocationd_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" DEPENDS += "libfsotransport libfsoresource" diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb index 0081298909..443d45ef89 100644 --- a/recipes/freesmartphone/fsomusicd_git.bb +++ b/recipes/freesmartphone/fsomusicd_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc DEPENDS += "gstreamer" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" RDEPENDS += "\ diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 002624fc2b..14b62a991d 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc inherit fso-plugin DEPENDS += "libnl2" -PV = "0.1.0.0+gitr${SRCREV}" +PV = "0.1.0.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/fsotimed_git.bb b/recipes/freesmartphone/fsotimed_git.bb index 3c789ad46c..65874de626 100644 --- a/recipes/freesmartphone/fsotimed_git.bb +++ b/recipes/freesmartphone/fsotimed_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/fsousaged_git.bb b/recipes/freesmartphone/fsousaged_git.bb index a7e4a1c0ee..d14b233ff6 100644 --- a/recipes/freesmartphone/fsousaged_git.bb +++ b/recipes/freesmartphone/fsousaged_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.9.0.1+gitr${SRCREV}" +PV = "0.9.0.1+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/gsmd2_git.bb b/recipes/freesmartphone/gsmd2_git.bb index 4d25aa94e9..8f14bc9141 100644 --- a/recipes/freesmartphone/gsmd2_git.bb +++ b/recipes/freesmartphone/gsmd2_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Ixonos Team" SECTION = "console/network" DEPENDS = "dbus dbus-glib" LICENSE = "GPL" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/illume-theme-freesmartphone_git.bb b/recipes/freesmartphone/illume-theme-freesmartphone_git.bb index 1351674a18..c9f50f503c 100644 --- a/recipes/freesmartphone/illume-theme-freesmartphone_git.bb +++ b/recipes/freesmartphone/illume-theme-freesmartphone_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project" HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb index bce8312fcb..965f099ed5 100644 --- a/recipes/freesmartphone/libframeworkd-glib_git.bb +++ b/recipes/freesmartphone/libframeworkd-glib_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "freesmartphone.org API glib wrapper" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "dbus-glib" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb index f7e49cb89d..d9e4372686 100644 --- a/recipes/freesmartphone/libfso-glib_git.bb +++ b/recipes/freesmartphone/libfso-glib_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Didier 'Ptitjes" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs" -PV = "0.2.2+gitr${SRCREV}" +PV = "0.2.2+gitr${SRCPV}" +PE = "1" PR = "r0" inherit autotools_stage pkgconfig vala diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 3a268105d7..ef83a5d041 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -PV = "0.8.2.0+gitr${SRCREV}" +PV = "0.8.2.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 5840cdbfbc..c78e924118 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" DEPENDS += "libfsobasics alsa-lib" -PV = "0.2.0.0+gitr${SRCREV}" +PV = "0.2.0.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.1" diff --git a/recipes/freesmartphone/libfsoresource_git.bb b/recipes/freesmartphone/libfsoresource_git.bb index 40b536f293..8374decfc8 100644 --- a/recipes/freesmartphone/libfsoresource_git.bb +++ b/recipes/freesmartphone/libfsoresource_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org dbus resource library" DEPENDS += "libfso-glib" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb index a87fe6cf49..29f3e60ffb 100644 --- a/recipes/freesmartphone/libfsotransport_git.bb +++ b/recipes/freesmartphone/libfsotransport_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org transport library" -PV = "0.9.4+gitr${SRCREV}" +PV = "0.9.4+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb index 78050c40f5..c748c7aaf0 100644 --- a/recipes/freesmartphone/libgsm0710_git.bb +++ b/recipes/freesmartphone/libgsm0710_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A GSM 07.10 Protocol Engine" LICENSE = "GPL" SECTION = "devel" -PV = "1.2.0+gitr${SRCREV}" +PV = "1.2.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb index 69446879c3..40adaaa836 100644 --- a/recipes/freesmartphone/libgsm0710mux_git.bb +++ b/recipes/freesmartphone/libgsm0710mux_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPL" SECTION = "devel" DEPENDS = "glib-2.0 libgsm0710 libfsotransport" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/libpersistence_git.bb b/recipes/freesmartphone/libpersistence_git.bb index 8f6aafd42a..ab46850854 100644 --- a/recipes/freesmartphone/libpersistence_git.bb +++ b/recipes/freesmartphone/libpersistence_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Jürg Billeter, Michael 'Mickey' Lauer" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "libgee" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/mickeydbus_git.bb b/recipes/freesmartphone/mickeydbus_git.bb index 229ff7f1fd..ad2d356944 100644 --- a/recipes/freesmartphone/mickeydbus_git.bb +++ b/recipes/freesmartphone/mickeydbus_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.9.2+gitr${SRCREV}" +PV = "0.9.2+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/mickeyterm_git.bb b/recipes/freesmartphone/mickeyterm_git.bb index 276eeb55ab..a66290b00e 100644 --- a/recipes/freesmartphone/mickeyterm_git.bb +++ b/recipes/freesmartphone/mickeyterm_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "2.9.1+gitr${SRCREV}" +PV = "2.9.1+gitr${SRCPV}" +PE = "1" PR = "r3" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/multicat_git.bb b/recipes/freesmartphone/multicat_git.bb index c9344390ed..d31c38668b 100644 --- a/recipes/freesmartphone/multicat_git.bb +++ b/recipes/freesmartphone/multicat_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console" LICENSE = "GPLv2" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 5031ae5c13..726bfa865d 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -1,27 +1,48 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org" +SHR_RELEASE ?= "shr" LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r0" +PE = "1" inherit setuptools -SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" -S = "${WORKDIR}/git" +PACKAGES =+ "\ + ${PN}-cli \ + ${PN}-notes \ + ${PN}-data \ +" -RDEPENDS = "\ - python-elementary \ - python-edbus \ - python-codecs \ - python-shell \ - \ +RDEPENDS_${PN} = "\ + ${PN}-data \ shr-settings \ - shr-theme \ - frameworkd \ pyphonelog \ + shr-theme \ +" + +RDEPENDS_${PN}-notes = "\ + ${PN}-data \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-notes \ + ${PN}-cli \ " +PACKAGE_ARCH_${PN}-cli = "all" +PACKAGE_ARCH_${PN}-data = "all" +PACKAGE_ARCH_${PN}-notes = "all" + +SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" +S = "${WORKDIR}/git" FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier" FILES_${PN} += "${prefix}/share/applications/" -FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN} += "${prefix}/share/pixmaps/" +FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN}-cli += "${prefix}/bin/opimd-cli" +FILES_${PN}-notes += "${prefix}/bin/opimd-notes" +FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png" +FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop" diff --git a/recipes/freesmartphone/pycd_git.bb b/recipes/freesmartphone/pycd_git.bb index 3ed2b75292..449cc2268d 100644 --- a/recipes/freesmartphone/pycd_git.bb +++ b/recipes/freesmartphone/pycd_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Jan Luebbe <jluebbe@debian.org>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb index ebae18b628..145672ffe7 100644 --- a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb +++ b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Vala DBus Binding Tool" SECTION = "console" LICENSE = "GPLv2" DEPENDS = "vala-native libgee-native intltool-native libxml2-native" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/freesmartphone/zhone_git.bb b/recipes/freesmartphone/zhone_git.bb index 0fcc25c5f6..dba47be911 100644 --- a/recipes/freesmartphone/zhone_git.bb +++ b/recipes/freesmartphone/zhone_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "A phone UI based on the freesmartphone.org framework" LICENSE = "GPL" SECTION = "x11" DEPENDS = "edje-native python-pyrex-native python-cython-native" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" +PE = "1" PR = "r12" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ diff --git a/recipes/gnuradio/gnuradio-libusb-compat.inc b/recipes/gnuradio/gnuradio-libusb-compat.inc index 8a0ca54726..2cbc735cc3 100644 --- a/recipes/gnuradio/gnuradio-libusb-compat.inc +++ b/recipes/gnuradio/gnuradio-libusb-compat.inc @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" INC_PR = "r7" +PE = "1" inherit distutils-base autotools autotools_stage pkgconfig diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index d1d0c12fea..3ef62875ff 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" INC_PR = "r7" +PE = "1" inherit distutils-base autotools autotools_stage pkgconfig diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb index 03dfdb25e6..ed98ade6ee 100644 --- a/recipes/gnuradio/gnuradio_git.bb +++ b/recipes/gnuradio/gnuradio_git.bb @@ -9,7 +9,7 @@ DEPENDS += " gsl " SRCREV = "bf7ad4d17514aba9fc5209bc916ce37482f77eaa" PR = "${INC_PR}.2" -PV = "3.2.1-${PR}+gitr${SRCREV}" +PV = "3.2.1-${PR}+gitr${SRCPV}" EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp2 --disable-usrp2-firmware --with-fusb-tech=libusb1" diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc new file mode 100644 index 0000000000..0c23814b41 --- /dev/null +++ b/recipes/gpe-icons/gpe-icons.inc @@ -0,0 +1,36 @@ +SECTION = "gpe" +RDEPENDS += "gdk-pixbuf-loader-png" + +inherit update-alternatives + +INC_PR = "r3" + +ALTERNATIVE_NAME = "gpe-pixmaps" +ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" +ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi + pixmap_dirs_root="${datadir}/gpe/" + cd ${pixmap_dirs_root} + for pixmap_dir in pixmaps.*; do + if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then + continue; + fi + for pixmap in `find ${pixmap_dir}`; do + pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; + if [ ! -e ${pixmap_target} ] ; then + cp -ra ${pixmap} ${pixmap_target}; + echo "${pixmap} merged"; + fi; + done + done +} diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb index 6276e9510b..ac1e9fccd4 100644 --- a/recipes/gpe-icons/gpe-icons_0.25.bb +++ b/recipes/gpe-icons/gpe-icons_0.25.bb @@ -7,9 +7,14 @@ RDEPENDS = "gdk-pixbuf-loader-png" inherit gpe -PR = "r1" +PR = "${INC_PR}.0" #only icons present in the package PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}/gpe" +do_configure_prepend() { + sed -i "s| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps/| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps.${PN}/|g" Makefile +} + +require gpe-icons.inc diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb new file mode 100644 index 0000000000..192c8a7d8e --- /dev/null +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" +SECTION = "gpe" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "${INC_PR}.0" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/gpe/theme-neo/pixmaps" + +require gpe-icons.inc + +do_install() { + install -d ${D}${datadir}/gpe/ + install -d ${D}${datadir}/gpe/pixmaps.${PN}/ + cp -r ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/" +} + +FILES_${PN} = "${datadir}/gpe/pixmaps.${PN}/" + diff --git a/recipes/gpephone/addressbook_0.1.bb b/recipes/gpephone/addressbook_0.1.bb index 21fd95fe66..8121651187 100644 --- a/recipes/gpephone/addressbook_0.1.bb +++ b/recipes/gpephone/addressbook_0.1.bb @@ -3,6 +3,7 @@ DESCRIPTION = "LiPS address book" SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim" diff --git a/recipes/gpephone/addressbook_svn.bb b/recipes/gpephone/addressbook_svn.bb index cb913bc663..3faaeba654 100644 --- a/recipes/gpephone/addressbook_svn.bb +++ b/recipes/gpephone/addressbook_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS address book" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/almmgrd_svn.bb b/recipes/gpephone/almmgrd_svn.bb index 70d02ff018..3186b0f3aa 100644 --- a/recipes/gpephone/almmgrd_svn.bb +++ b/recipes/gpephone/almmgrd_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/calendar2_svn.bb b/recipes/gpephone/calendar2_svn.bb index c066fc77c0..ea4392f9bb 100644 --- a/recipes/gpephone/calendar2_svn.bb +++ b/recipes/gpephone/calendar2_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Calendar application for GPE Phone Edition" LICENSE = "LiPS" SECTION = "gpe" PRIORITY = "optional" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 libiac" diff --git a/recipes/gpephone/contact_svn.bb b/recipes/gpephone/contact_svn.bb index ef4d2707ab..c3915ff86a 100644 --- a/recipes/gpephone/contact_svn.bb +++ b/recipes/gpephone/contact_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone autotools diff --git a/recipes/gpephone/dialer_svn.bb b/recipes/gpephone/dialer_svn.bb index 7b1b883652..135c4ef43b 100644 --- a/recipes/gpephone/dialer_svn.bb +++ b/recipes/gpephone/dialer_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ libgpephone libgemwidget" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone autotools diff --git a/recipes/gpephone/firewall_svn.bb b/recipes/gpephone/firewall_svn.bb index 6c3ed64b26..ae452b5200 100644 --- a/recipes/gpephone/firewall_svn.bb +++ b/recipes/gpephone/firewall_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Cellphone firewall tool" SECTION = "gpe" PRIORITY = "optional" PR = "r1" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/gpe-applauncher_0.10.bb b/recipes/gpephone/gpe-applauncher_0.10.bb index 7167b42071..804a019b87 100644 --- a/recipes/gpephone/gpe-applauncher_0.10.bb +++ b/recipes/gpephone/gpe-applauncher_0.10.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" diff --git a/recipes/gpephone/gpe-applauncher_0.11.bb b/recipes/gpephone/gpe-applauncher_0.11.bb index 4934cdeaf2..4c87008d69 100644 --- a/recipes/gpephone/gpe-applauncher_0.11.bb +++ b/recipes/gpephone/gpe-applauncher_0.11.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r2" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" diff --git a/recipes/gpephone/gpe-applauncher_0.7.bb b/recipes/gpephone/gpe-applauncher_0.7.bb index 349330047b..e2ee0c4108 100644 --- a/recipes/gpephone/gpe-applauncher_0.7.bb +++ b/recipes/gpephone/gpe-applauncher_0.7.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client" diff --git a/recipes/gpephone/gpe-applauncher_0.8.bb b/recipes/gpephone/gpe-applauncher_0.8.bb index 641511ad5b..19f8fb3e77 100644 --- a/recipes/gpephone/gpe-applauncher_0.8.bb +++ b/recipes/gpephone/gpe-applauncher_0.8.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings" diff --git a/recipes/gpephone/gpe-applauncher_0.9.bb b/recipes/gpephone/gpe-applauncher_0.9.bb index fbc47bd091..1649c26d3f 100644 --- a/recipes/gpephone/gpe-applauncher_0.9.bb +++ b/recipes/gpephone/gpe-applauncher_0.9.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" diff --git a/recipes/gpephone/gpe-applauncher_svn.bb b/recipes/gpephone/gpe-applauncher_svn.bb index 3087088ab8..1d4c6990ed 100644 --- a/recipes/gpephone/gpe-applauncher_svn.bb +++ b/recipes/gpephone/gpe-applauncher_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" -PV = "0.11+svnr-${SRCREV}" +PV = "0.11+svnr${SRCPV}" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libabenabler2_1.0.bb b/recipes/gpephone/libabenabler2_1.0.bb index ce8470274d..8d2a43cae9 100644 --- a/recipes/gpephone/libabenabler2_1.0.bb +++ b/recipes/gpephone/libabenabler2_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord2 gconf sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libabenabler2_svn.bb b/recipes/gpephone/libabenabler2_svn.bb index 004ba3ec46..fae28a4c80 100644 --- a/recipes/gpephone/libabenabler2_svn.bb +++ b/recipes/gpephone/libabenabler2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "glib-2.0 librecord2 gconf sqlite3" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libabenabler_0.1.bb b/recipes/gpephone/libabenabler_0.1.bb index c76d8f469b..91620a9a87 100644 --- a/recipes/gpephone/libabenabler_0.1.bb +++ b/recipes/gpephone/libabenabler_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libabenabler_1.0.bb b/recipes/gpephone/libabenabler_1.0.bb index c76d8f469b..91620a9a87 100644 --- a/recipes/gpephone/libabenabler_1.0.bb +++ b/recipes/gpephone/libabenabler_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libabenabler_svn.bb b/recipes/gpephone/libabenabler_svn.bb index 4468c3580e..f7b28c5b8a 100644 --- a/recipes/gpephone/libabenabler_svn.bb +++ b/recipes/gpephone/libabenabler_svn.bb @@ -4,7 +4,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libalmmgr_svn.bb b/recipes/gpephone/libalmmgr_svn.bb index cbae037109..c3bb36c9ce 100644 --- a/recipes/gpephone/libalmmgr_svn.bb +++ b/recipes/gpephone/libalmmgr_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "glib-2.0 libiac" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libcalenabler2_svn.bb b/recipes/gpephone/libcalenabler2_svn.bb index e3bf129ab1..d42c60b6b7 100644 --- a/recipes/gpephone/libcalenabler2_svn.bb +++ b/recipes/gpephone/libcalenabler2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "glib-2.0 sqlite3 libical libalmmgr" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" diff --git a/recipes/gpephone/libgemwidget_0.1.bb b/recipes/gpephone/libgemwidget_0.1.bb index 0b670e485d..5198bedbf6 100644 --- a/recipes/gpephone/libgemwidget_0.1.bb +++ b/recipes/gpephone/libgemwidget_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgemwidget_1.0.bb b/recipes/gpephone/libgemwidget_1.0.bb index a9f02cd245..27b6336b76 100644 --- a/recipes/gpephone/libgemwidget_1.0.bb +++ b/recipes/gpephone/libgemwidget_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgemwidget_svn.bb b/recipes/gpephone/libgemwidget_svn.bb index f4e2e350d8..c5ed24af6b 100644 --- a/recipes/gpephone/libgemwidget_svn.bb +++ b/recipes/gpephone/libgemwidget_svn.bb @@ -3,7 +3,8 @@ LICENSE = "LiPS" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_0.3.bb b/recipes/gpephone/libgpephone_0.3.bb index 9a78fd9947..26e19a4142 100644 --- a/recipes/gpephone/libgpephone_0.3.bb +++ b/recipes/gpephone/libgpephone_0.3.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_0.4.bb b/recipes/gpephone/libgpephone_0.4.bb index 690b3eded6..b74f857d5f 100644 --- a/recipes/gpephone/libgpephone_0.4.bb +++ b/recipes/gpephone/libgpephone_0.4.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_svn.bb b/recipes/gpephone/libgpephone_svn.bb index ce960ac3cc..219e64fb8f 100644 --- a/recipes/gpephone/libgpephone_svn.bb +++ b/recipes/gpephone/libgpephone_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Base library for GPE phone environment." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" -PV = "0.4+svnr-${SRCREV}" +PV = "0.4+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac2_svn.bb b/recipes/gpephone/libiac2_svn.bb index 7ae0c7b693..d0a449dfb8 100644 --- a/recipes/gpephone/libiac2_svn.bb +++ b/recipes/gpephone/libiac2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ gtk-doc dbus-glib" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_0.1.bb b/recipes/gpephone/libiac_0.1.bb index 5d522b7f54..6905969c89 100644 --- a/recipes/gpephone/libiac_0.1.bb +++ b/recipes/gpephone/libiac_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc" PR = "r2" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_1.0.bb b/recipes/gpephone/libiac_1.0.bb index 940b1ecc31..3f13fbf5e9 100644 --- a/recipes/gpephone/libiac_1.0.bb +++ b/recipes/gpephone/libiac_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_svn.bb b/recipes/gpephone/libiac_svn.bb index 0cd1d6487d..a9abef2865 100644 --- a/recipes/gpephone/libiac_svn.bb +++ b/recipes/gpephone/libiac_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ gtk-doc" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libim2_svn.bb b/recipes/gpephone/libim2_svn.bb index 510877ce3e..1dec41915a 100644 --- a/recipes/gpephone/libim2_svn.bb +++ b/recipes/gpephone/libim2_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS instant messenger library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord2 libabenabler2 liblipsevent2 telepathy-glib telepathy-mission-control" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/liblipsevent2_svn.bb b/recipes/gpephone/liblipsevent2_svn.bb index 5d2330c671..5345c5a472 100644 --- a/recipes/gpephone/liblipsevent2_svn.bb +++ b/recipes/gpephone/liblipsevent2_svn.bb @@ -3,7 +3,8 @@ LICENSE = "LiPS" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libmsgenabler2_svn.bb b/recipes/gpephone/libmsgenabler2_svn.bb index a294dc93b7..f6d154b32f 100644 --- a/recipes/gpephone/libmsgenabler2_svn.bb +++ b/recipes/gpephone/libmsgenabler2_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libmsgenabler_1.0.bb b/recipes/gpephone/libmsgenabler_1.0.bb index bde6a2fd6b..98d8da96fc 100644 --- a/recipes/gpephone/libmsgenabler_1.0.bb +++ b/recipes/gpephone/libmsgenabler_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" PR = "r2" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libmsgenabler_svn.bb b/recipes/gpephone/libmsgenabler_svn.bb index c8672e143e..d37e519093 100644 --- a/recipes/gpephone/libmsgenabler_svn.bb +++ b/recipes/gpephone/libmsgenabler_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/librecord2_0.1.bb b/recipes/gpephone/librecord2_0.1.bb index 532cc267ff..ba8e5ca48e 100644 --- a/recipes/gpephone/librecord2_0.1.bb +++ b/recipes/gpephone/librecord2_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/librecord2_svn.bb b/recipes/gpephone/librecord2_svn.bb index 378032dabf..790081120e 100644 --- a/recipes/gpephone/librecord2_svn.bb +++ b/recipes/gpephone/librecord2_svn.bb @@ -4,7 +4,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libsettings_0.3.bb b/recipes/gpephone/libsettings_0.3.bb index 3c9794edc2..740ee6cb7c 100644 --- a/recipes/gpephone/libsettings_0.3.bb +++ b/recipes/gpephone/libsettings_0.3.bb @@ -4,6 +4,7 @@ PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 gconf" PR = "r1" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libsettings_svn.bb b/recipes/gpephone/libsettings_svn.bb index 770fe8cce6..aa55352cd6 100644 --- a/recipes/gpephone/libsettings_svn.bb +++ b/recipes/gpephone/libsettings_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 gconf" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libtapi_svn.bb b/recipes/gpephone/libtapi_svn.bb index 68e578728a..29bc40cf2d 100644 --- a/recipes/gpephone/libtapi_svn.bb +++ b/recipes/gpephone/libtapi_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS telephony library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libglade libgsmd" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libvoc_svn.bb b/recipes/gpephone/libvoc_svn.bb index 3389c7d10a..eaec6d2f51 100644 --- a/recipes/gpephone/libvoc_svn.bb +++ b/recipes/gpephone/libvoc_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS voice call library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libglade libgsmd" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/machined_svn.bb b/recipes/gpephone/machined_svn.bb index 0c5ccfff51..1f1bc01246 100644 --- a/recipes/gpephone/machined_svn.bb +++ b/recipes/gpephone/machined_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus-glib gtk+" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/ptim-engine_1.0.bb b/recipes/gpephone/ptim-engine_1.0.bb index e1cd76ae30..ecf0103b04 100644 --- a/recipes/gpephone/ptim-engine_1.0.bb +++ b/recipes/gpephone/ptim-engine_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PR = "r0" +PE = "1" inherit gpephone pkgconfig autotools @@ -17,4 +18,4 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-engine_svn.bb b/recipes/gpephone/ptim-engine_svn.bb index 281ee72c26..8f9bf66854 100644 --- a/recipes/gpephone/ptim-engine_svn.bb +++ b/recipes/gpephone/ptim-engine_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -20,4 +21,4 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-headers_1.0.bb b/recipes/gpephone/ptim-headers_1.0.bb index 2ed36458e4..5c54cd78d1 100644 --- a/recipes/gpephone/ptim-headers_1.0.bb +++ b/recipes/gpephone/ptim-headers_1.0.bb @@ -3,6 +3,7 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+" +PE = "1" inherit gpephone pkgconfig autotools @@ -12,4 +13,4 @@ S = "${WORKDIR}/imheaders-${PV}" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-headers_svn.bb b/recipes/gpephone/ptim-headers_svn.bb index 4384feccbd..fc4eae920a 100644 --- a/recipes/gpephone/ptim-headers_svn.bb +++ b/recipes/gpephone/ptim-headers_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/ptim-helper_1.0.bb b/recipes/gpephone/ptim-helper_1.0.bb index 4d5609e6a2..1a885b4fd4 100644 --- a/recipes/gpephone/ptim-helper_1.0.bb +++ b/recipes/gpephone/ptim-helper_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PR = "r1" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/ptim-helper_svn.bb b/recipes/gpephone/ptim-helper_svn.bb index 71b004e92b..ed7b207ab4 100644 --- a/recipes/gpephone/ptim-helper_svn.bb +++ b/recipes/gpephone/ptim-helper_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/ptim-manager_1.0.bb b/recipes/gpephone/ptim-manager_1.0.bb index c0955a2176..a58cf78e5d 100644 --- a/recipes/gpephone/ptim-manager_1.0.bb +++ b/recipes/gpephone/ptim-manager_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" PR = "r0" +PE = "1" inherit gpephone pkgconfig autotools @@ -24,4 +25,4 @@ do_install_append () { do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-manager_svn.bb b/recipes/gpephone/ptim-manager_svn.bb index da0f4e6af4..ed9303b38d 100644 --- a/recipes/gpephone/ptim-manager_svn.bb +++ b/recipes/gpephone/ptim-manager_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/quickdial_svn.bb b/recipes/gpephone/quickdial_svn.bb index 2a52510d86..b111fe1ded 100644 --- a/recipes/gpephone/quickdial_svn.bb +++ b/recipes/gpephone/quickdial_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Quickdial application and backend" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/useen_svn.bb b/recipes/gpephone/useen_svn.bb index 1a180683a7..1dd4a6584d 100644 --- a/recipes/gpephone/useen_svn.bb +++ b/recipes/gpephone/useen_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Useen tool" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gstreamer/gst-omapfb_1.0.bb b/recipes/gstreamer/gst-omapfb_1.0.bb index f00ac7f523..4c2d3aefb5 100644 --- a/recipes/gstreamer/gst-omapfb_1.0.bb +++ b/recipes/gstreamer/gst-omapfb_1.0.bb @@ -6,7 +6,8 @@ inherit autotools DEPENDS = "gstreamer virtual/libx11 virtual/kernel" SRCREV = "6f0b1cb50d1c67c3a3db2f11246256060ac871de" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://github.com/felipec/${PN}.git;protocol=git \ file://0001-Implement-XOverlay-and-I420-to-422-colorspace-conver.patch;patch=1" diff --git a/recipes/gstreamer/gst-player_svn.bb b/recipes/gstreamer/gst-player_svn.bb index c44213bfa8..e75b0ffde5 100644 --- a/recipes/gstreamer/gst-player_svn.bb +++ b/recipes/gstreamer/gst-player_svn.bb @@ -8,8 +8,9 @@ SRC_URI = "svn://gstplayer.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk/gstplayer" -PV = "svnr${SRCREV}" -PR = "r2" +PE = "1" +PV = "1.0.0+svnr${SRCPV}" +PR = "r0" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc index a7ed936da3..fc2df36f4a 100644 --- a/recipes/gtk-webcore/midori.inc +++ b/recipes/gtk-webcore/midori.inc @@ -3,6 +3,8 @@ LICENSE = "GPLv2" DEPENDS = "webkit-gtk libsoup-2.4 libsexy" +PE = "1" + inherit autotools gtk-icon-cache pkgconfig SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" diff --git a/recipes/gtk-webcore/midori_0.0.8.bb b/recipes/gtk-webcore/midori_0.0.8.bb index 23d0179375..01fc94867c 100644 --- a/recipes/gtk-webcore/midori_0.0.8.bb +++ b/recipes/gtk-webcore/midori_0.0.8.bb @@ -3,6 +3,8 @@ LICENSE = "GPLv2" DEPENDS = "webkit-gtk libsexy" +PE = "1" + inherit autotools pkgconfig SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index e1e2ecf99d..2ba33139aa 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -4,7 +4,7 @@ DEPENDS += "python-native python-docutils-native" # increment PR every time SRCREV is updated! PR = "r2" -PV = "0.1.7+${PR}+gitr${SRCREV}" +PV = "0.1.7+${PR}+gitr${SRCPV}" SRC_URI = "git://git.xfce.org/apps/midori;protocol=git \ file://waf \ diff --git a/recipes/gypsy/files/remove-werror.patch b/recipes/gypsy/files/remove-werror.patch new file mode 100644 index 0000000000..8c60bd73b0 --- /dev/null +++ b/recipes/gypsy/files/remove-werror.patch @@ -0,0 +1,13 @@ +Index: configure.ac +=================================================================== +--- a/configure.ac (Revision 148) ++++ b/configure.ac (Arbeitskopie) +@@ -41,7 +41,7 @@ + AC_SUBST(DBUS_SERVICES_DIR) + AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for D-Bus is]) + +-CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format" ++CFLAGS="$CFLAGS -g -Wall -Wno-format" + + # TODO: add --with-xsltproc argument to override PATH + AC_CHECK_PROGS(XSLT, xsltproc) diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc index df5e1c7da3..efd64c6209 100644 --- a/recipes/gypsy/gypsy.inc +++ b/recipes/gypsy/gypsy.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GPS Controlling Daemon" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 dbus-glib bluez-libs libxslt-native" +DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" inherit autotools pkgconfig @@ -13,4 +13,12 @@ do_stage() { autotools_stage_all } -FILES_${PN} += "${datadir}/dbus-1/services/" + +PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg" + +FILES_lib${PN} = "${libdir}/lib*.so*" +FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" +FILES_lib${PN}-dbg = "${libdir}/.debug" +FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*" +FILES_${PN}-dbg ="${libexecdir}/.debug*" +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf" diff --git a/recipes/gypsy/gypsy_svn.bb b/recipes/gypsy/gypsy_svn.bb index 8dac863a2b..0245a955f9 100644 --- a/recipes/gypsy/gypsy_svn.bb +++ b/recipes/gypsy/gypsy_svn.bb @@ -2,7 +2,8 @@ require gypsy.inc SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ file://fixups.patch;patch=1;maxrev=107 \ - file://docs-reference-am.patch;patch=1;minrev=134" + file://docs-reference-am.patch;patch=1;minrev=134 \ + file://remove-werror.patch;patch=1" S = "${WORKDIR}/${PN}" PV = "0.0+svnr${SRCPV}" diff --git a/recipes/hal/ohm_git.bb b/recipes/hal/ohm_git.bb index ffdbb07b88..af2377e436 100644 --- a/recipes/hal/ohm_git.bb +++ b/recipes/hal/ohm_git.bb @@ -8,8 +8,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ file://fix_configure.patch;patch=1" SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e" -PV = "0.1.2+${PR}+gitr${SRCREV}" -PE = "1" +PV = "0.1.2+${PR}+gitr${SRCPV}" +PE = "2" S = "${WORKDIR}/git" diff --git a/recipes/imagemagick/files/fix_open_file.patch b/recipes/imagemagick/files/fix_open_file.patch new file mode 100644 index 0000000000..8374e1e551 --- /dev/null +++ b/recipes/imagemagick/files/fix_open_file.patch @@ -0,0 +1,12 @@ +diff -rup ImageMagick-6.3.5.orig/magick/delegate.c ImageMagick-6.3.5/magick/delegate.c +--- ImageMagick-6.3.5.orig/magick/delegate.c 2009-10-15 18:40:06.000000000 +0200 ++++ ImageMagick-6.3.5/magick/delegate.c 2009-10-15 18:23:10.000000000 +0200 +@@ -769,7 +769,7 @@ static void CopyDelegateFile(const char + /* + Copy source file to destination. + */ +- destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT); ++ destination_file=open(destination, O_BINARY | O_CREAT, O_WRONLY); + if (destination_file == -1) + return; + source_file=open(source,O_RDONLY | O_BINARY); diff --git a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb index b03e18e9c1..4f84f8ce1f 100644 --- a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb @@ -1,3 +1,5 @@ require imagemagick_${PV}.bb DEPENDS ="libtool-native" inherit native + +SRC_URI_append = " file://fix_open_file.patch;patch=1" diff --git a/recipes/iphone/gcc-iphone-cross_git.bb b/recipes/iphone/gcc-iphone-cross_git.bb index ea351cf0bf..f9e1b45b49 100644 --- a/recipes/iphone/gcc-iphone-cross_git.bb +++ b/recipes/iphone/gcc-iphone-cross_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "GCC for iPhone" DEPENDS = "iphone-sdks" -PV = "4.2.1+git${SRCREV}" +PV = "4.2.1+gitr${SRCPV}" +PE = "1" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 8baffd24c7..d746177d56 100644 --- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r23" +PR = "r24" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ @@ -19,6 +19,9 @@ SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ S = "${WORKDIR}/ipkg-utils" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields" do_compile() { diff --git a/recipes/libgdbus/libgdbus_git.bb b/recipes/libgdbus/libgdbus_git.bb index b780af37fe..c594f9aadd 100644 --- a/recipes/libgdbus/libgdbus_git.bb +++ b/recipes/libgdbus/libgdbus_git.bb @@ -3,8 +3,8 @@ SECTION = "libs" HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" LICENSE = "GPL LGPL" DEPENDS = "glib-2.0 dbus" -PE = "1" -PV = "0.2+gitr${SRCREV}" +PE = "2" +PV = "0.2+gitr${SRCPV}" SRC_URI = "git://git.moblin.org/repos/projects/libgdbus.git;protocol=http" S = "${WORKDIR}/git" diff --git a/recipes/libgee/libgee_git.bb b/recipes/libgee/libgee_git.bb index ead93741ce..48f6ced76d 100644 --- a/recipes/libgee/libgee_git.bb +++ b/recipes/libgee/libgee_git.bb @@ -4,7 +4,8 @@ HOMEPAGE = "http://live.gnome.org/Libgee" SECTION = "libs" DEPENDS = "glib-2.0" LICENSE = "LGPL" -PV = "0.5.0+gitr${SRCREV}" +PV = "0.5.0+gitr${SRCPV}" +PE = "1" SRC_URI = "\ git://git.gnome.org/libgee;protocol=git;branch=master \ diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb index 07e3af9a40..4124d582b6 100644 --- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb +++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb @@ -3,6 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "\ @@ -24,6 +26,10 @@ EXTRA_OECONF = "\ --enable-threads \ " +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + + do_stage() { oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb index 9e2c3d7ecc..f98a075049 100644 --- a/recipes/libnl/libnl2_git.bb +++ b/recipes/libnl/libnl2_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" SECTION = "libs/network" LICENSE = "LGPL" HOMEPAGE = "http://people.suug.ch/~tgr/libnl" -PV = "1.0+gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" +PE = "1" PR = "r1" inherit autotools diff --git a/recipes/libopie/libopie2.inc b/recipes/libopie/libopie2.inc index a5a5cef0bd..c9cba7bfef 100644 --- a/recipes/libopie/libopie2.inc +++ b/recipes/libopie/libopie2.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://opie.handhelds.org" SECTION = "opie/libs" LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" -DEPENDS = "libqpe-opie libpcap sqlite3 bluez-libs" +DEPENDS = "libqpe-opie libpcap sqlite3 bluez4" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" S = "${WORKDIR}/libopie2" diff --git a/recipes/libpcap/libpcap.inc b/recipes/libpcap/libpcap.inc index 4468a4b89e..165971acb5 100644 --- a/recipes/libpcap/libpcap.inc +++ b/recipes/libpcap/libpcap.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Network Packet Capture Library" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "libs/network" LICENSE = "BSD" -DEPENDS = "bluez-libs flex-native bison-native" +DEPENDS = "bluez4 flex-native bison-native" PR = "r1" diff --git a/recipes/librsvg/librsvg-native_2.26.0.bb b/recipes/librsvg/librsvg-native_2.26.0.bb new file mode 100644 index 0000000000..05901c6a65 --- /dev/null +++ b/recipes/librsvg/librsvg-native_2.26.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +DEPENDS = "cairo-native pango-native" +LICENSE = "LGPL" + +inherit native autotools_stage + +SRC_URI = "${GNOME_MIRROR}/librsvg/2.26/librsvg-${PV}.tar.bz2" + +EXTRA_OECONF = "--disable-mozilla-plugin" diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb index 5ecd2944a2..055810ae94 100644 --- a/recipes/libsdl/libsdl-mixer_1.2.11.bb +++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb @@ -11,7 +11,7 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" inherit autotools_stage -EXTRA_OECONF = "--disable-music-mp3" +EXTRA_OECONF = "--disable-music-mp3 --disable-music-flac" # although we build smpeg... need to find out how # to deal with optional dependencies diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc index 5653925d68..0db0be8e14 100644 --- a/recipes/libsdl/libsdl.inc +++ b/recipes/libsdl/libsdl.inc @@ -1,11 +1,13 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "alsa-lib mesa virtual/libx11 libxext" +DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" +PR = "r1" + SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ diff --git a/recipes/libsynthesis/libsynthesis_git.bb b/recipes/libsynthesis/libsynthesis_git.bb index 3571a75a9f..869276ae8f 100644 --- a/recipes/libsynthesis/libsynthesis_git.bb +++ b/recipes/libsynthesis/libsynthesis_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Synthesis SyncML Engine" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" LICENSE = "LGPLv2.1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r1" DEPENDS = "libpcre" diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc index 3f67152ca1..603f48d196 100644 --- a/recipes/libxml/libxml2-native.inc +++ b/recipes/libxml/libxml2-native.inc @@ -1,26 +1,21 @@ DESCRIPTION = "GNOME XML library" DEPENDS = "python-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" +PR = "r3" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig distutils-native-base +inherit distutils-base autotools native pkgconfig -do_configure_prepend () { - EXTRA_LIBXML2_OECONF="\ - --with-python=${PYTHON_DIR} \ - --without-debug \ - --without-legacy \ - --with-catalog \ - --without-docbook \ - --with-c14n \ - " -} - -do_configure (){ - autotools_do_configure ${EXTRA_LIBXML2_OECONF} -} +EXTRA_OECONF = "\ + --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \ + --without-debug \ + --without-legacy \ + --without-catalog \ + --without-docbook \ + --with-c14n \ +" do_stage () { oe_runmake install diff --git a/recipes/linux/linux-davinci_2.6.30.bb b/recipes/linux/linux-davinci_2.6.30.bb index 63c87e820b..679f6819a7 100644 --- a/recipes/linux/linux-davinci_2.6.30.bb +++ b/recipes/linux/linux-davinci_2.6.30.bb @@ -10,7 +10,8 @@ DEFAULT_PREFERENCE = "1" SRCREV = "5212151f26e688416faac9f6f33ddd958f7de96c" # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -PV = "2.6.30-${PR}+gitr${SRCREV}" +PV = "2.6.30-${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ file://defconfig" diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index ffa1a35950..37d45ba25f 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -17,7 +17,8 @@ SRCREV_hawkboard = "b60234a5b0ee985912ecb59d3e689c1ed4baa46c" BRANCH = "master" # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -PV = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}" +PV = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git \ file://defconfig" diff --git a/recipes/linux/linux-eten_2.6.28-rc4+git.bb b/recipes/linux/linux-eten_2.6.28-rc4+git.bb index 0d3dac86c6..a5508371ec 100644 --- a/recipes/linux/linux-eten_2.6.28-rc4+git.bb +++ b/recipes/linux/linux-eten_2.6.28-rc4+git.bb @@ -9,7 +9,8 @@ KERNEL_RELEASE = "2.6.28-rc4" KERNEL_VERSION = "${KERNEL_RELEASE}" # See http://wiki.openembedded.net/index.php/Versioning_Policy -PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" +PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/linux/linux-kirkwood_2.6.29.5.bb b/recipes/linux/linux-kirkwood_2.6.29.5.bb index f503829211..576c851ccb 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb @@ -7,8 +7,9 @@ require linux.inc # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc PV = "2.6.29.5" -PR_append = "+gitr${SRCREV}" -#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}" +PR_append = "+gitr${SRCPV}" +PE = "1" +#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCPV}" SRCREV = "70deca35020a5dc3bd3c228bd46852cab77a7f6b" SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \ diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb index 8c533e10a5..20dafb645d 100644 --- a/recipes/linux/linux-msm7xxxx_git.bb +++ b/recipes/linux/linux-msm7xxxx_git.bb @@ -1,9 +1,10 @@ require linux.inc -PV = "2.6.25+${PR}+gitr${SRCREV}" -PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}" +PV = "2.6.25+${PR}+gitr${SRCPV}" +PE = "1" +PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}" PR = "r13" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream" diff --git a/recipes/linux/linux-neuros_2.6.15.bb b/recipes/linux/linux-neuros_2.6.15.bb index f103d2c35f..c5453ec3b3 100644 --- a/recipes/linux/linux-neuros_2.6.15.bb +++ b/recipes/linux/linux-neuros_2.6.15.bb @@ -2,6 +2,7 @@ PV = "2.6.15-torfu" PR = "r5" +PE = "2" COMPATIBLE_MACHINE = "(neuros-osd)" diff --git a/recipes/linux/linux-neuros_git.bb b/recipes/linux/linux-neuros_git.bb index 9228ec24c8..449868bf9f 100644 --- a/recipes/linux/linux-neuros_git.bb +++ b/recipes/linux/linux-neuros_git.bb @@ -4,8 +4,8 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices" SRCREV = "465f0ba12501e1c4e048f0a3ca8182404aeb66fc" -PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCREV}" -PE = "1" +PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCPV}" +PE = "2" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/recipes/linux/linux-omap-pm_2.6.28.bb b/recipes/linux/linux-omap-pm_2.6.28.bb index b09b31c62b..4111abb845 100644 --- a/recipes/linux/linux-omap-pm_2.6.28.bb +++ b/recipes/linux/linux-omap-pm_2.6.28.bb @@ -7,7 +7,8 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "fe30e75b8c0b91b259fcea781b859e594ba21ae9" -PV = "2.6.28-pm3+gitr${SRCREV}" +PV = "2.6.28-pm3+gitr${SRCPV}" +PE = "1" PR = "r7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.28 \ diff --git a/recipes/linux/linux-omap-pm_2.6.29.bb b/recipes/linux/linux-omap-pm_2.6.29.bb index 9112c7dd8a..b63dc6b543 100644 --- a/recipes/linux/linux-omap-pm_2.6.29.bb +++ b/recipes/linux/linux-omap-pm_2.6.29.bb @@ -8,6 +8,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "e63cf0710a4fb639d91d3e8b05aa485fbfa381b3" PV = "2.6.29" +PE = "1" MACHINE_KERNEL_PR_append = "-pm2+gitr${SRCREV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.29 \ diff --git a/recipes/linux/linux-omap-pm_git.bb b/recipes/linux/linux-omap-pm_git.bb index 574e0a3ca6..354956953c 100644 --- a/recipes/linux/linux-omap-pm_git.bb +++ b/recipes/linux/linux-omap-pm_git.bb @@ -9,7 +9,8 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "7c5cb7862d32cb344be7831d466535d5255e35ac" -PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCREV}" +PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCPV}" +PE = "1" FILESPATHPKG_prepend = "linux-omap-pm-2.6.31:" diff --git a/recipes/linux/linux-omap2_git.bb b/recipes/linux/linux-omap2_git.bb index dcb8139486..4111387cf1 100644 --- a/recipes/linux/linux-omap2_git.bb +++ b/recipes/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" -#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" +#PV = "2.6.26+2.6.27-rc1+${PR}+gitr${SRCPV}" PR = "r64" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb index 0fb9988ed8..8985075984 100644 --- a/recipes/linux/linux-omap_2.6.31.bb +++ b/recipes/linux/linux-omap_2.6.31.bb @@ -12,7 +12,8 @@ DEFAULT_PREFERENCE_omap5912osk = "1" SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}" +PE = "1" PV = "2.6.31" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omap_git.bb b/recipes/linux/linux-omap_git.bb index 7690b4d381..7ae5e0b4bf 100644 --- a/recipes/linux/linux-omap_git.bb +++ b/recipes/linux/linux-omap_git.bb @@ -12,7 +12,7 @@ SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4" FILESPATHPKG_prepend = "linux-omap-2.6.31:" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}" PV = "2.6.31" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omapzoom_git.bb b/recipes/linux/linux-omapzoom_git.bb index 60d4e8e062..ad5d996495 100644 --- a/recipes/linux/linux-omapzoom_git.bb +++ b/recipes/linux/linux-omapzoom_git.bb @@ -7,8 +7,9 @@ COMPATIBLE_MACHINE = "omapzoom" SRCREV = "26d16dad66b1d3955d8958938f9de5f2e0fce7fb" -#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCREV}" -PV = "2.6.27.10-${PR}+gitr${SRCREV}" +#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCPV}" +PE = "1" +PV = "2.6.27.10-${PR}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.omapzoom.org/repo/omapkernel.git;protocol=git \ diff --git a/recipes/linux/linux-openmoko-2.6.24_git.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb index 99e478c3d6..06693f5f65 100644 --- a/recipes/linux/linux-openmoko-2.6.24_git.bb +++ b/recipes/linux/linux-openmoko-2.6.24_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.24" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe5" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb index 0b779384d9..5613c24a30 100644 --- a/recipes/linux/linux-openmoko-2.6.28_git.bb +++ b/recipes/linux/linux-openmoko-2.6.28_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.28" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe2" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb index 301ac6b863..f7706bd74a 100644 --- a/recipes/linux/linux-openmoko-2.6.31_git.bb +++ b/recipes/linux/linux-openmoko-2.6.31_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.31" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe1" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" PR = "r5" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-devel_git.bb b/recipes/linux/linux-openmoko-devel_git.bb index fb9c4f0498..b94d202f1c 100644 --- a/recipes/linux/linux-openmoko-devel_git.bb +++ b/recipes/linux/linux-openmoko-devel_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe1" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index 2a61a95443..a0b209d02f 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3" OMV = "oe11" -PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}" PR = "r6" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb index e02cc6f135..36cc8f8919 100644 --- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3-drm" OMV = "oe15" -PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}" PR = "r4" SRC_URI = "\ diff --git a/recipes/linux/linux-replicant_git.bb b/recipes/linux/linux-replicant_git.bb index 7919694dfc..894e30882f 100644 --- a/recipes/linux/linux-replicant_git.bb +++ b/recipes/linux/linux-replicant_git.bb @@ -1,9 +1,10 @@ require linux.inc -PV = "2.6.25+${PR}+gitr${SRCREV}" -PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}" +PV = "2.6.25+${PR}+gitr${SRCPV}" +PE = "2" +PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}" PR = "r13" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream" diff --git a/recipes/linux/linux-xilinx-slab_git.bb b/recipes/linux/linux-xilinx-slab_git.bb index 2900ad9516..104d4b5724 100644 --- a/recipes/linux/linux-xilinx-slab_git.bb +++ b/recipes/linux/linux-xilinx-slab_git.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c" PR = "r3" -PV = "2.6.25+2.6.26+${PR}+gitr${SRCREV}" +PV = "2.6.25+2.6.26+${PR}+gitr${SRCPV}" PE = "1" COMPATIBLE_MACHINE = "xilinx-ml403" diff --git a/recipes/linux/linux-xo_git.bb b/recipes/linux/linux-xo_git.bb index 37e95208e9..b533249457 100644 --- a/recipes/linux/linux-xo_git.bb +++ b/recipes/linux/linux-xo_git.bb @@ -4,7 +4,8 @@ DESCRIPTION = "Linux kernel for XO laptop (aka OLPC)" SRCREV = "28f4cb6e780db078a09c765595e0ee84fda20f88" -PV = "2.6.22+gitr${SRCREV}" +PV = "2.6.22+gitr${SRCPV}" +PE = "1" PR = "r0" COMPATIBLE_MACHINE = "xo" diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb index 64fac44558..1b960ecc62 100644 --- a/recipes/linux/openezx-kernel_git.bb +++ b/recipes/linux/openezx-kernel_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM pho AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>" HOMEPAGE = "http://www.openezx.org" KV = "2.6.29+2.6.30rc2" -PV = "${KV}+gitr${SRCREV}" +PV = "${KV}+gitr${SRCPV}" +PE = "1" PR = "r3" require linux.inc diff --git a/recipes/madbufferfly/madbutterfly_git.bb b/recipes/madbufferfly/madbutterfly_git.bb index a0f31691f8..54c99fa283 100644 --- a/recipes/madbufferfly/madbutterfly_git.bb +++ b/recipes/madbufferfly/madbutterfly_git.bb @@ -3,7 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "BSD" DEPENDS = "cairo pango" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.gitorious.org/madbutterfly/mainline.git;protocol=git \ file://001_makefile.am_bugs.patch;patch=1" diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb index a2a807f28a..ae3b122899 100644 --- a/recipes/matchbox2/matchbox-panel-2_svn.bb +++ b/recipes/matchbox2/matchbox-panel-2_svn.bb @@ -7,7 +7,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" RDEPENDS_${PN} = "matchbox-panel-2-icon-theme" PACKAGE_ARCH = "${MACHINE_ARCH}" PV = "2.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit autotools_stage pkgconfig @@ -19,6 +19,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ " S = "${WORKDIR}/${PN}" +TARGET_CFLAGS += "-Wno-error" + EXTRA_OECONF = "--disable-static --program-transform-name='s/$/-2/'" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" diff --git a/recipes/mesa/freeglut_2.4.0.bb b/recipes/mesa/freeglut_2.4.0.bb index a244fb23e1..cfc9ec175f 100644 --- a/recipes/mesa/freeglut_2.4.0.bb +++ b/recipes/mesa/freeglut_2.4.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library. " LICENSE = "MIT/X11" -DEPENDS = "mesa" +DEPENDS = "virtual/libgl" SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-${PV}.tar.gz" diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc index 18e9b4ebed..402a82a6b3 100644 --- a/recipes/mesa/mesa-common-old.inc +++ b/recipes/mesa/mesa-common-old.inc @@ -1,4 +1,5 @@ SECTION = "x11" +PE = "2" SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ file://mklib-rpath-link.patch;patch=1" diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index ccfe504d54..fc530a2569 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -5,6 +5,7 @@ HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" INC_PR = "r7" +PE = "2" SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb index 93568432bc..34ab1696c8 100644 --- a/recipes/mesa/mesa-dri_7.2.bb +++ b/recipes/mesa/mesa-dri_7.2.bb @@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PE = "1" PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb index 93568432bc..34ab1696c8 100644 --- a/recipes/mesa/mesa-dri_7.4.bb +++ b/recipes/mesa/mesa-dri_7.4.bb @@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PE = "1" PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb new file mode 100644 index 0000000000..bea43c3596 --- /dev/null +++ b/recipes/mesa/mesa-dri_7.6.bb @@ -0,0 +1,25 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto expat" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ + " +PR = "${INC_PR}.0" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# ASUS EeePC 901 has DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_eee901 = "1" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--disable-gallium --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index 4ca1b73122..9082035afd 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -5,16 +5,23 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PV = "7.2+gitr${SRCREV}" -PR = "${INC_PR}.0" -PE = "1" +PV = "7.6.1+gitr${SRCPV}" +PR = "${INC_PR}.3" -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-2" +DEFAULT_PREFERENCE_om-gta02 = "2" + +SRCREV_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo" S = "${WORKDIR}/git" +PACKAGES =+ " mesa-utils " + FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_mesa-utils = "${bindir}/*" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" +EXTRA_OECONF_append_om-gta02 = " --disable-glx-tls --disable-gallium-intel " diff --git a/recipes/mesa/mesa-xlib_7.2.bb b/recipes/mesa/mesa-xlib_7.2.bb index 0035540838..f6c44ebdb0 100644 --- a/recipes/mesa/mesa-xlib_7.2.bb +++ b/recipes/mesa/mesa-xlib_7.2.bb @@ -5,7 +5,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PE = "1" PR = "r4" EXTRA_OECONF += "--with-driver=xlib" diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb new file mode 100644 index 0000000000..2581d03fe2 --- /dev/null +++ b/recipes/mesa/mesa-xlib_7.6.bb @@ -0,0 +1,14 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ + " + +PR = "${INC_PR}.0" + +EXTRA_OECONF += "--disable-gallium --with-driver=xlib" diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb index d8c857fef7..dd4e07e80f 100644 --- a/recipes/mesa/mesa_6.0.1.bb +++ b/recipes/mesa/mesa_6.0.1.bb @@ -3,6 +3,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ file://Make-config.patch;patch=1 \ file://mklib.patch;patch=1" S = "${WORKDIR}/Mesa-${PV}" +PE = "2" LICENSE = "LGPL" # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}" diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb index 0e9f99684f..7eb52b2579 100644 --- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb +++ b/recipes/mesa/mesa_6.4.1+cvs20060101.bb @@ -2,6 +2,7 @@ SECTION = "unknown" SRCDATE = "20060101" PV = "6.4.1+cvs${SRCDATE}" +PE = "2" SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \ file://mklib-rpath-link.patch;patch=1" diff --git a/recipes/mesa/mesa_7.6.bb b/recipes/mesa/mesa_7.6.bb new file mode 100644 index 0000000000..43cde679a1 --- /dev/null +++ b/recipes/mesa/mesa_7.6.bb @@ -0,0 +1,2 @@ +# This is a dummy package so OE can use the poky mesa files +require mesa-dri_${PV}.bb diff --git a/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index 65fab979b1..6fbe51ccc6 100644 --- a/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Mobile Broadband Service Provider Database" SECTION = "network" LICENSE = "CCPD" -PV = "gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info;protocol=git" diff --git a/recipes/moblin/json-glib_0.6.2.bb b/recipes/moblin/json-glib_0.6.2.bb index 822ddad7e5..c81b07a38d 100644 --- a/recipes/moblin/json-glib_0.6.2.bb +++ b/recipes/moblin/json-glib_0.6.2.bb @@ -1,6 +1,7 @@ SRC_URI = "http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz" PR = "r0" +PE = "1" DEPENDS = "glib-2.0" diff --git a/recipes/moblin/json-glib_git.bb b/recipes/moblin/json-glib_git.bb index 0522df1f1f..7945824da6 100644 --- a/recipes/moblin/json-glib_git.bb +++ b/recipes/moblin/json-glib_git.bb @@ -1,6 +1,7 @@ HOMEPAGE = "http://live.gnome.org/JsonGlib" SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git" -PV = "0.6.2+git${SRCREV}" +PV = "0.6.2+gitr${SRCPV}" +PE = "1" PR = "r0" S = "${WORKDIR}/git" diff --git a/recipes/moblin/libccss_git.bb b/recipes/moblin/libccss_git.bb index e622d9f9bf..900524b0ed 100644 --- a/recipes/moblin/libccss_git.bb +++ b/recipes/moblin/libccss_git.bb @@ -1,5 +1,6 @@ SRC_URI = "git://anongit.freedesktop.org/git/ccss.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4" diff --git a/recipes/moblin/librest_git.bb b/recipes/moblin/librest_git.bb index ec2d676fd5..0012e77025 100644 --- a/recipes/moblin/librest_git.bb +++ b/recipes/moblin/librest_git.bb @@ -1,6 +1,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" DEPENDS = "libsoup-2.4" diff --git a/recipes/moblin/moblin-menus_git.bb b/recipes/moblin/moblin-menus_git.bb index ae60573649..5b779a8c81 100644 --- a/recipes/moblin/moblin-menus_git.bb +++ b/recipes/moblin/moblin-menus_git.bb @@ -1,7 +1,8 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ file://configurefix.patch;patch=1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r1" S = "${WORKDIR}/git" diff --git a/recipes/moblin/mojito_git.bb b/recipes/moblin/mojito_git.bb index f9104a9371..e9b3cf0972 100644 --- a/recipes/moblin/mojito_git.bb +++ b/recipes/moblin/mojito_git.bb @@ -1,6 +1,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r3" DEPENDS = "libsoup-2.4 gconf librest glib-2.0 twitter-glib sqlite3 gnome-keyring" diff --git a/recipes/moblin/twitter-glib_git.bb b/recipes/moblin/twitter-glib_git.bb index 791cace092..1c65f33a40 100644 --- a/recipes/moblin/twitter-glib_git.bb +++ b/recipes/moblin/twitter-glib_git.bb @@ -1,6 +1,7 @@ HOMEPAGE = "http://live.gnome.org/TwitterGlib" SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" DEPENDS = "glib-2.0 gtk+ json-glib" diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index aa01cc7c20..984227bd7b 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -41,7 +41,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "0.0+1.0rc2+gitr${SRCREV}" +PV = "0.0+1.0rc2+gitr${SRCPV}" PR = "r15" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_om-gta02 = "1" diff --git a/recipes/mux/mux_git.bb b/recipes/mux/mux_git.bb index a6596b99ac..e149559a45 100644 --- a/recipes/mux/mux_git.bb +++ b/recipes/mux/mux_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "GTK+ widgets for moblin" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" LICENSE = "LGPLv2.1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" LICENSE = "LGPLv2.1" diff --git a/recipes/navit/files/maps.xml b/recipes/navit/files/maps.xml new file mode 100644 index 0000000000..6f59f20c39 --- /dev/null +++ b/recipes/navit/files/maps.xml @@ -0,0 +1,24 @@ + <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly --> + <mapset enabled="no"> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/> + <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/> + </mapset> + + <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory --> + <mapset enabled="no"> + <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/> + </mapset> + + <!-- Mapset template for openstreetmaps --> + <mapset enabled="yes"> + <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/> + </mapset> + + <!-- Mapset template for garmin maps --> + <mapset enabled="no"> + <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/> + </mapset> diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop index 085c8c9238..05ecc1d4ee 100644 --- a/recipes/navit/files/navit.desktop +++ b/recipes/navit/files/navit.desktop @@ -2,7 +2,7 @@ Name=Navit Comment=GPS Navigation Exec=navit -Icon=navit.png +Icon=navit Terminal=false Type=Application Categories=GTK; diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml new file mode 100644 index 0000000000..cce85aaf2f --- /dev/null +++ b/recipes/navit/files/navit.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE config SYSTEM "navit.dtd"> +<config xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/plugins)"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/debug)"/> + + <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10"> + <graphics type="gtk_drawing_area"/> + <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/gui[@type='internal'])"/> + <xi:include href="/usr/share/navit/osd.xml"/> + <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/> + <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> + <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> --> + </vehicle> + + <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://"/> + + <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 --> + <tracking cdf_histsize="0"/> + + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='car'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='bike'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='pedestrian'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='horse'])"/> + + <route destination_distance="50"/> + + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/navigation)"/> + + <xi:include href="/usr/share/navit/speech.xml"/> + <xi:include href="/usr/share/navit/maps.xml"/> + + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Car'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Car-dark'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Bike'])"/> + <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='T@H'])"/> + </navit> +</config> diff --git a/recipes/navit/files/navit.xml-so.patch b/recipes/navit/files/navit.xml-so.patch index c374756447..9151bc4a5e 100644 --- a/recipes/navit/files/navit.xml-so.patch +++ b/recipes/navit/files/navit.xml-so.patch @@ -1,13 +1,17 @@ ---- navit-0.0.3/src/navit.xml.orig 2008-01-01 15:24:43.000000000 +0000 -+++ navit-0.0.3/src/navit.xml 2008-01-01 15:25:01.000000000 +0000 -@@ -1,8 +1,8 @@ - <?xml version="1.0" encoding="utf-8"?> - <!DOCTYPE navit SYSTEM "navit.dtd"> - <plugins> -- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/> -- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" /> -+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"/> -+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no" /> - </plugins> - <debug name="navit:do_draw" level="0" /> - <!-- +--- navit/navit/navit.xml.orig 2009-07-19 13:08:16.000000000 +0200 ++++ navit/navit/navit.xml 2009-07-19 13:09:12.000000000 +0200 +@@ -6,10 +6,10 @@ + on upgrade. Rather copy it to ~/.navit/. Please read wiki --> + <config xmlns:xi="http://www.w3.org/2001/XInclude"> + <plugins> +- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/> +- <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/> +- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/> +- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/> ++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0" ondemand="yes"/> ++ <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/> ++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0" active="no"/> ++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/> + </plugins> + + <debug name="navit:do_draw" level="0"/> diff --git a/recipes/navit/files/osd.xml b/recipes/navit/files/osd.xml new file mode 100644 index 0000000000..a8a97d74c9 --- /dev/null +++ b/recipes/navit/files/osd.xml @@ -0,0 +1,44 @@ + <!-- FreeRunner Layout 3 --> + <osd enabled="yes" type="text" label="${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30" align="0" background_color="#000000cc" font_size="300" /> + <osd enabled="yes" type="gps_status" x="430" y="0" w="65" h="30" align="0" background_color="#000000cc" font_size="300" /> + <osd enabled="yes" type="compass" align="0" font_size="350" x="0" y="30" w="150" h="150" background_color="#000000cc" /> + <osd enabled="yes" type="navigation_next_turn" x="-150" y="30" w="150" h="60" background_color="#000000cc" /> + <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="-150" y="90" w="150" h="40" align="0" background_color="#000000cc" font_size="450"/> + <osd enabled="yes" type="button" x="-55" y="-90" command="zoom_in()" src="gui_zoom_in.svg"/> + <osd enabled="yes" type="button" x="5" y="-90" command="zoom_out()" src="gui_zoom_out.svg"/> + <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="120" y="-50" w="240" h="25" align="0" background_color="#000000cc" font_size="280"/> + <osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="0" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" /> + <osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="160" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" /> + <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25" w="160" h="25" align="4" background_color="#000000cc" font_size="350" /> + <!-- / FreeRunner Layout 3 --> + + <!-- Mineque's OSD 003 Layout --> + <!--osd enabled="yes" type="text" label="Currently On ${navigation.item.street_name} ${navigation.item[1].street_name_systematic}" x="0" y="0" w="735" h="35" align="16" background_color="#a60c0f00" font_size="430" src="gui_fullscreen.svg" /> + <osd enabled="yes" type="gps_status" x="735" y="0" w="65" h="30" align="0" background_color="#a60c0f00" font_size="300" /> + <osd enabled="yes" type="text" label="ETA:${navigation.item.destination_time[arrival]}" x="50" y="-100" w="275" h="70" align="4" background_color="#a60c0f01" font_size="500" /> + <osd enabled="yes" type="text" label="TL:${navigation.item.destination_time[remaining]}" x="475" y="-100" w="275" h="70"align="4" background_color="#a60c0f00" font_size="500" /> + <osd enabled="yes" type="text" label="Dist:${navigation.item.destination_length[named]}" x="50" y="-60" w="275" h="70" align="4" background_color="#a60c0f00" font_size="500" /> + <osd enabled="yes" type="text" label="${vehicle.position_speed} / ${tracking.item.route_speed}" x="475" y="-60" w="275" h="70" align="4" background_color="#a60c0f00" font_size="500"/> + <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="325" y="-40" w="150" h="40" align="0" background_color="#a60c0f00" font_size="500"/> + <osd enabled="yes" type="navigation_next_turn" x="325" y="-135" w="150" h="100" align="15" background_color="#a60c0f00" /> + <osd enabled="yes" type="button" x="0" y="-120" w="800" h="120" command="" src="/home/mineque/.navit/skins/Mineque_003/M_003_01.png" /> + <osd enabled="yes" type="button" x="0" y="0" w="800" h="35" command="" src="/home/mineque/.navit/skins/Mineque_003/M_003_02.png" /> + <osd enabled="yes" type="button" x="5" y="35" command="gui.fullscreen()" src="gui_fullscreen.svg"/> + <osd enabled="no" type="button" x="300" y="100" command="gui.menu()" src="menu.xpm"/> + <osd enabled="yes" type="button" x="5" y="475" command="zoom_in()" src="gui_zoom_in.svg"/> + <osd enabled="yes" type="button" x="-53" y="475" command="zoom_out()" src="gui_zoom_out.svg"/--> + <!-- / Mineque's OSD 003 Layout --> + + <!-- Default --> + <!-- osd items allow to position display and control items directly on top of the map: --> + <!-- osd enabled="no" type="compass"/> + <osd enabled="no" type="eta"/> + <osd enabled="no" type="navigation_distance_to_target"/> + <osd enabled="no" type="navigation"/> + <osd enabled="no" type="navigation_distance_to_next"/> + <osd enabled="no" type="navigation_next_turn"/> + <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> + <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/> + <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/> + <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/--> + <!-- Default --> diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop new file mode 100644 index 0000000000..d313d6a63e --- /dev/null +++ b/recipes/navit/files/shr/navit.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Navit +Comment=GPS Navigation +Exec=fsoraw -r CPU,GPS -- navit +Icon=navit +Terminal=false +Type=Application +Categories=GTK; +MimeType=text/x-vcard; +StartupNotify=true diff --git a/recipes/navit/files/shr/navit.launcher b/recipes/navit/files/shr/navit.launcher new file mode 100644 index 0000000000..68baaeb956 --- /dev/null +++ b/recipes/navit/files/shr/navit.launcher @@ -0,0 +1,57 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2008 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: navit.launcher +# Date: 20080105 (YMD) +# +################################################################################# +# +# 20080105 - v0.0.1 - Initial release +# 20090818 - - Zoff <zoff@zoff.cc> addons and fixes +# 20091025 - - Zoff check if navit already running +# 20091122 - - Zoff use fsoraw, use correct LANG setting +# +# +################################################################################# + +# On devices with low memory (< 512Mb?) Navit will segfault on start. +# This can be worked around by doing +# "echo 1 > /proc/sys/vm/overcommit_memory" + +# check if navit already running: +pgrep '^navit$' +not_running=$? + +if [ $not_running == 0 ]; then + echo "navit already running !!" +else + echo "ok starting navit ..." + + # HINT: to get correct LANG setting + . /etc/profile + + # HINT: we need that for streetname search + export LC_ALL='' + unset LC_ALL + + # HINT: that should be set in illume, but atm its not + # export LANG=de_AT.utf8 + + if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000" + then + if test "$USER" = "root" + then + echo "Enabling low-mem workaround..." + OLD=`cat /proc/sys/vm/overcommit_memory` + echo 1 > /proc/sys/vm/overcommit_memory + navit.real $* + echo ${OLD} > /proc/sys/vm/overcommit_memory + exit + else + echo "I need root-privs to enable the low-mem workaround!" + fi + fi + navit.real $* +fi diff --git a/recipes/navit/files/shr/navit.png b/recipes/navit/files/shr/navit.png Binary files differnew file mode 100644 index 0000000000..76156d0334 --- /dev/null +++ b/recipes/navit/files/shr/navit.png diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop new file mode 100644 index 0000000000..9a2378a3ea --- /dev/null +++ b/recipes/navit/files/shr/navitD.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=NavitD +Comment=GPS Navigation Display blanking disabled +Exec=fsoraw -r CPU,GPS,Display -- navit +Icon=navitD +Terminal=false +Type=Application +Categories=GTK; +MimeType=text/x-vcard; +StartupNotify=true diff --git a/recipes/navit/files/shr/navitD.png b/recipes/navit/files/shr/navitD.png Binary files differnew file mode 100644 index 0000000000..a23ba5ce03 --- /dev/null +++ b/recipes/navit/files/shr/navitD.png diff --git a/recipes/navit/files/speech.xml b/recipes/navit/files/speech.xml new file mode 100644 index 0000000000..28c49906d9 --- /dev/null +++ b/recipes/navit/files/speech.xml @@ -0,0 +1,8 @@ + <!-- Navit provides speech output in text format. + If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second. + The default is text output to the shell --> + <!-- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> --> + <!-- <speech type="cmdline" data="espeak -s 150 -v czech '%s' &"/> --> + <!-- <speech type="cmdline" data="flite -t '%s'"/> --> + <!-- <speech type="cmdline" data="/usr/local/bin/say.sh '%s'"/> --> + <speech type="cmdline" data="espeak '%s' &"/> diff --git a/recipes/navit/navit-icons/configure.in b/recipes/navit/navit-icons/configure.in new file mode 100644 index 0000000000..25259007e8 --- /dev/null +++ b/recipes/navit/navit-icons/configure.in @@ -0,0 +1,69 @@ +AC_INIT(navit, 0.2.0) +SOURCE_MODE=svn + +AM_INIT_AUTOMAKE +AM_CONFIG_HEADER(config.h) + +AC_SUBST(SOURCE_MODE) +AM_CONDITIONAL(SOURCE_MODE_SVN, [test "x${SOURCE_MODE}" = "xsvn"]) + +if test "x${SOURCE_MODE}" = "xsvn" ; then + USE_MAINTAINER_MODE=yes +else + USE_MAINTAINER_MODE=no +fi + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is enabled by default (reason of inclusion of this function) + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +AM_MAINTAINER_MODE + +# svg +AC_ARG_ENABLE(svg, [ --disable-svg disable Scalable Vector Graphics], enable_svg=$enableval, enable_svg=yes) +AC_ARG_ENABLE(svg2png, [ --disable-svg2png disable conversion of svgs to pngs], enable_svg2png=$enableval, enable_svg2png=yes) +AC_ARG_ENABLE(svg2png-scaling, [ --enable-svg2png-scaling enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96") +AC_ARG_ENABLE(svg2png-scaling-flag, [ --enable-svg2png-scaling-flag enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="8 16 32 48 96") +AC_ARG_ENABLE(svg2png-scaling-nav, [ --enable-svg2png-scaling-nav enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="8 16 32 48 96") +AC_ARG_WITH(svg2png-use-convert, [ --with-svg2png-use-convert use imagemagick's convert for png creation], SVG2PNG_CONVERTER="convert") +AC_ARG_WITH(svg2png-use-rsvg-convert, [ --with-svg2png-use-rsvg-convert use librsvg's rsvg-convert for png creation], SVG2PNG_CONVERTER="rsvg-convert") +AC_ARG_WITH(svg2png-use-inkscape, [ --with-svg2png-use-inkscape use inkscapes internal convert routines for png creation], SVG2PNG_CONVERTER="inkscape") +AC_ARG_WITH(svg2png-use-ksvgtopng4, [ --with-svg2png-use-ksvgtopng4 use kde4's ksvgtopng4 for png creation], SVG2PNG_CONVERTER="ksvgtopng4") +AC_ARG_WITH(svg2png-use-ksvgtopng, [ --with-svg2png-use-ksvgtopng use kde3's convert for png creation], SVG2PNG_CONVERTER="ksvgtopng") +if test "x${enable_svg2png}" = "xyes" ; then + if test "x${SVG2PNG_CONVERTER}" = "x"; then + SVG2PNG_CONVERTER="ksvgtopng ksvgtopng4 rsvg-convert inkscape convert" + fi + AC_PATH_PROGS([SVG2PNG], ${SVG2PNG_CONVERTER}, [none]) + if test "x${SVG2PNG}" = "xnone"; then + enable_svg2png="no" + fi +fi +AC_SUBST(SVG2PNG) +AC_SUBST(SVG2PNG_SCALES) +AC_SUBST(SVG2PNG_SCALES_FLAG) +AC_SUBST(SVG2PNG_SCALES_NAV) +AM_CONDITIONAL(USE_SVG2PNG_SCALES, test "x${SVG2PNG_SCALES}" != "xyes" -a "x${SVG2PNG_SCALES}" != "x") +AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes" -a "x${SVG2PNG_SCALES_FLAG}" != "x") +AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x") +AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes") +AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes") + +AC_CONFIG_FILES([ +Makefile +]) + +AC_OUTPUT + diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb new file mode 100644 index 0000000000..09961deb7c --- /dev/null +++ b/recipes/navit/navit-icons_svn.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +SECTION = "x11/applications" +DEPENDS = "glib-2.0 gtk+" +RRECOMMENDS = "gpsd espeak flite" + +PV = "0.1.0+svnr${SRCPV}" +PR = "r0" + +DEPENDS_shr += " librsvg-native" +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher" + +S = "${WORKDIR}/xpm" + +inherit autotools + +FILES_${PN} = " /usr/share/navit/xpm/" + +#use different URL than navit_svn doest, to prevent upgrade/downgrade cycle in downloads dir +SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \ + file://configure.in" + +do_configure_prepend() { + cp ${WORKDIR}/configure.in ${S}/ + # replace include with just xpmdir variable + sed -i 's#.*Makefile.inc.*#xpmdir=$(pkgdatadir)/xpm#g' ${S}/Makefile.am + # don't install desktopfile and icons + sed -i 's/^\(EXTRADIST.*\) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) \(.*\)$/\1\2/g' ${S}/Makefile.am +} diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index fa250ffac9..7b2c109ad5 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -2,27 +2,60 @@ DESCRIPTION = "Navit is a car navigation system with routing engine." LICENSE = "GPL" SECTION = "x11/applications" DEPENDS = "glib-2.0 gtk+" -RRECOMMENDS = "gpsd speechd flite" +RRECOMMENDS = "gpsd espeak flite" + +PE = "1" +INC_PR = "r3" inherit autotools -EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher" PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" -FILES_${PN} += "${libdir}/${PN}/*/*.so" +FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/dbus-1/services/ ${datadir}/icons/*/*/apps/navit.png" FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" +FILES_${PN}-dev += "${libdir}/${PN}/*/*.la" + +CONFFILES_${PN} += "${datadir}/navit/navit.default.xml \ + ${datadir}/navit/navit.xml \ + ${datadir}/navit/maps.xml \ + ${datadir}/navit/osd.xml \ + ${datadir}/navit/speech.xml \ + " SRC_URI_append = " \ file://navit.desktop \ file://navit.png \ + file://navit.xml \ + file://maps.xml \ + file://osd.xml \ + file://speech.xml \ " +SRC_URI_append_shr = "file://navitD.desktop \ + file://navitD.png \ + " + +DEPENDS_append_shr = " gypsy" +RDEPENDS_append_shr = " fsoraw" do_install_append() { install -d ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps/ install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/ + + #Use split config + mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml + install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml + install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml + install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml + install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml + #FIXME: don't install those in the first place, + #FIXME: rather then deleting post-install? rm ${D}${libdir}/${PN}/*/*.la } diff --git a/recipes/navit/navit_0.0.4.bb b/recipes/navit/navit_0.0.4.bb index dbb83d9ff4..75d63be57d 100644 --- a/recipes/navit/navit_0.0.4.bb +++ b/recipes/navit/navit_0.0.4.bb @@ -1,6 +1,6 @@ require navit.inc -PR = "r2" +PR = "${INC_PR}.0" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" diff --git a/recipes/navit/navit_0.1.0.bb b/recipes/navit/navit_0.1.0.bb index 5162fa0a85..9ad09481a9 100644 --- a/recipes/navit/navit_0.1.0.bb +++ b/recipes/navit/navit_0.1.0.bb @@ -1,5 +1,5 @@ require navit.inc -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index 833eb4714e..b17ae51387 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,12 +1,21 @@ -require navit.inc +PV = "0.1.0+svnr${SRCPV}" +PR = "${INC_PR}.0" + +DEPENDS_shr += " librsvg-native" -PV = "0.1.0+svnrev${SRCREV}" -PR = "r2" +RDEPENDS = " navit-icons" -DEFAULT_PREFERENCE = "-1" +require navit.inc + +EXTRA_OECONF_shr += " --enable-cache-size=20971520" S = "${WORKDIR}/navit" SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https" +do_configure_prepend() { + #Remove xpm building + sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am +} + EXTRA_AUTORECONF = " -I m4" diff --git a/recipes/netbase/netbase/om-gta01/interfaces b/recipes/netbase/netbase/om-gta01/interfaces index 56c485ef75..e595239758 100644 --- a/recipes/netbase/netbase/om-gta01/interfaces +++ b/recipes/netbase/netbase/om-gta01/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 + up route add default gw 192.168.0.200 metric 8 up echo nameserver 208.67.222.222 >> /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase/om-gta02/interfaces b/recipes/netbase/netbase/om-gta02/interfaces index ceedfc59c2..08bd3bb074 100644 --- a/recipes/netbase/netbase/om-gta02/interfaces +++ b/recipes/netbase/netbase/om-gta02/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 - up echo nameserver 208.67.222.222 >> /etc/resolv.conf + up route add default gw 192.168.0.200 metric 8 + up echo nameserver 208.67.222.222 > /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/neuros-public/neuros-app-photoalbum_git.bb b/recipes/neuros-public/neuros-app-photoalbum_git.bb index a17fdb55a6..81dabca283 100644 --- a/recipes/neuros-public/neuros-app-photoalbum_git.bb +++ b/recipes/neuros-public/neuros-app-photoalbum_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros photoalbum app" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-app-vplayer_git.bb b/recipes/neuros-public/neuros-app-vplayer_git.bb index 5bb2d8008c..2d80785f94 100644 --- a/recipes/neuros-public/neuros-app-vplayer_git.bb +++ b/recipes/neuros-public/neuros-app-vplayer_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros videoplayer app" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-lib-gui_git.bb b/recipes/neuros-public/neuros-lib-gui_git.bb index 2c46dcc843..ccadf0e74a 100644 --- a/recipes/neuros-public/neuros-lib-gui_git.bb +++ b/recipes/neuros-public/neuros-lib-gui_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros lib-gui" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-lib-widgets_git.bb b/recipes/neuros-public/neuros-lib-widgets_git.bb index 6718880583..2857b98079 100644 --- a/recipes/neuros-public/neuros-lib-widgets_git.bb +++ b/recipes/neuros-public/neuros-lib-widgets_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r3" inherit qt4e diff --git a/recipes/neuros-public/neuros-mainmenu_git.bb b/recipes/neuros-public/neuros-mainmenu_git.bb index a8aca3124c..f1bb262e9f 100644 --- a/recipes/neuros-public/neuros-mainmenu_git.bb +++ b/recipes/neuros-public/neuros-mainmenu_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r2" inherit qt4e diff --git a/recipes/neuros-public/neuros-nwm_git.bb b/recipes/neuros-public/neuros-nwm_git.bb index 258842afa4..bbe40b0059 100644 --- a/recipes/neuros-public/neuros-nwm_git.bb +++ b/recipes/neuros-public/neuros-nwm_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r7" inherit qt4e update-rc.d diff --git a/recipes/neuros-public/neuros-qt-plugins_git.bb b/recipes/neuros-public/neuros-qt-plugins_git.bb index 416639ba6e..6b3ecf496a 100644 --- a/recipes/neuros-public/neuros-qt-plugins_git.bb +++ b/recipes/neuros-public/neuros-qt-plugins_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r4" inherit qt4e diff --git a/recipes/openbsc/openbsc_git.bb b/recipes/openbsc/openbsc_git.bb index f2fa2099ac..d3c2205a90 100644 --- a/recipes/openbsc/openbsc_git.bb +++ b/recipes/openbsc/openbsc_git.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://openbsc.gnumonks.org" RDEPENDS = "libdbd-sqlite3" SRC_URI = "git://bs11-abis.gnumonks.org/openbsc.git;protocol=git" -PV = "0.0.1.0+gitr${SRCREV}" +PV = "0.0.1.0+gitr${SRCPV}" +PE = "1" S = "${WORKDIR}/git/openbsc" diff --git a/recipes/opencv/artoolkit_2.72.1.bb b/recipes/opencv/artoolkit_2.72.1.bb index 2dfbc429bc..1863844c9e 100644 --- a/recipes/opencv/artoolkit_2.72.1.bb +++ b/recipes/opencv/artoolkit_2.72.1.bb @@ -1,7 +1,9 @@ DESCRIPTION = "ARToolKit is a software library that allows for the creation of augmented reality applications. " LICENSE = "GPL/ARToolkit" -DEPENDS = "libxi gstreamer virtual/libx11 freeglut mesa" +DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl" + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \ file://configure.diff;patch=1 \ diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb index d9379333f8..2c2e14c61a 100644 --- a/recipes/openmoko-3rdparty/advancedcaching_git.bb +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.opkg.org/package_268.html" RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" -PV = "0.1.2+gitr${SRCREV}" +PV = "0.1.2+gitr${SRCPV}" SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" diff --git a/recipes/openmoko-projects/om-locations_git.bb b/recipes/openmoko-projects/om-locations_git.bb index b50de38e9e..1d82d25d9f 100644 --- a/recipes/openmoko-projects/om-locations_git.bb +++ b/recipes/openmoko-projects/om-locations_git.bb @@ -4,7 +4,8 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "eet evas edje ecore edbus etk" RDEPENDS_${PN} = "diversity-daemon" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" +PE = "1" PR = "r1.03" SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git" diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index 4b4c9add4a..09c95c63c6 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Paroli" SECTION = "x11" LICENSE = "GPL" -PV = "0.2.1+gitr${SRCREV}" +PV = "0.2.1+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/openmoko-projects/tichy_git.bb b/recipes/openmoko-projects/tichy_git.bb index 4a1ffb500e..80ee4f161b 100644 --- a/recipes/openmoko-projects/tichy_git.bb +++ b/recipes/openmoko-projects/tichy_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Python applets manager" SECTION = "x11" LICENSE = "GPL" DEPENDS += "python-pygame virtual/libsdl libsdl-image python-dbus python-pygobject" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.openmoko.org/git/tichy.git;protocol=git" diff --git a/recipes/openmoocow/openmoocow_git.bb b/recipes/openmoocow/openmoocow_git.bb index ab53313a3f..1071f2afac 100644 --- a/recipes/openmoocow/openmoocow_git.bb +++ b/recipes/openmoocow/openmoocow_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.srcf.ucam.org/~taw27/openmoko/openmoocow/" AUTHOR = "Thomas White" LICENSE = "GPLv3" SECTION = "applications/games" -PV = "0.0.3+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master" diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index 2e7baee496..15ff7eba94 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,13 +4,14 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r16" +INC_PR = "r17" FILESPATHPKG =. "opkg:" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://opkg_unarchive.patch;patch=1;maxrev=201 \ file://opkg-intercept-cleanup.patch;patch=1;maxrev=241 \ + file://dont-install-update-alternatives.patch;patch=1 \ " SRC_URI += "file://configure" diff --git a/recipes/opkg/opkg/dont-install-update-alternatives.patch b/recipes/opkg/opkg/dont-install-update-alternatives.patch new file mode 100644 index 0000000000..4ab7707606 --- /dev/null +++ b/recipes/opkg/opkg/dont-install-update-alternatives.patch @@ -0,0 +1,6 @@ +diff -uNr trunk.orig/utils/Makefile.am trunk/utils/Makefile.am +--- trunk.orig/utils/Makefile.am 2009-10-24 00:55:25.000000000 +0200 ++++ trunk/utils/Makefile.am 2009-11-11 16:56:00.000000000 +0100 +@@ -1 +1 @@ +-bin_SCRIPTS = update-alternatives opkg-key ++bin_SCRIPTS = opkg-key diff --git a/recipes/packagekit/packagekit_0.5.2.bb b/recipes/packagekit/packagekit_0.5.2.bb new file mode 100644 index 0000000000..5cc4d9ecb8 --- /dev/null +++ b/recipes/packagekit/packagekit_0.5.2.bb @@ -0,0 +1,60 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "${IPKG_VARIANT}" + +inherit gnome autotools_stage + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ + " + +PR = "r0" +PE = "2" + +S = "${WORKDIR}/PackageKit-${PV}" + +EXTRA_OECONF = "--with-security-framework=dummy \ + --with-default-backend=opkg \ + --enable-opkg \ + --enable-dummy \ + --disable-networkmanager \ + --disable-connman \ + --disable-tests \ + --disable-qt \ + --disable-gstreamer-plugin \ + --disable-local \ + --disable-strict \ + ac_cv_path_XMLTO=no \ + " + + +do_configure_prepend() { + mkdir -p m4 + echo "EXTRA_DIST=" > gtk-doc.make + sed -i -e s:0\.1\.5:0\.1\.6:g configure.ac +} + +do_configure_append() { + for i in $(find . -name Makefile) ; do + sed -i -e s:${STAGING_DIR_NATIVE}::g \ + -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ + -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ + $i + done +} + + +PACKAGES =+ "${PN}-website" +FILES_${PN}-website = "${datadir}/PackageKit/website" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir}/python*" + +PACKAGES =+ "${PN}-gtkmodule" +FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" + +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" +FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a" diff --git a/recipes/pidgin/msn-pecan_git.bb b/recipes/pidgin/msn-pecan_git.bb index dba7fd77dc..3e724f01ec 100644 --- a/recipes/pidgin/msn-pecan_git.bb +++ b/recipes/pidgin/msn-pecan_git.bb @@ -4,7 +4,7 @@ SECTION = "x11/network" LICENSE="GPL-2" RDEPENDS="pidgin" DEPENDS="pidgin" -PV="0.0.1+gitr${SRCREV}" +PV="0.0.1+gitr${SRCPV}" PR="r0" inherit pkgconfig diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb index 10f99bae0e..7ece33cfdb 100644 --- a/recipes/pingus/pingus_0.7.2.bb +++ b/recipes/pingus/pingus_0.7.2.bb @@ -7,6 +7,9 @@ PR = "r2" ARM_INSTRUCTION_SET = "arm" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + inherit scons SRC_URI = "\ diff --git a/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch new file mode 100644 index 0000000000..1005d78689 --- /dev/null +++ b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch @@ -0,0 +1,13 @@ +Index: libcanberra-0.14/src/alsa.c +=================================================================== +--- libcanberra-0.14.orig/src/alsa.c ++++ libcanberra-0.14/src/alsa.c +@@ -272,7 +272,7 @@ + return translate_error(ret); + } + +-#define BUFSIZE (16*1024) ++#define BUFSIZE (128*1024) + + static void* thread_func(void *userdata) { + struct outstanding *out = userdata; diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index f9388e17cf..85dca9a3fe 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r1" +PR = "r2" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index a0b63069f1..def42e6d0a 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r2" +PR = "r3" inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb index e106653c45..fafdffaf88 100644 --- a/recipes/pyphonelog/pyphonelog_git.bb +++ b/recipes/pyphonelog/pyphonelog_git.bb @@ -8,7 +8,7 @@ RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils" inherit distutils S = "${WORKDIR}/git" -PV = "0.17.0+gitr${SRCREV}" +PV = "0.17.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http" FILES_${PN} += "${datadir}/applications/phonelog.desktop \ diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb index c616a2beed..af79b98bf7 100644 --- a/recipes/python/python-phoneutils_git.bb +++ b/recipes/python/python-phoneutils_git.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" DEPENDS = "libphone-utils python-cython-native python-pyrex-native" RDEPENDS = "libphone-utils" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master" diff --git a/recipes/python/python-pycrypto_2.0.1.bb b/recipes/python/python-pycrypto_2.0.1.bb index 7300bbd60b..a9f3f52e9e 100644 --- a/recipes/python/python-pycrypto_2.0.1.bb +++ b/recipes/python/python-pycrypto_2.0.1.bb @@ -5,6 +5,7 @@ DEPENDS = "gmp" SRCNAME = "pycrypto" LICENSE = "pycrypto" PR = "ml1" +PE = "1" SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pycrypto_git.bb b/recipes/python/python-pycrypto_git.bb index 9e6eecbebd..28fce0d4f9 100644 --- a/recipes/python/python-pycrypto_git.bb +++ b/recipes/python/python-pycrypto_git.bb @@ -6,7 +6,8 @@ SRCNAME = "pycrypto" LICENSE = "pycrypto" PR = "ml0" -PV = "2.0.1+gitr${SRCREV}" +PV = "2.0.1+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.pycrypto.org:9419/crypto/pycrypto-2.x.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/python/python-pyrtc_git.bb b/recipes/python/python-pyrtc_git.bb index af3bcfd5e4..d367cad9ba 100644 --- a/recipes/python/python-pyrtc_git.bb +++ b/recipes/python/python-pyrtc_git.bb @@ -6,7 +6,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" +PE = "1" PR = "ml1" SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb index 719215c5d2..f5ff6b0cdd 100644 --- a/recipes/qt/qt-x11-free_3.3.6.bb +++ b/recipes/qt/qt-x11-free_3.3.6.bb @@ -1,6 +1,6 @@ -DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa" +DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql virtual/libgl" PROVIDES = "qt3x11" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb index 7e430c8024..e218073cce 100644 --- a/recipes/qt/qt-x11-free_3.3.7.bb +++ b/recipes/qt/qt-x11-free_3.3.7.bb @@ -1,6 +1,6 @@ -DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa" +DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql virtual/libgl" PROVIDES = "qt3x11" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/recipes/quake/quetoo_0.6.1.bb b/recipes/quake/quetoo_0.6.1.bb index 33a7075799..b031238da3 100644 --- a/recipes/quake/quetoo_0.6.1.bb +++ b/recipes/quake/quetoo_0.6.1.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims to provide security and performance enhancements." LICENSE = "GPLv2" -DEPENDS = "libsdl-x11 zlib mesa" +DEPENDS = "libsdl-x11 zlib virtual/libgl" SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}.tar.bz2" +PR = "r1" inherit autotools pkgconfig diff --git a/recipes/resolvconf/resolvconf_1.45.bb b/recipes/resolvconf/resolvconf_1.45.bb new file mode 100644 index 0000000000..2c210ef1ec --- /dev/null +++ b/recipes/resolvconf/resolvconf_1.45.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ +information about currently available nameservers. It sets \ +itself up as the intermediary between programs that supply \ +nameserver information and programs that need nameserver \ +information." +SECTION = "console/network" +LICENSE = "GPL" +AUTHOR = "Thomas Hood" +HOMEPAGE = "http://packages.debian.org/resolvconf" +DEPENDS = "bash" +RDEPENDS = "bash" + +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" + +do_compile () { + : +} + +do_install () { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface + install -d ${D}${mandir}/man8 ${D}${docdir}/${P} + cp -pPR etc/* ${D}${sysconfdir}/ + install -m 0755 bin/resolvconf ${D}${base_sbindir}/ + install -m 0644 README ${D}${docdir}/${P}/ + install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ +} + +PACKAGE_ARCH = "all" + diff --git a/recipes/rt-tests/rt-tests_0.28.bb b/recipes/rt-tests/rt-tests_0.28.bb index 4915146538..14df5ddfc7 100644 --- a/recipes/rt-tests/rt-tests_0.28.bb +++ b/recipes/rt-tests/rt-tests_0.28.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest" LICENSE = "GPL" PR = "r1" +PE = "1" SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2" diff --git a/recipes/rt-tests/rt-tests_git.bb b/recipes/rt-tests/rt-tests_git.bb index fbb07911c6..b6b6e4406b 100644 --- a/recipes/rt-tests/rt-tests_git.bb +++ b/recipes/rt-tests/rt-tests_git.bb @@ -5,7 +5,8 @@ PR = "r0" SRCREV = "42ab9e7cd259fae674dc2b2aa2962caaf8f09409" -PV = "0.51+${PR}+gitr${SRCREV}" +PV = "0.51+${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tglx/rt-tests;protocol=git" diff --git a/recipes/sdr/dttsp_svn.bb b/recipes/sdr/dttsp_svn.bb index ac49779a76..ad6079fa3c 100644 --- a/recipes/sdr/dttsp_svn.bb +++ b/recipes/sdr/dttsp_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Software Radio Core" LICENSE = "GPLv3" DEPENDS = "fftwf jack" -PV = "${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" SRCREV = "241" SRC_URI = "svn://206.216.146.154/svn/repos_sdr_linux/branches/ab2kt;module=dttsp-ng" diff --git a/recipes/sdr/sdrshell_svn.bb b/recipes/sdr/sdrshell_svn.bb index 1641aa5668..30d7241f49 100644 --- a/recipes/sdr/sdrshell_svn.bb +++ b/recipes/sdr/sdrshell_svn.bb @@ -6,7 +6,8 @@ DEPENDS = "dttsp" inherit qmake qt3x11 SRCREV = "57" -PV = "${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" SRC_URI = "svn://sdr-shell.googlecode.com/svn/branches;module=sdr-shell-v2;proto=http \ file://gcc-43-fix.patch;patch=1;pnum=0" diff --git a/recipes/serial-utils/pty-forward-native.bb b/recipes/serial-utils/pty-forward-native.bb index c613276645..0c1239f20d 100644 --- a/recipes/serial-utils/pty-forward-native.bb +++ b/recipes/serial-utils/pty-forward-native.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY" AUTHOR = "Holger 'Zecke' Freyther" LICENSE = "GPL" SECTION = "console/network" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git" diff --git a/recipes/serial-utils/serial-forward.bb b/recipes/serial-utils/serial-forward.bb index b03fc597dd..6da2d0df0c 100644 --- a/recipes/serial-utils/serial-forward.bb +++ b/recipes/serial-utils/serial-forward.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Forward a serial using TCP/IP" AUTHOR = "Holger 'Zecke' Freyther'" LICENSE = "GPL" SECTION = "console/devel" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git/;protocol=git" diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index dff37cc083..97b84984b6 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" PR = "r2" COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 28474d4915..36154cef8e 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR config" SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r6" inherit e diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 0c8d75ae3a..3bbfa61dc7 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR applications.menu config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" RCONFLICTS_${PN} = "e-wm-menu" diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb index 6c46ed8558..d2e987eef9 100644 --- a/recipes/shr/e-wm-sysactions-shr_git.bb +++ b/recipes/shr/e-wm-sysactions-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR sysactions config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r4" RPROVIDES_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb index 35da5231f0..e993cb6e37 100644 --- a/recipes/shr/e-wm-theme-illume-gry_git.bb +++ b/recipes/shr/e-wm-theme-illume-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "elementary-theme-gry" LICENCE = "unknown" -PV = "0.3-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb index ed6adf71c0..10a5016758 100644 --- a/recipes/shr/e-wm-theme-illume-neo_git.bb +++ b/recipes/shr/e-wm-theme-illume-neo_git.bb @@ -7,7 +7,7 @@ RDEPENDS = "e-wm" RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENCE = "unknown" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb index 9dfee0b293..76aaf6d23b 100644 --- a/recipes/shr/e-wm-theme-illume-niebiee_git.bb +++ b/recipes/shr/e-wm-theme-illume-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue Illume theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-shr_git.bb b/recipes/shr/e-wm-theme-illume-shr_git.bb index 2c63be670b..af126dc92e 100644 --- a/recipes/shr/e-wm-theme-illume-shr_git.bb +++ b/recipes/shr/e-wm-theme-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-sixteen_git.bb b/recipes/shr/e-wm-theme-illume-sixteen_git.bb index da8895d97f..f164f0fc24 100644 --- a/recipes/shr/e-wm-theme-illume-sixteen_git.bb +++ b/recipes/shr/e-wm-theme-illume-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index 655f377cab..2b1dfaab3c 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-gry" LICENSE = "unknown" -PV = "0.8-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb index 2c1f2f7831..4701c220c6 100644 --- a/recipes/shr/elementary-theme-neo_git.bb +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index 0c99635fc2..1736ad9a7a 100644 --- a/recipes/shr/elementary-theme-niebiee_git.bb +++ b/recipes/shr/elementary-theme-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue elementary theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb index d1045e6498..4eb43af767 100644 --- a/recipes/shr/elementary-theme-sixteen_git.bb +++ b/recipes/shr/elementary-theme-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "elementary SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb index 2279af0e04..2c68bd29da 100644 --- a/recipes/shr/etk-theme-neo_git.bb +++ b/recipes/shr/etk-theme-neo_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb index e05fa56ee4..3a324e9728 100644 --- a/recipes/shr/etk-theme-shr_git.bb +++ b/recipes/shr/etk-theme-shr_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "etk SHR theme" LICENSE = "MIT BSD" -PV = "1.1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb index 3be7ceb9ac..c1d15b18c3 100644 --- a/recipes/shr/frameworkd-config-shr_git.bb +++ b/recipes/shr/frameworkd-config-shr_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" SRCREV_FORMAT = "FSO_REV-SHR_REV" -PV = "0.9.5.9+gitr${SRCREV}" +PV = "0.9.5.9+gitr${SRCPV}" PR = "r7" SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \ diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb index 6415b6a6ec..66caabf1cc 100644 --- a/recipes/shr/gtk-theme-neo_git.bb +++ b/recipes/shr/gtk-theme-neo_git.bb @@ -5,7 +5,7 @@ RDEPENDS += "icon-theme-neo" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb index 1b6c8ae7e2..438ac238c9 100644 --- a/recipes/shr/icon-theme-neo_git.bb +++ b/recipes/shr/icon-theme-neo_git.bb @@ -6,7 +6,7 @@ RDEPENDS = "e-wm" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb index 27dc47bac3..7f7f6b4fe1 100644 --- a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb @@ -5,7 +5,7 @@ RDEPENDS = "libframeworkd-phonegui-efl" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" require libframeworkd-phonegui-efl-theme.inc diff --git a/recipes/shr/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb index 207658f807..cb1feade68 100644 --- a/recipes/shr/libframeworkd-phonegui-efl2_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl2_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "frameworkd EFL phonegui 2" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" SRC_URI = "git://shr.bearstech.com/repo/libframeworkd-phonegui-efl2.git;protocol=http;branch=master" diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb index b24e152364..c4181cf345 100644 --- a/recipes/shr/libframeworkd-phonegui-efl_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.3+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r35" require libframeworkd-phonegui-efl-theme.inc diff --git a/recipes/shr/libframeworkd-phonegui_git.bb b/recipes/shr/libframeworkd-phonegui_git.bb index 50b546512a..aa1f107555 100644 --- a/recipes/shr/libframeworkd-phonegui_git.bb +++ b/recipes/shr/libframeworkd-phonegui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Frameworkd phonegui library" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r10" DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils" diff --git a/recipes/shr/libmodulo_git.bb b/recipes/shr/libmodulo_git.bb index 2e05d7218f..029f928d53 100644 --- a/recipes/shr/libmodulo_git.bb +++ b/recipes/shr/libmodulo_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Modulo is a lightweight component container that supports Inversion Of Control, also commonly called Dependency Injection" SECTION = "libs" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" inherit autotools autotools_stage pkgconfig vala diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index a4519c7f1d..fcc076f237 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR default module for the Phone UI daemon" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r3" SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index 41e159b57e..84b04c5a60 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A generic framework for phone ui" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib" diff --git a/recipes/shr/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb index 7cf26ffec1..e0a2e2c110 100644 --- a/recipes/shr/libphone-utils_git.bb +++ b/recipes/shr/libphone-utils_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "phone-utils library" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" DEPENDS="glib-2.0" diff --git a/recipes/shr/ologicd_git.bb b/recipes/shr/ologicd_git.bb index 58b82dd0ff..105199a582 100644 --- a/recipes/shr/ologicd_git.bb +++ b/recipes/shr/ologicd_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "" SECTION = "libs" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r0" inherit autotools diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb index 8631efce19..e35cbf7649 100644 --- a/recipes/shr/phonefsod_git.bb +++ b/recipes/shr/phonefsod_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-apps_git.bb b/recipes/shr/phoneui-apps_git.bb index a6e3e17aee..a1916df4a0 100644 --- a/recipes/shr/phoneui-apps_git.bb +++ b/recipes/shr/phoneui-apps_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" inherit pkgconfig autotools diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb index 32ad61d765..e786d3e4cd 100644 --- a/recipes/shr/phoneuid_git.bb +++ b/recipes/shr/phoneuid_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-config_git.bb b/recipes/shr/shr-config_git.bb index 60ed586179..cc8d685a27 100644 --- a/recipes/shr/shr-config_git.bb +++ b/recipes/shr/shr-config_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Sebastian Spaeth (see AUTHORS)" LICENSE = "GPLv2" DEPENDS = "vala-native elementary libeflvala" SECTION = "x11/application" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r4" EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi" diff --git a/recipes/shr/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb index 1b9a383130..6cfb87f43b 100644 --- a/recipes/shr/shr-contacts_git.bb +++ b/recipes/shr/shr-contacts_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r6" inherit pkgconfig autotools diff --git a/recipes/shr/shr-dialer_git.bb b/recipes/shr/shr-dialer_git.bb index 796b96592b..f4813141e4 100644 --- a/recipes/shr/shr-dialer_git.bb +++ b/recipes/shr/shr-dialer_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r9" inherit pkgconfig autotools diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb index ca5eb59b0f..331c0f1e6a 100644 --- a/recipes/shr/shr-installer_git.bb +++ b/recipes/shr/shr-installer_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit" SECTION = "x11/application" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r0" inherit setuptools diff --git a/recipes/shr/shr-messages_git.bb b/recipes/shr/shr-messages_git.bb index 6fc0694c29..b821545fac 100644 --- a/recipes/shr/shr-messages_git.bb +++ b/recipes/shr/shr-messages_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r8" inherit pkgconfig autotools diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb index 7d34a7f487..747f6d7df5 100644 --- a/recipes/shr/shr-settings_git.bb +++ b/recipes/shr/shr-settings_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils" SECTION = "x11/application" PE = "1" -PV = "0.1.1+gitr${SRCREV}" +PV = "0.1.1+gitr${SRCPV}" PR = "r7" inherit setuptools diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb index 0276ce81ce..bc29ee5e27 100644 --- a/recipes/shr/shr-specs_git.bb +++ b/recipes/shr/shr-specs_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The SHR DBus API Specification" HOMEPAGE = "http://shr-project.org/" LICENSE = "BSD" SECTION = "devel/specifications" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb index 9c653acdc4..f80df61f67 100644 --- a/recipes/shr/shr-splash-theme-dontpanic_git.bb +++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - DON'T PANIC theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb index 94e2d18878..3890a7f383 100644 --- a/recipes/shr/shr-splash-theme-handy_git.bb +++ b/recipes/shr/shr-splash-theme-handy_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - handy theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-logo_git.bb b/recipes/shr/shr-splash-theme-logo_git.bb index 77ae8d7d25..09ea014e79 100644 --- a/recipes/shr/shr-splash-theme-logo_git.bb +++ b/recipes/shr/shr-splash-theme-logo_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - SHR logo theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb index dfc8524ceb..e16cfa3fb4 100644 --- a/recipes/shr/shr-splash-theme-niebiee_git.bb +++ b/recipes/shr/shr-splash-theme-niebiee_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb index f132c1d7aa..97ef436e6c 100644 --- a/recipes/shr/shr-splash-theme-simple_git.bb +++ b/recipes/shr/shr-splash-theme-simple_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - simple SHR theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-tux_git.bb b/recipes/shr/shr-splash-theme-tux_git.bb index 6f846461b3..743dacd2b4 100644 --- a/recipes/shr/shr-splash-theme-tux_git.bb +++ b/recipes/shr/shr-splash-theme-tux_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - SHR Tux theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb index 5053befbf8..9bf4ca12df 100644 --- a/recipes/shr/shr-splash_git.bb +++ b/recipes/shr/shr-splash_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r4" RRECOMMENDS_${PN} += "\ virtual/shr-splash-theme" diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb index 9a8c8e2d49..04ab37dc63 100644 --- a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb +++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A gtk theme that looks like e17" LICENSE = "MIT BSD" -PV = "0.1.1+gitr${SRCREV}" +PV = "0.1.1+gitr${SRCPV}" PR = "r5" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-theme_git.bb b/recipes/shr/shr-theme_git.bb index 54803107a4..704072f8af 100644 --- a/recipes/shr/shr-theme_git.bb +++ b/recipes/shr/shr-theme_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Standard icon theme for the SHR distribution" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/data" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" inherit autotools diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb index 64393068a7..65bea25739 100644 --- a/recipes/shr/shr-today_git.bb +++ b/recipes/shr/shr-today_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-edje python-dbus python-edbus python-ecore" SECTION = "x11/applications" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r2" inherit distutils diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb index 0ce9ee4415..89f8551aa0 100644 --- a/recipes/tasks/task-boot.bb +++ b/recipes/tasks/task-boot.bb @@ -14,7 +14,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" # Make sure we build the kernel -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel virtual/update-alternatives-native" # # minimal set of packages - needed to boot diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index 099ca1d91b..bea25d6d15 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -23,7 +23,8 @@ SRC_URI_append_armv7a = " \ # Again, no '.' in PWD allowed :( PR = "r37" -PV = "svnr${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" INITSCRIPT_NAME = "gstti-init" diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc index 3aafd47cf1..e723856cc7 100644 --- a/recipes/ti/ti-dmai.inc +++ b/recipes/ti/ti-dmai.inc @@ -11,5 +11,5 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRANCH_BRIJESH_DMAI_DEV_ S = "${WORKDIR}/BRANCH_BRIJESH_DMAI_DEV_2_xx/davinci_multimedia_application_interface" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "svnr${SRCREV}" - +PV = "2.0+svnr${SRCPV}" +PE = "1" diff --git a/recipes/toscoterm/toscoterm_git.bb b/recipes/toscoterm/toscoterm_git.bb index 9826c9e9d1..ce71492e5d 100644 --- a/recipes/toscoterm/toscoterm_git.bb +++ b/recipes/toscoterm/toscoterm_git.bb @@ -3,7 +3,8 @@ SECTION = "x11/applications" LICENSE = "GPLv3" DEPENDS = "vte" HOMEPAGE = "https://projetos.ossystems.com.br/projects/show/toscoterm" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r3" SRC_URI = "git://projetos.ossystems.com.br/git/toscoterm.git;protocol=git" diff --git a/recipes/tzdata/tzdata_2009r.bb b/recipes/tzdata/tzdata_2009r.bb new file mode 100644 index 0000000000..17c2dd4f0c --- /dev/null +++ b/recipes/tzdata/tzdata_2009r.bb @@ -0,0 +1,3 @@ +require tzdata.inc +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" +PR = "${INC_PR}.0" diff --git a/recipes/u-boot/u-boot-omap3_git.bb b/recipes/u-boot/u-boot-omap3_git.bb index b8f95f5744..27c8314655 100644 --- a/recipes/u-boot/u-boot-omap3_git.bb +++ b/recipes/u-boot/u-boot-omap3_git.bb @@ -4,9 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5" -PV = "2008.10+${PR}+gitr${SRCREV}" -PR ="r2" -PE = "1" +PV = "2008.10+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ " diff --git a/recipes/u-boot/u-boot-omap3pandora_git.bb b/recipes/u-boot/u-boot-omap3pandora_git.bb index 77634aa080..4c89ece7a5 100644 --- a/recipes/u-boot/u-boot-omap3pandora_git.bb +++ b/recipes/u-boot/u-boot-omap3pandora_git.bb @@ -7,9 +7,9 @@ SRCREV = "70532c1152662f88ba1e0627c96307d93536508f" PROVIDES = "u-boot" -PV = "pandora+${PR}+gitr${SRCREV}" -PR ="r3" -PE = "1" +PV = "pandora+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=master;protocol=git \ " diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 903aea27b9..bb1e7da6bf 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -3,6 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" INC_PR = "r32" +PE = "1" # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index af0c650190..051e344413 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.30" SRCREV="b364abfd3f728894120996d5da2565614132708f" -PV = "${UCLIBC_BASE}+gitr${SRCREV}" +PV = "${UCLIBC_BASE}+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index d5d6d1ab20..be54ba817d 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.30" SRCREV="8a6a88f5032ccbc3bfb8836c783a55316b156481" -PV = "${UCLIBC_BASE}+gitr${SRCREV}" +PV = "${UCLIBC_BASE}+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb index 40534b4bb4..455831cf1f 100644 --- a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -3,6 +3,8 @@ inherit native PROVIDES += "virtual/update-alternatives-native" +PR = "${INC_PR}.0" + do_stage () { install -d ${sbindir} \ ${libdir}/opkg/alternatives diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc index f23bfe8bb4..2d8fd42c0c 100644 --- a/recipes/update-alternatives/update-alternatives-cworth.inc +++ b/recipes/update-alternatives/update-alternatives-cworth.inc @@ -1,7 +1,8 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://update-alternatives.use.last.patch;patch=1" S = "${WORKDIR}/ipkg/C" PACKAGE_ARCH = "all" -PR = "r1" +INC_PR = "r3" diff --git a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch new file mode 100644 index 0000000000..7bd5bd268b --- /dev/null +++ b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch @@ -0,0 +1,34 @@ +diff -uNr C.orig/update-alternatives C/update-alternatives +--- C.orig/update-alternatives 2003-03-28 17:39:45.000000000 +0100 ++++ C/update-alternatives 2009-09-17 16:46:59.000000000 +0200 +@@ -97,8 +97,8 @@ + + ## path=`sed -ne "1!p" $ad/$name | sort -nr -k2 | head -1 | sed 's/ .*//'` + ## busybox safe: +- path=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/[^ ]* //'` +- if [ -z "$path" ]; then ++ prio=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/ [^ ]*$//'` ++ if [ -z "$prio" ]; then + echo "update-alternatives: removing $link as no more alternatives exist for it" + rm $ad/$name + if [ -L $link ]; then +@@ -107,11 +107,19 @@ + return 0 + fi + ++ ## find last line with highest priority ++ path=`grep "${prio}$" $ad/$name | tail -n 1 | sed 's/ [^ ]*$//'` ++ + if [ ! -e $link -o -L $link ]; then + local link_dir=`dirname $link` + if [ ! -d $link_dir ]; then + mkdir -p $link_dir + fi ++ if [ -h $link -a -d $link ]; then ++ # if $link exists and the target is directory, than ln -sf $path $link, doesn't replace link to that directory, but creates new link inside ++ echo "update-alternatives: Removing $link" ++ rm -f $link ++ fi + ln -sf $path $link + echo "update-alternatives: Linking $link to $path" + else diff --git a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb index 6cab1e55ec..b95d6d5ff2 100644 --- a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -2,6 +2,8 @@ require update-alternatives-cworth.inc RPROVIDES_${PN} = "update-alternatives" +PR="${INC_PR}.0" + do_install () { install -d ${D}${sbindir} \ ${D}${sysconfdir}/alternatives \ diff --git a/recipes/usbmode/usbmode.bb b/recipes/usbmode/usbmode.bb new file mode 100644 index 0000000000..f68fc759b3 --- /dev/null +++ b/recipes/usbmode/usbmode.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Freerunner USB Mode Control Program" +RDEPENDS += "python python-pygtk" +LICENSE = "GPL" +HOMEPAGE = http://techiem2.net/index.php?/archives/10-Freerunner-USB-Mode-Control-Program.html" +SECTION = "x11/games" +PV = "1.0" + +SRC_URI = "\ + http://www.techiem2.net/files/usbmode.tar.gz \ +" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/usbmode.desktop ${D}${datadir}/applications + install -m 0755 ${S}/usbmode.py ${D}${bindir}/usbmode.py +} + +FILES_${PN} = "${bindir}/usbmode.py ${datadir}/applications/usbmode.desktop" + diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 8129c53e0d..14661764b7 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses virtual/libintl" +DEPENDS = "blktool udev zlib ncurses virtual/libintl" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/vagalume/files/index.theme b/recipes/vagalume/files/index.theme new file mode 100644 index 0000000000..453acf0586 --- /dev/null +++ b/recipes/vagalume/files/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=Vagalume +Comment=Vagalume icons +Directories=scalable/actions + +[scalable/actions] +Size=48 +Type=Scalable diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb index 5b29ae17b6..6ef0d19829 100644 --- a/recipes/vagalume/vagalume_0.7.1.bb +++ b/recipes/vagalume/vagalume_0.7.1.bb @@ -2,13 +2,20 @@ DESCRIPTION = "Last.fm client" AUTHOR = "agarcia@igalia.com" HOMEPAGE = "http://vagalume.igalia.com/" SECTION = "x11" -DEPENDS = "gtk+ gstreamer" +DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" +RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS = "dbus-x11" +PR = "r2" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ + file://index.theme \ " S = "${WORKDIR}/vagalume-${PV}.orig" inherit autotools FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + +do_install_append() { + install -m 0644 ${WORKDIR}/index.theme ${D}${datadir}/vagalume/icons/hicolor +} diff --git a/recipes/vala-terminal/vala-terminal_git.bb b/recipes/vala-terminal/vala-terminal_git.bb index 5bc4c79cb2..953d3431b0 100644 --- a/recipes/vala-terminal/vala-terminal_git.bb +++ b/recipes/vala-terminal/vala-terminal_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala." SECTION = "x11/applications" DEPENDS = "vala-native vte" -PV = "1.1.1+gitr${SRCREV}" +PV = "1.1.1+gitr${SRCPV}" +PE = "1" PR = "r0" inherit autotools diff --git a/recipes/vlc/vlc-davinci_0.8.6h.bb b/recipes/vlc/vlc-davinci_0.8.6h.bb index 71520bbb9b..4477330c0c 100644 --- a/recipes/vlc/vlc-davinci_0.8.6h.bb +++ b/recipes/vlc/vlc-davinci_0.8.6h.bb @@ -8,7 +8,8 @@ SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c" PR = "r6" -PV = "0.8.6h+${PR}+gitr${SRCREV}" +PV = "0.8.6h+${PR}+gitr${SRCPV}" +PE = "1" DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb index 6dca9e049c..b23a4a869c 100644 --- a/recipes/webkit/webkit-efl_git.bb +++ b/recipes/webkit/webkit-efl_git.bb @@ -4,7 +4,7 @@ DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \ libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl \ sqlite3 libxslt gperf-native libxt" -PV = "1.1.11+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r1" SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master" diff --git a/recipes/x-load/x-load-omap3pandora_git.bb b/recipes/x-load/x-load-omap3pandora_git.bb index c19b719592..ea4c80c012 100644 --- a/recipes/x-load/x-load-omap3pandora_git.bb +++ b/recipes/x-load/x-load-omap3pandora_git.bb @@ -8,9 +8,9 @@ SRCREV = "ea866e76420f629614ae3fc828f1525a77e051e8" PROVIDES = "x-load" -PV = "1.42+${PR}+gitr${SRCREV}" -PR ="r1" -PE = "1" +PV = "1.42+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://git.openpandora.org/pandora-x-loader.git;branch=master;protocol=git" diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 0e0e603cb8..ceee39a877 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -7,9 +7,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE SRCREV = "319b26586fafb86f919f514bcd175838aaab96b3" -PV = "1.42+${PR}+gitr${SRCREV}" -PR ="r8" -PE = "1" +PV = "1.42+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git" diff --git a/recipes/xcb/libpthread-stubs_0.2.bb b/recipes/xcb/libpthread-stubs_0.2.bb new file mode 100644 index 0000000000..9614a74a68 --- /dev/null +++ b/recipes/xcb/libpthread-stubs_0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "This library provides weak aliases for pthread functions \ +not provided in libc or otherwise available by default." +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +PARALLEL_MAKE = "" +#DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/recipes/xorg-app/appres_1.0.2.bb b/recipes/xorg-app/appres_1.0.2.bb new file mode 100644 index 0000000000..4b6447a82e --- /dev/null +++ b/recipes/xorg-app/appres_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "The appres program prints the resources seen by an application." + +DEPENDS += " virtual/libx11 libxt" + diff --git a/recipes/xorg-app/bdftopcf-native_1.0.2.bb b/recipes/xorg-app/bdftopcf-native_1.0.2.bb new file mode 100644 index 0000000000..41049946e5 --- /dev/null +++ b/recipes/xorg-app/bdftopcf-native_1.0.2.bb @@ -0,0 +1,8 @@ +inherit native +require xorg-app-common.inc +PE = "1" + +XORG_PN = "bdftopcf" + +DEPENDS = "libxfont-native" + diff --git a/recipes/xorg-app/bdftopcf_1.0.2.bb b/recipes/xorg-app/bdftopcf_1.0.2.bb new file mode 100644 index 0000000000..6af52c9783 --- /dev/null +++ b/recipes/xorg-app/bdftopcf_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "converts BDF fonts to PCF fonts" + +DEPENDS += " libxfont" + diff --git a/recipes/xorg-app/bitmap_1.0.4.bb b/recipes/xorg-app/bitmap_1.0.4.bb new file mode 100644 index 0000000000..561489f188 --- /dev/null +++ b/recipes/xorg-app/bitmap_1.0.4.bb @@ -0,0 +1,3 @@ +require xorg-app-common.inc +DEPENDS += " virtual/libx11 libxmu xbitmaps libxt" +PE = "1" diff --git a/recipes/xorg-app/constype_1.0.2.bb b/recipes/xorg-app/constype_1.0.2.bb new file mode 100644 index 0000000000..96b340c8c7 --- /dev/null +++ b/recipes/xorg-app/constype_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "print an X window dump" +DEPENDS += " libxmu virtual/libx11" +PE = "1" diff --git a/recipes/xorg-app/editres_1.0.4.bb b/recipes/xorg-app/editres_1.0.4.bb new file mode 100644 index 0000000000..a307941b3a --- /dev/null +++ b/recipes/xorg-app/editres_1.0.4.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxt libxmu libxaw" + diff --git a/recipes/xorg-app/iceauth_1.0.3.bb b/recipes/xorg-app/iceauth_1.0.3.bb new file mode 100644 index 0000000000..9b5ea948b2 --- /dev/null +++ b/recipes/xorg-app/iceauth_1.0.3.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "a tool for manipulating ICE protocol authorization records" + +DEPENDS += " libice" + diff --git a/recipes/xorg-app/lbxproxy_1.0.2.bb b/recipes/xorg-app/lbxproxy_1.0.2.bb new file mode 100644 index 0000000000..1303947c27 --- /dev/null +++ b/recipes/xorg-app/lbxproxy_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \ +extension to X (LBX) must make their connections to an lbxproxy." + +DEPENDS += " xtrans libxext liblbxutil virtual/libx11 libice xproxymngproto bigreqsproto zlib" diff --git a/recipes/xorg-app/luit_1.0.4.bb b/recipes/xorg-app/luit_1.0.4.bb new file mode 100644 index 0000000000..01645af9e0 --- /dev/null +++ b/recipes/xorg-app/luit_1.0.4.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals" +DEPENDS += " zlib zlib virtual/libx11 libfontenc" +PE = "1" diff --git a/recipes/xorg-app/mkcomposecache_1.2.1.bb b/recipes/xorg-app/mkcomposecache_1.2.1.bb new file mode 100644 index 0000000000..5c80f67ccd --- /dev/null +++ b/recipes/xorg-app/mkcomposecache_1.2.1.bb @@ -0,0 +1,3 @@ +require xorg-app-common.inc + +DESCRIPTION = "used for creating global (system-wide) Compose cache files" diff --git a/recipes/xorg-app/mkfontdir-native_1.0.5.bb b/recipes/xorg-app/mkfontdir-native_1.0.5.bb new file mode 100644 index 0000000000..645379e23f --- /dev/null +++ b/recipes/xorg-app/mkfontdir-native_1.0.5.bb @@ -0,0 +1,8 @@ +inherit native + +require mkfontdir_1.0.4.bb + +DEPENDS = "util-macros-native mkfontscale-native" + +S = "${WORKDIR}/mkfontdir-${PV}" +XORG_PN = "mkfontdir" diff --git a/recipes/xorg-app/mkfontdir_1.0.5.bb b/recipes/xorg-app/mkfontdir_1.0.5.bb new file mode 100644 index 0000000000..601278dcb3 --- /dev/null +++ b/recipes/xorg-app/mkfontdir_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "a program to create an index of X font files in a directory" + +PE = "1" + +RDEPENDS += "mkfontscale" + diff --git a/recipes/xorg-app/mkfontscale-native_1.0.7.bb b/recipes/xorg-app/mkfontscale-native_1.0.7.bb new file mode 100644 index 0000000000..bae3416b67 --- /dev/null +++ b/recipes/xorg-app/mkfontscale-native_1.0.7.bb @@ -0,0 +1,7 @@ +inherit native +require mkfontscale_${PV}.bb + +DEPENDS = "libx11-native libfontenc-native freetype-native" + +S="${WORKDIR}/mkfontscale-${PV}" +XORG_PN="mkfontscale" diff --git a/recipes/xorg-app/mkfontscale_1.0.7.bb b/recipes/xorg-app/mkfontscale_1.0.7.bb new file mode 100644 index 0000000000..126918b065 --- /dev/null +++ b/recipes/xorg-app/mkfontscale_1.0.7.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "a program to create an index of scalable font files for X" + +DEPENDS += " zlib libfontenc freetype virtual/libx11" diff --git a/recipes/xorg-app/rstart_1.0.3.bb b/recipes/xorg-app/rstart_1.0.3.bb new file mode 100644 index 0000000000..aafaddcf4b --- /dev/null +++ b/recipes/xorg-app/rstart_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11" + diff --git a/recipes/xorg-app/sessreg_1.0.5.bb b/recipes/xorg-app/sessreg_1.0.5.bb new file mode 100644 index 0000000000..bd81532513 --- /dev/null +++ b/recipes/xorg-app/sessreg_1.0.5.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "a simple program for managing utmp/wtmp entries" + +DEPENDS += " virtual/libx11" + diff --git a/recipes/xorg-app/setxkbmap_1.1.0.bb b/recipes/xorg-app/setxkbmap_1.1.0.bb new file mode 100644 index 0000000000..9b97cf437a --- /dev/null +++ b/recipes/xorg-app/setxkbmap_1.1.0.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/recipes/xorg-app/smproxy_1.0.3.bb b/recipes/xorg-app/smproxy_1.0.3.bb new file mode 100644 index 0000000000..64b4ec320d --- /dev/null +++ b/recipes/xorg-app/smproxy_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxt libxmu" + diff --git a/recipes/xorg-app/x11perf_1.5.1.bb b/recipes/xorg-app/x11perf_1.5.1.bb new file mode 100644 index 0000000000..00b78c134c --- /dev/null +++ b/recipes/xorg-app/x11perf_1.5.1.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X11 server performance test program" +DEPENDS += "libxmu libxrender libxft libxext fontconfig" +PE = "1" + +FILES_${PN} += "/usr/lib/X11/x11perfcomp/*" diff --git a/recipes/xorg-app/xauth_1.0.4.bb b/recipes/xorg-app/xauth_1.0.4.bb new file mode 100644 index 0000000000..e3cd44cec1 --- /dev/null +++ b/recipes/xorg-app/xauth_1.0.4.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "X authority file utility" +DEPENDS += "libxau libxext libxmu" +PE = "1" diff --git a/recipes/xorg-app/xbacklight_1.1.1.bb b/recipes/xorg-app/xbacklight_1.1.1.bb new file mode 100644 index 0000000000..ab911de04a --- /dev/null +++ b/recipes/xorg-app/xbacklight_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "adjust backlight brightness using RandR extension" + +DEPENDS += " virtual/libx11 libxrender libxrandr" diff --git a/recipes/xorg-app/xclipboard_1.1.0.bb b/recipes/xorg-app/xclipboard_1.1.0.bb new file mode 100644 index 0000000000..2bdb000c5d --- /dev/null +++ b/recipes/xorg-app/xclipboard_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxt" + diff --git a/recipes/xorg-app/xclock_1.0.4.bb b/recipes/xorg-app/xclock_1.0.4.bb new file mode 100644 index 0000000000..0e73c6408f --- /dev/null +++ b/recipes/xorg-app/xclock_1.0.4.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +DESCRIPTION = "analog / digital clock for X" +DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt" +PE = "1" diff --git a/recipes/xorg-app/xcmsdb_1.0.2.bb b/recipes/xorg-app/xcmsdb_1.0.2.bb new file mode 100644 index 0000000000..aafaddcf4b --- /dev/null +++ b/recipes/xorg-app/xcmsdb_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11" + diff --git a/recipes/xorg-app/xcompmgr_1.1.5.bb b/recipes/xorg-app/xcompmgr_1.1.5.bb new file mode 100644 index 0000000000..45f74d33f2 --- /dev/null +++ b/recipes/xorg-app/xcompmgr_1.1.5.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Compositing Manager" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS += "libxdamage libxcomposite libxrender" diff --git a/recipes/xorg-app/xcursorgen-native_1.0.3.bb b/recipes/xorg-app/xcursorgen-native_1.0.3.bb new file mode 100644 index 0000000000..0cbf9fc716 --- /dev/null +++ b/recipes/xorg-app/xcursorgen-native_1.0.3.bb @@ -0,0 +1,7 @@ +inherit native +require xcursorgen_${PV}.bb + +DEPENDS = "libx11-native libpng-native" + +S="${WORKDIR}/xcursorgen-${PV}" +XORG_PN="xcursorgen" diff --git a/recipes/xorg-app/xcursorgen_1.0.3.bb b/recipes/xorg-app/xcursorgen_1.0.3.bb new file mode 100644 index 0000000000..98e619e99a --- /dev/null +++ b/recipes/xorg-app/xcursorgen_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +DESCRIPTION = "create an X cursor file from a collection of PNG images" +DEPENDS += " virtual/libx11 libxcursor libpng" +PE = "1" diff --git a/recipes/xorg-app/xdm_1.1.9.bb b/recipes/xorg-app/xdm_1.1.9.bb new file mode 100644 index 0000000000..eb153b1da9 --- /dev/null +++ b/recipes/xorg-app/xdm_1.1.9.bb @@ -0,0 +1,10 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "X display manager" + +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw" + +EXTRA_OECONF += " --with-random-device=/dev/urandom" + +FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*" diff --git a/recipes/xorg-app/xdpyinfo_1.1.0.bb b/recipes/xorg-app/xdpyinfo_1.1.0.bb new file mode 100644 index 0000000000..2ecd1a6709 --- /dev/null +++ b/recipes/xorg-app/xdpyinfo_1.1.0.bb @@ -0,0 +1,10 @@ +require xorg-app-common.inc + +DESCRIPTION = "X display information utility" +LICENSE = "MIT" +DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau" +PE = "1" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +EXTRA_OECONF = "--disable-xkb" diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb index 42541cd22d..7198a794d8 100644 --- a/recipes/xorg-app/xdriinfo_1.0.1.bb +++ b/recipes/xorg-app/xdriinfo_1.0.1.bb @@ -1,5 +1,5 @@ require xorg-app-common.inc PE = "1" -DEPENDS += " virtual/libx11 glproto mesa" +DEPENDS += " virtual/libx11 glproto virtual/libgl" diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb index 3d1c9e9613..b995e91753 100644 --- a/recipes/xorg-app/xdriinfo_1.0.2.bb +++ b/recipes/xorg-app/xdriinfo_1.0.2.bb @@ -1,4 +1,4 @@ require xorg-app-common.inc DESCRIPTION = "query configuration information of DRI drivers" -DEPENDS += " virtual/libx11 glproto mesa" +DEPENDS += " virtual/libx11 glproto virtual/libgl" PE = "1" diff --git a/recipes/xorg-app/xdriinfo_1.0.3.bb b/recipes/xorg-app/xdriinfo_1.0.3.bb new file mode 100644 index 0000000000..b995e91753 --- /dev/null +++ b/recipes/xorg-app/xdriinfo_1.0.3.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +DESCRIPTION = "query configuration information of DRI drivers" +DEPENDS += " virtual/libx11 glproto virtual/libgl" +PE = "1" diff --git a/recipes/xorg-app/xedit_1.1.2.bb b/recipes/xorg-app/xedit_1.1.2.bb new file mode 100644 index 0000000000..e98f981c95 --- /dev/null +++ b/recipes/xorg-app/xedit_1.1.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxprintutil libxp libxt" + diff --git a/recipes/xorg-app/xev_1.0.4.bb b/recipes/xorg-app/xev_1.0.4.bb new file mode 100644 index 0000000000..b7a4070a8f --- /dev/null +++ b/recipes/xorg-app/xev_1.0.4.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Event Viewer" +LICENSE = "MIT" +PE = "1" + +SRC_URI += "file://diet-x11.patch;patch=1" diff --git a/recipes/xorg-app/xeyes_1.0.991.bb b/recipes/xorg-app/xeyes_1.0.991.bb new file mode 100644 index 0000000000..07ce0724fa --- /dev/null +++ b/recipes/xorg-app/xeyes_1.0.991.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" diff --git a/recipes/xorg-app/xfs_1.1.0.bb b/recipes/xorg-app/xfs_1.1.0.bb new file mode 100644 index 0000000000..8cef4bda9a --- /dev/null +++ b/recipes/xorg-app/xfs_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "X fontserver" +DEPENDS += " libfs libxfont xtrans" +PE = "1" diff --git a/recipes/xorg-app/xgamma_1.0.3.bb b/recipes/xorg-app/xgamma_1.0.3.bb new file mode 100644 index 0000000000..e5d479aa81 --- /dev/null +++ b/recipes/xorg-app/xgamma_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "Alter a monitor's gamma correction through the X server" +DEPENDS += " virtual/libx11 libxxf86vm" +PE = "1" diff --git a/recipes/xorg-app/xgc_1.0.2.bb b/recipes/xorg-app/xgc_1.0.2.bb new file mode 100644 index 0000000000..2bdb000c5d --- /dev/null +++ b/recipes/xorg-app/xgc_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxt" + diff --git a/recipes/xorg-app/xhost_1.0.3.bb b/recipes/xorg-app/xhost_1.0.3.bb new file mode 100644 index 0000000000..af5beadd79 --- /dev/null +++ b/recipes/xorg-app/xhost_1.0.3.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "Server access control program for X" +LICENSE = "MIT" +DEPENDS += "libxmu libxau" +PE = "1" diff --git a/recipes/xorg-app/xinit_1.1.1.bb b/recipes/xorg-app/xinit_1.1.1.bb new file mode 100644 index 0000000000..ce82fb05d4 --- /dev/null +++ b/recipes/xorg-app/xinit_1.1.1.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Window System initializer" +PE = "1" + +FILES_${PN} += "${libdir}X11/xinit" diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb new file mode 100644 index 0000000000..ce82fb05d4 --- /dev/null +++ b/recipes/xorg-app/xinit_1.2.0.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Window System initializer" +PE = "1" + +FILES_${PN} += "${libdir}X11/xinit" diff --git a/recipes/xorg-app/xinput_1.5.0.bb b/recipes/xorg-app/xinput_1.5.0.bb new file mode 100644 index 0000000000..a95753c1f9 --- /dev/null +++ b/recipes/xorg-app/xinput_1.5.0.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc + +DESCRIPTION = "a utility to configure and test XInput devices" +DEPENDS += " libxi" diff --git a/recipes/xorg-app/xkbcomp-native_1.1.1.bb b/recipes/xorg-app/xkbcomp-native_1.1.1.bb new file mode 100644 index 0000000000..ee7c25c407 --- /dev/null +++ b/recipes/xorg-app/xkbcomp-native_1.1.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." + +SECTION = "x11/applications" +LICENSE = "MIT-X" +S="${WORKDIR}/xkbcomp-${PV}" + +DEPENDS = "libx11-native libxkbfile-native" + +SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2" + +inherit native autotools pkgconfig diff --git a/recipes/xorg-app/xkbcomp_1.1.1.bb b/recipes/xorg-app/xkbcomp_1.1.1.bb new file mode 100644 index 0000000000..ca6cdb8898 --- /dev/null +++ b/recipes/xorg-app/xkbcomp_1.1.1.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." + +DEPENDS += " virtual/libx11 libxkbfile" diff --git a/recipes/xorg-app/xkbevd_1.1.0.bb b/recipes/xorg-app/xkbevd_1.1.0.bb new file mode 100644 index 0000000000..27bbe169ef --- /dev/null +++ b/recipes/xorg-app/xkbevd_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/recipes/xorg-app/xkbprint_1.0.2.bb b/recipes/xorg-app/xkbprint_1.0.2.bb new file mode 100644 index 0000000000..27bbe169ef --- /dev/null +++ b/recipes/xorg-app/xkbprint_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxkbfile virtual/libx11" + diff --git a/recipes/xorg-app/xkbutils_1.0.2.bb b/recipes/xorg-app/xkbutils_1.0.2.bb new file mode 100644 index 0000000000..15ce7e6011 --- /dev/null +++ b/recipes/xorg-app/xkbutils_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +#DESCRIPTION = "" + +DEPENDS += " libxaw libxkbfile virtual/libx11" + diff --git a/recipes/xorg-app/xkill_1.0.2.bb b/recipes/xorg-app/xkill_1.0.2.bb new file mode 100644 index 0000000000..e539dad1a2 --- /dev/null +++ b/recipes/xorg-app/xkill_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxmu" + diff --git a/recipes/xorg-app/xlsatoms_1.0.2.bb b/recipes/xorg-app/xlsatoms_1.0.2.bb new file mode 100644 index 0000000000..e539dad1a2 --- /dev/null +++ b/recipes/xorg-app/xlsatoms_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxmu" + diff --git a/recipes/xorg-app/xlsclients_1.0.2.bb b/recipes/xorg-app/xlsclients_1.0.2.bb new file mode 100644 index 0000000000..e539dad1a2 --- /dev/null +++ b/recipes/xorg-app/xlsclients_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxmu" + diff --git a/recipes/xorg-app/xmag_1.0.3.bb b/recipes/xorg-app/xmag_1.0.3.bb new file mode 100644 index 0000000000..4c1359427f --- /dev/null +++ b/recipes/xorg-app/xmag_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "magnify parts of the screen" +DEPENDS += " libxaw libxt" +PE = "1" diff --git a/recipes/xorg-app/xman_1.1.0.bb b/recipes/xorg-app/xman_1.1.0.bb new file mode 100644 index 0000000000..e4e6bff80f --- /dev/null +++ b/recipes/xorg-app/xman_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "manual page browser for X" +DEPENDS += " libxaw libxprintutil libxp libxt" +RDEPENDS = " man" +PE = "1" + +FILES_${PN} += " /usr/share/X11/xman.help" diff --git a/recipes/xorg-app/xmodmap_1.0.4.bb b/recipes/xorg-app/xmodmap_1.0.4.bb new file mode 100644 index 0000000000..4b031293a2 --- /dev/null +++ b/recipes/xorg-app/xmodmap_1.0.4.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +LICENSE = "MIT" +PE = "1" diff --git a/recipes/xorg-app/xpr_1.0.3.bb b/recipes/xorg-app/xpr_1.0.3.bb new file mode 100644 index 0000000000..96b340c8c7 --- /dev/null +++ b/recipes/xorg-app/xpr_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "print an X window dump" +DEPENDS += " libxmu virtual/libx11" +PE = "1" diff --git a/recipes/xorg-app/xprop_1.1.0.bb b/recipes/xorg-app/xprop_1.1.0.bb new file mode 100644 index 0000000000..1781fb1a1b --- /dev/null +++ b/recipes/xorg-app/xprop_1.1.0.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc +PE = "1" + +DESCRIPTION = "a property displayer for X" + +DEPENDS += " libxmu virtual/libx11" diff --git a/recipes/xorg-app/xrandr_1.3.2.bb b/recipes/xorg-app/xrandr_1.3.2.bb new file mode 100644 index 0000000000..05ef6af95d --- /dev/null +++ b/recipes/xorg-app/xrandr_1.3.2.bb @@ -0,0 +1,8 @@ +require xorg-app-common.inc + +DESCRIPTION = "X Resize and Rotate extension command." +LICENSE= "BSD-X" +DEPENDS += "libxrandr libxrender" +PE = "1" + +SRC_URI += "file://resolve_symbol_clash.patch;patch=1" diff --git a/recipes/xorg-app/xrdb_1.0.6.bb b/recipes/xorg-app/xrdb_1.0.6.bb new file mode 100644 index 0000000000..177d3ab23b --- /dev/null +++ b/recipes/xorg-app/xrdb_1.0.6.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "X server resource database utility" +LICENSE = "xrdb" +DEPENDS += "libxmu" +PE = "1" diff --git a/recipes/xorg-app/xrefresh_1.0.3.bb b/recipes/xorg-app/xrefresh_1.0.3.bb new file mode 100644 index 0000000000..aafaddcf4b --- /dev/null +++ b/recipes/xorg-app/xrefresh_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11" + diff --git a/recipes/xorg-app/xrx_1.0.3.bb b/recipes/xorg-app/xrx_1.0.3.bb new file mode 100644 index 0000000000..cf18e2e140 --- /dev/null +++ b/recipes/xorg-app/xrx_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau" + diff --git a/recipes/xorg-app/xset_1.1.0.bb b/recipes/xorg-app/xset_1.1.0.bb new file mode 100644 index 0000000000..fa2e4c25a2 --- /dev/null +++ b/recipes/xorg-app/xset_1.1.0.bb @@ -0,0 +1,11 @@ +require xorg-app-common.inc + +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" +PE = "1" + +SRC_URI += "file://disable-xkb.patch;patch=1" + +CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--disable-xkb" diff --git a/recipes/xorg-app/xsetroot_1.0.3.bb b/recipes/xorg-app/xsetroot_1.0.3.bb new file mode 100644 index 0000000000..0f63feb79f --- /dev/null +++ b/recipes/xorg-app/xsetroot_1.0.3.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc + +DESCRIPTION = "Sets the visual appearance of the X root window" +LICENSE = "MIT" +DEPENDS += "libxmu xbitmaps" +PE = "1" diff --git a/recipes/xorg-app/xvinfo_1.1.0.bb b/recipes/xorg-app/xvinfo_1.1.0.bb new file mode 100644 index 0000000000..ac27f13f34 --- /dev/null +++ b/recipes/xorg-app/xvinfo_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc + +DESCRIPTION = "Print out X-Video extension adaptor information" +DEPENDS += " libxv" +PE = "1" diff --git a/recipes/xorg-app/xwd_1.0.3.bb b/recipes/xorg-app/xwd_1.0.3.bb new file mode 100644 index 0000000000..7b712390c6 --- /dev/null +++ b/recipes/xorg-app/xwd_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxmu virtual/libx11" + diff --git a/recipes/xorg-app/xwininfo_1.0.5.bb b/recipes/xorg-app/xwininfo_1.0.5.bb new file mode 100644 index 0000000000..069dd30aa8 --- /dev/null +++ b/recipes/xorg-app/xwininfo_1.0.5.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxmu libxext virtual/libx11" + diff --git a/recipes/xorg-app/xwud_1.0.2.bb b/recipes/xorg-app/xwud_1.0.2.bb new file mode 100644 index 0000000000..aafaddcf4b --- /dev/null +++ b/recipes/xorg-app/xwud_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11" + diff --git a/recipes/xorg-data/xbitmaps_1.1.0.bb b/recipes/xorg-data/xbitmaps_1.1.0.bb new file mode 100644 index 0000000000..6e5d7fe5ba --- /dev/null +++ b/recipes/xorg-data/xbitmaps_1.1.0.bb @@ -0,0 +1,6 @@ +require xorg-data-common.inc + +DESCRIPTION = "Common X11 Bitmaps" +LICENSE = "MIT" +DEPENDS += "libxmu" + diff --git a/recipes/xorg-data/xcursor-themes_1.0.2.bb b/recipes/xorg-data/xcursor-themes_1.0.2.bb new file mode 100644 index 0000000000..1107d08da9 --- /dev/null +++ b/recipes/xorg-data/xcursor-themes_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-data-common.inc +PE = "1" + +DEPENDS += " libxcursor xcursorgen-native" + +FILES_${PN} += "${datadir}/icons" + diff --git a/recipes/xorg-doc/xorg-docs_1.5.bb b/recipes/xorg-doc/xorg-docs_1.5.bb new file mode 100644 index 0000000000..6b5cbad5f5 --- /dev/null +++ b/recipes/xorg-doc/xorg-docs_1.5.bb @@ -0,0 +1,12 @@ +require xorg-doc-common.inc + +DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \ +source tree." + +DEPENDS += " intltool" + +PE = "1" + +FILES_${PN} += " /usr/share/X11/doc" + +EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " diff --git a/recipes/xorg-doc/xorg-sgml-doctools_1.3.bb b/recipes/xorg-doc/xorg-sgml-doctools_1.3.bb new file mode 100644 index 0000000000..053ca2eaaa --- /dev/null +++ b/recipes/xorg-doc/xorg-sgml-doctools_1.3.bb @@ -0,0 +1,4 @@ +require xorg-doc-common.inc +PE = "1" + +FILES_${PN} += " /usr/share/X11/sgml" diff --git a/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb b/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb new file mode 100644 index 0000000000..c993bc7718 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-acecad_1.4.0.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- AceCad input driver" +PE = "1" + diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb b/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb new file mode 100644 index 0000000000..34a497438b --- /dev/null +++ b/recipes/xorg-driver/xf86-input-aiptek_1.3.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-input.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-citron_2.2.2.bb b/recipes/xorg-driver/xf86-input-citron_2.2.2.bb new file mode 100644 index 0000000000..4c449b12d7 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-citron_2.2.2.bb @@ -0,0 +1,5 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X Server -- Citron input driver" +PE = "1" + diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb b/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb new file mode 100644 index 0000000000..311caf6553 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-fpit_1.3.0.bb @@ -0,0 +1,3 @@ +require xorg-driver-input.inc +PE = "1" + diff --git a/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb b/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb new file mode 100644 index 0000000000..311caf6553 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-hyperpen_1.3.0.bb @@ -0,0 +1,3 @@ +require xorg-driver-input.inc +PE = "1" + diff --git a/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb b/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb new file mode 100644 index 0000000000..a53297fd8a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-joystick_1.4.99.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- joystick input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb new file mode 100644 index 0000000000..a53297fd8a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-joystick_1.5.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- joystick input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb b/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb new file mode 100644 index 0000000000..28a834a274 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-keyboard_1.4.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- keyboard input driver" + +DEPENDS += " kbproto" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb b/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-mouse_1.5.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb b/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb new file mode 100644 index 0000000000..cce8e75524 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-mutouch_1.2.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- muTouch input driver" diff --git a/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb b/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb new file mode 100644 index 0000000000..1ed62d4cad --- /dev/null +++ b/recipes/xorg-driver/xf86-input-penmount_1.4.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- Penmount input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.5.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.5.bb new file mode 100644 index 0000000000..7a433df2a6 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.6.5.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" + +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/recipes/xorg-driver/xf86-input-void_1.3.0.bb b/recipes/xorg-driver/xf86-input-void_1.3.0.bb new file mode 100644 index 0000000000..2fa7021d95 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-void_1.3.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- void input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-apm_1.2.2.bb b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb new file mode 100644 index 0000000000..1cef0fbb55 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-apm_1.2.2.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "This is the Alliance Promotion driver for XFree86 4.0+" + +DEPENDS += " xf86rushproto" + +SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" diff --git a/recipes/xorg-driver/xf86-video-ark_0.7.2.bb b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb new file mode 100644 index 0000000000..f62f5a3586 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ark_0.7.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- ark display driver" + +SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" diff --git a/recipes/xorg-driver/xf86-video-ast_0.89.9.bb b/recipes/xorg-driver/xf86-video-ast_0.89.9.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ast_0.89.9.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-ati_6.12.4.bb b/recipes/xorg-driver/xf86-video-ati_6.12.4.bb new file mode 100644 index 0000000000..4aae05a747 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ati_6.12.4.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- ATI display driver" +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-chips_1.2.2.bb b/recipes/xorg-driver/xf86-video-chips_1.2.2.bb new file mode 100644 index 0000000000..9e09d8e81c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-chips_1.2.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- Chips display driver" diff --git a/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb new file mode 100644 index 0000000000..d85ae168b0 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-dummy_0.3.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- dummy display driver" + +SRC_URI += "file://get-rid-of-host-includes.patch;patch=1" diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.6.bb b/recipes/xorg-driver/xf86-video-geode_2.11.6.bb new file mode 100644 index 0000000000..380ce2ea0b --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode_2.11.6.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc +PE = "1" + +COMPATIBLE_HOST = 'i.86.*-linux' +DESCRIPTION = "X.org server -- Geode GX2/LX display driver" diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb index fecba818a5..91bfb967dd 100644 --- a/recipes/xorg-driver/xf86-video-glamo_git.bb +++ b/recipes/xorg-driver/xf86-video-glamo_git.bb @@ -1,11 +1,15 @@ require xorg-driver-video.inc -SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo;protocol=git;branch=master" -PV = "0.1+gitr${SRCREV}" -PE = "1" - -DESCRIPTION = "X.Org X server -- fbdev display driver" +SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master" S = "${WORKDIR}/git" -ARM_INSTRUCTION_SET = "arm" +PV="1.0.0+gitr${SRCPV}" +PE = "2" +PR = "r3" + +RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri" +DEPENDS += "libdrm" + +DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support" +EXTRA_OECONF = " --enable-kms " diff --git a/recipes/xorg-driver/xf86-video-glint_1.2.4.bb b/recipes/xorg-driver/xf86-video-glint_1.2.4.bb new file mode 100644 index 0000000000..eac23c74d9 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-glint_1.2.4.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Glint display driver" + +DEPENDS += " xf86dgaproto drm xf86driproto" + diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.3.bb b/recipes/xorg-driver/xf86-video-i128_1.3.3.bb new file mode 100644 index 0000000000..78d5eda810 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-i128_1.3.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- i128 display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-i740_1.3.2.bb b/recipes/xorg-driver/xf86-video-i740_1.3.2.bb new file mode 100644 index 0000000000..6c2ea7438b --- /dev/null +++ b/recipes/xorg-driver/xf86-video-i740_1.3.2.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- i740 display driver" + +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb b/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-mach64_6.8.2.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-mga_1.4.11.bb b/recipes/xorg-driver/xf86-video-mga_1.4.11.bb new file mode 100644 index 0000000000..0ed0d28dfd --- /dev/null +++ b/recipes/xorg-driver/xf86-video-mga_1.4.11.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- MGA display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-mga_1.9.100.bb b/recipes/xorg-driver/xf86-video-mga_1.9.100.bb new file mode 100644 index 0000000000..0ed0d28dfd --- /dev/null +++ b/recipes/xorg-driver/xf86-video-mga_1.9.100.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- MGA display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb b/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb new file mode 100644 index 0000000000..b519e60e58 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-neomagic_1.2.4.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc + +PE = "1" + +DESCRIPTION = "X11 driver for NeoMagic 2200, 2160, 2097, 2093, 2090, 2070" + +DEPENDS += " xf86dgaproto" + diff --git a/recipes/xorg-driver/xf86-video-newport_0.2.3.bb b/recipes/xorg-driver/xf86-video-newport_0.2.3.bb new file mode 100644 index 0000000000..b9f88fcc6f --- /dev/null +++ b/recipes/xorg-driver/xf86-video-newport_0.2.3.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "This is an unaccelerated driver for the SGI newport cards." + +#DEPENDS += " " + diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.15.bb b/recipes/xorg-driver/xf86-video-nv_2.1.15.bb new file mode 100644 index 0000000000..0d4ee2ed19 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-nv_2.1.15.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NV display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index cc68163df4..89cb729379 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -3,8 +3,8 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc" -PV = "0.1.1+${PR}+gitr${SRCREV}" -PE = "1" +PV = "0.1.1+${PR}+gitr${SRCPV}" +PE = "2" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ " diff --git a/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb b/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb new file mode 100644 index 0000000000..facae8950a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-openchrome_0.2.904.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- openchrome display driver" +PE = "1" + +do_configure_prepend() { + rm ${S}/acinclude.m4 || true +} + diff --git a/recipes/xorg-driver/xf86-video-r128_6.8.1.bb b/recipes/xorg-driver/xf86-video-r128_6.8.1.bb new file mode 100644 index 0000000000..994ea24d8f --- /dev/null +++ b/recipes/xorg-driver/xf86-video-r128_6.8.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- r128 display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb b/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb new file mode 100644 index 0000000000..ee92c364da --- /dev/null +++ b/recipes/xorg-driver/xf86-video-radeonhd_1.3.0.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- AMD/ATI r5xx, r6xx display driver" + +EXTRA_OECONF += " \ + ac_cv_file___src_AtomBios_includes_atombios_h=yes \ + ac_cv_file___src_AtomBios_includes_Decoder_h=yes \ +" diff --git a/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb b/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb new file mode 100644 index 0000000000..e6c89a8c74 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-rendition_4.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver supporting cards based on the V1000 or the V2x00." + +#DEPENDS += " " diff --git a/recipes/xorg-driver/xf86-video-s3_0.6.3.bb b/recipes/xorg-driver/xf86-video-s3_0.6.3.bb new file mode 100644 index 0000000000..b5fef823b6 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-s3_0.6.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- legacy S3 display driver" diff --git a/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb b/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb new file mode 100644 index 0000000000..5f7dd350ce --- /dev/null +++ b/recipes/xorg-driver/xf86-video-s3virge_1.10.4.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- S3 ViRGE display driver" diff --git a/recipes/xorg-driver/xf86-video-savage_2.3.1.bb b/recipes/xorg-driver/xf86-video-savage_2.3.1.bb new file mode 100644 index 0000000000..eafe3899e6 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-savage_2.3.1.bb @@ -0,0 +1,12 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- Savage display driver" + +DEPENDS += " drm xf86driproto" + +EXTRA_OECONF += " \ + ac_cv_file__usr_include_xorg_dri_h=yes \ + ac_cv_file__usr_include_xorg_sarea_h=yes \ + ac_cv_file__usr_include_xorg_dristruct_h=yes \ +" diff --git a/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb new file mode 100644 index 0000000000..5b9b4fc326 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-siliconmotion_1.7.3.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +PE = "1" +DESCRIPTION = "X.Org X server -- SiliconMotion display driver" diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.2.bb b/recipes/xorg-driver/xf86-video-sis_0.10.2.bb new file mode 100644 index 0000000000..dc083b3e88 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-sis_0.10.2.bb @@ -0,0 +1,11 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- SiS display driver" +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" +PE = "1" + +EXTRA_OECONF += " \ + ac_cv_file__usr_include_xorg_dri_h=yes \ + ac_cv_file__usr_include_xorg_sarea_h=yes \ + ac_cv_file__usr_include_xorg_dristruct_h=yes \ +" diff --git a/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb b/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb new file mode 100644 index 0000000000..8f6dfae1f6 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-sisusb_0.9.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc + +PE = "1" + +DESCRIPTION = "X.Org X server -- SiS USB display driver" +DEPENDS += " xineramaproto xf86miscproto" diff --git a/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-suncg14_1.1.1.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-suncg3_1.1.1.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb b/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-suncg6_1.1.1.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb b/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-sunffb_1.2.1.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb b/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-suntcx_1.1.1.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb b/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb new file mode 100644 index 0000000000..fe52f5eb19 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-tdfx_1.4.3.bb @@ -0,0 +1,12 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " drm xf86driproto" + +EXTRA_OECONF += " \ + ac_cv_file__usr_include_xorg_dri_h=yes \ + ac_cv_file__usr_include_xorg_sarea_h=yes \ + ac_cv_file__usr_include_xorg_dristruct_h=yes \ +" diff --git a/recipes/xorg-driver/xf86-video-tga_1.2.1.bb b/recipes/xorg-driver/xf86-video-tga_1.2.1.bb new file mode 100644 index 0000000000..d3cf65f034 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-tga_1.2.1.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc + +PE = "1" + +DESCRIPTION = "DEC 21030 X11 driver" + +DEPENDS += " xf86dgaproto" + diff --git a/recipes/xorg-driver/xf86-video-trident_1.3.3.bb b/recipes/xorg-driver/xf86-video-trident_1.3.3.bb new file mode 100644 index 0000000000..fe37be5d0b --- /dev/null +++ b/recipes/xorg-driver/xf86-video-trident_1.3.3.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.org X server -- Trident display driver" +DEPENDS += " xf86dgaproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb b/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb new file mode 100644 index 0000000000..843aa707b7 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-tseng_1.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb new file mode 100644 index 0000000000..bd2f7cf7c1 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.1.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1 \ + file://fix-configure-includes.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.8.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb b/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb new file mode 100644 index 0000000000..bfceb2995c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-voodoo_1.2.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X11 driver for Voodoo/Voodoo2" + +DEPENDS += " xf86dgaproto" diff --git a/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb b/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb new file mode 100644 index 0000000000..ea1c005e8c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-wsfb_0.3.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- wsfb display driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb b/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgi_1.5.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgixp_1.7.99.4.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/recipes/xorg-font/encodings_1.0.3.bb b/recipes/xorg-font/encodings_1.0.3.bb new file mode 100644 index 0000000000..aba075c0d8 --- /dev/null +++ b/recipes/xorg-font/encodings_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS = "mkfontscale-native font-util-native" +RDEPENDS = "" + diff --git a/recipes/xorg-font/font-adobe-100dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-100dpi_1.0.1.bb new file mode 100644 index 0000000000..e1bdcb5e7a --- /dev/null +++ b/recipes/xorg-font/font-adobe-100dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc +PE = "1" + diff --git a/recipes/xorg-font/font-adobe-75dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-75dpi_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-adobe-75dpi_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.2.bb b/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.2.bb new file mode 100644 index 0000000000..0799b8a97e --- /dev/null +++ b/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-font-common.inc + +DESCRIPTION = "Adobe typeface software" + +PE = "1" diff --git a/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.2.bb b/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.2.bb new file mode 100644 index 0000000000..6e20eb97d8 --- /dev/null +++ b/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-font-common.inc + +DESCRIPTION = "Adobe typeface software" + +PE = "1" + diff --git a/recipes/xorg-font/font-adobe-utopia-type1_1.0.2.bb b/recipes/xorg-font/font-adobe-utopia-type1_1.0.2.bb new file mode 100644 index 0000000000..6e20eb97d8 --- /dev/null +++ b/recipes/xorg-font/font-adobe-utopia-type1_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-font-common.inc + +DESCRIPTION = "Adobe typeface software" + +PE = "1" + diff --git a/recipes/xorg-font/font-alias_1.0.2.bb b/recipes/xorg-font/font-alias_1.0.2.bb new file mode 100644 index 0000000000..90eec26a57 --- /dev/null +++ b/recipes/xorg-font/font-alias_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-font-common.inc + +DESCRIPTION = "X font aliases." + +DEPENDS = "virtual/xserver font-util" +RDEPENDS = "encodings font-util" + +PE = "1"
\ No newline at end of file diff --git a/recipes/xorg-font/font-arabic-misc_1.0.1.bb b/recipes/xorg-font/font-arabic-misc_1.0.1.bb new file mode 100644 index 0000000000..6171333d6a --- /dev/null +++ b/recipes/xorg-font/font-arabic-misc_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-font-common.inc + +DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \ +of the Arabic characters available in Unicode." + +PE = "1" + diff --git a/recipes/xorg-font/font-bh-100dpi_1.0.1.bb b/recipes/xorg-font/font-bh-100dpi_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-100dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bh-75dpi_1.0.1.bb b/recipes/xorg-font/font-bh-75dpi_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-75dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.1.bb b/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.1.bb b/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bh-ttf_1.0.1.bb b/recipes/xorg-font/font-bh-ttf_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-ttf_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bh-type1_1.0.1.bb b/recipes/xorg-font/font-bh-type1_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bh-type1_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bitstream-100dpi_1.0.1.bb b/recipes/xorg-font/font-bitstream-100dpi_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-bitstream-100dpi_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-bitstream-75dpi_1.0.1.bb b/recipes/xorg-font/font-bitstream-75dpi_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-bitstream-75dpi_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-bitstream-speedo_1.0.1.bb b/recipes/xorg-font/font-bitstream-speedo_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-bitstream-speedo_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-bitstream-type1_1.0.1.bb b/recipes/xorg-font/font-bitstream-type1_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-bitstream-type1_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-cronyx-cyrillic_1.0.1.bb b/recipes/xorg-font/font-cronyx-cyrillic_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-cronyx-cyrillic_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-cursor-misc_1.0.1.bb b/recipes/xorg-font/font-cursor-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-cursor-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-daewoo-misc_1.0.1.bb b/recipes/xorg-font/font-daewoo-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-daewoo-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-dec-misc_1.0.1.bb b/recipes/xorg-font/font-dec-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-dec-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-ibm-type1_1.0.1.bb b/recipes/xorg-font/font-ibm-type1_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-ibm-type1_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-isas-misc_1.0.1.bb b/recipes/xorg-font/font-isas-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-isas-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-jis-misc_1.0.1.bb b/recipes/xorg-font/font-jis-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-jis-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-micro-misc_1.0.1.bb b/recipes/xorg-font/font-micro-misc_1.0.1.bb new file mode 100644 index 0000000000..383d16c799 --- /dev/null +++ b/recipes/xorg-font/font-micro-misc_1.0.1.bb @@ -0,0 +1,4 @@ +require xorg-font-common.inc +PE = "1" + +EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r" diff --git a/recipes/xorg-font/font-misc-cyrillic_1.0.1.bb b/recipes/xorg-font/font-misc-cyrillic_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-misc-cyrillic_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-misc-ethiopic_1.0.1.bb b/recipes/xorg-font/font-misc-ethiopic_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-misc-ethiopic_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-misc-meltho_1.0.1.bb b/recipes/xorg-font/font-misc-meltho_1.0.1.bb new file mode 100644 index 0000000000..719a443b51 --- /dev/null +++ b/recipes/xorg-font/font-misc-meltho_1.0.1.bb @@ -0,0 +1,5 @@ +require xorg-font-common.inc + +DESCRIPTION = "These fonts are designed for the display of Syriac text." +PE = "1" + diff --git a/recipes/xorg-font/font-misc-misc_1.1.0.bb b/recipes/xorg-font/font-misc-misc_1.1.0.bb new file mode 100644 index 0000000000..f795db09f3 --- /dev/null +++ b/recipes/xorg-font/font-misc-misc_1.1.0.bb @@ -0,0 +1 @@ +require xorg-font-common.inc diff --git a/recipes/xorg-font/font-mutt-misc_1.0.1.bb b/recipes/xorg-font/font-mutt-misc_1.0.1.bb new file mode 100644 index 0000000000..a5ded3d3cc --- /dev/null +++ b/recipes/xorg-font/font-mutt-misc_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-font-common.inc + +DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \ +the glyphs needed for Unicode text." + +PE = "1" + diff --git a/recipes/xorg-font/font-schumacher-misc_1.1.0.bb b/recipes/xorg-font/font-schumacher-misc_1.1.0.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-schumacher-misc_1.1.0.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-screen-cyrillic_1.0.2.bb b/recipes/xorg-font/font-screen-cyrillic_1.0.2.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-screen-cyrillic_1.0.2.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-sony-misc_1.0.1.bb b/recipes/xorg-font/font-sony-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-sony-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-sun-misc_1.0.1.bb b/recipes/xorg-font/font-sun-misc_1.0.1.bb new file mode 100644 index 0000000000..60ef06fba0 --- /dev/null +++ b/recipes/xorg-font/font-sun-misc_1.0.1.bb @@ -0,0 +1,2 @@ +require xorg-font-common.inc +PE = "1" diff --git a/recipes/xorg-font/font-util-native_1.1.1.bb b/recipes/xorg-font/font-util-native_1.1.1.bb new file mode 100644 index 0000000000..2da3b0c293 --- /dev/null +++ b/recipes/xorg-font/font-util-native_1.1.1.bb @@ -0,0 +1,13 @@ +inherit native +require xorg-font-common.inc + +XORG_PN = "font-util" + +DEPENDS = "bdftopcf-native" + +PE = "1" +PR = "r1" + +do_configure_prepend() { + sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in +} diff --git a/recipes/xorg-font/font-util_1.1.1.bb b/recipes/xorg-font/font-util_1.1.1.bb new file mode 100644 index 0000000000..8e22276c27 --- /dev/null +++ b/recipes/xorg-font/font-util_1.1.1.bb @@ -0,0 +1,15 @@ +require xorg-font-common.inc + +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + +DESCRIPTION = "X font utils." + +DEPENDS = "encodings" +RDEPENDS = "mkfontdir mkfontscale encodings" + +PR = "r1" +PE = "1" + +do_configure_prepend() { + sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in +} diff --git a/recipes/xorg-font/font-winitzki-cyrillic_1.0.1.bb b/recipes/xorg-font/font-winitzki-cyrillic_1.0.1.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-winitzki-cyrillic_1.0.1.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/font-xfree86-type1_1.0.2.bb b/recipes/xorg-font/font-xfree86-type1_1.0.2.bb new file mode 100644 index 0000000000..f8fe553c62 --- /dev/null +++ b/recipes/xorg-font/font-xfree86-type1_1.0.2.bb @@ -0,0 +1,3 @@ +require xorg-font-common.inc + +PE = "1" diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc index c2ea41e8e0..7a3b0e3f64 100644 --- a/recipes/xorg-font/xorg-font-common.inc +++ b/recipes/xorg-font/xorg-font-common.inc @@ -19,6 +19,8 @@ do_configure_prepend() { fi } +EXTRA_OECONF += " --with-fontrootdir=${libdir}/X11/fonts" + EXTRA_OEMAKE += "FCCACHE=/bin/true" do_install_append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f diff --git a/recipes/xorg-lib/libapplewm_1.4.0.bb b/recipes/xorg-lib/libapplewm_1.4.0.bb new file mode 100644 index 0000000000..bc502fb505 --- /dev/null +++ b/recipes/xorg-lib/libapplewm_1.4.0.bb @@ -0,0 +1,7 @@ +require xorg-lib-common.inc + +DEPENDS += "libxext applewmproto" +PR = "r1" +PE = "1" + +XORG_PN = "libAppleWM" diff --git a/recipes/xorg-lib/libdmx_1.1.0.bb b/recipes/xorg-lib/libdmx_1.1.0.bb new file mode 100644 index 0000000000..9b66101563 --- /dev/null +++ b/recipes/xorg-lib/libdmx_1.1.0.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Distributed Multihead extension library" +DEPENDS += "libxext dmxproto" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-lib/libfontenc-native_1.0.5.bb b/recipes/xorg-lib/libfontenc-native_1.0.5.bb new file mode 100644 index 0000000000..a907e08f12 --- /dev/null +++ b/recipes/xorg-lib/libfontenc-native_1.0.5.bb @@ -0,0 +1,8 @@ +require libfontenc_${PV}.bb + +DEPENDS = "zlib-native xproto-native" +PE = "1" + +XORG_PN = "libfontenc" + +inherit native diff --git a/recipes/xorg-lib/libfontenc_1.0.5.bb b/recipes/xorg-lib/libfontenc_1.0.5.bb new file mode 100644 index 0000000000..654fc72eca --- /dev/null +++ b/recipes/xorg-lib/libfontenc_1.0.5.bb @@ -0,0 +1,7 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 font encoding library" +LICENSE = "BSD-X" +DEPENDS += "zlib xproto" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-lib/libfs_1.0.2.bb b/recipes/xorg-lib/libfs_1.0.2.bb new file mode 100644 index 0000000000..2bc6b0ae38 --- /dev/null +++ b/recipes/xorg-lib/libfs_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Font Services library" +DEPENDS += "xproto fontsproto xtrans" +PE = "1" + +XORG_PN = "libFS" diff --git a/recipes/xorg-lib/libice-native_1.0.6.bb b/recipes/xorg-lib/libice-native_1.0.6.bb new file mode 100644 index 0000000000..fd835b6013 --- /dev/null +++ b/recipes/xorg-lib/libice-native_1.0.6.bb @@ -0,0 +1,8 @@ +require libice_${PV}.bb + +DEPENDS = "libx11-native xproto-native xtrans-native" +PROVIDES = "ice-native" + +inherit native + +XORG_PN = "libICE" diff --git a/recipes/xorg-lib/libice_1.0.6.bb b/recipes/xorg-lib/libice_1.0.6.bb new file mode 100644 index 0000000000..e4a6557397 --- /dev/null +++ b/recipes/xorg-lib/libice_1.0.6.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Inter-Client Exchange library" +DEPENDS += "xproto xtrans" +PROVIDES = "ice" +PR = "r1" +PE = "1" + +XORG_PN = "libICE" diff --git a/recipes/xorg-lib/libpciaccess_0.10.9.bb b/recipes/xorg-lib/libpciaccess_0.10.9.bb new file mode 100644 index 0000000000..26d1d95e35 --- /dev/null +++ b/recipes/xorg-lib/libpciaccess_0.10.9.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +DEPENDS += "xproto virtual/libx11" + +PR="r1" diff --git a/recipes/xorg-lib/libsm-native_1.1.1.bb b/recipes/xorg-lib/libsm-native_1.1.1.bb new file mode 100644 index 0000000000..78268a1d2b --- /dev/null +++ b/recipes/xorg-lib/libsm-native_1.1.1.bb @@ -0,0 +1,7 @@ +require libsm_${PV}.bb + +inherit native + +DEPENDS = "libx11-native libice-native xproto-native xtrans-native" + +XORG_PN = "libSM" diff --git a/recipes/xorg-lib/libsm_1.1.1.bb b/recipes/xorg-lib/libsm_1.1.1.bb new file mode 100644 index 0000000000..7a3089894d --- /dev/null +++ b/recipes/xorg-lib/libsm_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Session management library" +DEPENDS += "libice xproto xtrans e2fsprogs-libs" +PR = "r0" +PE = "1" + +XORG_PN = "libSM" diff --git a/recipes/xorg-lib/libwindowswm_1.0.1.bb b/recipes/xorg-lib/libwindowswm_1.0.1.bb new file mode 100644 index 0000000000..a03d49505b --- /dev/null +++ b/recipes/xorg-lib/libwindowswm_1.0.1.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DEPENDS += "libxext windowswmproto" +PE = "1" + +XORG_PN = "libWindowsWM" diff --git a/recipes/xorg-lib/libx11-native_1.3.2.bb b/recipes/xorg-lib/libx11-native_1.3.2.bb new file mode 100644 index 0000000000..71b45afdf4 --- /dev/null +++ b/recipes/xorg-lib/libx11-native_1.3.2.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "" + +inherit native diff --git a/recipes/xorg-lib/libx11/dolt-fix.patch b/recipes/xorg-lib/libx11/dolt-fix.patch new file mode 100644 index 0000000000..ea1a8bd937 --- /dev/null +++ b/recipes/xorg-lib/libx11/dolt-fix.patch @@ -0,0 +1,21 @@ +diff -uNr libX11-1.2.99.901.orig/acinclude.m4 libX11-1.2.99.901/acinclude.m4 +--- libX11-1.2.99.901.orig/acinclude.m4 2009-09-05 10:57:11.000000000 +0200 ++++ libX11-1.2.99.901/acinclude.m4 2009-09-05 10:59:14.000000000 +0200 +@@ -197,7 +197,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -213,7 +213,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch b/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch new file mode 100644 index 0000000000..4358f79896 --- /dev/null +++ b/recipes/xorg-lib/libx11/x11_disable_makekeys.1.6.3.patch @@ -0,0 +1,24 @@ +diff -uNr libX11-1.2.99.901.orig/src/util/Makefile.am libX11-1.2.99.901/src/util/Makefile.am +--- libX11-1.2.99.901.orig/src/util/Makefile.am 2009-08-12 13:21:19.000000000 +0200 ++++ libX11-1.2.99.901/src/util/Makefile.am 2009-08-12 13:22:21.000000000 +0200 +@@ -1,20 +1,3 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-CC = @CC_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb new file mode 100644 index 0000000000..796ed1eeb6 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.2.bb @@ -0,0 +1,32 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" +PROVIDES = "virtual/libx11" +PE = "1" +PR = "r3" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.1.6.3.patch;patch=1 \ + file://dolt-fix.patch;patch=1 \ + file://keysymdef_include.patch;patch=1" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; gcc makekeys.c -o makekeys + mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/recipes/xorg-lib/libxau-native_1.0.5.bb b/recipes/xorg-lib/libxau-native_1.0.5.bb new file mode 100644 index 0000000000..3fc07b6ab6 --- /dev/null +++ b/recipes/xorg-lib/libxau-native_1.0.5.bb @@ -0,0 +1,9 @@ +require libxau_${PV}.bb + +DEPENDS = "xproto-native util-macros-native" +PROVIDES = "" +PR = "r1" + +XORG_PN = "libXau" + +inherit native diff --git a/recipes/xorg-lib/libxau_1.0.5.bb b/recipes/xorg-lib/libxau_1.0.5.bb new file mode 100644 index 0000000000..3a77534cff --- /dev/null +++ b/recipes/xorg-lib/libxau_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" +DEPENDS += " xproto" +PROVIDES = "xau" +PE = "1" + +XORG_PN = "libXau" diff --git a/recipes/xorg-lib/libxaw_1.0.7.bb b/recipes/xorg-lib/libxaw_1.0.7.bb new file mode 100644 index 0000000000..8a9245d218 --- /dev/null +++ b/recipes/xorg-lib/libxaw_1.0.7.bb @@ -0,0 +1,24 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Athena Widget Set" +DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" +PROVIDES = "xaw" +PR = "r1" +PE = "1" + +XORG_PN = "libXaw" + +do_stage_append () { + ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 + ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 + ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so +} + +PACKAGES =+ "libxaw6 libxaw7 libxaw8" + +# disable docs as groff detection doesn't work on some hosts while cross compilling +EXTRA_OECONF += " --disable-docs " + +FILES_libxaw6 = "${libdir}/libXaw6.so.6*" +FILES_libxaw7 = "${libdir}/libXaw7.so.7*" +FILES_libxaw8 = "${libdir}/libXaw8.so.8*" diff --git a/recipes/xorg-lib/libxcalibrate_git.bb b/recipes/xorg-lib/libxcalibrate_git.bb index fadaf933ec..efff1a8505 100644 --- a/recipes/xorg-lib/libxcalibrate_git.bb +++ b/recipes/xorg-lib/libxcalibrate_git.bb @@ -5,8 +5,8 @@ LICENSE = "BSD-X" DEPENDS = "virtual/libx11 calibrateproto libxext" PR = "r0" -PV = "0.0+${PR}+gitr${SRCREV}" -PE = "2" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "3" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git" diff --git a/recipes/xorg-lib/libxcomposite_0.4.1.bb b/recipes/xorg-lib/libxcomposite_0.4.1.bb new file mode 100644 index 0000000000..55a91b7048 --- /dev/null +++ b/recipes/xorg-lib/libxcomposite_0.4.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Composite extension library." +LICENSE= "BSD-X" +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" +PROVIDES = "xcomposite" +PE = "1" + +XORG_PN = "libXcomposite" diff --git a/recipes/xorg-lib/libxcursor-native_1.1.10.bb b/recipes/xorg-lib/libxcursor-native_1.1.10.bb new file mode 100644 index 0000000000..403030e93d --- /dev/null +++ b/recipes/xorg-lib/libxcursor-native_1.1.10.bb @@ -0,0 +1,6 @@ +require libxcursor_${PV}.bb + +DEPENDS = "libx11-native fixesproto-native libxfixes-native" +PE = "1" + +inherit native diff --git a/recipes/xorg-lib/libxcursor_1.1.10.bb b/recipes/xorg-lib/libxcursor_1.1.10.bb new file mode 100644 index 0000000000..4713eccc48 --- /dev/null +++ b/recipes/xorg-lib/libxcursor_1.1.10.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X cursor management library" +LICENSE= "BSD-X" +DEPENDS += "libxrender libxfixes" +PR = "r2" +PE = "1" + +XORG_PN = "libXcursor" diff --git a/recipes/xorg-lib/libxdamage_1.1.2.bb b/recipes/xorg-lib/libxdamage_1.1.2.bb new file mode 100644 index 0000000000..e56d1d0954 --- /dev/null +++ b/recipes/xorg-lib/libxdamage_1.1.2.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 damaged region extension library" +LICENSE= "BSD-X" +DEPENDS += "damageproto libxfixes" +PROVIDES = "xdamage" +PR = "r1" +PE = "1" + +XORG_PN = "libXdamage" diff --git a/recipes/xorg-lib/libxdmcp-native_1.0.3.bb b/recipes/xorg-lib/libxdmcp-native_1.0.3.bb new file mode 100644 index 0000000000..873e9397d7 --- /dev/null +++ b/recipes/xorg-lib/libxdmcp-native_1.0.3.bb @@ -0,0 +1,10 @@ +require libxdmcp_${PV}.bb + +DEPENDS = "xproto-native util-macros-native" +PR = "r1" +PE = "1" + +XORG_PN = "libXdmcp" +PROVIDES = "" + +inherit native diff --git a/recipes/xorg-lib/libxdmcp_1.0.3.bb b/recipes/xorg-lib/libxdmcp_1.0.3.bb new file mode 100644 index 0000000000..0aa95b4677 --- /dev/null +++ b/recipes/xorg-lib/libxdmcp_1.0.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Display Manager Control Protocol library" +DEPENDS += "xproto" +PROVIDES = "xdmcp" +PR = "r1" +PE = "1" + +XORG_PN = "libXdmcp" diff --git a/recipes/xorg-lib/libxext-native_1.1.1.bb b/recipes/xorg-lib/libxext-native_1.1.1.bb new file mode 100644 index 0000000000..5d8db969da --- /dev/null +++ b/recipes/xorg-lib/libxext-native_1.1.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto-native libx11-native xextproto-native libxau-native util-macros-native" +PROVIDES = "" +PR = "r1" +PE = "1" + +XORG_PN = "libXext" + +inherit native + diff --git a/recipes/xorg-lib/libxext_1.1.1.bb b/recipes/xorg-lib/libxext_1.1.1.bb new file mode 100644 index 0000000000..81231a866c --- /dev/null +++ b/recipes/xorg-lib/libxext_1.1.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau" +PROVIDES = "xext" +PR = "r1" +PE = "1" + +XORG_PN = "libXext" diff --git a/recipes/xorg-lib/libxfixes-native_4.0.4.bb b/recipes/xorg-lib/libxfixes-native_4.0.4.bb new file mode 100644 index 0000000000..5ef6ded80a --- /dev/null +++ b/recipes/xorg-lib/libxfixes-native_4.0.4.bb @@ -0,0 +1,6 @@ +require libxfixes_${PV}.bb + +DEPENDS = "libx11-native" +PE = "1" + +inherit native diff --git a/recipes/xorg-lib/libxfixes_4.0.4.bb b/recipes/xorg-lib/libxfixes_4.0.4.bb new file mode 100644 index 0000000000..5b2100a815 --- /dev/null +++ b/recipes/xorg-lib/libxfixes_4.0.4.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Fixes extension library." +LICENSE= "BSD-X" +DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +PE = "1" + +XORG_PN = "libXfixes" diff --git a/recipes/xorg-lib/libxfont-native_1.4.1.bb b/recipes/xorg-lib/libxfont-native_1.4.1.bb new file mode 100644 index 0000000000..deb66a91cf --- /dev/null +++ b/recipes/xorg-lib/libxfont-native_1.4.1.bb @@ -0,0 +1,11 @@ +require libxfont_${PV}.bb + +DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \ + libfontenc-native xtrans-native freetype-native util-macros-native" +PROVIDES = "${P} ${PF} ${PN}" +PE = "1" + +# no need for patch used in libxfont +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + +inherit native diff --git a/recipes/xorg-lib/libxfont_1.4.1.bb b/recipes/xorg-lib/libxfont_1.4.1.bb new file mode 100644 index 0000000000..811066e4de --- /dev/null +++ b/recipes/xorg-lib/libxfont_1.4.1.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 font rasterisation library" +LICENSE= "BSD-X" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" +PE = "1" + +#SRC_URI += "file://no-scalable-crash.patch;patch=1" + +# disable docs +EXTRA_OECONF += " --disable-devel-docs " + +XORG_PN = "libXfont" diff --git a/recipes/xorg-lib/libxfontcache_1.0.5.bb b/recipes/xorg-lib/libxfontcache_1.0.5.bb new file mode 100644 index 0000000000..ee999de4f5 --- /dev/null +++ b/recipes/xorg-lib/libxfontcache_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X-TrueType font cache extension client library" +DEPENDS += "libxext fontcacheproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXfontcache" diff --git a/recipes/xorg-lib/libxft_2.1.14.bb b/recipes/xorg-lib/libxft_2.1.14.bb new file mode 100644 index 0000000000..84d0cc2cbe --- /dev/null +++ b/recipes/xorg-lib/libxft_2.1.14.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc + +DESCRIPTION = "FreeType-based font drawing library for X" +DEPENDS += "libxrender freetype fontconfig" +PROVIDES = "xft" +PR = "r0" +PE = "1" + +XORG_PN = "libXft" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" diff --git a/recipes/xorg-lib/libxi_1.3.bb b/recipes/xorg-lib/libxi_1.3.bb new file mode 100644 index 0000000000..31e3b4906d --- /dev/null +++ b/recipes/xorg-lib/libxi_1.3.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXi" diff --git a/recipes/xorg-lib/libxinerama_1.1.bb b/recipes/xorg-lib/libxinerama_1.1.bb new file mode 100644 index 0000000000..b7135bc28e --- /dev/null +++ b/recipes/xorg-lib/libxinerama_1.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Xinerama extension library" +DEPENDS += "libxext xineramaproto" +PROVIDES = "xinerama" +PR = "r3" +PE = "1" + +XORG_PN = "libXinerama" diff --git a/recipes/xorg-lib/libxkbfile-native_1.0.6.bb b/recipes/xorg-lib/libxkbfile-native_1.0.6.bb new file mode 100644 index 0000000000..27c5dce5e4 --- /dev/null +++ b/recipes/xorg-lib/libxkbfile-native_1.0.6.bb @@ -0,0 +1,8 @@ +require libxkbfile_${PV}.bb + +DEPENDS = "libx11-native kbproto-native" +PE = "1" + +XORG_PN = "libxkbfile" + +inherit native diff --git a/recipes/xorg-lib/libxkbfile_1.0.6.bb b/recipes/xorg-lib/libxkbfile_1.0.6.bb new file mode 100644 index 0000000000..a404180d49 --- /dev/null +++ b/recipes/xorg-lib/libxkbfile_1.0.6.bb @@ -0,0 +1,7 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 keyboard file manipulation library" +LICENSE= "GPL" +DEPENDS += "virtual/libx11 kbproto" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-lib/libxmu_1.0.5.bb b/recipes/xorg-lib/libxmu_1.0.5.bb new file mode 100644 index 0000000000..9a02bf82be --- /dev/null +++ b/recipes/xorg-lib/libxmu_1.0.5.bb @@ -0,0 +1,16 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous utility library" +DEPENDS += "libxt libxext" +PROVIDES = "xmu" +PR = "r1" +PE = "1" + +XORG_PN = "libXmu" + +LEAD_SONAME = "libXmu" + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" diff --git a/recipes/xorg-lib/libxpm_3.5.8.bb b/recipes/xorg-lib/libxpm_3.5.8.bb new file mode 100644 index 0000000000..75c10bf2c9 --- /dev/null +++ b/recipes/xorg-lib/libxpm_3.5.8.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Pixmap library" +LICENSE = "X-BSD" +DEPENDS += "libxext libsm libxt" +PR = "r3" +PE = "1" + +XORG_PN = "libXpm" + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/recipes/xorg-lib/libxrender-native_0.9.5.bb b/recipes/xorg-lib/libxrender-native_0.9.5.bb new file mode 100644 index 0000000000..a4f4ba9e36 --- /dev/null +++ b/recipes/xorg-lib/libxrender-native_0.9.5.bb @@ -0,0 +1,6 @@ +require libxrender_${PV}.bb + +DEPENDS = "libx11-native renderproto-native" +PE = "1" + +inherit native diff --git a/recipes/xorg-lib/libxrender_0.9.5.bb b/recipes/xorg-lib/libxrender_0.9.5.bb new file mode 100644 index 0000000000..ad833a8259 --- /dev/null +++ b/recipes/xorg-lib/libxrender_0.9.5.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Rendering Extension client library" +LICENSE = "BSD-X" +DEPENDS += "virtual/libx11 renderproto xproto xdmcp" +PR = "r1" +PE = "1" + +XORG_PN = "libXrender" diff --git a/recipes/xorg-lib/libxres_1.0.4.bb b/recipes/xorg-lib/libxres_1.0.4.bb new file mode 100644 index 0000000000..02a0cae0d8 --- /dev/null +++ b/recipes/xorg-lib/libxres_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Resource extension library" +DEPENDS += "libxext resourceproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXres" diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb new file mode 100644 index 0000000000..ff22c337a0 --- /dev/null +++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Screen Saver extension library" +LICENSE = "GPL" +DEPENDS += "libxext scrnsaverproto" +PROVIDES = "libxss" +RREPLACES = "libxss" +PR = "r1" +PE = "1" + +XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxt-native_1.0.7.bb b/recipes/xorg-lib/libxt-native_1.0.7.bb new file mode 100644 index 0000000000..9745f6530d --- /dev/null +++ b/recipes/xorg-lib/libxt-native_1.0.7.bb @@ -0,0 +1,8 @@ +require libxt_${PV}.bb + +DEPENDS = "libx11-native libsm-native kbproto-native" +PROVIDES = "xt-native" + +inherit native + +XORG_PN = "libXt" diff --git a/recipes/xorg-lib/libxt_1.0.7.bb b/recipes/xorg-lib/libxt_1.0.7.bb new file mode 100644 index 0000000000..4190a1158b --- /dev/null +++ b/recipes/xorg-lib/libxt_1.0.7.bb @@ -0,0 +1,19 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 toolkit intrinsics library" +DEPENDS += "libsm virtual/libx11 kbproto" +PROVIDES = "xt" +PR = "r1" +PE = "1" + +XORG_PN = "libXt" + +EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) || exit 1 + oe_runmake +} diff --git a/recipes/xorg-lib/libxtst_1.1.0.bb b/recipes/xorg-lib/libxtst_1.1.0.bb new file mode 100644 index 0000000000..174046fc1e --- /dev/null +++ b/recipes/xorg-lib/libxtst_1.1.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Test Extension: client side library" +DEPENDS += "libxext recordproto inputproto libxi" +PROVIDES = "xtst" +PR = "r1" +PE = "1" + +XORG_PN = "libXtst" diff --git a/recipes/xorg-lib/libxv_1.0.5.bb b/recipes/xorg-lib/libxv_1.0.5.bb new file mode 100644 index 0000000000..6014326e90 --- /dev/null +++ b/recipes/xorg-lib/libxv_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Video extension library" +LICENSE = "GPL" +DEPENDS += "libxext videoproto" +PR = "r1" + +XORG_PN = "libXv" diff --git a/recipes/xorg-lib/libxvmc_1.0.5.bb b/recipes/xorg-lib/libxvmc_1.0.5.bb new file mode 100644 index 0000000000..64943ce9bd --- /dev/null +++ b/recipes/xorg-lib/libxvmc_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Video Motion Compensation extension library" +DEPENDS += "libxext libxv videoproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXvMC" diff --git a/recipes/xorg-lib/libxxf86dga_1.1.1.bb b/recipes/xorg-lib/libxxf86dga_1.1.1.bb new file mode 100644 index 0000000000..47492d7108 --- /dev/null +++ b/recipes/xorg-lib/libxxf86dga_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Direct Graphics Access extension library" +DEPENDS += "libxext xf86dgaproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86dga" diff --git a/recipes/xorg-lib/libxxf86misc_1.0.2.bb b/recipes/xorg-lib/libxxf86misc_1.0.2.bb new file mode 100644 index 0000000000..d1f8719cde --- /dev/null +++ b/recipes/xorg-lib/libxxf86misc_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 XFree86 miscellaneous extension library" +DEPENDS += "libxext xf86miscproto" +PROVIDES = "xxf86misc" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86misc" diff --git a/recipes/xorg-lib/libxxf86vm_1.1.0.bb b/recipes/xorg-lib/libxxf86vm_1.1.0.bb new file mode 100644 index 0000000000..2d1af9c9aa --- /dev/null +++ b/recipes/xorg-lib/libxxf86vm_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 XFree86 video mode extension library" +DEPENDS += "libxext xf86vidmodeproto" +PR = "r0" +PE = "1" + +XORG_PN = "libXxf86vm" diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 1b5ca6388f..ca6dae5fc5 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -5,7 +5,7 @@ LICENSE = "X11" PV = "0.17.3" PR = "r4" -PR_append = "+gitr${SRCREV}" +PR_append = "+gitr${SRCPV}" SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc" diff --git a/recipes/xorg-lib/xtrans-native_1.2.5.bb b/recipes/xorg-lib/xtrans-native_1.2.5.bb new file mode 100644 index 0000000000..c7988c7264 --- /dev/null +++ b/recipes/xorg-lib/xtrans-native_1.2.5.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-native" + +inherit native diff --git a/recipes/xorg-lib/xtrans_1.2.5.bb b/recipes/xorg-lib/xtrans_1.2.5.bb new file mode 100644 index 0000000000..81464f49bc --- /dev/null +++ b/recipes/xorg-lib/xtrans_1.2.5.bb @@ -0,0 +1,14 @@ +require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." +PE = "1" +PR = "r0" + +ALLOW_EMPTY = "1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans" + +RDEPENDS_${PN}-dev = "" + +XORG_PN = "xtrans" diff --git a/recipes/xorg-proto/applewmproto_1.4.1.bb b/recipes/xorg-proto/applewmproto_1.4.1.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/applewmproto_1.4.1.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/bigreqsproto-native_1.1.0.bb b/recipes/xorg-proto/bigreqsproto-native_1.1.0.bb new file mode 100644 index 0000000000..e86417195d --- /dev/null +++ b/recipes/xorg-proto/bigreqsproto-native_1.1.0.bb @@ -0,0 +1,7 @@ +require bigreqsproto_${PV}.bb + +PR = "r1" + +XORG_PN = "bigreqsproto" + +inherit native diff --git a/recipes/xorg-proto/bigreqsproto_1.1.0.bb b/recipes/xorg-proto/bigreqsproto_1.1.0.bb new file mode 100644 index 0000000000..ffe3bce8d8 --- /dev/null +++ b/recipes/xorg-proto/bigreqsproto_1.1.0.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "bigreqsproto" diff --git a/recipes/xorg-proto/calibrateproto_git.bb b/recipes/xorg-proto/calibrateproto_git.bb index 6f5414fb1a..8709acd11c 100644 --- a/recipes/xorg-proto/calibrateproto_git.bb +++ b/recipes/xorg-proto/calibrateproto_git.bb @@ -3,8 +3,8 @@ require xorg-proto-common.inc DESCRIPTION = "Touchscreen calibration protocol" PR = "r0" -PV = "0.0+${PR}+gitr${SRCREV}" -PE = "2" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "3" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" S = "${WORKDIR}/git" diff --git a/recipes/xorg-proto/compositeproto_0.4.1.bb b/recipes/xorg-proto/compositeproto_0.4.1.bb new file mode 100644 index 0000000000..b7bb50e579 --- /dev/null +++ b/recipes/xorg-proto/compositeproto_0.4.1.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +CONFLICTS = "compositeext" +PE = "1" + +XORG_PN = "compositeproto" diff --git a/recipes/xorg-proto/damageproto_1.2.0.bb b/recipes/xorg-proto/damageproto_1.2.0.bb new file mode 100644 index 0000000000..e7abb316ed --- /dev/null +++ b/recipes/xorg-proto/damageproto_1.2.0.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "damageext" +PR = "r1" +PE = "1" + +XORG_PN = "damageproto" diff --git a/recipes/xorg-proto/dmxproto_2.3.bb b/recipes/xorg-proto/dmxproto_2.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/dmxproto_2.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/dri2proto_2.1.bb b/recipes/xorg-proto/dri2proto_2.1.bb new file mode 100644 index 0000000000..a0e1fd3989 --- /dev/null +++ b/recipes/xorg-proto/dri2proto_2.1.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DRI2 extension headers" + +require xorg-proto-common.inc diff --git a/recipes/xorg-proto/evieext_1.1.0.bb b/recipes/xorg-proto/evieext_1.1.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/evieext_1.1.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/fixesproto-native_4.1.1.bb b/recipes/xorg-proto/fixesproto-native_4.1.1.bb new file mode 100644 index 0000000000..927e004437 --- /dev/null +++ b/recipes/xorg-proto/fixesproto-native_4.1.1.bb @@ -0,0 +1,7 @@ +require fixesproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fixesproto" + +inherit native diff --git a/recipes/xorg-proto/fixesproto_4.1.1.bb b/recipes/xorg-proto/fixesproto_4.1.1.bb new file mode 100644 index 0000000000..f9bc9d9e3c --- /dev/null +++ b/recipes/xorg-proto/fixesproto_4.1.1.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "fixesext" +PR = "r1" +PE = "1" + +XORG_PN = "fixesproto" diff --git a/recipes/xorg-proto/fontcacheproto-native_0.1.3.bb b/recipes/xorg-proto/fontcacheproto-native_0.1.3.bb new file mode 100644 index 0000000000..f6df67f59e --- /dev/null +++ b/recipes/xorg-proto/fontcacheproto-native_0.1.3.bb @@ -0,0 +1,7 @@ +require fontcacheproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fontcacheproto" + +inherit native diff --git a/recipes/xorg-proto/fontcacheproto_0.1.3.bb b/recipes/xorg-proto/fontcacheproto_0.1.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/fontcacheproto_0.1.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/fontsproto-native_2.1.0.bb b/recipes/xorg-proto/fontsproto-native_2.1.0.bb new file mode 100644 index 0000000000..4371a07836 --- /dev/null +++ b/recipes/xorg-proto/fontsproto-native_2.1.0.bb @@ -0,0 +1,9 @@ +require fontsproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fontsproto" + +S = "${WORKDIR}/fontsproto-${PV}" + +inherit native diff --git a/recipes/xorg-proto/fontsproto_2.1.0.bb b/recipes/xorg-proto/fontsproto_2.1.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/fontsproto_2.1.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/glproto_1.4.10.bb b/recipes/xorg-proto/glproto_1.4.10.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.10.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/inputproto-native_2.0.bb b/recipes/xorg-proto/inputproto-native_2.0.bb new file mode 100644 index 0000000000..11e0dae601 --- /dev/null +++ b/recipes/xorg-proto/inputproto-native_2.0.bb @@ -0,0 +1,7 @@ +require inputproto_${PV}.bb + +PR = "r1" + +XORG_PN = "inputproto" + +inherit native diff --git a/recipes/xorg-proto/inputproto_2.0.bb b/recipes/xorg-proto/inputproto_2.0.bb new file mode 100644 index 0000000000..e3a8b09f2b --- /dev/null +++ b/recipes/xorg-proto/inputproto_2.0.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "inputproto" diff --git a/recipes/xorg-proto/kbproto-native_1.0.4.bb b/recipes/xorg-proto/kbproto-native_1.0.4.bb new file mode 100644 index 0000000000..cdb7c0e16d --- /dev/null +++ b/recipes/xorg-proto/kbproto-native_1.0.4.bb @@ -0,0 +1,6 @@ +require kbproto_${PV}.bb +require xorg-proto-native.inc + +PR = "r1" + +XORG_PN = "kbproto" diff --git a/recipes/xorg-proto/kbproto_1.0.4.bb b/recipes/xorg-proto/kbproto_1.0.4.bb new file mode 100644 index 0000000000..b3e9ffc365 --- /dev/null +++ b/recipes/xorg-proto/kbproto_1.0.4.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "kbproto" diff --git a/recipes/xorg-proto/randrproto_1.3.1.bb b/recipes/xorg-proto/randrproto_1.3.1.bb new file mode 100644 index 0000000000..85000cc900 --- /dev/null +++ b/recipes/xorg-proto/randrproto_1.3.1.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "randrext" +PR = "r1" +PE = "1" + +XORG_PN = "randrproto" diff --git a/recipes/xorg-proto/recordproto_1.14.bb b/recipes/xorg-proto/recordproto_1.14.bb new file mode 100644 index 0000000000..af63403600 --- /dev/null +++ b/recipes/xorg-proto/recordproto_1.14.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "recordext" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/renderproto-native_0.11.bb b/recipes/xorg-proto/renderproto-native_0.11.bb new file mode 100644 index 0000000000..8d83c99774 --- /dev/null +++ b/recipes/xorg-proto/renderproto-native_0.11.bb @@ -0,0 +1,7 @@ +require renderproto_${PV}.bb + +PR = "r1" + +XORG_PN = "renderproto" + +inherit native diff --git a/recipes/xorg-proto/renderproto_0.11.bb b/recipes/xorg-proto/renderproto_0.11.bb new file mode 100644 index 0000000000..3d20b24afd --- /dev/null +++ b/recipes/xorg-proto/renderproto_0.11.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +CONFLICTS = "renderext" +PE = "1" diff --git a/recipes/xorg-proto/resourceproto_1.1.0.bb b/recipes/xorg-proto/resourceproto_1.1.0.bb new file mode 100644 index 0000000000..1fb8aa7f12 --- /dev/null +++ b/recipes/xorg-proto/resourceproto_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "resourceext" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/scrnsaverproto_1.2.0.bb b/recipes/xorg-proto/scrnsaverproto_1.2.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/scrnsaverproto_1.2.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/videoproto_2.3.0.bb b/recipes/xorg-proto/videoproto_2.3.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/videoproto_2.3.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/windowswmproto_1.0.4.bb b/recipes/xorg-proto/windowswmproto_1.0.4.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/windowswmproto_1.0.4.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/xcmiscproto-native_1.2.0.bb b/recipes/xorg-proto/xcmiscproto-native_1.2.0.bb new file mode 100644 index 0000000000..417a2aaf13 --- /dev/null +++ b/recipes/xorg-proto/xcmiscproto-native_1.2.0.bb @@ -0,0 +1,7 @@ +require xcmiscproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xcmiscproto" + +inherit native diff --git a/recipes/xorg-proto/xcmiscproto_1.2.0.bb b/recipes/xorg-proto/xcmiscproto_1.2.0.bb new file mode 100644 index 0000000000..8f48ecd9cd --- /dev/null +++ b/recipes/xorg-proto/xcmiscproto_1.2.0.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "xcmiscproto" diff --git a/recipes/xorg-proto/xextproto-native_7.1.1.bb b/recipes/xorg-proto/xextproto-native_7.1.1.bb new file mode 100644 index 0000000000..ff2bc4ffd3 --- /dev/null +++ b/recipes/xorg-proto/xextproto-native_7.1.1.bb @@ -0,0 +1,7 @@ +require xextproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xextproto" + +inherit native diff --git a/recipes/xorg-proto/xextproto_7.1.1.bb b/recipes/xorg-proto/xextproto_7.1.1.bb new file mode 100644 index 0000000000..3637929316 --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.1.1.bb @@ -0,0 +1,3 @@ +require xorg-proto-common.inc + +PE = "1" diff --git a/recipes/xorg-proto/xf86bigfontproto-native_1.2.0.bb b/recipes/xorg-proto/xf86bigfontproto-native_1.2.0.bb new file mode 100644 index 0000000000..b0ac594997 --- /dev/null +++ b/recipes/xorg-proto/xf86bigfontproto-native_1.2.0.bb @@ -0,0 +1,7 @@ +require xf86bigfontproto_${PV}.bb + +PR = "r1" + +XORG_PN = "xf86bigfontproto" + +inherit native diff --git a/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb b/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb new file mode 100644 index 0000000000..f29fdb84a7 --- /dev/null +++ b/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "xf86bigfontproto" diff --git a/recipes/xorg-proto/xf86dgaproto_2.1.bb b/recipes/xorg-proto/xf86dgaproto_2.1.bb new file mode 100644 index 0000000000..2e0e734858 --- /dev/null +++ b/recipes/xorg-proto/xf86dgaproto_2.1.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "xxf86dgaext" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/xf86driproto_2.1.0.bb b/recipes/xorg-proto/xf86driproto_2.1.0.bb new file mode 100644 index 0000000000..3637929316 --- /dev/null +++ b/recipes/xorg-proto/xf86driproto_2.1.0.bb @@ -0,0 +1,3 @@ +require xorg-proto-common.inc + +PE = "1" diff --git a/recipes/xorg-proto/xf86miscproto_0.9.3.bb b/recipes/xorg-proto/xf86miscproto_0.9.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/xf86miscproto_0.9.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/xf86vidmodeproto_2.3.bb b/recipes/xorg-proto/xf86vidmodeproto_2.3.bb new file mode 100644 index 0000000000..946be11407 --- /dev/null +++ b/recipes/xorg-proto/xf86vidmodeproto_2.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "xxf86vmext" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/xineramaproto_1.2.bb b/recipes/xorg-proto/xineramaproto_1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/xineramaproto_1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-proto/xproto-native_7.0.16.bb b/recipes/xorg-proto/xproto-native_7.0.16.bb new file mode 100644 index 0000000000..cc7b6f65d3 --- /dev/null +++ b/recipes/xorg-proto/xproto-native_7.0.16.bb @@ -0,0 +1,5 @@ +require xproto_${PV}.bb + +DEPENDS += "util-macros-native" + +inherit native diff --git a/recipes/xorg-proto/xproto_7.0.16.bb b/recipes/xorg-proto/xproto_7.0.16.bb new file mode 100644 index 0000000000..513c78be4e --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.16.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r0" +PE = "1" + +DEPENDS += "util-macros" + +XORG_PN = "xproto" diff --git a/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb new file mode 100644 index 0000000000..9c3d9efa71 --- /dev/null +++ b/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +PROVIDES="xproxymngproto" +PR = "r1" +PE = "1" diff --git a/recipes/xorg-util/makedepend-native_1.0.2.bb b/recipes/xorg-util/makedepend-native_1.0.2.bb new file mode 100644 index 0000000000..9facfc69fa --- /dev/null +++ b/recipes/xorg-util/makedepend-native_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-util-common.inc +inherit native + +DESCRIPTION = "create dependencies in makefiles" +DEPENDS = "xproto-native util-macros-native" +PR = "r2" +PE = "1" + +XORG_PN = "makedepend" diff --git a/recipes/xorg-util/makedepend_1.0.2.bb b/recipes/xorg-util/makedepend_1.0.2.bb new file mode 100644 index 0000000000..e998bba1b0 --- /dev/null +++ b/recipes/xorg-util/makedepend_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "create dependencies in makefiles" +DEPENDS = "xproto util-macros" +PR = "r2" +PE = "1" diff --git a/recipes/xorg-util/util-macros-native_1.3.0.bb b/recipes/xorg-util/util-macros-native_1.3.0.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.3.0.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.3.0.bb b/recipes/xorg-util/util-macros_1.3.0.bb new file mode 100644 index 0000000000..4775fc6901 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.3.0.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +ALLOW_EMPTY = "1" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.3.bb b/recipes/xorg-util/xorg-cf-files_1.0.3.bb new file mode 100644 index 0000000000..7c3fb8d7e9 --- /dev/null +++ b/recipes/xorg-util/xorg-cf-files_1.0.3.bb @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +DESCRIPTION = "X Window System CF files" + +PR = "r1" +PE = "1" + +FILES_${PN} += " /usr/lib/X11/config" diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index cfd350e886..c9b33768c6 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -2,18 +2,18 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -INC_PR = "r12" +INC_PR = "r13" PROVIDES = "virtual/xserver" -DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ +DEPENDS = "hal fontconfig freetype flex-native kbproto \ xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ -libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate \ +libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate \ libxv" RECOMMENDS_${PN} = "hal libpciaccess" @@ -47,7 +47,7 @@ FILES_${PN}-sdl = "${bindir}/Xsdl" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 ${libdir}/xorg/protocol.txt" FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" FILES_${PN}-xephyr = "${bindir}/Xephyr" @@ -67,6 +67,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ # 84.0k libxf4bpp.so PACKAGES =+ "${PN}-extension-dri \ + ${PN}-extension-dri2 \ ${PN}-extension-glx \ ${PN}-module-libint10 \ ${PN}-module-libafb \ @@ -78,6 +79,7 @@ PACKAGES =+ "${PN}-extension-dri \ ${PN}-module-libxf4bpp" FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" +FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" diff --git a/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 614848f3e3..40b6fe8c3f 100644 --- a/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,8 +9,8 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-security-policy" PROVIDES = "virtual/xserver" -PE = "1" -PV = "1.3.0.0+gitr${SRCREV}" +PE = "2" +PV = "1.3.0.0+gitr${SRCPV}" PR = "r3" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf index 3fc8d83b22..7d7589fd6c 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf @@ -1,20 +1,52 @@ +Section "Module" + Load "glx" + Load "dri2" +EndSection + + Section "Monitor" - Identifier "Builtin Default Monitor" + Identifier "LCD Panel" EndSection + Section "Device" - Identifier "Builtin Default glamo Device 0" - Driver "glamo" -EndSection + Identifier "Glamo Graphics Chip" + Driver "glamo" +EndSection + Section "Screen" - Identifier "Builtin Default glamo Screen 0" - Device "Builtin Default glamo Device 0" - Monitor "Builtin Default Monitor" + Identifier "Default Screen" + Device "Glamo Graphics Chip" + Monitor "LCD Panel" EndSection -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default glamo Screen 0" + +Section "InputDevice" + Identifier "Power Button" + Driver "evdev" + Option "Device" "/dev/input/event0" EndSection + +Section "InputDevice" + Identifier "AUX Button" + Driver "evdev" + Option "Device" "/dev/input/event4" +EndSection + + +Section "InputDevice" + Identifier "Touchscreen" + Driver "evdev" + Option "Device" "/dev/input/event1" +EndSection + + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Power Button" + InputDevice "AUX Button" + InputDevice "Touchscreen" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch new file mode 100644 index 0000000000..e332ce0bbe --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch @@ -0,0 +1,22 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch new file mode 100644 index 0000000000..fb8d3815be --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch @@ -0,0 +1,96 @@ +diff -Nur xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c +--- xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c 2009-09-24 07:12:00.000000000 +0200 ++++ xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c 2009-10-08 11:45:50.000000000 +0200 +@@ -95,6 +95,8 @@ + + #include "os.h" + ++#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270) ++ + EventListPtr xf86Events = NULL; + + /** +@@ -1086,4 +1088,67 @@ + EnableDevice(dev, TRUE); + } + ++/* Taken from evdev-properties.h. */ ++#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap" ++#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion" ++ ++/* This is a hack until we get device -> CRTC association. */ ++void ++xf86InputRotationNotify(Rotation rotation) ++{ ++ DeviceIntPtr dev; ++ LocalDevicePtr local; ++ int ret; ++ int swap_axes = 0; ++ CARD8 invert[2] = { 0, 0 }; ++ static Atom prop_swap = 0, prop_invert = 0; ++ static int atom_generation = -1; ++ ++ if (atom_generation != serverGeneration) { ++ prop_swap = 0; ++ prop_invert = 0; ++ } ++ ++ switch (rotation & RR_Rotate_All) { ++ case RR_Rotate_0: ++ break; ++ case RR_Rotate_90: ++ swap_axes = 1; ++ invert[0] = 1; ++ break; ++ case RR_Rotate_180: ++ invert[0] = 1; ++ invert[1] = 1; ++ break; ++ case RR_Rotate_270: ++ swap_axes = 1; ++ invert[1] = 1; ++ break; ++ } ++ ++ if (!prop_swap) ++ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES, ++ strlen(EVDEV_PROP_SWAP_AXES), TRUE); ++ if (!prop_invert) ++ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES, ++ strlen(EVDEV_PROP_INVERT_AXES), TRUE); ++ ++ for (dev = inputInfo.devices; dev; dev = dev->next) { ++ local = dev->public.devicePrivate; ++ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8, ++ PropModeReplace, 1, &swap_axes, FALSE); ++ if (ret != Success) { ++ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n"); ++ continue; ++ } ++ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8, ++ PropModeReplace, 2, invert, FALSE); ++ if (ret != Success) { ++ xf86Msg(X_ERROR, "Changing invert property failed!\n"); ++ continue; ++ } ++ } ++} ++ ++ + /* end of xf86Xinput.c */ +diff -Nur xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c +--- xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c 2009-10-01 08:27:36.000000000 +0200 ++++ xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c 2009-10-08 11:28:42.000000000 +0200 +@@ -391,6 +391,12 @@ + if (didLock) + crtc->funcs->unlock (crtc); + ++ /* ++ * Rotate Touchscreen ++ */ ++ xf86InputRotationNotify(crtc->rotation); ++ ++ + return ret; + } + diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.1.bb b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb new file mode 100644 index 0000000000..8f72741387 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.7.1.bb @@ -0,0 +1,19 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" +PR = "r1" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + " +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/xorg-xserver/xserver-xorg_1.7.2.bb new file mode 100644 index 0000000000..8f72741387 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.7.2.bb @@ -0,0 +1,19 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" +PR = "r1" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + " +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " diff --git a/recipes/xscreensaver/xscreensaver.inc b/recipes/xscreensaver/xscreensaver.inc index 5f8cdc0074..628f1207aa 100644 --- a/recipes/xscreensaver/xscreensaver.inc +++ b/recipes/xscreensaver/xscreensaver.inc @@ -6,7 +6,7 @@ DESCRIPTION = "*The* screensaver package for X11" HOMEPAGE = "http://www.jwz.org/xscreensaver/" SECTION = "x11-misc" LICENSE = "BSD" -DEPENDS = "intltool mesa freeglut virtual/libx11 gtk+ libxml2 libglade" +DEPENDS = "intltool virtual/libgl freeglut virtual/libx11 gtk+ libxml2 libglade" # xscreensaver-demo is a glade app LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver index 584cb0a53c..2e0db5bfbb 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -49,10 +49,13 @@ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" fi -# use usb mouse if present -# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically -if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then - ARGS="$ARGS -mouse /dev/input/mice" +# Xorg doesn't support "-mouse" option, and uses /dev/input/mouse0 automatically +# On neo we have touchscreen as /dev/input/mice, usb connected mouse would be probably mouse0 +if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mouse0 ]; then + if [ "$XSERVER" != "/usr/bin/Xorg" ]; then + ARGS="$ARGS -mouse /dev/input/mouse0" + fi + USB_MOUSE="1" fi # start off server in conventional location. @@ -128,8 +131,21 @@ case `module_id` in fi DPI=142 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" - XSERVER=/usr/bin/Xglamo + + if [ "$XSERVER" = "/usr/bin/Xorg" ]; then + if [ "$DPI" = "285" ]; then + # Fix for only 3 columns of icons in illume desktop + DPI=280 + fi + if [ -z "${USB_MOUSE}" ]; then + # Fix for segfault while typing on illume keyboard + ARGS="$ARGS -nocursor" + fi + ARGS="$ARGS -dpi ${DPI} vt1" + else + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" + XSERVER=/usr/bin/Xglamo + fi ;; "Nokia N770") ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate new file mode 100644 index 0000000000..b852c0cb1d --- /dev/null +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate @@ -0,0 +1,23 @@ +#!/bin/sh + +while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] +do + /usr/bin/xtscal +done + +SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration + +if [ ! -d $SYSFS_CALIBRATION_DIR ]; then + # moved in 2.6.31 + SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/s3c2410-ts/calibration +fi + +if [ -d $SYSFS_CALIBRATION_DIR ]; then + echo 0 > $SYSFS_CALIBRATION_DIR/0 + echo 80000 > $SYSFS_CALIBRATION_DIR/1 + echo -8000000 > $SYSFS_CALIBRATION_DIR/2 + echo -81000 > $SYSFS_CALIBRATION_DIR/3 + echo 0 > $SYSFS_CALIBRATION_DIR/4 + echo 75000000 > $SYSFS_CALIBRATION_DIR/5 + echo 65536 > $SYSFS_CALIBRATION_DIR/6 +fi |
