diff options
188 files changed, 12810 insertions, 2533 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 7137876a93..b4e78f8118 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -215,8 +215,10 @@ autotools_stage_all() { # b) packaged staging will fix that anyways. :M: if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then + echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + fi fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index ca5303d97f..005e7cc0e9 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -10,6 +10,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index b29d86cefd..133859d5a0 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -13,6 +13,8 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \ inherit autotools pkgconfig gconf +AUTOTOOLS_STAGE_PKGCONFIG = "1" + gnome_stage_includes() { autotools_stage_includes } diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 968aa42c3b..94fdbf41c4 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -100,6 +100,8 @@ def oestats_stop(server, d, failures): response = oestats_send(server, "/builds/%s/" % id, { 'status': status, }) + if status == 'Failed': + bb.note("oestats: build failed, see http://%s%s" % (server,response)) except: bb.note("oestats: error stopping build") @@ -124,7 +126,6 @@ def oestats_task(server, d, task, status): logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task)) if len(logs) > 0: log = logs[0] - bb.note("oestats: sending log file : %s" % log) files['log'] = { 'filename': 'log.txt', 'content': file(log).read(), @@ -149,6 +150,8 @@ def oestats_task(server, d, task, status): # send report try: response = oestats_send(server, "/tasks/", vars, files) + if status == 'Failed': + bb.note("oestats: task failed, see http://%s%s" % (server, response)) except: bb.note("oestats: error sending task, disabling stats") oestats_setid(d, "") diff --git a/conf/checksums.ini b/conf/checksums.ini index b3d2f441a3..df007df044 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -26,6 +26,10 @@ sha256=5782f645ab00224e733b018f82ea6e84d72a9f16a56ad645f4930145576bc8b5 md5=7f76fd173b550b1236025592be88f84c sha256=f09d4ae3365b876da9f40f49178ab7241bb7e4c1d67db9e2f310f9c76d5834a6 +[http://maxim.org.za/AT91RM9200/2.6/2.6.20-at91.patch.gz] +md5=333b0e9328194f28af83c26d3717e4ac +sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47 + [http://www.amd.com/files/connectivitysolutions/geode/geode_lx/AES_Linux_LX_02.01.0100.tar.gz] md5=12cb241a9037fffe31ba7c68a48ed614 sha256=a6068b4aa0e2330eed6e4741bad3191dc9ca7d7326f7bfab578ac55e2b8b91a2 @@ -66,6 +70,10 @@ sha256=8750d58745e57654820aa9359891cb0d875d804dbfcfa2e1bb95c56531e423d1 md5=1ab76bfd6731d80f6abbd1643c90cabd sha256=7794d91711e8c9e526431da72c53bb08e14790f326d0e330d9e9d651f3f6fc6c +[http://pypi.python.org/packages/source/C/Cython/Cython-0.9.6.14.tar.gz] +md5=edb342c7525119c2a924897873d215b4 +sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7 + [http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.101.tar.gz] md5=6e9bb994a8716112a78c1306261f4164 sha256=a96fb122261fb5f069341d7e69dcf07a2988da7cfd8df65d50843b8b102fb55c @@ -150,6 +158,10 @@ sha256=8401b31d22605e787edef75025eb048b2b3cfaee92ed8358bdcaedca5761f7ea md5=3942a55cfc5e6d3b612a46cc1a9515b9 sha256=e6dafb82ddf7730ebe7ae2de0ce158d3052d782780b41a14c4fed304e463632e +[http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip] +md5=9a6dc3846041b899edf9eff8a906fb11 +sha256=f764d0554e236357fc55d128a012cb6ac2ceb638023f4af88c8f509511f209fd + [http://www.urban.ne.jp/home/kanemori/zaurus/IaiMaster_0.5.tar.gz] md5=6e3992e261e1fb7fbae08530d45886b7 sha256=bb837de5130cdbe2c1f4dd7ded8c890ef11f37979526e480afd82b364605563b @@ -158,6 +170,10 @@ sha256=bb837de5130cdbe2c1f4dd7ded8c890ef11f37979526e480afd82b364605563b md5=b12df56aedcfd0af2e61c503b3643f51 sha256=8c03d7fec2bc1f43be6b1b4d91b88e79fed3f02bf0f993553083222d24da6190 +[ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-6.3.5-10.tar.bz2] +md5=1b31777138ed78ae0e95b8480cb7e2c2 +sha256=a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84 + [http://effbot.org/downloads/Imaging-1.1.5.tar.gz] md5=a64512e39469213ced0d091b9eba76c0 sha256=14fd700b64d3060e356fc217d8539d1fb468d8688a451f9d6e2faaef1139a58c @@ -170,6 +186,10 @@ sha256=7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90 md5=0f429212fdcfd99efe6bfd3904adece8 sha256=272ddac7f039d12938f50c281f42941d6dea7ab940f1b3b3dd5ab28572678bd4 +[http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2] +md5=cb5dcdaf07ccad18a921058138dedc4a +sha256=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c + [ftp://sources.redhat.com/pub/lvm2/LVM2.2.01.15.tgz] md5=c71654baff263254fb5a226624ee8ef3 sha256=80b47604ace83db4450f43d94a99fdf2ca317323fde8a591f57290d28ece7d3b @@ -206,6 +226,10 @@ sha256=ffac9cd4a6fbc59618bf4e79c389a927491a81b448528278e010a190e2483544 md5=18c05d88e22c3b815a43ca8d7152ccdc sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 +[http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2] +md5=7e27e535c2d267637df34898f1b91707 +sha256=3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953 + [http://www.cpan.org/modules/by-module/Mail/Mail-Sendmail-0.79.tar.gz] md5=038f261afd091d8fad347d6c66d2833d sha256=8a5eb39d3b9a3a4219c6d6051328c62bd51e9b53723ee5b42cd66e8672e681b9 @@ -266,6 +290,10 @@ sha256=fc87440d252c77f5c1afc17bb3015586cca264bc5fa8794bc54b869b8106265d md5=bb1b4859522cb6e1a3a3dc4b7397db64 sha256=412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68 +[http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.12.tar.bz2] +md5=6f4bf7d803d442e9d093a0daa203d506 +sha256=d60027a4a36e64d02723d00b76c08e8d92850cab6269b2edcda4a1bb30cc7723 + [http://downloads.sourceforge.net/openjade/OpenSP-1.5.tar.gz] md5=87f56e79ae0c20397f4207d61d154303 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704 @@ -322,6 +350,14 @@ sha256=9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13 md5=0415b95a023061679021323d9ce56fe0 sha256=e93c6f74e425d4b9e65ecc7e7b7854c586a1448009ce873b30e7a2d6c8ca30ae +[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.5.1a.tar.gz] +md5=0132c5cd2f8685e4948fb14dcb65f637 +sha256=7f34e865505bd467557220961b091fc54782114865e1c5b81e68395989ddbd53 + +[http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.8.4.tar.gz] +md5=100b95005bb93c8b95e96406aad661bc +sha256=0f8f39a3c78a0d0ec947da1c19c7f8ecb41123755ff2bc31795a77946280f627 + [http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tar.bz2] md5=0ba90c79175c017101100ebf5978e906 sha256=325fdc7351a08bd8d811e7fb53c41bff11764648ab1a671abd910afec946b38a @@ -354,10 +390,22 @@ sha256=ee75c05bb8a17a7978abbbc0f38fb79b1915c1e2357889e65657a39024d5b3a3 md5=a150750ad33c512edc4afee5270b37cb sha256=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4 +[http://www.ralinktech.com.tw/data/RT71W_Firmware_V1.8.zip] +md5=1e7a5dc574e0268574fcda3fd5cf52f7 +sha256=e2d3ac1aaf4815e0c9531bc3fb7f56f30604cd52351332f1f8d6a28bb9a953bf + [http://www.libsdl.org/release/SDL-1.2.11.tar.gz] md5=418b42956b7cd103bfab1b9077ccc149 sha256=6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730 +[http://www.libsdl.org/release/SDL-1.2.12.tar.gz] +md5=544b4554986e51eed6d34435cf9c5f3f +sha256=df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9 + +[http://www.libsdl.org/release/SDL-1.2.13.tar.gz] +md5=c6660feea2a6834de10bc71b2f8e4d88 +sha256=94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132 + [http://www.libsdl.org/release/SDL-1.2.7.tar.gz] md5=d29b34b6ba3ed213893fc9d8d35e357a sha256=f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd @@ -378,10 +426,18 @@ sha256=2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69 md5=2b8beffad9179d80e598c22c80efb135 sha256=89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a +[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8.tar.gz] +md5=0b5b91015d0f3bd9597e094ba67c4d65 +sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6 + [http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz] md5=e45b1048d2747480dcc65ece4130a920 sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb +[http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.7.tar.gz] +md5=6bd4662d1423810f3140d4da21b6d912 +sha256=2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53 + [http://bloodgate.com/perl/sdl/pub/SDL_perl-1.20.3.tar.gz] md5=ab7fb92a1ed0db54a88839e64b9ce2c6 sha256=ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d @@ -466,6 +522,10 @@ sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5 md5=56df2ae66db57932515a491c03bf514f sha256=f3b2df3f4483752a42f1a775a1163da1f9e91bf5f19d302abc93544aca20d2cd +[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz] +md5=1a933b1114c41a25587ee59ba8376f7c +sha256=1684cb64a6bd24e019532ae2e5d4a962d43d9215623e9d4dc77536f118fbf31b + [http://snafu.freedom.org/Vmaps/Vmaps-1.1.tgz] md5=0ba6f2b97ff8eb3e975ed906f2311080 sha256=f97b3c0a36c7422d38af67dd68855e5c25581f7b6e79f8671e298e66b4d0026e @@ -554,10 +614,34 @@ sha256=482891fb0e376e2aaeee25afa8b4913e6dc50f4fdc280f9f152b3ee8745d735d md5=bbc9c124f8072875129bd67092f0fa0b sha256=db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f +[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-2.6.0.tar.gz] +md5=d627a5d1061160c683f2257da498355b +sha256=35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb + +[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-2.6.3.tar.gz] +md5=40d9da8b04c70035b89f8ad7fcc4519d +sha256=e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec + +[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-2.6.4.tar.gz] +md5=16748b2d6e318e0e2a25581005e1943a +sha256=4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe + [http://www.abiword.org/downloads/abiword/2.5.2/source/abiword-plugins-2.5.2.tar.gz] md5=0ad700d0cb6d176b39a191b16e3886c0 sha256=5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85 +[http://www.abiword.org/downloads/abiword/2.6.0/source/abiword-plugins-2.6.0.tar.gz] +md5=ebdc165d1b6c3c69f11148cf7841f257 +sha256=329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785 + +[http://www.abiword.org/downloads/abiword/2.6.3/source/abiword-plugins-2.6.3.tar.gz] +md5=92a2e98fb26595666cb68e9bb56babd0 +sha256=d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194 + +[http://www.abiword.org/downloads/abiword/2.6.4/source/abiword-plugins-2.6.4.tar.gz] +md5=3bf973c5a1446ef3eaf980724821d6e9 +sha256=ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb + [http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-0.7.0.tar.bz2] md5=59ea4498886642aa975f04233cc92558 sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931 @@ -606,6 +690,18 @@ sha256=0273c476875e5dd09c7e15e8de58ed18fa9f5f2f9482a78e4171b3f56d75efa4 md5=34c0447951d438d76fa32d08eab5da01 sha256=90cbd5030938ce1622a8e399c95088bf464bceb95adc290640d4610eb8522aeb +[http://download.aircrack-ng.org/aircrack-ng-0.9.1.tar.gz] +md5=07488ff1e178b5b7fe04c6fd78da2b96 +sha256=dd76f20083aca758c71ce8b7d9f0a4c0042b9720d508e48339bf0949fad5300c + +[http://download.aircrack-ng.org/aircrack-ng-0.9.3.tar.gz] +md5=f37fdb000d8bad77da6a0a43bc2ef67a +sha256=71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58 + +[http://repository.maemo.org/pool/maemo4.1/free/a/alarmd/alarmd_0.5.20.tar.gz] +md5=9730a07d6990422a92559f9795a694f5 +sha256=0a2cfda6701b344eed3e760089e306c50bfd71699592e4e0711c4609814a23ba + [http://downloads.sourceforge.net/albumshaper/albumshaper_2.1.tar.bz2] md5=242c260c50fd774f2301dba66deb668b sha256=67b43e51aa5afb22a7329fd78e9d17f489fceb4ac00d9861312993709739528e @@ -642,6 +738,10 @@ sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3 md5=94254ea0d2c966a58184b134e9da29ff sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952 +[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.17.tar.bz2] +md5=9bbbdc502478cdc75074c9ba42c385b3 +sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833 + [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2] md5=3106c2d59a329263867fa3dd44133dda sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790 @@ -654,6 +754,18 @@ sha256=c8feb3eb9d4255a4aff7ca839555293c237c1b2f034c118127e826843c6f0184 md5=49fb5fbae8bf955b248e46ff9c9a2aa1 sha256=85245d7666d82cc44010dfe14f6427a8586da2c8b033fb636f0f041dd7e5168b +[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.17.tar.bz2] +md5=1b1850c2fc91476a73d50f537cbd402f +sha256=8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca + +[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.15.tar.bz2] +md5=908c2dd7ec33bc8e1fcd5e92c7e5e125 +sha256=3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95 + +[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.17.tar.bz2] +md5=f37d0b2b19dfbe215144941ab8bb6e49 +sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560 + [ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2] md5=ba9b8010120701d0f6daf061d392cfa2 sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b @@ -670,6 +782,10 @@ sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb md5=287f46f891581c15018de4f8c0731575 sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac +[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.17.tar.bz2] +md5=14ccd0c900bf663afb36eac6f92d41d6 +sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125 + [http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz] md5=e3619c07bd175ce5f73d67388c0c2ea5 sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13 @@ -686,6 +802,10 @@ sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c md5=ed2183311aacf5714afbd825f3671417 sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3 +[ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz] +md5=bb96cc8d50b4f00ee653f0800643ea8a +sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926 + [ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz] md5=b1e6309e8331e0f4e6efd311c2d97fa8 sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d @@ -746,6 +866,10 @@ sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10 md5=67d439a252996357b0313b3ad999739a sha256=6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686 +[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.14.tar.gz] +md5=19efa18fb1ef20c58b9b44e94258b814 +sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045 + [ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.3.tar.gz] md5=e2e6e23f43bfdf135b923205659dfaf1 sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710 @@ -774,14 +898,30 @@ sha256=3179a3cb9d42cd9651622e911e18c6ebff58f338a9f2f4f36610ca74d8c54885 md5=c0d60035d45c7f43d2ddd3c021709220 sha256=693609f59d0c0a6518a3654314aaef841305e029c8f7de4c42fbc0fd7f2dbb35 +[http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2] +md5=ada6a8dff4a147f41de02174f8703a0b +sha256=adbc29af4d08e64a221e213597556bf2a7121503fd33a66a2ffceeeffb404e88 + [ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz] md5=cebfeb99c4a7c2a6cee2564770415fe7 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 +[http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2] +md5=3e6bcedc549cb4c014227f882969db5c +sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e + +[http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch] +md5=ce753d3c06825e3e8d6801258d63f761 +sha256=1c6e90e00f3cb202f206e4b8f0524948ba295feb66aa6a68cf189f34dc851bde + [ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.5.tar.gz] md5=17fd8acac6293336bcef44391b71e337 sha256=ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b +[ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.tar.gz] +md5=bc80f0198773d5c05086522be67334eb +sha256=4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36 + [ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2] md5=16449e0a266e1ecc526b2f3cd39d4bc2 sha256=24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898 @@ -802,6 +942,14 @@ sha256=115248cb7b1fc35dc2be24218f91a87272cf5c0d8c2050a36da2314fadc05cf4 md5=88cfcd5c3b2a8f2504e561cb93546299 sha256=cc70d2ff8a2cafe3c7cce10dc5e90146111bc686ed6e08fc753e950c7050611e +[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.10.tar.gz] +md5=69057e2916287f6e2a1e36dba6d6800d +sha256=72bbb19e35ec304df06dca717b7ac2cae0d3409fe47c17c2dcf75850f61ddbe1 + +[http://ftp.digium.com/pub/asterisk/releases/asterisk-1.4.19.1.tar.gz] +md5=3b416557d2c395a36b97a819812e99b0 +sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259 + [http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-1.2.1.tar.gz] md5=bed4259905a7d7bc070c6319142b2075 sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a @@ -970,6 +1118,10 @@ sha256=d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561 md5=c84b1a8a23126e188426728710414dc8 sha256=9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52 +[http://avahi.org/download/avahi-0.6.23.tar.gz] +md5=aab1a304851d8145ea5f6a85c10af9e9 +sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d + [http://downloads.sourceforge.net/avetanabt/avetanaBluetooth-20060413.tgz] md5=3cb3be404950ef08e51adbe59c7b811e sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447 @@ -1262,6 +1414,10 @@ sha256=016b0faa1bbe20c13a4b5f495a5a4071349f6385012b767c89bb908452faecf2 md5=e26e2e06b6e4bf3acf1dc8688a94c0d1 sha256=e2c33ce6f23c9a366f109ced295626cb2f8bd6b2f08ff9df6dafb5448505a25e +[http://kernel.org//pub/linux/devel/binutils/binutils-2.18.50.0.7.tar.bz2] +md5=d5bce238060d631be60a3f1f1009a7ba +sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc + [ftp://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2] md5=9d22ee4dafa3a194457caf4706f9cf01 sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b @@ -1274,6 +1430,10 @@ sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1 md5=1e80b2a4e0d17aba3e377b3ee140ab5e sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872 +[http://download.berlios.de/bitbake/bitbake-1.8.6.tar.gz] +md5=0e0dacaae704aed08a940389250e61e9 +sha256=fd8a9e9e916314f9385f497d1f9b81d0885487f7741ad7be790972f44fc68b25 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2] md5=bbb3df097821d3edb4d5a4b2ae731de6 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219 @@ -1314,6 +1474,10 @@ sha256=5980de18e195be06f99afbc76f3c72e7ef7dbba03f16814351d20b8a2531c474 md5=d76dbdbb59924ace618e48fbddbf3365 sha256=eaa1a9746a4613a75a9fe9fc0c54a724758b899c5a898b8b50578066d8a82ead +[http://bluez.sourceforge.net/download/bluez-gnome-0.14.tar.gz] +md5=7c4106e6932683c12c1e30bfb166c13d +sha256=cdc6ceea80bb1f3d951deae17dbb2854a13c214ac5f452765650d59c9014ffe6 + [http://bluez.sourceforge.net/download/bluez-gnome-0.26.tar.gz] md5=d1e68cf63458472eaeb70ef1b3f1df5d sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2 @@ -1366,6 +1530,10 @@ sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e md5=60d48b5b83d98718ea642a887fa59b0b sha256=3eb55f212f554bdd6f41c10df8966e4ae90d89154756ffad396027c859d1e7b6 +[http://bluez.sourceforge.net/download/bluez-libs-3.33.tar.gz] +md5=4b3403f1c61f7b7758cabf1ac5cb5092 +sha256=04ad733f88662470906a6f0d9894f670a07573f7f7d2698c5ada70b3ae1ba3da + [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz] md5=8b73b0ccbcef6a4270468487b1309990 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8 @@ -1402,6 +1570,10 @@ sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103 md5=3d17bb712d243bb1b316f7e8a909fa82 sha256=9ffeaa94b862edb7e753a2f97f50b872435a7d5fe9135f24690733a777e85ecb +[http://bluez.sourceforge.net/download/bluez-utils-3.33.tar.gz] +md5=2e02aabd1a48998a48a22797f59ccf14 +sha256=c9e8f3aa3a34a558293faa1cb2b2204061852d045aaa5311bb1481f89751ab1d + [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz] md5=f63b440396baee7dee9259395a205d48 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39 @@ -1442,6 +1614,10 @@ sha256=7aeb2c4eb6ad6636631f85816b4f4d21ce811f763412530b70b2c85602e795d3 md5=00b1eee7f98b68fa762c4efb3b34caa1 sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf +[http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz] +md5=77a1ba78f37bdd7f024b67e1e36ad151 +sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26 + [http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz] md5=b86fb56a824d4a3dedcbda12f8b1a2b3 sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66 @@ -1526,6 +1702,22 @@ sha256=f3e1592607d42cab45387790af0cb0fea2d061f70f8679672a4397bcfe3562e5 md5=63041103f88192d209f6b1d7944fd118 sha256=1d7c1b1931549ac294f438c50148da052f69f501676ba361034ef72b111605d3 +[http://www.busybox.net/downloads/busybox-1.11.0.tar.gz] +md5=2e5b08cd8a76daf4a185c69b8070797f +sha256=458e4f20723a1527be0b563896b2d314bf2bb0063d5627f0c6536ed07f544771 + +[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch] +md5=f7780f73d3338b17d5f2eedbe76132de +sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b + +[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch] +md5=83763d83057bd5288bbd99f8a5b93c5c +sha256=8b09efc89a8618d526dd210a8a296558a27b1a5324d47b219826b2e1713e5e58 + +[http://www.busybox.net/downloads/busybox-1.11.1.tar.gz] +md5=9c9f06c2d949c6de844c7bed8eb47064 +sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03 + [http://www.busybox.net/downloads/busybox-1.2.0.tar.gz] md5=6af69ebbbf8adc874ccb6d67dca95df5 sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0 @@ -1590,10 +1782,30 @@ sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19 md5=ee76864958d568677f03db8afad92beb sha256=4b526afa73ca1ccd6f5f1f5fd23813f159f715c3d0e00688f1df54b51f443cdd +[http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz] +md5=3c15a0c8d1d3ee1c46a1634d00617b1a +sha256=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22 + [http://daniel.haxx.se/projects/c-ares/c-ares-1.3.0.tar.gz] md5=badb4563a02d4188b478df31fa1b657d sha256=5c4594f71eab62e24d12c67ae6a6aead306c537cf71e946c4e9fbebbe9786243 +[http://jalimo.evolvis.org/repository/sources/cacao-0.98+hg20071001.tar.bz2] +md5=9ff10c929bd0cbf15909107c1aff7518 +sha256=fdfdbdfdebefb89af560297796d4861ef4fc939e9dbe8500750909dea8662bee + +[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-0.98.tar.bz2] +md5=8b8907c8b925761c9410bcadb9705346 +sha256=cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188 + +[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.1/cacao-0.99.1.tar.bz2] +md5=a5641452c7ba173060c99ed700950b3d +sha256=c3b078efa6a417b5dff677497de0ae6ab9f66bb56c6490dcc96f43c082e69e07 + +[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.2/cacao-0.99.2.tar.bz2] +md5=912e353a26c88ba5f5f59ebb9f688e2f +sha256=670cd8fccb0749e657ebe72fa01e1b2dfbce3d811fe617136ccb8a39fc0bd5da + [http://cairographics.org/releases/cairo-1.2.2.tar.gz] md5=2460487b1257a5583c889b1b9d2033ec sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02 @@ -1774,6 +1986,10 @@ sha256=885eda0bbe68018b5770437e542473508f88205bb09cbfde7fc6e0c31f5a6f83 md5=5767ec5e6ff0857cbfe2d3ec1ee0e2bc sha256=39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93 +[http://www.kokkinizita.net/linuxaudio/downloads/clalsadrv-1.2.2.tar.bz2] +md5=7865b6c175e457ea9cb0148ce8baa746 +sha256=0fed89dd092936b5ffa74ad7df77a72b8cbeec8cea226ff48e107e326bd36f50 + [http://downloads.sourceforge.net/clamav/clamav-0.88.6.tar.gz] md5=db7f8b947bc21023f36e04bfdd555dd0 sha256=cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa @@ -1814,6 +2030,18 @@ sha256=6a068f70f908ee4de0ba4d7e1d5127b12ad548da371494c668966d1ff98e05a2 md5=cf5aaaf07fe43567fa605b33165355d7 sha256=4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b +[ftp://ftp.gnu.org/gnu/classpath/classpath-0.93.tar.gz] +md5=ffa9e9cac31c5acbf0ea9eff9efa923d +sha256=df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945 + +[ftp://ftp.gnu.org/gnu/classpath/classpath-0.96.1.tar.gz] +md5=a2ffb40f13fc76c2dda8f8311b30add9 +sha256=ee464d20ef9df2196e238302d5d06954cb96a11e73c4c44c6ef376859de2a078 + +[ftp://ftp.gnu.org/gnu/classpath/classpath-0.97.2.tar.gz] +md5=6a35347901ace03c31cc49751b338f31 +sha256=001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4 + [http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2] md5=079f167fba6e17ae2c688a0dae858b0f sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5 @@ -1822,6 +2050,10 @@ sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5 md5=c0e2718d4bcd932709a6e1bcc910c47a sha256=056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b +[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.0.2.tar.bz2] +md5=97a0c627f91b51b6851b9a1ed9ee7afe +sha256=d04db59df8b013651721312ed167df95d47c88d55eac0eb5b7950d6958f3636e + [http://downloads.sourceforge.net/clearlooks/clearlooks-0.6.2.tar.bz2] md5=451ef33d1bffa261c5cbe01182199f97 sha256=be080113c9e9d137ee14eaf7f731c5ae58d24924748aaa725d0f061d59265f3b @@ -1834,6 +2066,14 @@ sha256=71d8c6459a4be1912dbc445e2e9d46303be6623cea51563c21abe39c8b5b0bd2 md5=7265673901eacb0b72a11cd6732cc698 sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057 +[http://www.kokkinizita.net/linuxaudio/downloads/clthreads-2.4.0.tar.bz2] +md5=90b650f1f5c9f39f4d77f73aca3c53be +sha256=a69fd566af24b85a10c5ecd957a85b7f5eb1c56995d2b999219b52f353ea1de9 + +[http://www.kokkinizita.net/linuxaudio/downloads/clxclient-3.6.1.tar.bz2] +md5=bd47f80a855d3203fcf10365e79d85e4 +sha256=9de3e621d7acabb161b5926565a9c9373fedbc632222018f692346790149545d + [http://www.cmake.org/files/v2.2/cmake-2.2.3.tar.gz] md5=c0b57a115e24005f9828ca7b53908779 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd @@ -1850,6 +2090,10 @@ sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1 md5=e95ae003672dfc6c8151a1ee49a0d4a6 sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27 +[http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz] +md5=32b0df93b285ee094e053552d9301cb6 +sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch] md5=97cdbeb23bc8c8f4fe563d10a0c8c110 sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378 @@ -2026,6 +2270,10 @@ sha256=7b83689a47efa627d4b5670317125de3d87ae9278cf69c3ac7e3b7be646e715d md5=823010ec78215d476537c9eba9381cdd sha256=7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73 +[http://downloads.sourceforge.net/dtorrent/ctorrent-dnh3.3.1.tar.gz] +md5=9bfe42c2dd6a6aabd545fe332bc23e87 +sha256=e65d9c7a4da499314126d979a0a79ce5123e0f969c786bfddcee261f14cb648b + [http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz] md5=37570a7f018f41d701cd29cd95b45241 sha256=c8c42cc08b9b462f9c497441dacde1eac71fd717195ddfbeac68141bd0ad95a8 @@ -2126,6 +2374,10 @@ sha256=384279adfd582ad6f905197c46a5157f855462718530148fdbab3328cf621eb7 md5=ea76410ad88fa7b6c17a6aac424382c9 sha256=0ee2d5d04972a15c3154730f328467a5cf5c7e69766a73bab06664263666bfeb +[http://www.cython.org/cython-0.9.6.9.zip] +md5=5eba3f3d2ed1271adf85b39079ab0415 +sha256=b58768fd50c7eefde5a0943ce3c99843cfbdf736793e439a0df4ab7916c7fb58 + [http://xlibs.freedesktop.org/release/damageext-1.0.tar.bz2] md5=1d88a72b12b5ec505747069053d54847 sha256=4488bee8994e45dfe91563e89fd7e862779ae02a67b8a121d2ec10b263f2d2f3 @@ -2186,6 +2438,10 @@ sha256=a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337 md5=efd0c958da79c1cd941ecd3f63e637ae sha256=055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b +[http://samba.org/ftp/tridge/dbench/dbench-4.0.tar.gz] +md5=1fe56ff71b9a416f8889d7150ac54da4 +sha256=6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a + [http://downloads.sourceforge.net/dbh/dbh_1.0-18.tar.bz2] md5=dca09e2949616471669320e3429a49ef sha256=62c8c36df69c48bed9e8a1406faa5df5d057876b34fc110492c87260a70692c6 @@ -2242,6 +2498,14 @@ sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57 md5=ee893bc87b784a8c2285f5041b5e7033 sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57 +[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.82.4.tar.gz] +md5=f491e0372128a6d1178b210a8b1a842f +sha256=e34e30a4c0ea405f9e830aa0026e9c0632f526f242e90526ff0a7da8dd7f5e2e + +[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz] +md5=562c78876219bf458d79a041af18293d +sha256=89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191 + [http://packetstormsecurity.org/UNIX/scanners/dcetest-2.0.tar.gz] md5=74ee7617c8b01cc641992c1d13dc394b sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3 @@ -2438,6 +2702,14 @@ sha256=6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 md5=621dc7dc1e3b9b6770110117df45611a sha256=e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a +[http://downloads.sourceforge.net/djvu/djvulibre-3.5.19.tar.gz] +md5=0330d87ad337e408e21e1018eb511839 +sha256=57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78 + +[http://downloads.sourceforge.net/djvu/djvulibre-3.5.20.tar.gz] +md5=c94091de014b3aaf037d3d0f398d36c2 +sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 + [http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2] md5=d80acad88411e7944b9b085463d53302 sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2 @@ -2474,6 +2746,10 @@ sha256=f4eeee90f076d891034faf1268b6352b8df9cb262b787384ed4386cf6ea4faa7 md5=ea0a936e88eb294038e67eeb0d7129c4 sha256=05fdfd561eee33de12d978795b7f12338327c6da1ce65971463b58f2e90b48e4 +[http://downloads.sourceforge.net/dosbox/dosbox-0.72.tar.gz] +md5=262939cc28966c1f9b07c2bc472b699f +sha256=1747d7d9f1e5c0635b5d2d3e6648e8dc36316b1bc88b3755bf96b7fde499ac79 + [ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-2.10.src.tar.gz] md5=59a02f311a891af8787c4c9e28c6b89b sha256=55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064 @@ -2482,6 +2758,10 @@ sha256=55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064 md5=407d405ade410f7597d364ab5dc8c9f6 sha256=0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484 +[http://www.azzit.de/dotconf/download/v1.0/dotconf-1.0.13.tar.gz] +md5=bbf981a5f4a64e94cc6f2a693f96c21a +sha256=8955fad7d9e7aef36f7a82f9577c3ae4901db1ded6ce57aec0d93e39c8899b65 + [ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz] md5=0fc9fffc2c2cfa7107d8f422815078c1 sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f @@ -2494,6 +2774,10 @@ sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713 md5=88effb358aa04d25036b662d588433a6 sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817 +[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.14.19.tar.gz] +md5=dad1a4a08c475b31a6b62e7dc92fe9d2 +sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587 + [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz] md5=8e11d77770452f97bb3c23f510489815 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d @@ -2522,10 +2806,22 @@ sha256=152f87b4fbfe3976c0409fb9e0812af17c9aa0907b04549604110c05248f810f md5=5c0f7405b915799c3d952d3a93a5df69 sha256=39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c +[http://matt.ucc.asn.au/dropbear/dropbear-0.51.tar.bz2] +md5=95d900913bee4b27d7e9ce55f8a55427 +sha256=8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c + [http://www.monkey.org/~dugsong/dsniff/dsniff-2.3.tar.gz] md5=183e336a45e38013f3af840bddec44b4 sha256=82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5 +[http://install.tarball.in.source.dir/dsplink_1_50.tar.gz] +md5=f14e000ae17735568c9cb58bde504fb5 +sha256=677a8cd27d05b1401ddef152270a498fc4d34cb9ba94779c571f2f2794b20811 + +[http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz] +md5=a2d7803976f82db3edeb374109cba6df +sha256=8ae0026054fb9f437d59a3bb932628fc2915af6697e430325e0950e960ca6c34 + [http://www.jdl.com/pub/software/dtc-20070216.tgz] md5=8762121262ead127171c4fce40ccc289 sha256=dd687b4f691bf9970f53ca2c84d8481b9f82d857de347375d29bacf648b8da71 @@ -2566,6 +2862,10 @@ sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9 md5=1829b2b261e0e0d07566066769b5b28b sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b +[http://people.openmoko.org/stefan/e_nm-big-hack.patch] +md5=91d8ce9e7bfcc0a61220ebc4ea83ab5f +sha256=60ed501bd19b61f7d8456a2e906c890307e73f20ec1e4186d4eca312a74b0d05 + [http://activecampus2.ucsd.edu/apt/sarge/easysoap++/easysoap++_0.6.1-5.diff.gz] md5=fecfbc5272922f85635d0229d1b05260 sha256=37e5aab00a316a22329c64848f467b0ce73bba3bcb08c4cba6d193ba8f5e9b90 @@ -2586,6 +2886,18 @@ sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952 md5=c3c60c83f6df30021e11da50a699dec9 sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077 +[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar] +md5=412d8badd227807ef2f52608435240fb +sha256=dfe24798ca067c75c84f01bf4ee3734fde3e32e4f270f7222025218d3baffbbb + +[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip] +md5=9e1fc1c86c85e72df5e141069b82041d +sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc + +[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip] +md5=9e1fc1c86c85e72df5e141069b82041d +sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc + [http://enlightenment.freedesktop.org/files/ecore-0.9.9.037.tar.gz] md5=ec6d00a39ca6648f12f58f8d4f2208cc sha256=2c31372ccfc9b411edc73785450c5212dc4a2fe286de9f49f38a02dd24895aea @@ -2634,6 +2946,10 @@ sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28 md5=fd318a634c8f67c7ac8a975f16965cc3 sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29 +[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.131.tar.gz] +md5=f7963fba80c6f74cd6c4990d2a76d121 +sha256=947a9566a622f701a2fe2416d3b85b397d38d5f4189da91fc0a306b4d9950e6f + [http://www.mowem.de/elitaire/elitaire-0.0.5.tar.bz2] md5=3fb7b6073f3171d446698eb963fb087e sha256=91f16720df83b15da8747506d17224e2b3e5dd5e606c91a7f76cc7d784aae694 @@ -2646,6 +2962,10 @@ sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 md5=2a09c0355f33112e96ed253bd0bb308a sha256=0b46174c68b9cb19d0335f3f5194ee41e26865f4a9a62df9410f30693865e2d5 +[http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-0.23.4.tar.bz2] +md5=5a41033e3e41e9769628e0118f32d5c3 +sha256=c493b9a22c9580d49fd90d2bb6955435ccba9304ecb382411864041d914c94d6 + [http://ftp.gnome.org/pub/GNOME/sources/empathy/0.9/empathy-0.9.tar.bz2] md5=74c7255a56ffa8e37147a1a0cfe40565 sha256=51eab13f16c48433035e84b8eb6c66afbbf3e48199323d25f4f9a09c8047d078 @@ -2662,6 +2982,10 @@ sha256=f4b43083923e2998298fd270a8a9f9ed570f4fbebeaa46ce5f1788b76920308b md5=b3581e28d68d452286fb0bfe58bed3b3 sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d +[http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-1.9.tar.bz2] +md5=b3581e28d68d452286fb0bfe58bed3b3 +sha256=02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d + [http://download.sourceforge.net/abiword/enchant-1.1.3.tar.gz] md5=c95186755fe46b27a78d9a85fef2175c sha256=6a8bce57437c514f2578e7ff09f8a48ff3b20e7ed746c3113372d2c75d382c83 @@ -2714,10 +3038,18 @@ sha256=af38ecbffded26fd6caf3216ce0d1286322c461498630a2c83ab8722b8a8b712 md5=70b4c5c36781b6e1d5d2ed30a79db9c5 sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573 +[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.6.tar.bz2] +md5=cce9edb41b4a8308e0ef0eea24b5a1ab +sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f + [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz] md5=383db51e46d13d986966459e4918d236 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b +[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/epiphany-2.22.1.tar.bz2] +md5=f3354751f7e293c03ffb9f26bd00b17f +sha256=6faf0aaf8a44ad119baa921a634eb8dd2d02c4f501af176f294164f7d49dca5e + [http://enlightenment.freedesktop.org/files/epsilon-0.3.0.007.tar.gz] md5=408d3c63f9efa06e93e29a691c28985e sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc @@ -2734,6 +3066,14 @@ sha256=ae023107f8e0c872a2bb6f23a9a5f019b254e9b7eebd20a309af996d9cb7e38e md5=3facb5aa0115cc1c31771b9ad454ae76 sha256=68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76 +[https://launchpad.net/ubuntu/breezy/+source/esound/0.2.36-1ubuntu5/+files/esound_0.2.36-1ubuntu5.diff.gz] +md5=44b4d713387fb3f18666d289f88ae00c +sha256=9bd7db657b8e9622910b9d3188096e37ee627ac0651c78ddce58e205e7487932 + +[http://downloads.sourceforge.net/espeak/espeak-1.37-source.zip] +md5=5c7b292d0537232868b4ac1317d76c02 +sha256=77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3 + [http://downloads.sourceforge.net/espgs/espgs-7.07.1-source.tar.bz2] md5=d30bf5c09f2c7caa8291f6305cf03044 sha256=7e0ed705da90a4c65368675d68ccecb871f89cb06d2efc61ddd0bb5fee5570f2 @@ -2794,10 +3134,22 @@ sha256=ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e md5=f9414b4dbfdff9a8f7f2f146a351e05a sha256=30dbad09953d92e48cc27681d601d0a55e30dc8e82a89c173098187bd7b35e61 +[http://ftp.gnome.org/pub/GNOME/sources/evince/2.22/evince-2.22.2.tar.bz2] +md5=3661f901ab40cee44d5350a045a8bdb1 +sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e + +[http://ftp.gnome.org/pub/GNOME/sources/evince/2.23/evince-2.23.4.tar.bz2] +md5=4e353edd6481f67ee534a40d4b7f3b8c +sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b + [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz] md5=29bc8aec80b53480c2ea53aea1796e15 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6 +[http://www.exiv2.org/exiv2-0.15.tar.gz] +md5=bb18d19e1d6fb255dadda456cadec00e +sha256=b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e + [http://projects.o-hand.com/sources/exmap-console/exmap-console-0.4.tgz] md5=eb8b6d834d2224e17561593dc4158e4d sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b @@ -2874,10 +3226,18 @@ sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e md5=163a846e51b39fd626b43548c2cdda7c sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz] +md5=c324eb1e157edad17d98b1b2c8b99e25 +sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81 + [ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz] md5=c324eb1e157edad17d98b1b2c8b99e25 sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81 +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.5.tar.gz] +md5=95c0c78c734b9782ec8d47e99c8e3fc8 +sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa + [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz] md5=1c5a2ea659680bdd1e238d7828a857a7 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e @@ -2890,6 +3250,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f md5=2aaf871471a9ec037763c5dc7c193c57 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575 +[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz] +md5=92a70f9e56223b653bce0f58f90cf950 +sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54 + [http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-0.1.698.tar.gz] md5=1705bc0f8f1e03fe50d324ba84ac4e56 sha256=332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35 @@ -2914,6 +3278,10 @@ sha256=ec9f93968147526a9b2dd17e31a6d2795356b2eeed309f796f655b37b98abd83 md5=17062ae0f1d7d093e61cd002e39885ae sha256=190e2b5ae8467d4b0c26b10e091c74509e00d4bd895c240842ee02a870caa3eb +[http://only.mawhrin.net/fbreader/fbreader-sources-0.8.2a.tgz] +md5=3b4944bf0d37b42249bef84d59918ce0 +sha256=4e505820b150ae35a40c39a3d2aeb7a8dcb6bd9b599055c40f566d874e4d1c82 + [http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz] md5=40ed9608f46d787bfb65fd1269f7f459 sha256=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338 @@ -2966,6 +3334,10 @@ sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c md5=08f2e21c9fd02f4be2bd53a62592afa4 sha256=e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf +[http://www.fftw.org/fftw-3.2alpha3.tar.gz] +md5=a657ef428d0643942ec3e472b61b56d9 +sha256=4fc8fbe0cf94a0d281ddc309fa91e2b6e2fb14f4cafe525d20635a196c2cc245 + [ftp://ftp.feep.net/pub/software/fget/fget-1.3.3.tar.gz] md5=a556eef04aeb574ac8ab0dd8c868fcab sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43 @@ -3010,6 +3382,14 @@ sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800 md5=7a1fc804ed735c5b7e9b1498bac8b5db sha256=b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24 +[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2] +md5=4210ae0801df2eb498408533010d97c1 +sha256=606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9 + +[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2] +md5=406d67174f8f74ab154a1b17d0881b27 +sha256=e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33 + [http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0b2/source/firefox-3.0b2-source.tar.bz2] md5=77f0455cc0dcfaaf020f9ce54c065fb0 sha256=57a2d9cdbe69a507d2294c081bc74aeb4d6cbf4e72dc764cfc9b972151535f57 @@ -3054,6 +3434,10 @@ sha256=ca7653a03f562057098c9fb956de34021a14017c2a44eedd3ab0963dc877e7e5 md5=24c1576f5b3eb23ecedf4bebde96710f sha256=10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2 +[http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz] +md5=ae0aca1cb7b4801f4372f3a75a9e52b5 +sha256=922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b + [ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-0.17.tar.gz] md5=d44da0fc0fd495f580b9174d3beb6f7e sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db @@ -3262,6 +3646,10 @@ sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17 md5=f035852f521b54677f2b5c9e2f6d54a4 sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363 +[http://fontconfig.org/release/fontconfig-2.6.0.tar.gz] +md5=ab54ec1d4ddd836313fdbc0cd5299d6d +sha256=a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5 + [http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz] md5=890615fa4b3e6c82cd1b9807b106f042 sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd @@ -3346,6 +3734,10 @@ sha256=7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954 md5=65234327c5ac46ee00ebda15995d4c1c sha256=1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e +[http://downloads.sourceforge.net/freetype/freetype-2.3.6.tar.bz2] +md5=fb182d508017cb608e9df8c7dca648dc +sha256=d5a698c30376d14c1ce6540ed6d5627796421e6e97576620ea4562411a110e77 + [http://downloads.sourceforge.net/fribidi/fribidi-0.10.4.tar.bz2] md5=0f6e7ecca08e6e108dc06337f5b5cabf sha256=f3ecdb9d108bd61ec9394df75f5fd68ba886a8da0863ba6258338893aec6c04f @@ -3550,6 +3942,10 @@ sha256=63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913 md5=b594ff4ea4fbef4ba9220887de713dfe sha256=3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd +[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2] +md5=4a21ac777d4b5617283ce488b808da7b +sha256=7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.0/gcc-4.0.0.tar.bz2] md5=55ee7df1b29f719138ec063c57b89db6 sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc @@ -3582,6 +3978,14 @@ sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 md5=ef2a4d9991b3644115456ea05b2b8163 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] +md5=d79f553e7916ea21c556329eacfeaa16 +sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a + +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] +md5=4afa0290cc3a41ac8822666f1110de98 +sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 + [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz] md5=fc49f45251c1336fe1dad5dba1c83fcd sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92 @@ -3658,6 +4062,10 @@ sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9 md5=78f4b862510beb2e5d43223dd610e77d sha256=41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7 +[ftp://ftp.gnu.org/gnu/gettext/gettext-0.17.tar.gz] +md5=58a2bc6d39c0ba57823034d55d65d606 +sha256=209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba + [http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz] md5=f3d3f474a1458f37174c410dfef61a46 sha256=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694 @@ -3698,6 +4106,10 @@ sha256=41f4befa851177e2ca9bbab2fad19926178c831454ca51f2cb91fec0ed9e243e md5=a46acb413484300583ffca1fa54e0874 sha256=38ddc0ebc452968db653efce31864d61bc4a5e521a9694a8b9b8f4fe49a2d131 +[ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.19.tar.bz2] +md5=9b5cc6aef0baca3735ce9bc4fdc949d9 +sha256=f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0 + [ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-2.3.7.tar.bz2] md5=dfc47a29b3a7ade07bd17244f0e83311 sha256=2a6c869ba61c1b18bbafa95bdf89cdc8fe1f07b068aa37dc9332a158b7e295eb @@ -3706,6 +4118,14 @@ sha256=2a6c869ba61c1b18bbafa95bdf89cdc8fe1f07b068aa37dc9332a158b7e295eb md5=393e7fb4e5e141faa2e3b44da3f301e3 sha256=ea5cb59c739357003b3c7fb0d1166e8d8f913be6e9f4737c1905e62b93b0246f +[ftp://ftp.gimp.org/pub/gimp/v2.4/gimp-2.4.0.tar.bz2] +md5=35fecf14cd5237065aef624b93030d5e +sha256=ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc + +[ftp://ftp.gimp.org/pub/gimp/v2.5/gimp-2.5.2.tar.bz2] +md5=98add4a1ca6af2e20f80ae3f5a84a922 +sha256=78d209885768790be6d610d275430e6e775392b6384d326401a7ecc13606c539 + [http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2] md5=0a8474e0d90b139b1baa70b097a4fd51 sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436 @@ -3818,6 +4238,22 @@ sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d md5=195f9a803cc5279dbb39afdf985f44cb sha256=562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d +[http://download.gnome.org/sources/glib/2.16/glib-2.16.4.tar.bz2] +md5=2ab79b3c93258827cc6ea8ee50128e49 +sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d + +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.4.tar.bz2] +md5=2ab79b3c93258827cc6ea8ee50128e49 +sha256=16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d + +[http://download.gnome.org/sources/glib/2.16/glib-2.16.5.tar.bz2] +md5=039f02d47d4071322a3f00abf031e5d9 +sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 + +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.5.tar.bz2] +md5=039f02d47d4071322a3f00abf031e5d9 +sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 + [http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2] md5=aa214a10d873b68ddd67cd9de2ccae55 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5 @@ -3978,6 +4414,14 @@ sha256=7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1 md5=7b2e951912d4bee9613c35244ca32673 sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231 +[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.2/gnash-0.8.2.tar.bz2] +md5=05cac831181be3fb40cbf3c00ab25c0f +sha256=4c81e71e6619b79da9641a90ed2c73c362603103bcdcc7b9cc5cc53739d06baa + +[ftp://ftp.gnu.org/pub/gnu/gnash/0.8.3/gnash-0.8.3.tar.bz2] +md5=5033ef2602ea1234a9ccb73000a0dedb +sha256=af1fd8454472e0ac588c015b09c67449392f32aa6297d4a625b8344dce11c39a + [http://gnokii.org/download/gnocky/gnocky-0.0.3.tar.bz2] md5=239cfb4b743dc69723acbd01c44e7128 sha256=fb11b959c039f1a2c5471b2dc1270607acfc15fb667a69c2d4bdb0970b3595bb @@ -4010,6 +4454,10 @@ sha256=de8ba10bf7321b70ba5b3bdd45b61411b5a9fbd401fbe639041a875be01bd8f4 md5=e92edb17cd75faca45a4fe2d6806bdd8 sha256=56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.18/gnome-desktop-2.18.3.tar.bz2] +md5=98de3b7d0da690da8b94cddc74f3914b +sha256=8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.7/gnome-desktop-2.7.90.tar.bz2] md5=16691f6bdc7c09445c457387adaba1f1 sha256=6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e @@ -4030,6 +4478,10 @@ sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086 md5=e5fbfa461612916143a1321c9e0efde4 sha256=9d31e7ff0ebed5c7213bf45c5a810656b079ad03ebe3cc8fb952d984a52d6ddb +[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.22/gnome-icon-theme-2.22.0.tar.bz2] +md5=a4c03092da28ad53ed3867aef83f29d9 +sha256=98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2] md5=2fe5fb39cc18d1a6792fd3281223dfff sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612 @@ -4078,6 +4530,10 @@ sha256=dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a md5=a532717e8ac7f67b7198c256909cd7dd sha256=61a01f535b50ca0a4c35b4b59513287f17e0665c0b678952cae663b883b13827 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/gnome-panel-2.18.1.tar.bz2] +md5=6c325f5b5f9f424faa494665720bcfb9 +sha256=c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c + [http://downloads.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz] md5=db310dadcc958a781a2752a6a7748e60 sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179 @@ -4134,6 +4590,10 @@ sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 md5=78ffd75ae6abc3bb20dd04407a082a26 sha256=badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0 +[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.3.tar.bz2] +md5=3ce6ba6483ccd6fe9974cface582337a +sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07 + [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2] md5=c34736eb7cb687f9e5b6d4df48aaf7c8 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 @@ -4142,6 +4602,18 @@ sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 md5=66258443d9f93cc4f46b147dac33e63a sha256=a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 +[http://downloads.sourceforge.net/gnuplot/gnuplot-4.2.3.tar.gz] +md5=6b6d22662df5101b308c465a722c43ce +sha256=4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4 + +[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.0.4.tar.gz] +md5=d04b446fc76687272e64259d36d78b0e +sha256=2374cbf6df3568d7cef16ba6a11802e52e37d88719f704dff40d4fff9f81d313 + +[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.1.2.tar.gz] +md5=0208be69c598b37c8a0c4f59437e55d9 +sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb + [ftp://ftp.gnutls.org/pub/gnutls/gnutls-1.4.4.tar.bz2] md5=de5e060eeb2da36654e9e8af6b8b012a sha256=dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035 @@ -4170,6 +4642,10 @@ sha256=cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b md5=ebd3dc3ed4dffde781a2dc4eb4e39f3b sha256=cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57 +[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.4.0.tar.bz2] +md5=dce4000841ba5f80d310c4972b5f3efe +sha256=c682bca6f1ccc28bdc15751168893e0b28107217b275168b456d519292e44d87 + [http://ftp.5z.com/pub/gob/gob2-2.0.14.tar.gz] md5=f8721af6f4e90ff48bd7cb4c96a5a94c sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9 @@ -4186,6 +4662,10 @@ sha256=158258dcb85fd4f3e4ee5a61df49560f8b65d94682ef9322cbb20fb2d3e93034 md5=bb86c6ee2d953da77519cac4e1a5c609 sha256=fb35c1ae8dcd8cf81836a65536b7f62a274a90ccab6f579519c0885a575095bc +[http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-0.6.3.tar.bz2] +md5=3d8d3357f9d58af901cd1d6eb42e2973 +sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c + [http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.10/gpdf-2.10.0.tar.bz2] md5=9278cd3b9d06e3b1d364452f0e512fa9 sha256=b6a5abf78363205e01bf1d238eaf4c349c9725f57aa18e2adc0445268540c7e6 @@ -4322,6 +4802,10 @@ sha256=e51bdbba46d7d6950c1f4d3139a167f4c823e403f8a53b30a16cea32c7d540dc md5=b10a91ce3fb39b87656fc5c5510b68d6 sha256=780ddb4f2bb72e3e8d970ebc647c8040cfef0fccd405773cf7776074c26175b6 +[http://gpe.linuxtogo.org/download/source/gpe-calendar-0.91.tar.bz2] +md5=478ed24de48860712f45563640041301 +sha256=75581218e2871c8bd1ab645977318050d9ba60c5cf632a51c05c4339fa9365ae + [http://gpe.linuxtogo.org/download/source/gpe-clock-0.14.tar.gz] md5=367d329ff8af75abcb7f214e9b669c9c sha256=fb5790c58430e1ce9cfdccef117de4937c35a411894642aea622638519e5b764 @@ -4362,6 +4846,10 @@ sha256=6a246caeb7d29c2afb48e8c70ef8e1f2ba2a4642faeef3defd266522304d278b md5=849e9c42564174921f9bc9a1b08722ef sha256=0d46c8ec7b443d37630ef0625df3ac824f590a3048c6b973be83c305ab4de079 +[http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.7.tar.bz2] +md5=7fe086de357f209df9413fb07a515724 +sha256=f69273239546ea212f862e0c86a8288f63dad78359ce3c1081b98bddd778b378 + [http://gpe.linuxtogo.org/download/source/gpe-confd-0.16.tar.gz] md5=2677260df7d834ec416450e09ae5ba72 sha256=9ffba12d92466f9e34fed21e38baae5cbb6608436ee53fa3704fe3be5fceb4af @@ -4382,6 +4870,10 @@ sha256=f35c5e664ba0e9c3b3d694cdb1ee9af7c9195b6ace8e2ddeec0a0c21d7632df0 md5=5fcffd454e9c8f0b14804283c32da0ee sha256=5ceab2c275036da754ae7b7cbe162f9f2a5936334050beb34838d4f82e89843c +[http://gpe.linuxtogo.org/download/source/gpe-contacts-0.47.tar.bz2] +md5=c956ed93b8a163c046e9a7c19256432d +sha256=aa9656db3e46b27abf7564f2a04799f4b32e4c342e3036d069d456b103717bc5 + [http://gpe.linuxtogo.org/download/source/gpe-dm-0.48.tar.gz] md5=92e81fc34bb4643088efeaf1f6423483 sha256=4a78e69b44209d1c79a8649024584175aea518e5862d39c582944719a9a5e995 @@ -4426,6 +4918,10 @@ sha256=172e19d8ccaec35329064184790f9e4e64f1b31f412ba8b12c21860208a4e35e md5=625cb4e7a316c3a17f5cedca90dc3cb7 sha256=debebb0d6572ebaeabcd7581d688f69e20024f25be5fde01e6d0d8aaa149ebb3 +[http://gpe.linuxtogo.org/download/source/gpe-filemanager-0.30.tar.bz2] +md5=aecfb8d03fbfe11dfe6bc17db9591aee +sha256=6b4b4ee697472c7073e3ef9fa2e2ff89bcee07be452942814857cad3ef4f55ff + [http://dominion.kabel.utwente.nl/koen/pda/files/gpe-fsi.tar.bz2] md5=e485b0c8424dc9666078d482d22447da sha256=6a7455e4a066d5ecd9520feb9cd7bb1a7ecfe267faef32cd04a97b5c1738f8ec @@ -4474,10 +4970,18 @@ sha256=c87b5b67205dded1df87436badf0af307937e8d8d67c6279e961ee043dd23388 md5=459167b93c5ec6965d841e680243713f sha256=dde5a6aea6c997fa7621278c3c9fa95d4e18e1019409dd94a7e36b72615fa761 +[http://gpe.linuxtogo.org/download/source/gpe-login-0.90.tar.bz2] +md5=1c2f4993ce0355e364c3d0c5abd04c84 +sha256=e6441d0c64dde18f8cf3b6f733dfdc697708e982fb1dda122aa0d8877e0e826d + [http://gpe.linuxtogo.org/download/source/gpe-login-0.91.tar.bz2] md5=edfd1b07de39b4e5a0908cef8159b21d sha256=0fead38b9078842f847cfcc49fc903637d8185a0eca0be493078adfba799b7bf +[http://gpe.linuxtogo.org/download/source/gpe-login-0.93.tar.bz2] +md5=cb537b8091f91e5d6776f5435c26d2cf +sha256=6dd6f9b558ef7306578b4be1a83712e1080104570499fa9329072973bd2ed50f + [http://stag.mind.be/gpe-mini-browser-0.11.tar.bz2] md5=ebdb2eebb1ca1a5cb8ca7f1e4e3bb817 sha256=372836198e10982525f01e8bf9d959777ab66f93d0688274c43200c4b8c959f8 @@ -4522,6 +5026,10 @@ sha256=ece034b916a7760cfb854baab474b7931246bdb078c814366bf90a9fbff246af md5=1a7a4095cafed9cda21e500842b686a1 sha256=ddba5fea0424c9c121269e96ea202014a29568263d478ac5682022973d2986f1 +[http://gpe.linuxtogo.org/download/source/gpe-mini-browser-0.21.tar.gz] +md5=a1297dfd14c008e3415f89b01eef75cd +sha256=ec0358d104fa992f1437b37cdf70e83ab152794d2989ef2e9715ab8659dc46e3 + [http://gpe.linuxtogo.org/download/source/gpe-mininet-0.5.tar.gz] md5=4d199db47e91da9c89817e8bfbc2cded sha256=288d2470e6c8febb717ed0affa1f55484a0d0a4cdb8a331fae08d56d298a5653 @@ -4622,6 +5130,10 @@ sha256=609e24aa1413b1053ee3fd42c36c6ccf05d8067867021511c7d50d4829875b44 md5=774c64ed54455f1297ecbeeffdc52eed sha256=da051f5049d44415fff02b48368db4e3e3b6154135a50f990844d73896d18e19 +[http://gpe.linuxtogo.org/download/source/gpe-session-scripts-0.68.tar.gz] +md5=af6941561f0ef676b4536531cd4c40bf +sha256=f0cc9809776f77649287e88455657d47e804b11296c0f9f503ea0b1603b2e377 + [http://gpe.linuxtogo.org/download/source/gpe-shield-0.9.tar.gz] md5=1373a00d9dba5508da579c585c585d6d sha256=07d2a2d1c1868b292e3c362e4df4bf32c2aa4b6b22e394a9c5448b8cff4075dc @@ -4666,6 +5178,10 @@ sha256=bf1df54e88dbfa94be7b9f9a4c897635dca1ec56885352d8ebeac99f747b0554 md5=1225673cf9cc1671a031f0eb2b57b3f9 sha256=b0a7db0fceeda65b88bb8abd8743afb9bf0d5674ed3fe6444439c0dad90da27b +[http://gpe.linuxtogo.org/download/source/gpe-su-0.20.tar.gz] +md5=157cb20e41953d2148193d7e3eab173a +sha256=b5e3917a2a2fb1cbce5cc724cd4c6f523c84890b7f97d520808122cf04e89139 + [http://gpe.linuxtogo.org/download/source/gpe-taskmanager-0.17.tar.gz] md5=fd52d952a11913f98c833f6af012099d sha256=7d5938bea991f00e33268305ae11c977b92e4ab3392576f59132cd71fb7d782c @@ -4738,6 +5254,10 @@ sha256=addaf005bbcc23482bb655a0bfe476b4cc5fb303c29a7d6633165f3cbea02571 md5=402b0dcfff28bc5d2bfbcf7b1f644afe sha256=1200fd739898ce71303c758149150910faa803722bd790811b754a48e0ef944d +[http://gpe.linuxtogo.org/download/source/gpe-timesheet-0.32.tar.bz2] +md5=dc99875e4bcc5d4c41b0c471270c3736 +sha256=9360cadc13eea2906089df5fd5f79d94efb14a72081a3d02ea165ee45a792ae2 + [http://gpe.linuxtogo.org/download/source/gpe-today-0.10.tar.gz] md5=7cd5e86b94d84a48077ec6ab6357be60 sha256=1b007d46df292109147f4b270a2a555a5e8c2a90804c37028f1e7d10db512729 @@ -4770,6 +5290,10 @@ sha256=ec2ef95c967acce5834c8b4985c610014c16242d223d233947d67b4514ebe298 md5=d60eda0b82431bc4dd92cf7c40c0efe9 sha256=85124fe55ecd1ad303a3a333b9d8501deb627beeca85bfb6f66832389bc73f49 +[http://gpe.linuxtogo.org/download/source/gpe-todo-0.57.tar.bz2] +md5=149ba7a31c7a7855146faa8f321d7cca +sha256=b8304c9f69922b30064a4e8637576034fe0be3a4b699a04968e1b1f899974df1 + [http://gpe.linuxtogo.org/download/source/gpe-watch-0.10.tar.gz] md5=0c1cc9a5e7086194c1d2ff462759f135 sha256=4e3cc87dfde964eda9092f72f6a945765795d00dad5bb2368d9cb0a500f21fc8 @@ -4810,6 +5334,10 @@ sha256=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055 md5=8b6344276252635b18572bca17aa62f6 sha256=5858eb726867e8c28f42101dbff7a5234b960f5944c7800939bf39a775147322 +[http://gpe.linuxtogo.org/download/source/gpesyncd-2.0.tar.bz2] +md5=399bbb65ddd5d7c4bcd328d2e3880532 +sha256=26db3e8e03af47ffdbf5951e3bbfa2b7ccfd13e03fdac9f4b2d9111a436bc8f7 + [ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.0.tar.gz] md5=1abf7accd905c435da567d0852c080af sha256=685e0162af08d90e01251a02c2f916de59b2b4fa903e9a3a119208b6bcca6092 @@ -4822,6 +5350,10 @@ sha256=376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f md5=3b133a3703f16835e55d1a2f8cfdfa70 sha256=e8dddaf7abc51a33b635bcb6b1864fca72f31fe8e9de3eb70a58e631eed99959 +[ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.gz] +md5=0a2d20f70e6e01a4869ad6b7497404ae +sha256=9b5c1d9dd51c4c8909219619412c7a983512b6ac958ab4cf661322d930c2a665 + [http://downloads.sourceforge.net/gphoto/gphoto2-2.1.4.tar.bz2] md5=5bbee55d4e59b063d3cff0fbc9121006 sha256=c52e77a52ad11a02ae9f0b8491915f3f09fec23f8f740cc6079570241caf63cb @@ -4834,6 +5366,10 @@ sha256=fefaabea8aede51ae9560ba71e2a7c31f4d856b0bb1fc0de7297d12e1215698c md5=2de2bcc62599b8a7337b54b0a067c50b sha256=82330519effc421a39c196d2a2806dc9c3cdcc891b7ec34dee04b3fe4ef4534a +[http://downloads.sourceforge.net/gphoto/gphoto2-2.4.0.tar.bz2] +md5=5fd1f711ca806adb687b33c55964d898 +sha256=8aa5ac34dae18284f3f04db874648a6dc70ecee3045ace674351b7326ae1c4e5 + [ftp://arcana.linux.it/pub/gpm/gpm-1.20.1.tar.bz2] md5=2c63e827d755527950d9d13fe3d87692 sha256=11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936 @@ -4846,6 +5382,10 @@ sha256=c29373b752730195fc52e6ab0fc871f259284e2175bf2baf1701f027da60d200 md5=cf9f349fec33760c8026c9b12c6f7a9d sha256=539d5c703799b12f5785286a689fd16f5fe957c2eaf460360e79f5f51d8c132e +[http://downloads.sourceforge.net/gpsbabel/gpsbabel-1.3.3.tar.gz] +md5=0ba7f4c623518e6bfe8da12d0691fb96 +sha256=b5d1021b0ea755d6b3bee57b0720a22021b6c8bad88acbda314874987f7fc1a6 + [http://download.berlios.de/gpsd/gpsd-2.28.tar.gz] md5=a49e1bd180a4ad4b1f5f9c3bd7f0e15d sha256=2e81676f9bcb01249216c413d253acddd1358a0dd982e77c5e14d15e6a45cabe @@ -4862,10 +5402,18 @@ sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28 md5=1ad07e10f34e46ffdaf10688743f2f43 sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8 +[http://download.berlios.de/gpsd/gpsd-2.37.tar.gz] +md5=6c96cc0b2df0279cb7baac1ebc5881d3 +sha256=8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137 + [http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz] md5=28b13b7253c8f019433be68686070558 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 +[http://www.gpsdrive.de/gpsdrive-2.10pre2.tar.gz] +md5=28b13b7253c8f019433be68686070558 +sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 + [http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz] md5=28b13b7253c8f019433be68686070558 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 @@ -4886,6 +5434,10 @@ sha256=fcee22d7e31a936cde4672ac318ffabb9d39b7fc3b74de391bdade1419c59dfd md5=2cd110305cfe4c530fcd6e34bb52e1f2 sha256=948d389d72906b798db3b5013a1769d1f8c9c9f3b6dff66c8820dfa0820b02e2 +[http://downloads.sourceforge.net/gqview/gqview-2.1.5.tar.gz] +md5=4644187d9b14b1dc11ac3bb146f262ea +sha256=12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546 + [http://downloads.sourceforge.net/granule/granule-1.2.4-1.tar.gz] md5=7f4e11d04e369391de27fca82ee60f11 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c @@ -4942,6 +5494,18 @@ sha256=f05d6793b943b7d1115e2b4b047ec1131c07c9ef0fd890d1616e5be0edd4a555 md5=e21aef9a84d67dea9a68c1379781f763 sha256=a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607 +[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.2.tar.bz2] +md5=3c7fb1cd1308b1972a76b86bb29fc890 +sha256=ffa7c89bccab5d1be53b6fcedcf7a5c071d585cf522fee5864add05d350f5842 + +[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.3.tar.bz2] +md5=c07fd2da0835989fc4eae291cbc05f09 +sha256=b85899ac1c792db2e12d7063c45c0c6638dc8cc234d3ac6786b739cc6486439f + +[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.4.tar.bz2] +md5=761cbbc0b5f077449082d0ea7527941e +sha256=840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2 + [http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/gst-fluendo-mp3-0.10.2.tar.bz2] md5=f3c32e0bc3ec1be461ce43e407a6a67f sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5 @@ -4954,6 +5518,10 @@ sha256=8e6e078161d9cc020ac9a403c3e7c0f124684c994d66b01895b147bf618bdc13 md5=7887664f95687aa72519f3bcd49091dc sha256=4dc7305cdca586ef8d31b7a587c36d5eaa242ec0ddd50db32c3159fdcfab42bb +[http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-0.10.0.4.tar.bz2] +md5=5c250ac8027ba855bc46b1bf8aefa658 +sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645 + [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.1.tar.bz2] md5=398729b82b911eebb14156c2fa02525b sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007 @@ -4966,6 +5534,14 @@ sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e md5=395f3ed705928e77e5620cccf11a8cff sha256=9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed +[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.6.tar.bz2] +md5=fb47838aa0ccef52683cea5d89364053 +sha256=c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6 + +[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.8.tar.bz2] +md5=ddc8f92dab0081f131650ad6c95908b8 +sha256=da4d8b06d3cb3d35940c2313b9c4b52e24d46eb94d3e8b346f0c144362b612a4 + [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.11.tar.bz2] md5=2e78ff25635b31d948def7c2b2d79054 sha256=2193e3f940f0fd2ca10a137efbb79bc1edc8a12543b618b9a97f680f9d15bfb4 @@ -4982,6 +5558,10 @@ sha256=9d7bd85694e2d563ce30b01b902055149ce93a5fe45060ae9c06413f7ecee4c1 md5=151b66228e08ab0c7601713030fb1c3f sha256=f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d +[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.20.tar.bz2] +md5=180dd3452438b31fba732d2216e55eb6 +sha256=aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff + [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2] md5=2b5958fb0baaf8d1b4eae18f7b13d49b sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac @@ -5014,6 +5594,14 @@ sha256=dcf56a49b8fc0db16985bf133d4085d84602a19c15acb79890ac012d7cf9f962 md5=25f111360c2930705b91b4fcf93ae5c5 sha256=9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66 +[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.7.tar.bz2] +md5=e02d729b22451f75414a27456ae5c16a +sha256=9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d + +[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.9.tar.bz2] +md5=c6d873b254eda073d722064003e304b6 +sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8 + [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2] md5=cf604b6acd80b57dc5173db7e93fc116 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f @@ -5026,6 +5614,10 @@ sha256=4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152 md5=f1016148ecbfba968c0ef1773066988b sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62 +[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.7.tar.bz2] +md5=cff4f55138d12152cf580a3ee71c2519 +sha256=556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35 + [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.8.tar.bz2] md5=090d87a1716eee45a9804ca8558668da sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de @@ -5034,6 +5626,14 @@ sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de md5=7c60018e8b9ce7f62c7078bee5851f07 sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98 +[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.7.tar.gz] +md5=166164eb07eacd1d70b965731eb6cbdb +sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106 + +[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.10.tar.bz2] +md5=6183d61e434b5d34f232248a35571627 +sha256=c875753a6cccd40a79f5824ea5ec51ee4615a4f22103e4adfc6a0221bf615d8e + [http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2] md5=16dd6515fd011ad449e5ce191dbb94be sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d @@ -5058,6 +5658,10 @@ sha256=522d674bd9884bb1aff8e5e16fe64d7b8d190a329323db6a1795c4f5fd66ae2e md5=3232416ea6fceab628236d67a7d0a44a sha256=442862dc93e734aa58f13bcf3914dc7a40d3fa28f0ae2152c80457438dc3569c +[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.20.tar.bz2] +md5=d5af70413a65ebf855f788f965685e2b +sha256=c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba + [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2] md5=263a7800ecf44d0f38d0cbc80bce65ff sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc @@ -5098,6 +5702,10 @@ sha256=3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3 md5=e9c280afec29b11772af5a7c807abf41 sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd +[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.11.tar.bz2] +md5=f7aab88e856a813386f797aade5867ad +sha256=c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9 + [http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2] md5=dc8455144f27945f2fcbe91e75acd118 sha256=e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa @@ -5190,6 +5798,10 @@ sha256=47492876466dcbcd82e371264c6a1422f82feb80e40fe25a42ccc1fb7897180c md5=a16fc3d5e2c7b3d94791bf797588adc3 sha256=a5b138e5cfa1f5c2c4dbb0a071d5492d49142c363ec9b92da8d7e3a6e6bb35b5 +[http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.13/gtkhtml-3.13.91.tar.bz2] +md5=debaf8eb4468dc1c084cb3f1b527bafd +sha256=e739290102fed3fb616e27578dee61a33c84301ec875bcf6af9493e8959dbeaa + [http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-3.6.2.tar.bz2] md5=37465fde0f1e1d7ba2284c5a4fd06fe7 sha256=0c34357bd2b4ed3584e18a30f13a9f5d4c70738872ef90db97c1298013b2f7b9 @@ -5210,10 +5822,18 @@ sha256=a9cbed1b4d3491b4e22b80c9f066224ffb80eb7e1113869534ce53b599c7ea5b md5=64d0040925043c0a5d9a8add76a0f98c sha256=99ce4d10541d964d809036970f53579813bb563495070ab09c742cc1e2cdef38 +[http://www.angstrom-distribution.org/unstable/sources/gtkimageview-1.3.0.tar.gz] +md5=574789e014988398dca2debc65c02097 +sha256=6a2f50c1a6e83c94618a271cc9b7ce0460fd1fe58adb12e05d0b1b07b43e4beb + [http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.7.6.tar.gz] md5=4bb348c98367228f0de0a2216a13d48f sha256=4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb +[http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz] +md5=b53564e553728d4b69f7d366dfeb5299 +sha256=1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43 + [http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-2.4.8.tar.bz2] md5=c2aee4c259a75fa0dc766d402bef253b sha256=218420f1c091846fa5f860e5f12c57650d8719f6cf9b922e7c6a69e0505aac32 @@ -5234,6 +5854,14 @@ sha256=ce2a88a784c73d49b3600b5927f65624f665460684dc4b479989ad1c53e565c5 md5=a4aceb5f185878c1de4e8aa7c38b6d1d sha256=6391c9735615ee929f4ae23bbfa8373c97ae64923c7fbe72cc4b0e262c4759e0 +[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.2.tar.gz] +md5=a4b64a992deae0532f8015bcc6c40784 +sha256=1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e + +[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.5.tar.gz] +md5=a3f8216544509a74a4441f689a0410d2 +sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289 + [http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz] md5=238f5ef66317bb24c3d4018a7d1e9ec3 sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e @@ -5286,6 +5914,10 @@ sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d md5=c7005ccb1765d8359fd2348350770495 sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0 +[http://hal.freedesktop.org/releases/hal-info-20080313.tar.gz] +md5=a391649c5d5baa1a8998b2e1c1ad6464 +sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9 + [http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz] md5=bd9195d086566f56634c0bcbbbcbebea sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be @@ -5346,6 +5978,14 @@ sha256=1379b222f81a86f10f5ba0113f43d52a13b5700cd6c57ea4416c8e8650f28300 md5=388d916894122be839ba09d804eefeb5 sha256=c8eabb77f72efaedb2ed4f1f18e2f3ca84164e0a9fa4dd313a23e3b0cc1ca3d4 +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-common-strings-l10n-public/hildon-common-strings-l10n-public_5.0+r6160.tar.gz] +md5=c882f41d9fa63090bc311d474a5f60ee +sha256=9abc9651c9998aae27ec3b2efa1901e24b502965e56922fc77682d7ab8ee3c84 + +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-control-panel-l10n-public/hildon-control-panel-l10n-public_5.0+r6088.tar.gz] +md5=ace44f0019c459cec92a8650944dafe9 +sha256=33b1621daf7cee020a6edcb0268fb71991c691b1412ea84bb9b60f1e2a166460 + [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-control-panel/hildon-control-panel_0.9.1-1.2.tar.gz] md5=72c8b814ebeec8668cea575e08bb1548 sha256=bbe77d297c7560d3fdad343ab49f23c9c0aa1574db77108d1b97845fb7bb26d5 @@ -5354,10 +5994,22 @@ sha256=bbe77d297c7560d3fdad343ab49f23c9c0aa1574db77108d1b97845fb7bb26d5 md5=b2247355c2fa3763904d698ec03ee78f sha256=bc532113a4e4f4646fb523393e1c3da4dbd5cb2955f223bcbfc794216a7ab8b0 +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-desktop/hildon-desktop_2.0.18-1.tar.gz] +md5=b559f191ffa21d3bcc9defdaff5ec2a2 +sha256=10e4321f8d30d629f67749f93cec129da1535b087ec1d67d95c23daf8afeb16d + +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-fm-l10n-public/hildon-fm-l10n-public_5.0+r6135.tar.gz] +md5=732e11dbca619dd7d24b1f5291f30517 +sha256=1e3200c9a1c04236a73c82151d538a33ed87bb97e4a8c362977c4795b604591c + [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_0.9.1-2.tar.gz] md5=6d2646bf0ef3da795a34245b870f7983 sha256=9305aff5ec4eefe462e94b49c0e1ec3037e9d3ae5a6fa47c8cb7136dadcb1e8c +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-games-wrapper/hildon-games-wrapper_1.9.4-1.tar.gz] +md5=b6fd35baddd7f275c3ad980030ab937f +sha256=b523e63ceef6cc7773f0b80e604ee3a9c032855c1a2de49207e8ed1963f8f62c + [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-home/hildon-home_0.8.20-2.tar.gz] md5=dd62148b18abe1e02182abba91e1d55b sha256=1b62825a44d7058e56162d6fc08d06454d30889cfaad6ff0bbd9e32bf4b0ce5c @@ -5374,6 +6026,14 @@ sha256=8899a280fb8d54594aa2423b7dea2c959070ae3fe4eb86458abdc8bb167ef483 md5=5218b2d7864f6f8af3ab6ea0cc27a313 sha256=43a532c99b8cdcc0e2f60d95769dee89f2e03a37c5d5931b8de6e4c39ad721ad +[http://repository.maemo.org/pool/maemo4.1/free/h/hildon-libs-l10n-public/hildon-libs-l10n-public_5.0+r6160.tar.gz] +md5=ac1f91e1e631c20adc4c4b9fe923020e +sha256=feacb7f38d7d859b982acf593ecaca6eeec34d6da34d3a28175dea020eda2aec + +[http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz] +md5=562d712b5cce9989b8b640e877384b47 +sha256=13d1330f1154d3eec92e06a9f15b246434ffef0e4947b3f4787a581dcc34f236 + [http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-libs/hildon-libs_0.9.6-2.tar.gz] md5=cba9fb4c6d61720d03aa4a4d543e2c5b sha256=763bd538f0647c373383c2d91fc0c76ae4840d64158509347162b20425a4c8f9 @@ -5386,6 +6046,14 @@ sha256=51005d8161b45a422158f04e76b244394aa5eb99b5098b2846f989ee9845b9e6 md5=7948087bfe3b1bf8025a37fbb64bde44 sha256=eca16f42de8e4a213acb3ba0978fa56fbdf2f38e5be5882163753068ab4a15cd +[http://repository.maemo.org/pool/sardine/main/source/h/hildon-thumbnail/hildon-thumbnail_0.11.tar.gz] +md5=25d8cc1cf817489a255a5bc6541b8bb6 +sha256=0dbce673dd0b32731994aaee276ad990ad0437174ef7887e51868d5841c3002a + +[http://repository.maemo.org/pool/maemo4.0/free/source/h/hildon-thumbnail/hildon-thumbnail_0.14.tar.gz] +md5=07ae084214ff2c8645a7f7b9337b525a +sha256=f7bdf832d3e44b552d9bd1824598c72f5bb9c1644531c5b6e830a541ea2c84dc + [ftp://ftp.logilab.org/pub/hmm/hmm-0.4.tar.gz] md5=9cd5734e1a54fdcec60ebf345e2e83c3 sha256=a6ca7fc30502b5d724c1ef52fbb2e587755831270fcfeb2e32a83984a6256b3c @@ -5486,6 +6154,10 @@ sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 md5=1713d9a4941120235cb0721ceba6493b sha256=acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586 +[http://downloads.sourceforge.net/htop/htop-0.7.tar.gz] +md5=4afc961fa709167e1b434682897991f9 +sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b + [http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2] md5=887bf4a85505e97babe1d90635361c0d sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c @@ -5546,6 +6218,10 @@ sha256=837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee md5=059e56be476891e84715c897b5935431 sha256=e01b7efcfafa5c00cd1786d71b526f963dcd5129b518cab2b597d21c5d68eaa8 +[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r8.patch] +md5=e03eb32c8e2a2329a424d92ea08566af +sha256=ba4ecafacfc25dddfafee84a5cb71a3d70d8f76ab3008047523036b0feafb84a + [http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r9.patch] md5=ebb78f58e9c84c73b90e9cbdde5f89d6 sha256=7578448fc2adbfc820158b2467dbb127ab012b3a97ad95366d8d1af002defbce @@ -5594,10 +6270,26 @@ sha256=46a02c0dddbe80fbd802da47d0a9eac03002deb538b109dae804553fbbdfa7bd md5=f134dc7324525cd41aa0096072a25449 sha256=13a3c3dc16eb6aaa3a5854a80633f4b047a9396cfb92a30c910b460492fe8f26 +[http://repository.maemo.org/extras/pool/chinook/free/source/i/icebreaker/icebreaker_0.2.6.tar.gz] +md5=cebdfc23cf6ce656cd36c887f8eebd18 +sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c + [http://www.digital-opsis.com/openembedded/icecc-create-env-0.1.tar.gz] md5=641ec45fe377529c7fd914f77b11b44f sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834 +[http://ftp.de.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz] +md5=7124ea3c13369ff27bcff0080aca678f +sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad + +[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz] +md5=7124ea3c13369ff27bcff0080aca678f +sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad + +[http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz] +md5=acfc72473215e2f498ac8dafea78eefa +sha256=15c64c5854e2151be3f1d583a1087c2058c541a73588ba46c1cb78ce346aa48a + [http://downloads.sourceforge.net/icewm/icewm-1.2.20.tar.gz] md5=6c94dae56fbf9aa085a1d780538018c1 sha256=0138dc364ee23156a58d890a5b2c61685bd91ea0017accf90118b38fef2df1d3 @@ -5706,6 +6398,10 @@ sha256=d42ec6f70b00100aa8816740259e3d70686aeae8c05a4f76b67f76b84c79833c md5=4d08cc2b3d54d88f7b68939d85d2dfab sha256=713a67e88d5e4a838823e5340f23d7862ff986a82c4ed0a2aed8fe44f9935120 +[http://www.rpsys.net/openzaurus/patches/archive/input_power-r6.patch] +md5=ee641ee6fda72f4b3c4e388d97fe8c17 +sha256=73c23893ee42b4bc98e84576ab833e9bc40e3a773fcb95747204fc811a33dca6 + [http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch] md5=25bbe0e1412dce7f36f54392872c673c sha256=8526befd5b233a5911ccc6b6db4bba29ca3156db2828c11b5c696aa2e506c621 @@ -5746,6 +6442,10 @@ sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5 md5=0da271f396bede5b8d09a61f6d1c4484 sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0 +[ftp://ftp.suse.com/pub/projects/init/insserv-1.11.0.tar.gz] +md5=252e8602205e733f1a4cbde09df8dcfb +sha256=ccec9cb7b6a5c9137918efac8a80ef0c80a16afa132a5ef2640263cf255e710f + [http://www.Vanille.de/mirror/insttrain-1.0.5.tgz] md5=2cec5b79969d0fc64c510edfe7113319 sha256=2dd29e066dece7062cb30daeedad7e5baa0b5cb993c67ba700ebacd6e0212487 @@ -5902,10 +6602,26 @@ sha256=942240421710da8a04fa6c7071f50f0737ab7198e31c1d96f1e0b73330e0d066 md5=4b83d4047670eb75bd14ae1bdd68dc38 sha256=47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c +[http://www.irssi.org/files/irssi-0.8.12.tar.bz2] +md5=e407b557b3cfc7c91ce4de2571dd79cb +sha256=462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0 + +[ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-1.4.tar.bz2] +md5=4073466e57df23d39721513219e4f7ae +sha256=0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97 + [http://download.ikaaro.org/itools/itools-0.13.0.tar.gz] md5=007ff9e08e26504f5c28462d7bbdaa3e sha256=c682a23faf732203a7de9b82ffb736396e5948e000ab10c1a42b0e936b6cc329 +[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2] +md5=e3013bb1e287b495b0668f4b6e2887c7 +sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a + +[http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.103.0.tar.gz] +md5=03a0f63b997ce7b83a1eeaa6b80f4388 +sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f + [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz] md5=a891a699010452258d77e59842ebe4a0 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e @@ -5930,6 +6646,14 @@ sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867 md5=c7affcc61d4135ee838121a57b08de0f sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3 +[http://downloads.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz] +md5=a965452442cdbfc94caba57d0dd25a8f +sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab + +[http://downloads.sourceforge.net/jamvm/jamvm-1.5.1.tar.gz] +md5=5a82751b50391eb092c906ce64f3b6bf +sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a + [http://www.rpsys.net/openzaurus/patches/archive/jffs2_longfilename-r1.patch] md5=1e30c4f6d5148d8462c41b7f58738531 sha256=f01a8f0975905597aaccd2d6647331aac14615b67a37ccf626bb2ea45db13294 @@ -5962,6 +6686,14 @@ sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585 md5=863bb6462f4ce535399a7c6276ae6776 sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585 +[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.60.tar.gz] +md5=bd8f021e43a8fbbec55ac2cd3d483243 +sha256=cffbcf6721b897ca1259661f418f3d81c1193702f59a29f0f3232c9b8f24faa3 + +[http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz] +md5=5571134c3863686b623ebe4e6b1f6fe6 +sha256=44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b + [http://downloads.sourceforge.net/justreader/justreader_2.0k.tgz] md5=74b2b89b12668cbbbb093b6343e9f52d sha256=55b0dd7ac3f9860a4cba0797213fdaa898b77f3228612e3499d54e6fe6144514 @@ -6022,6 +6754,10 @@ sha256=f219303e60f81b3cf6206b6c1851bd42069bd018ed18482ab04dded0b4339f8a md5=e86438fb4fff46bda188c2211eede1bf sha256=54bfe3995975d17355152c7bd1c5b0dbe61973e15135d52a799be890bc979467 +[http://www.rpsys.net/openzaurus/patches/archive/kexec-arm-r4a.patch] +md5=6ddd28b065a4d31685fe5551ecf5df46 +sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d + [http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz] md5=b4f7ffcc294d41a6a4c40d6e44b7734d sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 @@ -6050,6 +6786,10 @@ sha256=eb8a1c688b07adede53c362355e639d8ac29d30536d69eaee97235d14e6d7e76 md5=a1dcea71f0c3f881ef72f5bca2db7b39 sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b +[http://www.kismetwireless.net/code/kismet-2007-10-R1.tar.gz] +md5=2100c667e69db0cde35fa2d06c8516e2 +sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9 + [http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2] md5=6c96f954676c7b898dfe230e0f2a1fb5 sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e @@ -6058,6 +6798,10 @@ sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e md5=baa1f6e0b6acbf9576bb28cca5c32c89 sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0 +[http://kernel.org//pub/linux/libs/klibc/Stable/klibc-1.5.tar.bz2] +md5=481dfdef7273f2cc776c2637f481f017 +sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7 + [http://downloads.sourceforge.net/klimt/klimt-src-0.6.1.zip] md5=d12f56384b4ccde11cd756db2b14065c sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb @@ -6106,6 +6850,10 @@ sha256=3e406c76874827c236c7070c1349f8b4ee058aa664fc3066435c938bf6d5f0e8 md5=d9c05283660eae742a77dcbc0091841a sha256=35360dd6160d94a981d923486a026fe91dfc3e0db2f5923aeb782b7e9c5e606f +[http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz] +md5=a64c40feb74862cb4a91281bc7737f72 +sha256=9e69ded08dc9a8c75f36a3c020e7aa96b90313d91b2f58add6d4dfff1f8861b0 + [http://downloads.sourceforge.net/lcdproc/lcdproc-0.4.5.tar.gz] md5=c1e74364963054b26b2a77a37bd2bf36 sha256=a2163b474d75dc87891c6a81ce9e89f0c9ceab7cbef14b50f066bf3508eec977 @@ -6122,6 +6870,10 @@ sha256=f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727 md5=76c921973fdea4f880944a024197f924 sha256=930ef7de15eb028c1cdbfe3f1170aaa1d5b0b4d45a8fa496d944216e155122c2 +[http://downloads.sourceforge.net/lcms/lcms-1.17.tar.gz] +md5=07bdbb4cfb05d21caa58fe3d1c84ddc1 +sha256=5ef3b4dab30956772009e29dba33fe1256cf9da161106a1e70b0966c96d14583 + [http://savannah.nongnu.org/download/leafpad/leafpad-0.8.9.tar.gz] md5=66a502c2c9e87b8f7ef0370ecb83cbbb sha256=5e8014be4fbebd0ced491d16eef8ef38a03382c25ef0ce41f0ee22a9ada30a6f @@ -6182,6 +6934,10 @@ sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac md5=b372dcd527fd5b5058e77ee1b586afdf sha256=feb4abd0ea31b5a0b8344bfcb0e5987eefad723fa45f1d8e1e95c62acebab524 +[http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.10.tar.bz2] +md5=9e10a77ff225587e59c0a28c66b4faa7 +sha256=91a5b69435f10002b222be022c832d9860a93e0bc181e3f94abc150486ab031a + [ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2] md5=a75d2dbf3a3c66b567047c94245f8b82 sha256=1c9529f7245778a4f1422d6257d446b7c90a19c3b603b1a25db1669552c464b3 @@ -6706,6 +7462,10 @@ sha256=a2f434898bd5319024a97294cc4c7ba1d89bda4951af2015a887feca116e162f md5=12e136a4c0995068ff134997c84421ed sha256=99565c6f8a560abc24bf6c07726737d54db64daae08c8708fc9e8f3aeb723985 +[http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz] +md5=b92cba3cbcf1ee9bc221118a85d23dcd +sha256=e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954 + [http://www.25thandclement.com/~william/projects/releases/libarena-0.2.tgz] md5=dc51d2466493d16a81af10ae0390b292 sha256=560a17bc5d9e8ef71579391703c2a138d365e68396a5d8b21b1d9e1b232e16d0 @@ -6746,6 +7506,10 @@ sha256=b1a185c6e20ac50c95ec3ba1aca486819984cd213e9cea69ab0dbca21db78b92 md5=f1f0255f94e3354250d142b688013fad sha256=d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754 +[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.22/libbonobo-2.22.0.tar.bz2] +md5=998a576ad26784ac87eab99e96013527 +sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4 + [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2] md5=078942cb9c6a1a31f93958e993353f45 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8 @@ -6786,6 +7550,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb md5=f29e1e63fcc55e3ae4e81f5ee9dd7bdd sha256=448a3ab76109664bb6bd8bcc2c62d957c7d44b52e39c37d91b3b73b5cfe35a3f +[http://repository.maemo.org/pool/bora/free/source/libconic_0.13.tar.gz] +md5=f852e61c2700b5bc571a730c6516e4ce +sha256=1a9caf3ab9fd4d84fb2d8bb2fa1459e41d896a778d63cfd515cd55e1181379b0 + +[http://repository.maemo.org/pool/maemo4.1/free/libc/libconic/libconic_0.16.tar.gz] +md5=f1eb01149548d59956e7aaeb5e929ee1 +sha256=d90517115be58a29de7cf87e006e5e7cb2ae1786792d7d73042563f7b33f55ca + [http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2] md5=575442be0c61e4b1e05f2188e2ae3141 sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe @@ -6902,6 +7674,10 @@ sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499 md5=d444fb0068cdfed01bb1fd1e91d29270 sha256=6ff7a5dbb5ccf14995f6bde7f1fca6be5f7f91f62b2680a00d32e82b172c9499 +[https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz] +md5=4846797ef0fc70b0cbaede2514677c58 +sha256=0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1 + [http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz] md5=77728078a17e39f7c242b42c3bf6feb8 sha256=174cf27c57612971434ec8cc4a52bfd37bad8408e9b9219539c6d5113df6ff8f @@ -6918,6 +7694,10 @@ sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3 md5=493de1bfc84c1e0f82fd865795e48ffb sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c +[http://downloads.sourceforge.net/libetpan/libetpan-0.52.tar.gz] +md5=119eb4ac27fb75540ca74d8997f7fc7f +sha256=dddf7b94e3547436beca1ed5ed22616f350d7e79cd1d72c83b122c1707237525 + [http://downloads.sourceforge.net/libetpan/libetpan-0.54.tar.gz] md5=0214de45b1b92277fbfc6c9a00af5316 sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010 @@ -6966,6 +7746,10 @@ sha256=8daa7618787b3af2218eee9e074f90664bff5676896b997a760f8034383d70d6 md5=1b1e2b495c5aa20c08725f30545a110b sha256=830802525700e65809afdd56ccdb5cd9950747044ab50666257bbb3d59a82754 +[http://downloads.sourceforge.net/libexif/libexif-0.6.16.tar.bz2] +md5=deee153b1ded5a944ea05d041d959eca +sha256=db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43 + [http://downloads.sourceforge.net/libexif/libexif-0.6.9.tar.gz] md5=0aa142335a8a00c32bb6c7dbfe95fc24 sha256=a2f309c702ee72967676d96b1a9d06806d069fde8e88076200cca6479c3d3c38 @@ -7226,6 +8010,10 @@ sha256=db67f8fd78da55e71fe61eb28263d823f1bcda8d878bc6f2ffd9254a925dc84a md5=88d53855c41fa7713263e913871a5fcc sha256=ebbbc25a27587c21ed640b5d87b7c7783f4820c59c22f7b07e29e2306f1bbd65 +[http://gpe.linuxtogo.org/download/source/libgpewidget-0.117.tar.bz2] +md5=b85a839264a35d0faf9a1a38c486e189 +sha256=f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c + [ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-0.6.tar.gz] md5=516623893401d391b6c346cba543681d sha256=32fe6ccae632a2d6ede51477dbdd5b39a0816510031bae0b5e5059099044a58c @@ -7262,6 +8050,10 @@ sha256=4691bc87f567eba4938d1465e7a2ddfaf7bdea86629390830111bd03bd227ed5 md5=1938cbd9718595fd419907bf2f7c3195 sha256=f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80 +[http://downloads.sourceforge.net/gphoto/libgphoto2-2.4.0.tar.bz2] +md5=a60154772635b693ff08b4f34dea7f61 +sha256=0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79 + [http://repository.maemo.org/pool/bora/free/source/libgpsbt_0.1-18.tar.gz] md5=ce884aff8d063f9d51ebf75d899747fa sha256=495ebd711a63bee4eeaae7f0766323f2070bf30ab9b54f5ac18912baa1b41084 @@ -7302,6 +8094,10 @@ sha256=8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d md5=0c1a70ca77aef5706544c1b4082a632a sha256=54a1432c73e2df93dfe16bd6c11eb56c949da0967479be2e31e2c08ea0ee1901 +[http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-1.14.8.tar.bz2] +md5=09e4b6639be79fa888cabc751f73674f +sha256=d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748 + [http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz] md5=29690b14762a970b9ff725c85627c24b sha256=ee8dcb9cb850f94e75e374273b0860bcf214fd242651ee22ac74cbfd37449b4f @@ -7326,14 +8122,46 @@ sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c md5=2f0882a711759113b2388a790abe8fd8 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981 +[http://gpe.linuxtogo.org/download/source/libhandoff-0.1.tar.bz2] +md5=8ec44fda9476391ed372f835d5358fe8 +sha256=9505377f6b4d4b657889e8468fca8049c8c2c46c3ddd03bb4eef0e7b2e1bad3b + [http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildon/libhildon_1.99.0-1.tar.gz] md5=0ac69c278bd9f531a93b3c535f7ff145 sha256=67e74666b49b0d17ff16e209196674dc23faa8c45b4f9b2ad33b94ffb6f3be4c +[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildon/libhildon_2.0.4-1.tar.gz] +md5=2708e643dbfaa722486d71c2516a0480 +sha256=44a7942eaa7ed7f640b3c3b700289f2363bb7264a7443853bdc0786e92ed6346 + +[http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_1.9.41.tar.gz] +md5=204be732181d57af01a35ec5fbe072bf +sha256=f77ecd176be0c470d25431e2f8868bb78179ff1c52f5dd96bb093b13c2718ae2 + +[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonfm/libhildonfm_2.0.5.tar.gz] +md5=0196b326a048e4d1a1ac009f71e235ec +sha256=5065b98c01d9cbd4f7c5a769e659ce1f81cf3396f7c6e7af7785215cd18d7910 + +[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libh/libhildonhelp/libhildonhelp_1.9.1-1.tar.gz] +md5=7388ddc8b191f1ee450c0cb150d36969 +sha256=80272253b0ac6a6e3abe4c8a5398f65bf303f1654a44be7d8ceb1e7a3213b519 + [http://repository.maemo.org/pool/maemo4.0/free/source/libh/libhildonhelp/libhildonhelp_1.9.6-1.tar.gz] md5=6f3328136f1b8dabf667d954b0698189 sha256=b2219de48715579d589705cb7b88af8d3dd3cf18de0fd3d799241720b2384bdf +[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonhelp/libhildonhelp_2.0.3-0.tar.gz] +md5=f02c47001669ef103a22dbde4aa97d2b +sha256=46ad5df524cc74ab728e2a23b4ddc17f2624feb517c2d011b2b32c95ace3ecaf + +[http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_1.9.5-1ubuntu1.tar.gz] +md5=2320b71819d44dc40a974cb67084f2a7 +sha256=6815f0a46de672711866b031c09ed8a94e1cbbe193c6a6b5cb72286ff90cfe54 + +[http://repository.maemo.org/pool/maemo4.1/free/libh/libhildonmime/libhildonmime_2.0.2-1.tar.gz] +md5=b36a6332cbdd8deb73cd97f6e7bd4804 +sha256=a1dd25b7b4a8979f1d78596c2c65f062c30b5db794be71508ceb4d662052a8ee + [http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2] md5=cf829bb82f84728194c64a41e9f1cf32 sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af @@ -7342,6 +8170,10 @@ sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af md5=b77a17e4a5a817100ad4b2613935055e sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b +[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz] +md5=c2be282595751535a618ae0edeb8f648 +sha256=a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd + [ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.0b.tar.gz] md5=a625307d2cda4f3c609b79c1e3a93d87 sha256=794092368890321ffbb9cb1b260808d732658af093bd0a3e01c9b54c4bd657e5 @@ -7430,6 +8262,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea md5=705106da305e8de191549f1e7393185c sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 +[http://downloads.sourceforge.net/mikmod/libmikmod-3.1.12.tar.gz] +md5=9f3c740298260d5f88981fc0d51f6f16 +sha256=891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32 + [http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz] md5=19fc0879aebd1610813a23bd84726362 sha256=857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03 @@ -7470,6 +8306,10 @@ sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c md5=330cb7e3da57d7a4800bdc22e4608c51 sha256=e9e3f157c5c75acef702da9b41c17daa7ea7bb8d0952e6c6960f26980497477e +[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.5.tar.gz] +md5=d5e19bb77edd6ea798ce206bd05ccc5f +sha256=c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0 + [ftp://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz] md5=bf4983ea440542f3ec019cc1bb6ca87d sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29 @@ -7530,6 +8370,10 @@ sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c md5=65ce3266be385d0c7cd9a1157433332f sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4 +[http://liboil.freedesktop.org/download/liboil-0.3.14.tar.gz] +md5=7a9f719e50656b795c06c0167012a84f +sha256=a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f + [http://liboil.freedesktop.org/download/liboil-0.3.9.tar.gz] md5=5d139b1fb16f0e93f0c84290ad2aaff8 sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90 @@ -7562,6 +8406,10 @@ sha256=98a06dfb046c0bf064c12361333a88c6f624df311d8acbc0d25c93fdd6f2c1fe md5=2003ba5397e6d7f5446c03b2321b7b3e sha256=ad2336edd245788a528e55555e92a11bd434360fb7ff092e9edaeafb0442f3ab +[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.0.tar.gz] +md5=6d6b6a75bc8751a7421b5e739c53ef6e +sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c + [http://download.ofb.net/liboop/liboop-1.0.tar.bz2] md5=88fc8decf99fd75d2af40e0a005fa0d3 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2 @@ -7642,10 +8490,22 @@ sha256=4e13febd65a2f8f18cb55151cd10f5f0888bf1e7dc2a4c0d54f39f170255de1c md5=4c5b31154943108ba0fecf00c8af9f3c sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d +[http://repository.maemo.org/pool/maemo4.0/free/source/libo/libosso-gsf/libosso-gsf_1.11.10.4-1.tar.gz] +md5=4c5b31154943108ba0fecf00c8af9f3c +sha256=687f46d5d5eb5ced18534f3cfcfdd82db6b25679437602f1519cae48d019b55d + [http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso-help/libosso-help_1.0.01.tar.gz] md5=dbc3c68809e39bd6681aab8ad16ffe3c sha256=ef6f6fda31dfbf7b3186b6f1d0ffd12ee0675d9a057ad2994f81b5164213a693 +[http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_2.1.2-2.tar.gz] +md5=fc5a1f4598670cec9ac40fb603f80570 +sha256=ecbff97da422f1498eae8f9b8a17389c0ccdd7eee1ca0259f035e712c8e0a405 + +[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso-help/libosso-help_2.1.2-3.tar.gz] +md5=af766ed86b10dc14ed75d7ed256cbc8e +sha256=3e19a9940c3afb6e55623844f687e7ab0fa5599a1d01313d094f6ea0fe1367a4 + [http://repository.maemo.org/pool/maemo/ossw/source/libo/libosso/libosso_0.8.9-1.tar.gz] md5=f40c4c73f58cf62859129c3ff08d159d sha256=d832126b22dec3a60ee6cdbd476c908f7715fc94d6f1ee11731b1b1ffaf41d47 @@ -7658,6 +8518,10 @@ sha256=90febc4d50cb7b383f4afe67aa80acce9a246ba6a927b5bf805e8f401f16b7bd md5=92c51a937120eb1f230f84f58ce08da7 sha256=998a13a713c826a6ddbc69f956fbb78deef18b63e65f450a430df39930bcadb4 +[http://repository.maemo.org/pool/maemo4.1/free/libo/libosso/libosso_2.16-1.tar.gz] +md5=7be17731c65497c3122a562a6e117db4 +sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f + [ftp://ftp.pl.debian.org/pub/debian/pool/main/libp/libpaper/libpaper_1.1.20.tar.gz] md5=7075f580606a84e63b7d6d9fa3124c31 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9 @@ -7734,6 +8598,10 @@ sha256=2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69 md5=4691ad687281e943260021272c28043e sha256=ff30a5f1a99c61caebcdce9f59417b3f7a0dbed15c6786368f4a4a1d05c67eb1 +[http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.22/librsvg-2.22.2.tar.bz2] +md5=aae602677ce201b1a0ed6a0c18c207f2 +sha256=2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e + [http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.6/librsvg-2.6.5.tar.bz2] md5=2d1d16f9493c80ce8214e585727334ae sha256=11b97cbc654e366adedc28a93e334d34d46365b09a3adb028449119ab67cd643 @@ -7762,6 +8630,10 @@ sha256=9b3577052db92ac9282f4912eaa487729de34bf058585cfcbc79478831207889 md5=da63b0ed460c0f44b9f85774caf3fb0d sha256=a33977201ff13a4c08d3a74de0fcdbe7f072e4a92a261d5f39fbf16aab069050 +[http://gpe.linuxtogo.org/download/source/libschedule-0.17.tar.bz2] +md5=ba3a1063a9e8cd5a730b3871e468c227 +sha256=802c72f5f11d60f5cb75ef8acc116c5ab0600e3bc099fc5accf8a997e463b374 + [http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.10.tar.gz] md5=c009b0c89e5cf91dba17261f4cccfc4c sha256=e7720307f3fafb210963b6d91c608f25ae2088880260b3e39508c27aab13a3a0 @@ -7786,6 +8658,10 @@ sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160 md5=37c51ba4bd57164b1b0bb7b43b9adece sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 +[http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz] +md5=c2945a19ebfc94cb3a04b394ba2e07ed +sha256=a6b13f25e5e6b91ad490fe9e8afac22c484f372e4e245d397a813ea6563abdb3 + [http://downloads.sourceforge.net/libsigc/libsigc++-1.2.5.tar.gz] md5=d0d1ffcae0eced97ef4f17ce0ba81352 sha256=dcd6d3ea9a2c185b5286f80eefe9ac1402036b8fa21cfc742442d99579bd2b3e @@ -7818,6 +8694,10 @@ sha256=13447233b19f7a9d4e14b362f28f1dbe4bb6652bdc182bba974234b0bc15e791 md5=5a36bc38b8b70a0951fb3acc479503f5 sha256=d74ed600fab1bf5bab86a4815a5170157607317030bd9316e587486e29e815f8 +[http://gpe.linuxtogo.org/download/source/libsoundgen-0.6.tar.bz2] +md5=ce7e2c206c612e2dd09ec42e1179c9a7 +sha256=b4d9050bf46dab0f2f3a47911eac255c08159ab3965f5f10c4ab4e903eee1e31 + [http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.2/libsoup-2.2.100.tar.bz2] md5=936e29d705aab0483b9a5b8860f68c13 sha256=fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d @@ -7838,6 +8718,10 @@ sha256=e69f4cc9baee9be87400371cbdca1cb03428394c624640e64397089d090dbf0d md5=c779f84c4add124e704e6ea3ccc4039c sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a +[http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2] +md5=d0fc91ccb9da401e9e40d2f4612bdac9 +sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd + [http://www.libspf2.org/spf/libspf2-1.0.4.tar.gz] md5=5fe69ba13bf35d505b733247032a8a64 sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1 @@ -7846,6 +8730,14 @@ sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1 md5=3b291762e0149c975dab9f5ea15bad15 sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4 +[http://downloads.sourceforge.net/libspiff/libspiff-0.8.2.tar.bz2] +md5=e6505bdff9048bf61533c00caf48d553 +sha256=8451c7182a99f0f4a88b3c19234c5182689f91444c50fcb510452b5e5b8a7805 + +[http://downloads.sourceforge.net/libspiff/libspiff-0.8.3.tar.bz2] +md5=0f989402e5edcbd84c456be56c856f25 +sha256=8b4ebd22dcfa7511109c2f6fa9e304c2ef3acaa492d55423cdf9a6f54a2fdb22 + [http://www.0xbadc0de.be/libssh/libssh-0.11.tgz] md5=ad703c4702646c83ca4fcace92c220d3 sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb @@ -7878,6 +8770,10 @@ sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35 md5=594e9999483cdd5cd913b6ea8cf9b076 sha256=413ac7973fb4a353d98079b4ace1adaa8dcf8ce858113544c1ddb45660441b91 +[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.3.3.tar.gz] +md5=490ca1a0c614d4466394b72d43bf7370 +sha256=e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878 + [http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz] md5=55ee3c6db3e0927e7918309891a8f52b sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef @@ -7930,6 +8826,10 @@ sha256=c3963d969e13588fb142001d5a81c07962dc2ce7c03e2f4f551a29760e844a10 md5=0b87e84c7aad3b5e979bbe35312fd4c1 sha256=b8839214df514d560a202f54c30d1b2e2f443f0798193c9e926c9f9e11218b9c +[http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2] +md5=8c198831cc0495596c78134b8849e9ad +sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 + [http://downloads.sourceforge.net/libungif/libungif-4.1.3.tar.bz2] md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 @@ -7946,6 +8846,22 @@ sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc md5=caf182cbc7565dac0fd72155919672e6 sha256=37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44 +[http://downloads.sourceforge.net/libusb/libusb-0.9.0.tar.bz2] +md5=a23f06379e05f04a77aec1c1428082a0 +sha256=49aaecc7b8ff57903801745ad56e918b25df8a3839cff526c8a210c5cf5a2995 + +[http://downloads.sourceforge.net/libusb/libusb-0.9.2.tar.bz2] +md5=f28e7ae610147a057e481bc731749bc5 +sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176 + +[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2] +md5=3d9f7c3966d24c6e2d58becac96e4e27 +sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49 + +[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta2.tar.bz2] +md5=1fd5b9457e662531a48993191c1dfb64 +sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee + [http://downloads.sourceforge.net/libvisual/libvisual-0.1.3.tar.gz] md5=e70e91d2e90831c0eb78944b6a9605ef sha256=fc04f2f2bae4b3eef7eb331330e2e3fd336d1894dbf4cae631c8b635622cdd52 @@ -7982,6 +8898,10 @@ sha256=ce959b7349de056205e992b05c9c914994bc269d2b1d02de85eacd398263aab6 md5=c0a5a8478064287e167c15e3ec0e82a1 sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b +[http://downloads.sourceforge.net/libwpd/libwpd-0.8.14.tar.gz] +md5=64d66018897d759358f454010b6e75d2 +sha256=01744fa637ad16a8ffaefb1aa7b9b42a56e92f0a2a18753f6720a85aa289d4eb + [http://downloads.sourceforge.net/libwpd/libwpd-0.8.4.tar.gz] md5=0461d4bf2da534b4bed041b67d7f7064 sha256=b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096 @@ -8138,6 +9058,10 @@ sha256=4e1f39ee16596fd2a83d28d6c3b065f742254f3336f93ce8ed1cae48ecbe49da md5=d775d6478391b95d841a1018c8db0b95 sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 +[http://www.lighttpd.net/download/lighttpd-1.4.18.tar.gz] +md5=5db3204d57436a032f899ff9dbce793f +sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c + [http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-0.6.tar.gz] md5=c3e1b6c428218968e2963182c1df1fdc sha256=cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a @@ -8174,10 +9098,6 @@ sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340 md5=fb345125e23c787df0818ff7caad5515 sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b -[http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2] -md5=d74fc9ea01384bead3925434b932d6b7 -sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69 - [http://kernel.org//pub/linux/kernel/v2.4/linux-2.4.18.tar.bz2] md5=ad92859baaa837847b34d842b9f39d38 sha256=90d9a45ba395f742050f791b6944f6263d0ab03c84aad8a32967ca866906490e @@ -8238,10 +9158,22 @@ sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b md5=443c265b57e87eadc0c677c3acc37e20 sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 +[http://www.at91.com/repFichier/Project-217/linux-2.6.20-at91-exp.diff.bz2] +md5=691a9fd94de318aebb4b241fcff22cc6 +sha256=4f8529718a45a570cfbf452760009960264028467f398769236b501c9338fc1e + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2] md5=34b0f354819217e6a345f48ebbd8f13e sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 +[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2] +md5=34b0f354819217e6a345f48ebbd8f13e +sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 + +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2] +md5=1b515f588078dfa7f4bab2634bd17e80 +sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 + [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2] md5=1b515f588078dfa7f4bab2634bd17e80 sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 @@ -8282,6 +9214,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472 sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb +[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2] +md5=952715cc523f4a77e7c5f94f608594c0 +sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2] md5=3f23ad4b69d0a552042d1ed0f4399857 sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3 @@ -8290,10 +9226,30 @@ sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3 md5=3f23ad4b69d0a552042d1ed0f4399857 sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3 +[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2] +md5=3f23ad4b69d0a552042d1ed0f4399857 +sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3 + +[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.10.atmel.2.patch.bz2] +md5=9100112d9be5a696a31b131bf1eadff4 +sha256=f601cbb903b18219aafde2e75921553deb03612361aa06acfc82efd04daebdee + +[http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2] +md5=816a3d8315ff089ddee3c22c04b403a9 +sha256=03dcb188379fa94cc109d2b7733031de51d6c53d2a7e6701c72ba2ea60e580bc + +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2] +md5=db95a49a656a3247d4995a797d333153 +sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2 + [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2] md5=db95a49a656a3247d4995a797d333153 sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2 +[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2] +md5=5169d01c405bc3f866c59338e217968c +sha256=666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] md5=e921200f074ca97184e150ef5a4af825 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 @@ -8338,6 +9294,10 @@ sha256=97004d6cefd1b5c5f37efc1603e4103f9a809d79f8cc0faf2397fa882cdd6ee6 md5=b2b0ffd11d27c72a9c01b8a9ef3832b7 sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5 +[http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2] +md5=de958cdb8d00e74792dd69f3c945b037 +sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057 + [http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz] md5=bd92cf7fae640c7807b53d082bfe1d92 sha256=d0941b9947be08be440716c888b58cc6d088a214debefebe7bca99b84f387c02 @@ -8354,6 +9314,10 @@ sha256=4097abc39b928970ba3232942ac5a6db7ec4ed4164593b9223c90470c9c994dc md5=5687331324ff5fc551f37ce419b2a926 sha256=d701ba12a96d913fc963eb7e5cc751bbd12fefb921dae4e70c8549a43a108dd6 +[http://downloads.sourceforge.net/lirc/lirc-0.8.3.tar.gz] +md5=056d3ff0d855427da9628d2ff2ab4f57 +sha256=8bc1c6cfc6a9c312c8f5b8cc79b501e26b438c96a2d245f42e50bfb353617716 + [http://lisa-home.sourceforge.net/src/lisa-0.2.2.tar.bz2] md5=cba116a4880f77205e0813d93bf14310 sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db @@ -8414,10 +9378,18 @@ sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53 md5=f80615d9020c2d56a4a41dfa93ba8429 sha256=34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-r3.patch] +md5=e7773693243f7a7b4b0a76ae61e4881f +sha256=2e5bd2c74f01832945a27400bfbc779633b0e679d0bfe967744795e39b5d3165 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey-2.patch] md5=1928476f81aa970b84aec7eee6d89b1e sha256=138b70379317b4d2962694879c26f7579f7771256bd67d462012bed17f1fcba5 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomokeyb_suspendkey.patch] +md5=9b9b6da3612b629f40b97d295c8854f0 +sha256=aeab92eb4f81b3ae12a1d4e3d8d9b3650cc0f37ce7f9d1562c29364567d87acb + [http://www.rpsys.net/openzaurus/patches/archive/logo_oh-r0.patch.bz2] md5=bda8ae4e55b99f1815987bde365c4585 sha256=1eb0d211898a91a06063fb52a6d3e1ed45815e3b4563bc252b869e73af5bc1e7 @@ -8446,10 +9418,18 @@ sha256=c7cdd8ebffedf878e7b7d5d3848ecaacec4a7d57afd29602c2c9d64f0d8b5a63 md5=7abcba853b45a8595333da9aa807623c sha256=f7614a14e2ae31b2ba22e419f78ba0d21afbb98fdeb24ae117327c3c8af05f1d +[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.2.tar.gz] +md5=b80fb99e263dc67c2e8270bc22db8155 +sha256=d7efb5a6c777ed0f375444a57e4de75e8406adb61d1f52829f84bc5404cfb03b + [http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.2.3.tar.gz] md5=64daa4872972b85230b8746655ef5427 sha256=e0daa5f5113d03f515aa918ec8b67b0cae5a21eff5e81e224d94f69174430743 +[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.4.0.tar.bz2] +md5=d9504bb4251d4e5b32cb379debda634d +sha256=67cad76c18a138b9b55bf6ff88a5796128371cf9339b3761b36f79fb4e7459d7 + [http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz] md5=b5ce6a74abc9b9eb2af94dffdfd372a4 sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 @@ -8534,6 +9514,10 @@ sha256=bcead46b0bd887c3987e977a0a7d4c547b0f70f926d45e253784137569f57b9a md5=6760e5819f4238328709bf93bf10071c sha256=a2fbecb4dd7c1dab498e3d8b5a0e574e6b8be09c63329b0d29c6fa9adb4a2fc5 +[http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0a.patch] +md5=ed24c3496f8b1fd22360422ac4dfd42b +sha256=9cd89808a3c63e48ea809510e25a0277a53c7cb2e039f35afae7d2db2ab25b4a + [http://www.rpsys.net/openzaurus/patches/archive/lzo_crypto-r0b.patch] md5=7c4b0de088db249cd94ec0001c4d3edd sha256=f91accabee3408cc318affb01b1dd764cad555441a2c8ee23c598880f5825807 @@ -8590,6 +9574,10 @@ sha256=d7ee2e668455f9a092418e5475f32676eb0b37c54ae38a7fcdf2d14e0fb80c91 md5=be2790a34349ab452dddbcfe4c95606a sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f +[ftp://ftp.gnu.org/gnu/m4/m4-1.4.11.tar.gz] +md5=988aa098326d5f2b5b5aa4b3efe8d528 +sha256=c67b759d96471c9337d3b9f0ab2e1308f461a7dba445cfe0c3750db15b7ca77f + [ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz] md5=8d1d64dbecf1494690a0f3ba8db4482a sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88 @@ -8642,10 +9630,26 @@ sha256=46a30f2cd62c66099d4b87a32fb82751598758c213a1486ec7f44c23a33f5529 md5=fe1758398de89fce57f05f9c1d1bb923 sha256=70cfa5eacd27d46a5e6f562b01769c64794d20ce4636cf133def7db7f0715efb +[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-af-desktop-l10n-public/maemo-af-desktop-l10n-public_5.0+r6160.tar.gz] +md5=5e13cc37619d6a79459ef1b36d671597 +sha256=28d1dbeb0c6db7a4155fb87c838b0d814e583147fb0cc23bdf64691014f69add + +[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30-1.diff.gz] +md5=751fc2d7b3425b6e08ef2513418d8dce +sha256=d711152bf23b96aa55c6db3af61650353e88e95ffb61ce73760e0fdfde67d1dd + +[http://repository.maemo.org/pool/maemo4.1/free/m/maemo-launcher/maemo-launcher_0.30.orig.tar.gz] +md5=e188cd39bc29cdc27f60156961cd6328 +sha256=600b0284d6f2281d16307f176b45626891b2369ec2481b61885917daad86f46c + [http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch] md5=b391fd0d13f5cabbcb2aba3237156f32 sha256=7701fa20a835f3ae504a6e04d2e449b0be2d2380e7522fa5736791a55abacf4c +[http://repository.maemo.org/extras/pool/chinook/free/source/m/maemosweeper/maemosweeper_0.2.0-7.tar.gz] +md5=4ece4fdf0314b7310bc4228ca00d7d8e +sha256=d9afa1fa7db43b66db22ebe7a98f8370f4935c53d0eeb54b7e166ab7f7d43f5f + [http://handhelds.org/~zecke/oe_packages/mahjongg_V1.0.0.tar.gz] md5=83587af02f53eb222242d0d84380735a sha256=a059a2b0f438140a3bb1e30f410a28863eec61ebbb90c925209c7a473a89b76b @@ -8662,6 +9666,10 @@ sha256=f066c03bfe4c8efb0c6a7ca2971cb03fb723fda9591e0c57a7afeec05f606adc md5=13a91cfd9b26182edbbdcd2a0d27c80f sha256=e41470fbea5322aabdca21b3ee7ebc2b3ddb1638d25902ee96fcb10698b35dd4 +[http://www.claws-mail.org/downloads/plugins/mailmbox-1.14.tar.gz] +md5=62fb82a6e778d9788364a3cd1b78d609 +sha256=e59572e750baadad7d1baaf24b9e44d4fa5ab194ccf3faeb41c6061ca6b375a6 + [ftp://ftp.gnu.org/gnu/mailutils/mailutils-0.3.1.tar.bz2] md5=d2f0192b3dd95b33e764a0d480085cdd sha256=1d145c55cf9ef1cd9ad996bd7efe0df7765e0ec8ef60a0b95f5c239172efebdd @@ -8898,6 +9906,10 @@ sha256=396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974 md5=18b20db6e40480a53bac2870c56fc3c4 sha256=086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e +[http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_1.5.6.tar.gz] +md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a +sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4 + [http://repository.maemo.org/pool/bora/free/source/mce-dev_1.5.6.tar.gz] md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4 @@ -8962,6 +9974,18 @@ sha256=ebede057bf1c312182d069b958eccfafbb18fca4cbba0a41f0c5f35094cb15e2 md5=203188db254cc418e9d9dd9791543b9a sha256=8253a341c3bdd49467ecfdb5ccc03b359eacec5aec0b35bd77cdce341e157399 +[http://software.twotoasts.de/media/midori/midori-0.0.15.tar.gz] +md5=0b6eebdcedd224b2b9f437b706471762 +sha256=3b449713a164d574031843ca38f37be12e3ac40804995b3e5a252562a598482f + +[http://software.twotoasts.de/media/midori/midori-0.0.18.tar.gz] +md5=aa9c10bbf6fe3502a65633c4fac0fb80 +sha256=36c20ca7c59e6c35deb04a9febde8aa8040c78c6ba21f595442b94ab78ec137c + +[http://downloads.sourceforge.net/midpath/midpath-0.1.tar.gz] +md5=afed8ebe979ce2ea189b117062aaa011 +sha256=556729f60cf2de79a20627dd3f448a7b8dc164331576497f876a4a5c9179544f + [http://mikmod.raphnet.net/files/mikmod-3.2.2-beta1.tar.bz2] md5=006378681d520fa8ee1dacca965bbd3c sha256=0e760acb85584ea3e828989c5588f827f0dd845d3dd6948e2aea12bb6278651d @@ -9058,6 +10082,10 @@ sha256=94c4ab96ad858524b64864482f5623bd18f844b98788d7d4be1f8065a4f13a0d md5=75bbd1dc425849e415a60afd9e74d2ff sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc_spi-r4.patch] +md5=85922650d2e640e2cb723e71fd00a471 +sha256=34cf9ceb9e811ee85c74ae2c217548e1d193741fbf9a43d37116f1d4e404f496 + [http://www.rpsys.net/openzaurus/patches/archive/mmcsd_large_cards-r0.patch] md5=e331b314ab194a87bdd23aac1ee43bbe sha256=5e1e6967a9a4784f802947cf8569903ed91d8444b5c197d9572aeaf704583751 @@ -9114,6 +10142,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://go-mono.com/sources/mono/mono-1.2.5.1.tar.bz2] +md5=dfede0c8c29384a8f8a6953a9bd06224 +sha256=434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96 + [http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2] md5=391f85b4f962269e044ceac2b5235310 sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f @@ -9166,6 +10198,10 @@ sha256=57cc436480dd29ac7e751c4d5adbc2b0289ba2273bda388352be15446894bc56 md5=cd636aba15508940e202ff43dc483aa3 sha256=e17c283be0afa5abdf0be276e0240b3f1805afaea76537aacadc8e2ff626f9ef +[http://downloads.sourceforge.net/motion/motion-3.2.10.1.tar.gz] +md5=5ffdc958313345c69d3e0d5ec5c013cd +sha256=2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117 + [http://downloads.sourceforge.net/motion/motion-3.2.6.tar.gz] md5=71e6bd13fcca70372e9b7c7806d62b30 sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd @@ -9214,6 +10250,10 @@ sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48 md5=8352b619e04dcc73411a38b39dd855f6 sha256=d857f9df4a6cf50d0bc57dd11296dd1a8d1ac709442875ea4fcd757a89da8430 +[http://downloads.sourceforge.net/mpg123/mpg123-0.66.tar.bz2] +md5=6753c7ce5bb35bd65c535b2b6322a9aa +sha256=2cdcb3b78412034f787ae52e213d04455132f6c94c8b7f3f4b21c21c38d9afa5 + [http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz] md5=bb403b35c2d25655d55f0f616b8f47bb sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4 @@ -9250,6 +10290,10 @@ sha256=5e06d8ed89ba98092c2cda16ecd9cdfeaa08b6c0e77ac459f49ae6e5dd64d639 md5=17aa3fa0601cbe172d18f53489141e5a sha256=17e3966a9da7acb0560af1d2c1a5c0162da8e01de195aa096d594ab6248c4930 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r2.patch] +md5=8c63b0b47af4de62b48ea745faa11584 +sha256=7206aaf289cd349ed0c52bf081b9a29a25d03e83eaf3e6de4a6070c4de1abe9d + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r3.patch] md5=dd6ca5b6006aa03febb611f481cdd7ba sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351 @@ -9258,6 +10302,14 @@ sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351 md5=442bdbdb024db27dc9c89207fac16f95 sha256=c3ed189e314d0f1d106df3ecb80b1f1147e86fe6cd05ceb53652c1396b67ab2e +[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.1.0.tar.bz2] +md5=05aa9b015625aa20afba728fb7ee47b3 +sha256=a74b0cc7ec668418389d9f56f85ca8a4619b8674a2d90f5e51bfb8ae9a0667de + +[ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.2.0.tar.bz2] +md5=ca41f1fbaa056e8b8d71e8d52c0b1bad +sha256=05c6ee9dd87d4a323c37b69009769f2912fe67e8f9a5c9f98b169b8b2bd9dbc4 + [http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch] md5=0f7cdd68da77a62e77f9012de052c513 sha256=2e56fe35b6f3b93dac201c55764b8bf6d899c995e0d165381368cfca886c6739 @@ -9302,6 +10354,10 @@ sha256=d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4 md5=a2db4edb3e1e3b8e0f8c2242225ea513 sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd +[http://www.mythtv.org/mc/mythtv-0.21.tar.bz2] +md5=49fc135e1cde90cd935c1229467fa37e +sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4 + [http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2] md5=2478bff31a9223afffcb74e4dd021770 sha256=e8caa07c0a841fab2f11db43809c073485b0c1aa12be5dc1b90ca72fa6660175 @@ -9314,6 +10370,14 @@ sha256=f12483dbe029836cad6c58e53077281d9e71a062b1145e57342ea9671296ca40 md5=8de48d0de02ed2332a4f7a07563c67af sha256=7052f6ce989040d9f16c50337c438d030f26e8d2bc90439d25e9c0ae1921eb20 +[http://www.nano-editor.org/dist/v2.0/nano-2.0.6.tar.gz] +md5=619107f0fc3c4383d668cef15aa3ca32 +sha256=0d10d8f70a6fadfb9cfaa7b66c5fe7eba17e64ecb96104c4ddedc82f89765d5c + +[http://www.nano-editor.org/dist/v2.0/nano-2.0.7.tar.gz] +md5=16187fed2bdefec6275ece6401ce4cd2 +sha256=5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f + [http://downloads.sourceforge.net/nasm/nasm-0.98.38.tar.bz2] md5=9f682490c132b070d54e395cb6ee145e sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0 @@ -9438,6 +10502,10 @@ sha256=844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7 md5=f17e9983457e1cf61c37f0be4493fce6 sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf +[http://downloads.sourceforge.net/nfs/nfs-utils-1.1.2.tar.gz] +md5=76ee9274c2b867839427eba91b327f03 +sha256=1d09b1c133e4eed9d2df07ead4eba813e6993875c39e66d7b4081287029d4033 + [http://downloads.sourceforge.net/ngrep/ngrep-1.42.tar.bz2] md5=35e821cfd888e9523a90fb7e5074a072 sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9 @@ -9466,6 +10534,10 @@ sha256=f9c86a163bd27dc4fd05abb958bb857109a556a4a58f8d06663d49ac0559ac92 md5=0b8b1a58bfdb60fa41df46771a464b82 sha256=a99b07c2193eebeb766bc422dd2ebba6649680457d58a4f5a86f2567ce49b3fa +[http://downloads.sourceforge.net/notecase/notecase-1.7.2_src.tar.gz] +md5=ad8b93c16e740988b5114826c47a53bb +sha256=763529033d4858285401d9e68c6412d21ed62624fb65e8150d8c703012a4ca49 + [http://www.holtschneider.com/notez/notez-1.1.0.tar.gz] md5=c348a626fc09265fa74a12470c83c113 sha256=11ee0a660faca7993a2f525d2964391d135b9552d9e94abad6cb6c5f3983f964 @@ -9490,6 +10562,10 @@ sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173 md5=a09542645b91ff60564b0f4db436af01 sha256=8f486c4ef4d3f60fba4e0f855399184ca557f03a747cae6adde4cc2dffc53ff2 +[http://nslu.sf.net/downloads/nslu2-linksys-firmware-2.3r63.tar.bz2] +md5=d4daf9d424a182e7ca2747d9db004581 +sha256=703c9083f2f114588eb54442f7e621cbf3e0f1398c3381b5ad8d1fc56f6468a5 + [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz] md5=f384fb230145f90fb75df1e33062583f sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5 @@ -9526,6 +10602,10 @@ sha256=3f515a043bcd3b778d33938da224214e727faa528256d4a1a213bc8617ac2d0b md5=40cec6ce8ca2e95a4fbc7a28879bf4a5 sha256=7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b +[http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz] +md5=24a031f628cc91825bb80ee2aaa21b77 +sha256=3a60d6a6327f3ad8653e1de5dbf5c36f2a591d409d3e3ae7f6c84d25dbc3e7da + [http://meshcube.org/download/nylon-statistics_20050909.tgz] md5=103c5c821474ae6df7a3055ee72f4d00 sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4 @@ -9638,6 +10718,10 @@ sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c md5=991615f73338a571b6a1be7d74906934 sha256=e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062 +[http://www.openssl.org/source/openssl-0.9.7m.tar.gz] +md5=74a4d1b87e1e6e1ec95dbe58cb4c5b9a +sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572 + [http://www.openssl.org/source/openssl-0.9.8g.tar.gz] md5=acf70a16359bf3658bdfb74bda1c4419 sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0 @@ -9694,6 +10778,14 @@ sha256=4b3780ee09efe665a69151c994e0e5f01a56c57338660c18df30916904df83a6 md5=bb91e4d5bd45ff0d5c3e6214653422b7 sha256=4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb +[http://downloads.sourceforge.net/oprofile/oprofile-0.9.4.tar.gz] +md5=82b059379895cf125261d7d773465915 +sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade + +[http://www.rpsys.net/openzaurus/patches/archive/oprofile_always_bt_arm-r0.patch] +md5=9d1e6a9bd4d6dc9cae3c54c18c303ace +sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae + [http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz] md5=4cea186648c335752bc241418fd54038 sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e @@ -9770,14 +10862,34 @@ sha256=53704f6b0aace1b2f24b5366530f6df51bf4ffea7209055e9eadee541c2c221f md5=7f110e130db541b1aa9fc428b2620602 sha256=1a84b7d4939313e9b7ec0ce8f50934251fe1569e6144931dd323de8ee8dacccd +[http://repository.maemo.org/pool/maemo4.1/free/o/osso-games-startup/osso-games-startup_1.5.18-0.tar.gz] +md5=a3752aae572d3a621990d0b1db38a0eb +sha256=9cf40c2e07cbc55576bb4b09fc406351533e0b06064e935c73f7c5aedde13b81 + [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwconnect/osso-gwconnect_0.70.1.tar.gz] md5=e4a87e616807dfd8557663a28990e948 sha256=1bebf4c6adf9d383014bf0da8f133c0dbb6aa420033347e8e1f307f79051bc86 +[http://repository.maemo.org/pool/maemo4.0/free/source/o/osso-gwconnect/osso-gwconnect_1.0.12.tar.gz] +md5=067de342f812811e6585b58049895168 +sha256=015b5b318c74650d1e85319ee05e8c506dd7a30daf280d7c1e23b914c1e4c7f8 + +[http://repository.maemo.org/pool/bora/free/source/osso-gwconnect_1.0.8.tar.gz] +md5=23b4b9319dbe5b4f3818ddbd1548ead9 +sha256=02d0f7ac6a015a5183eca2c517aa50effbde19884e24f9e63c9daf530d2329e6 + [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-gwobex/osso-gwobex_0.26.1.tar.gz] md5=804ad2ed142c9ef31bee42a68704315c sha256=f5e784be11151f927c68f09ba4e2881a95b67c99de9ba597b8155a6d5421598f +[http://repository.maemo.org/pool/bora/free/source/osso-ic-oss_1.0.4.tar.gz] +md5=6868cbd4dfc78abd7c651428d517e723 +sha256=16a0da4d947bd9c64379870646bf321853c7627d7894843a9e394182ae70315e + +[http://repository.maemo.org/pool/maemo4.1/free/o/osso-mahjong/osso-mahjong_1.5.15-0.tar.gz] +md5=e304a3797ea19f5db3628f5891d97457 +sha256=6ca464db290b9576e55cb0a9b70cb3f592dca681023526e9997e90d977919213 + [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-screenshot-tool/osso-screenshot-tool_1.20-1.tar.gz] md5=d07be50f058ef53fbdc5c1720f26b9ad sha256=c01553daef241e425afd17f421f0cd2b8bf8ba03f55f5a3e30192c36511aa199 @@ -9786,10 +10898,22 @@ sha256=c01553daef241e425afd17f421f0cd2b8bf8ba03f55f5a3e30192c36511aa199 md5=27e905aad10d3e29f03a7d1d1180ea3a sha256=90c601d2ed52b2ce967e76678894e74569f59104614cf35de20dab78eb0144b5 +[http://repository.maemo.org/pool/maemo4.1/free/o/osso-systemui-dbus-dev/osso-systemui-dbus-dev_0.1.2.tar.gz] +md5=f172f015008a10de78097b969c98f14b +sha256=185e27dc0481056be87088b4abdade9f52e0be65e556565541567604703132e1 + [http://repository.maemo.org/pool/maemo/ossw/source/o/osso-thumbnail/osso-thumbnail_0.3.1-1.tar.gz] md5=95d35782e17404fa4c4b634ed7cd898d sha256=bec82e8b1b695f14403931a61ff438ebb62853a398598b540faabeea5fc774ad +[http://repository.maemo.org/pool/bora/free/source/osso-thumbnail_0.7-1.tar.gz] +md5=8873509c136c0a14105c0201ae792186 +sha256=dd9b3210a6f3168f7cf2c5ee1a36f7f19fd6f3dd834681cc561c813303077ebd + +[http://repository.maemo.org/pool/maemo4.1/free/o/osso-xterm/osso-xterm_0.14.mh12.tar.gz] +md5=dadb84bbea954dfc1b38bc9760209fbc +sha256=56f7a4c8ed79a7f00d171a83b6c0be7dc508c21f809d15dfa89887cfc9c40c2d + [http://erlang.org/download/otp_src_R11B-1.tar.gz] md5=1fe3707d9bed898bc51444cb529fdd79 sha256=d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 @@ -9814,6 +10938,14 @@ sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5 md5=7f54ae7ebe9adbefc2a2ad55c62589da sha256=2c23dac41ef0ec0b74b38c4c1dc4b0f6f21386c97a0062a745a2896cdf026e8d +[http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz] +md5=d2943e4469834b25afe62cc51adc025f +sha256=06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b + +[http://0pointer.de/lennart/projects/padevchooser/padevchooser-0.9.3.tar.gz] +md5=6a9b52ad349f3fb3d5a3ccdf85958710 +sha256=3238f19ea5a3c54efef31e4f86c712232c92704d68c9d2bbef0339ba9b4cb674 + [http://handhelds.org/~zecke/oe_packages/pairs_V1.1.1.tar.gz] md5=399e794dde87508b4214f1312cd79d06 sha256=7526d8de006817e5c6bc79826f810a15490611dcbd2d4fb9d8e9b9991c7ed506 @@ -9978,6 +11110,18 @@ sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903 md5=b220d8b8489003f3df03d897fbefa432 sha256=f85096df0acc179f676497e75b9ba8d9b8685b92b0b2b8b1d6871619ed879fbd +[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.20.bz2] +md5=08b2c1e9759ca409a0d2ca49db1bbedb +sha256=0417fc3609f5746bce6016862e7f83e83e98e17e5ae77887bf66b37748ab261c + +[http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.6.bz2] +md5=a42300de8720552d70470dd3e4afc75f +sha256=808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c + +[http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.21.7.bz2] +md5=b9c8734471a454806c77f040fcf9869b +sha256=5ee24e1c5636bcffed155b1c01d7d09fedb135fa2458c190a0da03a82c8c2f60 + [http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.22.5.bz2] md5=27544a58763bbd4ce497a77658af744a sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a @@ -9986,6 +11130,10 @@ sha256=0f96188e8d1c6e0934f8e8dc2455e1f94a47c10cb17268364bcd77df68c83c2a md5=e89c566908bb21e43937fe8bc33062c4 sha256=126057524ae9707137b0c478753edc8072e1710160b0604a43e4625d0fde519e +[http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2] +md5=d23e6c5bb8294d61f0d9a4957c22eb20 +sha256=c2085fc8fc6df586ef8c19a4562b84162f0b77956d691aa4fbee5e90c9800cb7 + [http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.23.1.bz2] md5=896c5d4e7fd68d37b8c16e5d2842563b sha256=55e811b4d4b0cbfde500bdd5455b7180d3def3dbdc52314520b7327d32b23f42 @@ -10010,6 +11158,18 @@ sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3 md5=527687c63f4252989dba6fb92baf9707 sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2] +md5=0c1c5d6d8cd82e18d62406d2f34d1d38 +sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1 + +[http://kernel.org//pub/linux/kernel/projects/rt/patch-2.6.25.4-rt6.bz2] +md5=be6ff6fc5eb746e66a1a15629d05bedd +sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186 + +[http://kernel.org//pub/linux/kernel/v2.6/patch-2.6.25.4.bz2] +md5=f12f43dd78b765f3d1402aa9d2170cf5 +sha256=5bad39b0d28f294f10690d15bc1e54ba549324a7ce26db1406f3c3a50cd1d504 + [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.26-rc4.bz2] md5=b5f96d823b1183ba0c4e61516e1a23c0 sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc @@ -10106,6 +11266,10 @@ sha256=6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925 md5=89fc389191d9611b314c3fc23235377b sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094 +[http://downloads.sourceforge.net/pcre/pcre-4.4.tar.bz2] +md5=89fc389191d9611b314c3fc23235377b +sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094 + [http://downloads.sourceforge.net/pcre/pcre-7.6.tar.bz2] md5=2af38e083fb90ef60fa9eda7cc290e86 sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735 @@ -10162,6 +11326,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 md5=e6029fafcee029edcfa2ceed7a005333 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1 +[http://us2.php.net/distributions/php-5.2.5.tar.bz2] +md5=1fe14ca892460b09f06729941a1bb605 +sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3 + [http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz] md5=21865bf2891222082afc44afdd80aeaa sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6 @@ -10170,6 +11338,14 @@ sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6 md5=08fcc5f6bb9e7676a2569386d5ea9f70 sha256=437c5fac2376e416b4427501d1b074da5aa6b8fea756a0d61aec22686f025721 +[http://downloads.sourceforge.net/pidgin/pidgin-2.2.1.tar.bz2] +md5=f1703430d4b8ffc96b493fc36cd46131 +sha256=6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823 + +[http://downloads.sourceforge.net/pidgin/pidgin-2.4.2.tar.bz2] +md5=2d10f9b6a5f0162cf88016ea2ca0a36d +sha256=3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f + [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z] md5=75af127948cc0c701d424d22d621f792 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4 @@ -10186,6 +11362,14 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4 md5=fb23e17a8a0308e8fad6dc153753ba9a sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4 +[http://cairographics.org/releases/pixman-0.10.0.tar.gz] +md5=41804ac38025102dcc9891dfd4a3d105 +sha256=48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0 + +[http://cairographics.org/releases/pixman-0.11.4.tar.gz] +md5=8c8afc259af61d42aa9b3d8ec5a9a03b +sha256=d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571 + [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.5.tar.bz2] md5=f9fea77e46ec7a3a16e925e137f146e7 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8 @@ -10234,6 +11418,10 @@ sha256=5ae5e9816bc8503b768f831f058bd1c379bb821e8c0776015ffeb998e1d912f8 md5=65408ad948c0b9e21dd5813e68ef76ad sha256=74c83c3283178656a6fc1ee571fb1ebbddda8f3b7c32ad405477ae278b0cf867 +[http://downloads.sourceforge.net/cmusphinx/pocketsphinx-0.4.1.tar.bz2] +md5=8c1bc9d5bdd6f6298222125669d16e1e +sha256=5a31aa10668b93e8283c58592b46368c26aa92e097cea0bda9b0554042bd6643 + [http://www.rpsys.net/openzaurus/patches/archive/poodle_asoc_fix-r1.patch] md5=7c766563674dec668baa5f650a14b7cd sha256=3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e @@ -10270,6 +11458,10 @@ sha256=e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41 md5=e897eb0dc64c2862091f97e20f580de6 sha256=66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c +[http://www.rpsys.net/openzaurus/patches/archive/poodle_serial_vcc-r0.patch] +md5=6db3d4256756ae8d209a2d7623c6d71b +sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3 + [http://www.rpsys.net/openzaurus/patches/archive/poodle_ssp-r1.patch] md5=8efe67bc46564512bd1de09fce5971ab sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8 @@ -10278,10 +11470,18 @@ sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8 md5=053fdfd70533ecce1a06353fa945f061 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9 +[http://poppler.freedesktop.org/poppler-0.6.4.tar.gz] +md5=13d12ca4e349574cfbbcf4a9b2b3ae52 +sha256=54269075e4d611a61792a374986e920744c8ca39c2df45911233873c7e714354 + [http://poppler.freedesktop.org/poppler-0.6.tar.gz] md5=96883867572aa1e55e979ec75369c562 sha256=ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae +[http://poppler.freedesktop.org/poppler-0.8.4.tar.gz] +md5=29d341f295d01bff64c63a29a6abb274 +sha256=45bd5740b07e6c15db9859a5ee82e2acc9eeec62be537735ae5872fc3648257a + [http://poppler.freedesktop.org/poppler-data-0.1.tar.gz] md5=5c700eb06dda9dafec09cd85225e34d4 sha256=6bd37c49ab4b22c67ab457c531f841968a3acdebbf9361acea7d7275c903dbc5 @@ -10338,6 +11538,10 @@ sha256=78c03b41d75f7402a63a5e5e13f3690005411a85299bc6ec9edbe04888db6d18 md5=a65bdc5d833169d28bf6fbaaa8d57fcf sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b +[ftp://ftp-archives.postgresql.org/pub/source/v8.1.8/postgresql-8.1.8.tar.bz2] +md5=b05e1d7f0cac9cc4e096aa21409dee55 +sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 + [ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2] md5=b05e1d7f0cac9cc4e096aa21409dee55 sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 @@ -10354,6 +11558,10 @@ sha256=99a9737480224be47362387d2d2389bee61d7685510b3a161b2b1db6c0556c26 md5=9c7131bce36bbb3e8b688478e8dc34c7 sha256=44ea3e6777c471a514d1e0a53b60cd5a4e2e56802ba23ec67331b69f122ec3d7 +[http://www.lesswatts.org/projects/powertop/download/powertop-1.10.tar.gz] +md5=e09f631f60d50299d8885193e6fd3756 +sha256=cc60000bbe5f4d7b9beae8a84e1cd1ba69339a489a7d1a7365a3d8fe8fd73d6b + [http://www.linuxpowertop.org/download/powertop-1.9.tar.gz] md5=7e2cd799941350a45586edac43760ac9 sha256=41899a12c3436a3e623744f41b459d4a7a7aa96da32b22a3b301037b54062594 @@ -10490,6 +11698,10 @@ sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 md5=669d52a70fb9a7a83c2507005bfa2a6f sha256=b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64 +[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.9.tar.gz] +md5=8fa6f7a9611bb194d94311764022b197 +sha256=9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d + [http://www.warmi.net/zaurus/files/puzz-le_2.0.0.tar.gz] md5=76535893b779926874f618d3fbf3e92b sha256=e4b4217b81ab0885db11cf7e0f18afdeaa969392fc15647a10c2aab9cbf583d8 @@ -10650,6 +11862,10 @@ sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1 md5=8e00f5154401a6f6d99efd20606e2819 sha256=9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5 +[http://org.csail.mit.edu/pybluez/release/pybluez-src-0.13.tar.gz] +md5=eb38d423b49255a7b9f5ba1f50844b53 +sha256=d8e41f48c86403cb7fc8d0880a207c53a9e4ba6b6eab2fe8870c346567fa3a03 + [http://org.csail.mit.edu/pybluez/release/pybluez-src-0.2.tar.gz] md5=f51efe7a299ce1ecbf1a017a4dda11c8 sha256=c16ac8a27af4fae6ef3f07cbd4da70bcf5b1be11dc664312f5c1e4d69c587d0a @@ -10706,6 +11922,10 @@ sha256=83787be6e11f6c7a45c111fa37f674a153274c45c2ab3f4b38b3b6dad933fcda md5=009986021225b7ea6e0ba848707785af sha256=efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41 +[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2] +md5=0e9e9300e81847f4f7266f49d3bebbaf +sha256=79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e + [http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz] md5=334e2d9e5a765ffa9769e2c4cdfcd110 sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4 @@ -10842,6 +12062,10 @@ sha256=5795b9d619142e2d01016130c7ac71298aa1cabda4806f11762bb8fd489293af md5=6591df8e9270eb358c881de4ebea1262 sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5 +[http://www.bellard.org/qemu/qemu-0.9.1.tar.gz] +md5=6591df8e9270eb358c881de4ebea1262 +sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5 + [http://taiga0818.hp.infoseek.co.jp/rpms/qfish2-1.1.0.tar.gz] md5=2a8219bcb375fac66cea66394c3c36fa sha256=1e097fdccda0fc914c8229aab7d83964c5944cc95eb053fd69e357dca69461b9 @@ -10958,6 +12182,14 @@ sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4 md5=022d7a3c572b554f3c47b12cae71a8a4 sha256=a97656796c0ef8e87dd83e6138bc406e31830d08f9b213e039d8be39ea65c8e4 +[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.0.tar.bz2] +md5=e17ad8c9dfecc95a3fd2bd5ed1d7bd3a +sha256=79945d06de16736d14210139e8e68cf29f8ea312190d2375507511f367a2f872 + +[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.4.1.tar.bz2] +md5=491d41cae681a2bab2656f8adc3ba503 +sha256=37274eff0b7cfb6f5a01e2535639ccd3eb4e9c6b27902d1f3bdf68a705c438d0 + [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2] md5=05d04688c0c0230ed54e89102d689ca4 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96 @@ -10994,6 +12226,14 @@ sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 md5=19678fe35170559cd6a6fa531c57799c sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 +[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.gz] +md5=f13ad0aa75efad314715930e663bad55 +sha256=4d1a5bf6a4e85eea83ef3e73d994f74cc4dd979e1023eaedef8da931ea37833a + +[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.1.tar.gz] +md5=b09decad252b5181f300135e3122481d +sha256=5aca7b784fc4de3db292666490ade84cfd1810f189c089c5c2810a710993f386 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 @@ -11006,6 +12246,10 @@ sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 md5=70b729dd5dd8b2b432d685918e1971f1 sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 +[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d @@ -11030,6 +12274,10 @@ sha256=a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a md5=28405a79f488570bf4e2e8d453f856a0 sha256=5cd896faae49268327231f299a1187a974cb85acb509fffe8a60b84693a7e3e8 +[http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2] +md5=97814471766f333e8642d338406ac9c5 +sha256=8a1a1e67980fb664f12dd99851cb600b970371bf35bb5e3242ef4d341877e80f + [http://download.savannah.gnu.org/releases/quilt/quilt-0.39.tar.gz] md5=34f0c654aefba0342db6c676988634b5 sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf @@ -11094,10 +12342,18 @@ sha256=e754605b72b5498d11207920291d0eed6fa78ad46d3b9ad018cff9bb480224ea md5=37478b1d3e76ea521aac22216582ec58 sha256=0cbfb4b3940ecc9e351bbd72b5a9c53af050f2f5f63d500e8ff714ab6c91e447 +[http://downloads.sourceforge.net/re2c/re2c-0.13.1.tar.gz] +md5=d6168a6c18d5912e98d9343b33fdad97 +sha256=1a47035dd0f283dbc6c0964679afdf6f2c975b462419d1880ac379dc880ba74a + [ftp://ftp.cwru.edu/pub/bash/readline-4.3.tar.gz] md5=f86f7cb717ab321fe15f1bbcb058c11e sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 +[ftp://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz] +md5=f86f7cb717ab321fe15f1bbcb058c11e +sha256=eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 + [ftp://ftp.gnu.org/gnu/recode/recode-3.6.tar.gz] md5=be3f40ad2e93dae5cd5f628264bf1877 sha256=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf @@ -11174,6 +12430,10 @@ sha256=72df7c8fe3ea2177adcb9442fcc49dfde75231abf0300844bf4551393cdd42b4 md5=38f159681196b566f20bf837aff1e8f8 sha256=4e5f63d8488b0fbd1a709429feb797c8c679de48f47ef93ab4741f8506830667 +[http://xorg.freedesktop.org/releases/individual/app/rgb-1.0.1.tar.bz2] +md5=255222b3ab3af671289a6b4844e9f393 +sha256=f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rgb-X11R7.0-1.0.0.tar.bz2] md5=675e72f221714c3db8730daf0b50f69f sha256=97aa9c7c1f7f0ef29d6be741a421f92ca27662775c7a5dd7734c38137ff0f82a @@ -11198,6 +12458,10 @@ sha256=c3ab591b02afbb5b3f76a0c1406c607b9561138bdb0a62105981de559d2920dc md5=63d503191eabed630324c104cc024475 sha256=1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e +[http://downloads.sourceforge.net/roadmap/roadmap-1.1.0-src.tar.gz] +md5=773c1e4291177c5b7a887763f6cb83a6 +sha256=bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed + [http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz] md5=749f5923a146f0e29f2bce127f09c2af sha256=2d544f4205cc42b4da2cd39ca589f2c826f56ad106e571450fc2694666440a92 @@ -11230,6 +12494,10 @@ sha256=d6bfdee4fd31c0e0089c6edab594eefaa5b7b95f0b783f1156dffadf1a90d820 md5=f25df2d1bc2d99536eba334778804632 sha256=413523cd8ebd4429c192c5cab7a85d017655b32f21a9c261169597180889b370 +[http://www.claws-mail.org/downloads/plugins/rssyl-0.15.tar.gz] +md5=1fa701df95bb538fd0f0bf18d51534c7 +sha256=ed783c3141176ae84b7caec3f76cb483b09cf5c6fbc675abcdaaf5970ff0a4f1 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2] md5=6f33a1bd8e99372b7544ddfcad456369 sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c @@ -11242,6 +12510,10 @@ sha256=9aaff97266bb7725c967abba81506644edee96748f5823bb1864ce8059874e97 md5=996d8d8831dbca17910094e56dcb5942 sha256=ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9 +[http://rsync.samba.org/ftp/rsync/old-versions/rsync-3.0.0.tar.gz] +md5=2122d460b4119749c6e5993938a9b501 +sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169 + [http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip] md5=c7536e907363ea1da63430b49e42931d sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29 @@ -11250,10 +12522,18 @@ sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29 md5=f4131d670920a878b4d4a0f5d4d8b93a sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39 +[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt2570-k2wrlz-1.6.1.tar.bz2] +md5=87947cf1868ac37d4d756f3585dbf1e6 +sha256=11d2c4a1b69a4b2b49811128a41c33f25c71e590b019ace392761598ca3d419f + [http://files.chumby.com/source/ironforge/build396/rt73-chumby-1.2.tar.gz] md5=0340e1ceba72330111e6fc85679c75bf sha256=94beb93da6dabd16892c899f496eeec745fc69b856abd0d19896b2a4b0fb7c72 +[http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-2.0.1.tar.bz2] +md5=121e2ed57d01e04f82e942c502b1ca75 +sha256=e04718f3989bc567bf185cacfb27e324218cce5f5c87fca65328e49a3b56e603 + [http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-3.0.1.tar.gz] md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c @@ -11290,6 +12570,10 @@ sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c md5=7a0c73ccf0e31808ad37b61e730cd10e sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-udc-r2.patch] +md5=1b8cfd298b9fa10c4779c98fbe8e0bd3 +sha256=564d375388284d7f13003202cba9fc1976b045bd14b3f12adec1449cded33f26 + [http://sablevm.org/download/release/1.12/sablevm-classpath-1.12.tar.gz] md5=ae8788df73ee0c2dd1ba8ed0f6d9b817 sha256=1e50e20b9f597235709eadda23e6d15d3cdd5e63dbfeed6f50aeb5a85b31c405 @@ -11318,6 +12602,10 @@ sha256=88049771c0d48e69b24f7234b2e4400bad53e6d9948d834aff9d563aac3ea8ca md5=9cf2bcef71509a81687dec8732545400 sha256=550429c7b22e58f4874dece816003ee0b769edbf2030d95aaee8c58588fbd60f +[http://samba.org/samba/ftp/stable/samba-3.2.0.tar.gz] +md5=318d5b1ec0507f0f6077b1470f9fc028 +sha256=63b744141982d15691b23e3bbe2114d3724fe9bc96c4605d97720bbfa560794d + [ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-1.0.15/sane-backends-1.0.15.tar.gz] md5=3b804f35cdfbc5ad2d201ffe078bbac9 sha256=89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe @@ -11370,6 +12658,10 @@ sha256=2068e0dc61189a37487dcf432909540e30579e452907ccbbd97d914fd0e06911 md5=e9a69f7014cad332cc78667b07eebbce sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a +[http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.20.20-v22.patch] +md5=0fd84a82c51f67d2d0531aab78f66d2a +sha256=fc5cd165ecc07d2e254412f39a17a26a753bf081a0e02ed5db0b02d2f6bacc6f + [http://downloads.sourceforge.net/schrodinger/schroedinger-0.2.0.0.tar.gz] md5=45f8d0efd9b76579a005e4ffe7f96ac3 sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0 @@ -11398,6 +12690,10 @@ sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62 md5=8f8725fa9b3385042115e84a06866ce6 sha256=c426660739a93f94364de29cde222f7c3621364d9843b52c91735ba8b6a81c62 +[ftp://ftp.debian.org/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz] +md5=659bf15bbbb31817ebad9372c8827618 +sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/scripts-X11R7.0-1.0.1.tar.bz2] md5=b5b43aa53372b78f1d67c86301e3dc02 sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33 @@ -11430,6 +12726,10 @@ sha256=29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6 md5=5eede9c97d1883f80770a3e211419783 sha256=5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e +[http://downloads.sourceforge.net/scummvm/scummvm-0.9.1.tar.bz2] +md5=30a82ad466bae223875e66ee14b94904 +sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a + [ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz] md5=4c9fb66fa496cf32542e92f32f821818 sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45 @@ -11438,10 +12738,18 @@ sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45 md5=c572e7842fe36348f5b2972c1025a75a sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80 +[http://downloads.sourceforge.net/sdcc/sdcc-src-2.8.0.tar.bz2] +md5=1b9c2e581b92d5e3f13bca37c5784080 +sha256=cbb035699d8910c7ca2fa360a773504b44165e98042ed8c208fea2fe47a96557 + [http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-icons/sdk-default-icons_0.2-1.tar.gz] md5=85ccc685b72f6f77da8a4b0ef7c5281b sha256=8dcd3aac06f24111461433353015cd36bfaaf45b74ff9aa336713759b6759b0c +[http://repository.maemo.org/pool/diablo/free/s/sdk-default-icons/sdk-default-icons_2.1-2.tar.gz] +md5=4c792ca02cb3cc971879ea0dcfd304f9 +sha256=96366d20b0fcc7b7be638b666635bc77666ff7f2acef33802d3a396806b87441 + [http://repository.maemo.org/pool/maemo/ossw/source/s/sdk-default-theme-config/sdk-default-theme-config_1.0-1.tar.gz] md5=ed7202fcabcce02a41225906deb0c682 sha256=1bc620973aa9448c7374e5c673f21b11f60abbc1d887b9719dd4a90cb99bea64 @@ -11506,6 +12814,14 @@ sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a md5=c4867d72c41564318e0107745eb7a0f2 sha256=7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a +[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c6.tar.gz] +md5=e3d56d4d19776042607cbbecae823c8b +sha256=075172b39f0933d3fbd1d4e90f29742c1402a29da26db04357eb18fd46ffd6b1 + +[http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c8.tar.gz] +md5=0e9bbe1466f3ee29588cc09d3211a010 +sha256=96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37 + [http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.3.tar.bz2] md5=2b53542095a35a8a5731164118643883 sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508 @@ -11534,6 +12850,10 @@ sha256=6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c md5=b3b4b45ef3f76f720fd0c389f131dd4c sha256=d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2 +[http://freedesktop.org/~hadess/shared-mime-info-0.51.tar.bz2] +md5=01d72161f7d88123fbccd378871f02f0 +sha256=1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8 + [http://www.do13.de/openzaurus/patches/sharpsl-pm-postresume-r0.patch] md5=bbca81d1c527d833b8e11a0d28275ab2 sha256=947e7bfe44dad0caf8dc857b40fa840a316cc0d9b97aafefd134ef1fdb87753b @@ -11546,6 +12866,10 @@ sha256=0e87278dcee1d69d3bc44a3f028b4a73b78ceed3c0ba5ab174e6d2f4066bc4db md5=416c6db0f2358ff9b88853dde2d6823f sha256=6c862826f6e0f72bb96ac7fca76c8118af65e65702dd55060d1ec06765f5add8 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm.patch] +md5=3cccf791dd1bc42fdb5a7a0e06086c09 +sha256=63028be5190d144538ab5fa8c1d74035424e5ae793d3abb4c5649665e31fd67b + [http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm_fixes1-r0.patch] md5=aeea5a2614fd8f9ae7d729d1ea1dddba sha256=1bd129c7a68537533c77267992eaf490ff64bcc3d01c6f4b51343b8f266ae99e @@ -11558,6 +12882,10 @@ sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2 md5=001103f5847e71b0198c3a11df7d62d0 sha256=17cebdc8ae4374c3944a3233d86278f4d09aaf90279b48e98367e9387f7e6acc +[http://repository.maemo.org/extras/pool/chinook/free/source/s/shishensho/shishensho_0.3.0-1.tar.gz] +md5=5a1b79ca2441a6f4b32d294855f05c47 +sha256=feec48d2d79aad6d5c7daa911702fccb3dce18ac2e1ee23341d135275ce2a719 + [http://www.shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/shorewall-2.0.9.tgz] md5=4d0f756b5b63a68593b2de560c1a5b35 sha256=06064e929423b1bd60a31652d2a31763dccc48e86ea9cdefbcadf524df2bd3f2 @@ -11726,6 +13054,10 @@ sha256=b8049142742cc81bc945aadefb40d173aeb447e428ec62a93e781032ea9b40c2 md5=c6f272e1f03e79add70f75fa52916005 sha256=f7066bd1ed417200f975679fa8eb652a86381ae533a394d68fd73b911ed89a43 +[http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.6.6.tar.gz] +md5=bbd7ebc5b0f1b3ec4d89ad66b20d5cea +sha256=c664ee801d1bc0500ae75739fa98bcc8ad410474c98a6757d3d1ee24a8241462 + [http://downloads.us.xiph.org/releases/speex/speex-1.1.12.tar.gz] md5=1bd6cdf3a0ebabf818cd72a3401e2610 sha256=77c8505bd9b73192789770299e0a727fba9c1d556d853b8cc473bfee393709f8 @@ -11746,6 +13078,10 @@ sha256=77a3609bf1762f533461c01ef3485d0c9382fa54ec05204f0ff157a4789ce7ab md5=5ff76b3a4799405ad91e88331eb938bb sha256=ffb5e646d98c058ad2f1f0d7738b39e29fbe432981b1b5d9c8a79cdcb168c3c6 +[http://downloads.sourceforge.net/cmusphinx/sphinxbase-0.3.tar.bz2] +md5=17610af80be230e5760dbb25690a45f0 +sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb + [http://www.rpsys.net/openzaurus/patches/archive/spitzkbd_fix-r0.patch] md5=d69c74ab8e2d7664a48a09773450dd27 sha256=59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b @@ -11798,10 +13134,18 @@ sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81 md5=b4f631268d811189cfca1d5259cb5dd8 sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500 +[http://www.sqlite.org/sqlite-3.5.4.tar.gz] +md5=f17da840eed792e896c3408d0ce97718 +sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f + [http://www.sqlite.org/sqlite-3.5.6.tar.gz] md5=903c9e935c538af392364a9172a3d98d sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb +[http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch] +md5=cfdb5caec0326a3ced8b4159f602c94f +sha256=a7e784b151b25ca724bb7c9611b07cd9a9f3de12014ee80fcada7dd9a8248f53 + [http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz] md5=0b7fcaab8e634ae2385984885c731082 sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974 @@ -11858,6 +13202,10 @@ sha256=7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09 md5=9c05c1831449219d063e803e3cf1dd88 sha256=06e1f846b47c3b3b702b65489bc7d4d4c6b9f499609f4aec4556cb5046729202 +[http://repository.maemo.org/extras/pool/chinook/free/source/s/statusbarclock/statusbarclock_0.8.tar.gz] +md5=1d1a700b695798f2e88b63eb8e811e99 +sha256=262e2cb0e3f98891b3216df838a0257fb6675b0b98be8084bfd43843cfc234b4 + [http://downloads.sourceforge.net/strace/strace-4.5.11.tar.bz2] md5=28335e15c83456a3db055a0a0efcb4fe sha256=9de428477d4d3f383d58c2f16b2544da2a5ec0acc50ee90ecb81dfe38f56edb8 @@ -11922,6 +13270,22 @@ sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b md5=157d31c9dc02aa22b5f27323e5a203fc sha256=c31d3bbee984c7971d2b24cddc279d8ad65edff8216778d617484c147ba3ae3d +[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.2.tar.gz] +md5=7624b5642c947fb054273f091a1d970c +sha256=c6b2ee967ae04776fd60a47dc283570917e387dbcffc907a0dfc91f567c139f7 + +[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.4.tar.gz] +md5=08fcda4a46454bfc66b97fba2d385f8c +sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a + +[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.2.tar.gz] +md5=3bc6a49357b4b8b478ce3dfb4f007f18 +sha256=84962251e647fdcdcf111bef0c478f7d3679ae104267ba72e59ad749c6955cc2 + +[http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/swfdec-mozilla-0.7.4.tar.gz] +md5=c5958f3b003190b21977495021ac2b28 +sha256=0d7927f2e791321b2867c120eb4140d9017c59b77925eb909b2a03f3ef2a8fe4 + [http://downloads.sourceforge.net/swig/swig-1.3.29.tar.gz] md5=44c6f6d8d724cf7fa4a5109e6f63c9b1 sha256=68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8 @@ -11950,6 +13314,10 @@ sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481 md5=e1f1af8c2add8310d0bbcddc9af523b8 sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481 +[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip] +md5=9473375f7615814025a5b66ee6a8400d +sha256=b9eaecd9edc58291c5b2c0d8de6a1ce0677b442d63edccd52dd3080da0bc55dc + [http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2] md5=45e9e89775613b0afb732fbc11c73d26 sha256=72a6ab7c8a0baf0d1d432929c19a7d096335ba4adc43e40488b6a77e5995a0f5 @@ -11970,6 +13338,10 @@ sha256=03e3dc79fd7b36266372de0d331d792c04d185e57495c6fb1d46a0ea0ed0b04d md5=b7857c045ef3b4810c9b8be965c05fb9 sha256=d162ddc4f4a29c770549cb135da179e205480c065739dbe6c3c1bed6d84a3060 +[http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz] +md5=14e7dcd0436d2f49aa403f67e1ef7ddc +sha256=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a + [http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-1.4.1.tar.gz] md5=d214aa40beabf7bdb0c9b3c64432c774 sha256=44357e0fae8c8f0e315bf130b4e86a4f96b91d66eeb4e473def4ce8336fff102 @@ -12010,6 +13382,10 @@ sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8 md5=cc5d4130b25bb8a1c930488b78930e9b sha256=34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a +[http://repository.maemo.org/pool/maemo4.1/free/t/tablet-browser-interface/tablet-browser-interface_0.0.5-1.tar.gz] +md5=930b83fa92154a2abb3d711b9e3af87a +sha256=199fcaa5bc5b0b56537d43c522a9f0d839e61d7ffc58438da56574f642159519 + [http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz] md5=dcd50ddb2544faeae77f194804559404 sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab @@ -12038,6 +13414,14 @@ sha256=d83dca75ba6088c90b993de9d30b4b0d3189e5efa84151c16d55ef0ec072c38a md5=71bfeab35c9935631fc133f9d272b041 sha256=0ef70273b6a54357c7823ed1f11015523f5cc5fe16df097e0b5300ae725c44e1 +[ftp://ftp.gnu.org/gnu/tar/tar-1.18.tar.bz2] +md5=70170208d7c1bb9ab40120579434b6a3 +sha256=44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e + +[ftp://ftp.gnu.org/gnu/tar/tar-1.20.tar.bz2] +md5=1a7e17f27abf583b3b0bc059a827e68b +sha256=be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb + [http://downloads.sourceforge.net/subapplet/tasklist-105.tar.gz] md5=dc62a061d83cf72d1eca7e8ae2c8e1a6 sha256=4078c44beebfd298995983b9e2ea189167a1ab081d96a7c485a67b65a974e878 @@ -12094,6 +13478,10 @@ sha256=3c4eb81c9d516937565a295beb0e98ab5c2a04864a0a5c8cef32916c63056b05 md5=94bbf929aceac7601421e60ba35683a5 sha256=63cd37752d153d222fa4a1fe08f6188832341f41652482bd7891e3fbe0ff8dd7 +[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.6.tar.gz] +md5=17564dcb79d886d527609c154834c1c7 +sha256=9ce73e484b2f2858d46ffea9893f9823b5de9c7310f7c26b027f73a1c8fde857 + [http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.5.10.tar.gz] md5=18b6cae979e438628a1032ff1f12b38e sha256=f779fbfd30ddc80e15c39f42fc9877725e829dfa19101c3762d6ae809760a3a9 @@ -12102,6 +13490,10 @@ sha256=f779fbfd30ddc80e15c39f42fc9877725e829dfa19101c3762d6ae809760a3a9 md5=b4cb035a6e235be3179364341843e929 sha256=e5cffebb02ad5c8192c7bd98aae90e65b008b03150b613659efa641d5f96c141 +[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.11.tar.gz] +md5=8da7a9c43f3721aed982412854c4783e +sha256=c587eeab36208da798203cd5997fb82c891136dcd18780cd06e3d27a1d6d4a58 + [http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz] md5=21bfda9e1fa12e25b4173deb9ffd0b5d sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82 @@ -12114,6 +13506,10 @@ sha256=926a8c047bd43a1fc21539c2ec5b9bf00426083ffe18c2db8c44964b80286b6a md5=463234dcf1182ba71a0d39f594922488 sha256=c7cbaa8edec5c9be78aa954938c64b57e6c2c0f13de260c88fefdbf849e94d4d +[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.61.tar.gz] +md5=8b9de30643f759bf2e40ccc833dd2633 +sha256=76009d233a69b2d12c2aff94770dfe9fc0558e07071f941b738bab357f8fb7b9 + [http://gpe.linuxtogo.org/download/source/teleport-0.33.tar.gz] md5=f406e66bf6a1effc31abf150ea7b5da1 sha256=f5e73b32337c2616114e0e45cdbd053975ffd38ec3fb28a411e165dbf27a583a @@ -12186,6 +13582,10 @@ sha256=802e13e13cb0051e0b06e5f1e24e0cc613aa0f7c0ef742e5b90a667b40978c46 md5=fbb6f446ea4ed18955e2714934e5b698 sha256=be88f037080b93ce0a337b2b3ca5e8195f76885deb6c558cc3aa872ee848fc76 +[ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz] +md5=bf5f4a6892cc7015a9ae8b81eb0b63f7 +sha256=16d746a7bf057a9147756e15fdd7ce76a63ddde122294ce188dc8332da5118ba + [http://downloads.sourceforge.net/vnc-tight/tightvnc-1.3dev7_unixsrc.tar.gz] md5=030903eeafc3c20ef1fb1610bfe6311d sha256=390fdd05d86e091300248a4f74a0ffe7b4169f75aa2c1a5461c997a4c2ed2c10 @@ -12310,6 +13710,10 @@ sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 md5=84ab290758d2c177df5924e10bff4835 sha256=522ded5292b80289e13dc8af9a0c11d35417f7079779969835cc8af55a38d006 +[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz] +md5=274ca4d36ee6fb216fa6cf01ad5eaa84 +sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c + [ftp://mama.indstate.edu/linux/tree/tree-1.5.2.tgz] md5=b86a3091ec93e1e13e81020fa33b6270 sha256=d830f5c79fa86bd5b40ce99e70408e7e734361a14dc0bea5bffa0586cfde9715 @@ -12438,6 +13842,10 @@ sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de md5=f10b6954498bab5d08d0f50de381af50 sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca +[ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2] +md5=096cac66046326659b97eeded007ec73 +sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7 + [http://downloads.sourceforge.net/u-boot/u-boot-1.1.4.tar.bz2] md5=096cac66046326659b97eeded007ec73 sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7 @@ -12466,6 +13874,10 @@ sha256=7e1d8239a5bd43c50f6091b484acbc8a7c5886cd4523f1e369504266cbaca50d md5=ebf58e04d72eab5c131c2c9118737024 sha256=82342a5d6088421e79699dd7af614ebecf6dd335eabce07690902a379f5ea8de +[http://www.uclibc.org/downloads/uClibc-0.9.28.tar.bz2] +md5=1ada58d919a82561061e4741fb6abd29 +sha256=c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb + [http://www.uclibc.org/downloads/uClibc-0.9.29.tar.bz2] md5=61dc55f43b17a38a074f347e74095b20 sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7 @@ -12478,6 +13890,10 @@ sha256=c409609ce3bdf5bc4c040aa17ec28c6c214695a6aaaa408643edbda704142fcf md5=039d1215960b879d5b292e5b713ced8b sha256=7007261ad816938ee4824720eb08e9bff4ad6f796965ec928f56acfa3c24a1b9 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00-touch-audio-r1.patch] +md5=958229e8a1cb706499eb75e5c8be804f +sha256=2a45b4e4e667b99ad32f5b9b12671f77646cc04d5798b9b8af5f30806149f8bd + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/ucb1x00_suspend.patch] md5=8cf0f9e1158bf04cccb65a0926221888 sha256=502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435 @@ -12514,10 +13930,18 @@ sha256=07b29dfdd2d63090c76df04c2dcde323640708c5a06b346cb299c0aba4351a3e md5=a8233f2afc62a8a8971f79df8878d57e sha256=4467f57484124b735450e05617c2aa0f75e0e56306e92c74f9dfe59bd028fcd9 +[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-124.tar.gz] +md5=2ea9229208154229c5d6df6222f74ad7 +sha256=cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7 + [http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz] md5=2d7e548820d2ded5e183933cb701defb sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443 +[http://downloads.sourceforge.net/ufraw/ufraw-0.12.tar.gz] +md5=b2c104938c1c3eb47e7605432bbd3157 +sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f + [http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2] md5=2832e23d4778bbacbfa4b49bf642d667 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256 @@ -12530,6 +13954,10 @@ sha256=e35fcb9b14e7621dc32975872a5147137ff12cc71e16993702a49268d59c079c md5=4ba5657f3f7d71a818f3e6259b5d4fde sha256=e5b7b7c4b61f7b0affa5e3987e0127c695d2e512f39df68b97479b50cc39ed78 +[http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_1.6.tar.gz] +md5=78b8ab318d725b07c3c08c390290a556 +sha256=0ecaf4e174c5b8eb3c1225cc60917404e14ad613f57fd2ca290d31548f089bcf + [http://downloads.sourceforge.net/ulxmlrpcpp/ulxmlrpcpp-1.5.2-src.tar.bz2] md5=cea56d3a1a7e4f1a4d12697330c4526b sha256=00f40bf3c8e4ed3ca169ec54352fc7499d443e443d91b7460997ddca5448905e @@ -12598,6 +14026,10 @@ sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94 md5=c8193bc27642fa446d702cfdb9464c2a sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d +[http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r3.patch] +md5=59ce16ffe6362514e26540e1a08856b7 +sha256=eb8d02a6355a62790f511269d046269840f40f962b5f910a3a3f3047f5364b9c + [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r5.patch] md5=e312729c632e820bd9d651476ccec9bc sha256=94b8926463a996056b4cdff85f940f2f647be30c55fe998943de7e92bd0fee64 @@ -12630,6 +14062,14 @@ sha256=00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423 md5=2ac1bdae03a858b965e895b211a75ad7 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd +[http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz] +md5=d669ae4a3567b0d5d3ff5db6351b4053 +sha256=651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674 + +[http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz] +md5=7b407c7ff5a38216f85d648365d81894 +sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb + [http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2] md5=e978c648f808cf1740b1583a78b922ff sha256=b09616934c21e10a9bac2d3941bd8585b075ccc10c2f5218a0f652b0e9386a4c @@ -12658,6 +14098,10 @@ sha256=2e68a53d1393e97926340d9b21e1bde488aaef05ab3e8bcab4849d1859115c6d md5=af9d9e03038481fbf79ea3ac33f116f9 sha256=b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b +[http://kernel.org//pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2] +md5=23f227da49df36f33fe47e917e332cd8 +sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c + [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2] md5=51952682d8b42aeda3af5cee0133ce2c sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b @@ -12790,6 +14234,10 @@ sha256=9f84c8e8a2f7f5969bc771741b1db64aa44c1b919e8ddbeba37875ca089b66d9 md5=9cd5ca752f7236167715ca1916da92ad sha256=d4e586a7475a0a2390ef9a7225e5146aa65ab70ec408cf9568c79c5aee0ca647 +[http://download.videolan.org/pub/videolan/vlc/0.8.6h/vlc-0.8.6h.tar.bz2] +md5=4a6eece2f56d4ad5dfa786e934d2b4a8 +sha256=50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221 + [http://194.213.43.198/vmedit/vmedit-0.02.tar.gz] md5=7550ea1dd951d2f7fb1a54caa88860b2 sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978 @@ -12810,6 +14258,10 @@ sha256=08d588ce0731d0c0e55a1cac35acf019e1b735d0f75f16962adfeb4fefd69441 md5=80d3ae3bbae2a488d433d86b8fd64777 sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37 +[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz] +md5=47845fd76f5f2354a3619c4097575487 +sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad + [http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz] md5=aaccdffc5656095a45dfe87c5bf612cb sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488 @@ -12818,6 +14270,10 @@ sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488 md5=e7518cff21326fe7eb9795b60c25ae6a sha256=be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7 +[http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.5.1.tar.gz] +md5=7a8e94dbe94f39a4fd89b72e0125f66f +sha256=f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed + [ftp://vsftpd.beasts.org/users/cevans/vsftpd-2.0.5.tar.gz] md5=146062e8b2f93af43ff6c2c770feea94 sha256=5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b @@ -12826,6 +14282,10 @@ sha256=5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b md5=a9dc7b330d52ce384e3e5715d396c72f sha256=c31e1e930bce109cccd40dc0378b7ee28933482855918f46573e79d9db818be7 +[http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.13.tar.bz2] +md5=40480f20f6b7664f3d364e4f2ed27889 +sha256=edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d + [http://ftp.gnome.org/pub/GNOME/sources/vte/0.16/vte-0.16.8.tar.bz2] md5=65344de3023c41c8dda2b35a415bf969 sha256=1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f @@ -12854,6 +14314,10 @@ sha256=1be8f5179f37a56094ae712f9561b86bb4cd40cb5c55d7dbc680f34b77d0b1cf md5=2c958056e0a82da4d85810ea51b9e07b sha256=c8e0cf191fb60b26eb5481c24d162c3675c72bc940c42393af2f0b62897de90f +[http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r0.patch] +md5=a32cf8e91474d9ccfecb2a225ed326f7 +sha256=d6863b3ad5ecb465d217714ad474f2a9fb6e7890b4565184e8d5962d46850a31 + [http://www.rpsys.net/openzaurus/patches/archive/w100_extmem-r1.patch] md5=a17be90788c4ccd6ee8253659b9321f8 sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134 @@ -12862,6 +14326,10 @@ sha256=56dfd5365848095793faa31ee1cf753c10891dd076944d3533b05c6547965134 md5=eec0b301b32bc8e9f65a4e54248c9868 sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0 +[http://wirbel.htpc-forum.de/w_scan/w_scan-20080720.tar.bz2] +md5=29d20fec3febf96de43bc27db4b47cfd +sha256=7107d31e05168febe4cd11bc7fb91ea8f6283b225c7c48a0e9579458d3b5de33 + [http://www.ibiblio.org/pub/Linux/system/network/misc/wakelan-1.1.tar.gz] md5=4a3a31d874967cd6ac761b7d4323e0d5 sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f @@ -13238,6 +14706,10 @@ sha256=eb7ea9a7917fa6d603529e76f793e56baefa87a3034602634c73f9b284adc8b7 md5=242388ab65dde3a3dd313eeee265e429 sha256=53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9 +[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.3.tar.bz2] +md5=3a2e0252e853ab30b3bff05ac92ec61c +sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4 + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2] md5=c0e88fc3483d90a7fea6a399298d90ea sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b @@ -13318,6 +14790,14 @@ sha256=46d3d459821a321cf82252bd4130134b5ecab0984cc0ec5ce0f0f8b3b6e41908 md5=24c33f833bb2db72a07c3d28bfc0aae9 sha256=f1b7f84175d33f4d18c83cd0d37bd3962acd668922fa074a8ae29e18517cdda7 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.1.5.tar.bz2] +md5=01705ea9a4d1699d5eeb17e7f297a581 +sha256=52b7daab86dade2d189f0378ddf196c018cdc9dd47ade0b3b8fc7591cb4bbe9e + +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-1.99.4.tar.bz2] +md5=f56d98ab11ef77cfcbafb5d93c697791 +sha256=71e896168819bcf50044c175482d03873c31bc6eb355305a87e94772580789dd + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2] md5=d982c6f185f4c75a4b65703ceed7be06 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 @@ -13362,6 +14842,10 @@ sha256=240abf3bc4068f9823dbe6e8ff9c63e5aee1442fd85c80122f2ee44c00fe101e md5=babf094e37bdfc08076d4adb4c69c1d9 sha256=b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.2.2.tar.bz2] +md5=ab3122921f6359c54e250879288ffd47 +sha256=c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2] md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77 @@ -13398,6 +14882,10 @@ sha256=2776fe554835a2be94e69cc40af7b4d4f7048d9a36a844ebaf1a792ba0868dea md5=d8bcd9fb1b4efb02acd251495f9a30c1 sha256=7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.2.2.tar.bz2] +md5=c47c598e55e7080b8ea30f70781f7ca3 +sha256=80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2] md5=12a908e5a97b1b03e8717abf167f4f27 sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d @@ -13498,6 +14986,10 @@ sha256=06c2462dfa65c32e31a972292531bf686c56c3f9cf21baf814ab0eda5cf26653 md5=ac1595de8397efd740038994b1e9ef67 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2] +md5=102b781f543213852401f3422b18ccc7 +sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.3.tar.bz2] md5=f6d559f9d20f61567d381916b376590f sha256=d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780 @@ -13922,6 +15414,10 @@ sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf md5=e4a282cfd708b8892fca4425fee9cd7b sha256=111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6 +[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.4.tar.bz2] +md5=01470d088da3a8a3deefa8e1f45d69cb +sha256=f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86driproto-X11R7.0-2.0.3.tar.bz2] md5=839a70dfb8d5b02bcfc24996ab99a618 sha256=256fd04cbd97b2b96e7ef808b6752561da855ded3835a1bb0d7acbe07758e924 @@ -14170,6 +15666,10 @@ sha256=c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186 md5=9df52a504dc04313a6650fae364ae04a sha256=1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52 +[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.5.tar.bz2] +md5=9a2aad51042141a0e6ad066015397595 +sha256=95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d + [http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.7.tar.bz2] md5=8b882d9e2deed9d85469a3beaec566a3 sha256=15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774 @@ -14338,6 +15838,10 @@ sha256=a3adf1c61247254cc81c80a6c020fe6a9fe0abbdc5f66f8631ec87a1a356c4ae md5=a7c05bf0897ba99fe01af528c0831183 sha256=5118569d9214c308b532cfb04df9cc14288f29b307adb00e3eed7f2ab5744efb +[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.2.0.tar.bz2] +md5=ea291c89e68832d570d9d5e007218bd6 +sha256=e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 + [http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.3.0.0.tar.bz2] md5=a51a7d482e3c689394755bb17bda8526 sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975 @@ -14350,6 +15854,10 @@ sha256=b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe md5=e548512ece2f2fd32e438fbbd8f5b857 sha256=8c5b0f58a7f4382f052df0f4fb352c26953402d3298ee69d2d7077b510e09099 +[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.tar.bz2] +md5=a06d9fe4f9f1d459ae02657f9ce64220 +sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 + [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2] md5=0e7527480fb845a3c2e333bd0f47ff50 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47 @@ -14542,6 +16050,10 @@ sha256=793e282c30c301ac5f2fd58f43dd59a691da1c18c7fbcbcbd9a08602f3ae8799 md5=237d27a5b46d1fa88fb43fb1a40cf209 sha256=c93e01cd754e8cafc6e02d32a7304d4b152e6aba9e6b0bcaea9ded12263f24b4 +[http://gpe.linuxtogo.org/download/source/xserver-common-1.18.tar.gz] +md5=72c8b5c4c4aa18abe4f29308d2726e1e +sha256=3e198bf84fac63cd5d93521c1646cf6dc2d959b4c84a16aa9cd1d9ca94ddd212 + [http://gpe.linuxtogo.org/download/source/xserver-common-1.22.tar.gz] md5=658badd22689cdde536050f740ec8319 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62 @@ -14750,6 +16262,10 @@ sha256=8288a1299f8c6f0176f2cd1b51f83b2c4b919460a2aa4fe98699b019e583bfc1 md5=51691a15137fbc35515a630d45d03352 sha256=dd71e82cd3df6ca60e629cc5655e7a380586b363a3d963482e9f151eb186dbad +[http://downloads.sourceforge.net/zd1211/zd1211-firmware-1.4.tar.bz2] +md5=19f28781d76569af8551c9d11294c870 +sha256=866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 + [http://downloads.sourceforge.net/zd1211/zd1211-firmware1.3.tar.bz2] md5=cfff76ea35f4f93c37f6c99aa2058140 sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 7dd416b102..fd74d7581c 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -75,10 +75,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" -#Prefer a newer GTK+ and friends -PREFERRED_VERSION_gtk+ ?= "2.12.3" -PREFERRED_VERSION_glib-2.0 ?= "2.14.4" - PREFERRED_PROVIDER_avahi = "avahi" #Small machines prefer kdrive, but we might ship full Xorg in other images diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 2ebb06d5c0..e52a8ddb68 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -4,8 +4,9 @@ PREFERRED_VERSION_cairo = "1.6.4" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_glib-2.0 = "2.16.3" +PREFERRED_VERSION_glib-2.0 = "2.16.4" PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_gtk+ = "2.12.11" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index c3e4b41b97..103adb051e 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -126,7 +126,7 @@ PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515" PREFERRED_VERSION_bzip2 ?= "1.0.2" PREFERRED_VERSION_cacao-cldc ?= "0.98" PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98" -PREFERRED_VERSION_cairo ?= "1.4.10" +PREFERRED_VERSION_cairo ?= "1.6.4" PREFERRED_VERSION_cairo-directfb ?= "1.4.8" PREFERRED_VERSION_cairomm ?= "1.2.4" PREFERRED_VERSION_calendar ?= "1.0" @@ -465,7 +465,7 @@ PREFERRED_VERSION_gizmod ?= "2.3" PREFERRED_VERSION_gkrellm ?= "2.2.10" PREFERRED_VERSION_glib-1.2 ?= "1.2.10" PREFERRED_VERSION_glib-1.2-native ?= "1.2.10" -PREFERRED_VERSION_glib-2.0 ?= "2.16.1" +PREFERRED_VERSION_glib-2.0 ?= "2.16.4" PREFERRED_VERSION_glib-2.0-native ?= "2.16.1" PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" @@ -616,7 +616,7 @@ PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gstreamer ?= "0.10.17" PREFERRED_VERSION_gthumb ?= "2.6.9" -PREFERRED_VERSION_gtk+ ?= "2.10.14" +PREFERRED_VERSION_gtk+ ?= "2.12.11" PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2" @@ -986,7 +986,6 @@ PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpixman ?= "0.9.6" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" PREFERRED_VERSION_libpthread-stubs ?= "0.1" @@ -1442,7 +1441,7 @@ PREFERRED_VERSION_pine ?= "4.64" PREFERRED_VERSION_pipeman ?= "1.0.0" PREFERRED_VERSION_pipepanic ?= "0.1.1" PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.9.6" +PREFERRED_VERSION_pixman ?= "0.10.0" PREFERRED_VERSION_pixops-test ?= "1.0" PREFERRED_VERSION_pkgconfig ?= "0.22" PREFERRED_VERSION_pkgconfig-native ?= "0.22" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d8c3686b64..3b86c2a539 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -71,7 +71,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "d4b28ec4e2818207cc0e48b90dbce581e0b779e7" +SRCREV_pn-linux-openmoko ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759" SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index cbd82fa467..5d88adee4a 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -4,8 +4,12 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard" # Only has DVI connector for external screen GUI_MACHINE_CLASS = "bigscreen" @@ -36,4 +40,4 @@ PREFERRED_VERSION_u-boot = "git" EXTRA_IMAGEDEPENDS += "u-boot x-load" # and sdio -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc index 96e2f1bd25..2efc6c77e7 100644 --- a/conf/machine/include/neuros.inc +++ b/conf/machine/include/neuros.inc @@ -16,7 +16,7 @@ neuros_make_installkit () { cp ${IMAGE_NAME}.rootfs.yaffs2 ${IMAGE_NAME}-installkit/rootfs.yaffs2 cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ - mkfs.jffs2 -x lzo -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n + mkfs.jffs2 -x lzo -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 --pad=0x400000 -n echo "${MACHINE}" > rootfs.version echo "${MACHINE}" > u-boot.version echo "${MACHINE}" > uImage.version diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 190d1d1049..46bd42f2a2 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -36,7 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES += "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools diff --git a/contrib/source-checker/oe-source-checker.py b/contrib/source-checker/oe-source-checker.py index 9ac147b00b..0ae356395c 100644 --- a/contrib/source-checker/oe-source-checker.py +++ b/contrib/source-checker/oe-source-checker.py @@ -87,7 +87,7 @@ for source in checksums_parser.sections(): if md5 != md5data: file_ok = False - shapipe = os.popen("oe_sha256sum " + localpath) + shapipe = os.popen("sha256sum " + localpath) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() diff --git a/packages/alsa/alsa-lib_1.0.17.bb b/packages/alsa/alsa-lib_1.0.17.bb new file mode 100644 index 0000000000..f4ae21b637 --- /dev/null +++ b/packages/alsa/alsa-lib_1.0.17.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "GPL" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1 \ + file://fix_libmath.patch;patch=1 \ + " + +inherit autotools pkgconfig + + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + + +do_stage () { + autotools_stage_all +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/packages/alsa/alsa-oss_1.0.17.bb b/packages/alsa/alsa-oss_1.0.17.bb new file mode 100644 index 0000000000..cb77cc6759 --- /dev/null +++ b/packages/alsa/alsa-oss_1.0.17.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPL" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ + file://libio.patch;patch=1 \ + " + +inherit autotools + +LEAD_SONAME = "libaoss.so.0" + +do_configure_prepend () { + touch NEWS README AUTHORS ChangeLog +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/alsa/alsa-plugins_1.0.17.bb b/packages/alsa/alsa-plugins_1.0.17.bb new file mode 100644 index 0000000000..b17a3265e8 --- /dev/null +++ b/packages/alsa/alsa-plugins_1.0.17.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "ALSA Plugins" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "multimedia/alsa/plugins" +LICENSE = "GPL" +DEPENDS = "alsa-lib pulseaudio" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" + +inherit autotools + +PACKAGES_DYNAMIC = "libasound-module*" + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) +} + +FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" +FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" diff --git a/packages/alsa/alsa-utils_1.0.17.bb b/packages/alsa/alsa-utils_1.0.17.bb new file mode 100644 index 0000000000..d5f116bafc --- /dev/null +++ b/packages/alsa/alsa-utils_1.0.17.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://alsa-utils-automake.patch;patch=1 \ + " + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + + +do_configure_append() { + for i in $(find ${S} -name Makefile) ; do + sed -i -e s:/usr/include/ncurses:${STAGING_INCDIR}/ncurses:g $i + done +} + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" diff --git a/packages/apt/apt-0.5.28.6/autofoo.patch b/packages/apt/apt-0.5.28.6/autofoo.patch index eaad80d3b4..02ee7e057f 100644 --- a/packages/apt/apt-0.5.28.6/autofoo.patch +++ b/packages/apt/apt-0.5.28.6/autofoo.patch @@ -1,3 +1,4 @@ +upstream: more recent version in OE # # Patch managed by http://www.holgerschurig.de/patcher.html diff --git a/packages/apt/apt-0.6.25/autofoo.patch b/packages/apt/apt-0.6.25/autofoo.patch index 7083b838a2..1a6887bc8f 100644 --- a/packages/apt/apt-0.6.25/autofoo.patch +++ b/packages/apt/apt-0.6.25/autofoo.patch @@ -1,3 +1,4 @@ +upstream: more recent version in OE # # Patch managed by http://www.holgerschurig.de/patcher.html diff --git a/packages/c-ares/c-ares_1.5.2.bb b/packages/c-ares/c-ares_1.5.2.bb new file mode 100644 index 0000000000..9098a9cb31 --- /dev/null +++ b/packages/c-ares/c-ares_1.5.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz" +LICENSE = "MIT" +S = "${WORKDIR}/c-ares-${PV}" + +inherit autotools + +do_stage() { + oe_libinstall -C .libs -a libcares ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/ares + install -m 0644 ares*.h ${STAGING_INCDIR}/ares/ +} + diff --git a/packages/cmake/cmake.inc b/packages/cmake/cmake.inc index d046c84858..eb816680cd 100644 --- a/packages/cmake/cmake.inc +++ b/packages/cmake/cmake.inc @@ -5,6 +5,7 @@ DESCRIPTION = "A cross-platform, open-source make system" HOMEPAGE = "http://www.cmake.org/" LICENSE = "Berkeley-style license" SECTION = "console/utils" +PR = "r1" CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz" @@ -14,5 +15,5 @@ inherit autotools S = "${WORKDIR}/cmake-${PV}" do_configure () { - ./configure --prefix=${base_prefix} || die "./bootstrap failed" + ./configure --prefix=${prefix} || die "./bootstrap failed" } diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index 0e85d38a82..098d0054cd 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -18,13 +18,7 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \ S = "${WORKDIR}/codec_engine_2_10_01" -# Path to the dir where the TI tools are unpacked -TITOOLSDIR ?= "/OE/TI" -# Path under TITOOLSDIR where dspbios is unpacked -TIBIOSDIR ?= "bios_5_32_03" -TIXDCTOOLSDIR ?= "${TIBIOSDIR}/xdctools" -# Path under TITOOLSDIR where the dsp toolchain is unpacked -TICGTOOLSDIR ?= "cg6x_6_1_2" +require ti-paths.inc PARALLEL_MAKE = "" diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index 2347068379..f303b6e53f 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -11,12 +11,7 @@ S = "${WORKDIR}/dsplink_1_50/dsplink" # Needed for buildscripts export DSPLINK = "${S}" -# Path to the dir where the TI tools are unpacked -TITOOLSDIR ?= "/OE/TI" -# Path under TITOOLSDIR where dspbios is unpacked -TIBIOSDIR ?= "bios_5_32_03" -# Path under TITOOLSDIR where the dsp toolchain is unpacked -TICGTOOLSDIR ?= "cg6x_6_1_2" +require ti-paths.inc DSPLINKPLATFORM ?= "Davinci" diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc new file mode 100644 index 0000000000..83cbe683c0 --- /dev/null +++ b/packages/dsplink/ti-paths.inc @@ -0,0 +1,8 @@ +# Path to the dir where the TI tools are unpacked +TITOOLSDIR ?= "/OE/TI" +# Path under TITOOLSDIR where dspbios is unpacked +TIBIOSDIR ?= "bios_5_32_03" +TIXDCTOOLSDIR ?= "${TIBIOSDIR}/xdctools" +# Path under TITOOLSDIR where the dsp toolchain is unpacked +TICGTOOLSDIR ?= "cg6x_6_1_2" + diff --git a/packages/dvbtools/wscan_20080720.bb b/packages/dvbtools/wscan_20080720.bb new file mode 100644 index 0000000000..b71fb2bf18 --- /dev/null +++ b/packages/dvbtools/wscan_20080720.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Wscan is a dvb channel scanner that doesn't require an initial frequency table" +LICENSE = "GPLv2" + +SRC_URI = "http://wirbel.htpc-forum.de/w_scan/w_scan-${PV}.tar.bz2" +S = "${WORKDIR}/w_scan-${PV}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 w_scan ${D}/${bindir}/ + + install -d ${D}/${datadir}/w_scan + install -m 0644 *.ids *.classes ${D}/${datadir}/w_scan/ +} + +FILES_${PN} += "${datadir}" diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c93261283f..0cbfce233c 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r21" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -44,7 +44,7 @@ EXTRA_OECONF = " \ --enable-libfaadbin \ --enable-libgsm \ --enable-libmp3lame \ - --disable-swscale \ + --enable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -93,8 +93,9 @@ do_stage() { install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h done - install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h - install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h + install -d ${STAGING_INCDIR}/libswscale/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ install -d ${STAGING_INCDIR}/libpostproc install -d ${STAGING_INCDIR}/postproc diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb index 2d881214a0..3beffce09e 100644 --- a/packages/freesmartphone/illume-theme-freesmartphone_git.bb +++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb @@ -2,11 +2,16 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project" HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" PV = "0.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master" S = "${WORKDIR}/git/illume" +do_compile() { + cd illume && ./build.sh && cd .. + cd illume_init && ./build.sh && cd .. +} + do_install() { install -d ${D}${sysconfdir}/enlightenment install -d ${D}${datadir}/enlightenment/data/themes/ @@ -15,8 +20,8 @@ do_install() { # Make illume the default profile echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile - install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/ - install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/ + install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/ } RPROVIDES_${PN} = "illume-theme" diff --git a/packages/fvwm/.mtn2git_empty b/packages/fvwm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fvwm/.mtn2git_empty diff --git a/packages/fvwm/files/.mtn2git_empty b/packages/fvwm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fvwm/files/.mtn2git_empty diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch new file mode 100644 index 0000000000..59c4275bf3 --- /dev/null +++ b/packages/fvwm/files/acinclude.m4.patch @@ -0,0 +1,32 @@ +upstream: OE-only +origin: Yuri Bushmelev <jay4mail at gmail.com> +comment: disable xft-config calls while cross-compiling +--- fvwm-2.5.26/acinclude.m4.orig 2008-06-10 01:53:46.000000000 +0400 ++++ fvwm-2.5.26/acinclude.m4 2008-06-10 01:53:51.000000000 +0400 +@@ -1225,14 +1225,14 @@ + XFT_CONFIG=$xft_config_prefix/bin/xft-config + fi + fi +-AC_PATH_PROG(XFT_CONFIG, xft-config, no) ++dnl AC_PATH_PROG(XFT_CONFIG, xft-config, no) + + min_xft_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for Xft - version >= $min_xft_version) + no_xft="" + pkg_config_xft_exists="" + +-if test "$XFT_CONFIG" = "no" ; then ++dnl if test "$XFT_CONFIG" = "no" ; then + if test "x$PKG_CONFIG" != "xno" ; then + if $PKG_CONFIG --exists 'xft' ; then + if $PKG_CONFIG --exists 'xft >= $1' ; then +@@ -1249,7 +1249,8 @@ + else + no_xft=yes + fi +-else ++dnl else ++if false; then + XFT_CFLAGS=`$XFT_CONFIG $xft_config_args --cflags` + XFT_LIBS=`$XFT_CONFIG $xft_config_args --libs` + xft_config_major_version=`$XFT_CONFIG $xft_config_args --version | \ diff --git a/packages/fvwm/files/oe-configure.ac.patch b/packages/fvwm/files/oe-configure.ac.patch new file mode 100644 index 0000000000..c140cff5dd --- /dev/null +++ b/packages/fvwm/files/oe-configure.ac.patch @@ -0,0 +1,56 @@ +upstream: OE-only +origin: Yuri Bushmelev <jay4mail at gmail.com> +comment: disable mkstemp() safety check, X11/keysym.h check and old libstroke check +--- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400 ++++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400 +@@ -1405,7 +1407,8 @@ + + # check for mkstemp, see the discution on this subject on the fvwm workers + # list (2001-02-16 and 2001-02-24) +-AM_SAFETY_CHECK_MKSTEMP ++#AM_SAFETY_CHECK_MKSTEMP ++AC_DEFINE(HAVE_SAFETY_MKSTEMP) + + # If we do not have atexit(), then check for on_exit() + if test x$ac_cv_func_atexit = xno; then +@@ -1465,23 +1468,23 @@ + problem_gnomehints=": Explicitly disabled" + fi + +-# Define some compatibility macros needed for config.h. +-mg_DEFINE_IF_NOT([#include <X11/keysym.h>], +- [defined XK_Page_Up && defined XK_Page_Down], +- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], +- [Old AIX systems (3.2.5) don't define some common keysyms.]) +-AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], +-[#ifdef COMPAT_OLD_KEYSYMDEF +-# define XK_Page_Up XK_Prior +-# define XK_Page_Down XK_Next +-#endif]) +- +-if test x"$with_stroke" = xyes; then +- mg_DEFINE_IF_NOT([#include <stroke.h>], +- [defined STROKE_MAX_SEQUENCE], +- [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS], +- [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.]) +-fi ++## Define some compatibility macros needed for config.h. ++#mg_DEFINE_IF_NOT([#include <X11/keysym.h>], ++# [defined XK_Page_Up && defined XK_Page_Down], ++# [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS], ++# [Old AIX systems (3.2.5) don't define some common keysyms.]) ++#AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF], ++#[#ifdef COMPAT_OLD_KEYSYMDEF ++## define XK_Page_Up XK_Prior ++## define XK_Page_Down XK_Next ++##endif]) ++ ++#if test x"$with_stroke" = xyes; then ++# mg_DEFINE_IF_NOT([#include <stroke.h>], ++# [defined STROKE_MAX_SEQUENCE], ++# [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS], ++# [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.]) ++#fi + AH_VERBATIM([_COMPAT_OLD_LIBSTROKE], + [#ifdef COMPAT_OLD_LIBSTROKE + /* currently we only use one constant */ diff --git a/packages/fvwm/files/upstream-configure.ac.patch b/packages/fvwm/files/upstream-configure.ac.patch new file mode 100644 index 0000000000..e897d58fed --- /dev/null +++ b/packages/fvwm/files/upstream-configure.ac.patch @@ -0,0 +1,26 @@ +upstream: http://fvwm.lair.be/viewtopic.php?f=49&t=2107 +status: pending +origin: Yuri Bushmelev <jay4mail at gmail.com> +comment: fixes libs detection in configure when cross-compiling +--- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400 ++++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400 +@@ -792,7 +792,8 @@ + problem_xpm=": Internal xpm detection logic error" + fi + fi], +- [with_xpm=no; problem_xpm=": Xpm test error, see config.log"]) ++ [with_xpm=no; problem_xpm=": Xpm test error, see config.log"], ++ [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + AC_MSG_RESULT($with_xpm) + CPPFLAGS="$my_CPPFLAGS" + LIBS="$my_LIBS" +@@ -840,7 +841,8 @@ + problem_png=": Internal png detection logic error" + fi + fi], +- [with_png="no"; problem_png=": png test error, see config.log"]) ++ [with_png="no"; problem_png=": png test error, see config.log"], ++ [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + AC_MSG_RESULT($with_png) + CPPFLAGS="$my_CPPFLAGS" + LIBS="$my_LIBS" diff --git a/packages/fvwm/fvwm_2.5.26.bb b/packages/fvwm/fvwm_2.5.26.bb new file mode 100644 index 0000000000..10677aea6a --- /dev/null +++ b/packages/fvwm/fvwm_2.5.26.bb @@ -0,0 +1,46 @@ +SECTION = "x11/wm" +DESCRIPTION = "FVWM Window Manager" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr xft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke" + +SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 \ + file://oe-configure.ac.patch;patch=1 \ + file://upstream-configure.ac.patch;patch=1 \ + file://acinclude.m4.patch;patch=1 \ + " + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-xinerama --disable-bidi --disable-perllib \ + --disable-gtk --without-gnome --without-imlib \ + --disable-freetypetest --disable-fontconfigtest --disable-xfttest \ + --disable-imlibtest --disable-sm \ + " + +PACKAGES =+ "${PN}-perl" + +FILES_${PN}-dbg += " \ + ${libexecdir}/${PN}/${PV}/.debug \ + ${bindir}/${PN}-bug \ +" + +FILES_${PN}-dev += "${bindir}/${PN}-config" + +FILES_${PN}-perl = " \ + ${bindir}/${PN}-convert-2.4 \ + ${bindir}/${PN}-convert-2.6 \ + ${bindir}/${PN}-menu* \ + ${bindir}/${PN}-perllib \ + ${libexecdir}/${PN}/${PV}/FvwmPerl \ + ${libexecdir}/${PN}/${PV}/FvwmCommand.pm \ + ${libexecdir}/${PN}/${PV}/FvwmConsoleC.pl \ + ${libexecdir}/${PN}/${PV}/FvwmDebug \ + ${libexecdir}/${PN}/${PV}/FvwmGtkDebug \ + ${libexecdir}/${PN}/${PV}/FvwmTabs \ + ${libexecdir}/${PN}/${PV}/FvwmWindowMenu \ + ${datadir}/${PN}/FvwmScript-ComExample \ + ${datadir}/${PN}/FvwmScript-Setup95 \ + ${datadir}/${PN}/fvwm-script-setup95.pl \ + ${datadir}/${PN}/fvwm-script-ComExample.pl \ +" + diff --git a/packages/gcc/gcc-4.2.4.inc b/packages/gcc/gcc-4.2.4.inc index 87eb532b21..4078009bd5 100644 --- a/packages/gcc/gcc-4.2.4.inc +++ b/packages/gcc/gcc-4.2.4.inc @@ -68,6 +68,6 @@ FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" JAVA = "" -EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc index d9bd40092c..878e2ba1ef 100644 --- a/packages/gcc/gcc-configure-common.inc +++ b/packages/gcc/gcc-configure-common.inc @@ -11,7 +11,7 @@ JAVA_mipsel ?= "" JAVA_sh3 ?= "" # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' FORTRAN ?= ",f77" -LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" +LANGUAGES ?= "c,objc,c++${FORTRAN}${JAVA}" EXTRA_OECONF_BASE ?= "" EXTRA_OECONF_PATHS ?= "" diff --git a/packages/gcc/gcc-cross_4.2.4.bb b/packages/gcc/gcc-cross_4.2.4.bb index e07143d0d8..cac2550f0e 100644 --- a/packages/gcc/gcc-cross_4.2.4.bb +++ b/packages/gcc/gcc-cross_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc_4.2.4.bb b/packages/gcc/gcc_4.2.4.bb index 43fa3a9ebc..033f33f8d3 100644 --- a/packages/gcc/gcc_4.2.4.bb +++ b/packages/gcc/gcc_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/packages/gettext/gettext-0.17/.mtn2git_empty b/packages/gettext/gettext-0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gettext/gettext-0.17/.mtn2git_empty diff --git a/packages/gettext/gettext-0.17/autotools.patch b/packages/gettext/gettext-0.17/autotools.patch new file mode 100644 index 0000000000..9f16b1881f --- /dev/null +++ b/packages/gettext/gettext-0.17/autotools.patch @@ -0,0 +1,62 @@ +Index: gettext-0.17/gettext-runtime/man/Makefile.am +=================================================================== +--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200 ++++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200 +@@ -158,8 +158,7 @@ + $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@ + mv t-$@ $@ + +-install-html-local: +- $(mkdir_p) $(DESTDIR)$(htmldir) ++install-html: installdirs-html + for file in $(man_HTML); do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \ +Index: gettext-0.17/gettext-tools/man/Makefile.am +=================================================================== +--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200 ++++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200 +@@ -186,8 +186,7 @@ + $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@ + mv t-$@ $@ + +-install-html-local: +- $(mkdir_p) $(DESTDIR)$(htmldir) ++install-html: installdirs-html + for file in $(man_HTML); do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \ +Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac +=================================================================== +--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200 ++++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200 +@@ -1,5 +1,5 @@ + dnl Configuration for the GNU libasprintf library +-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2007 Free Software Foundation, Inc. + dnl + dnl This program is free software: you can redistribute it and/or modify + dnl it under the terms of the GNU General Public License as published by +@@ -54,8 +54,7 @@ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE + AC_TYPE_SIZE_T +-gl_AC_TYPE_LONG_LONG +-gt_TYPE_LONGDOUBLE ++AC_TYPE_LONG_LONG_INT + gt_TYPE_WCHAR_T + gt_TYPE_WINT_T + AC_CHECK_TYPE([ptrdiff_t], , +@@ -79,8 +78,11 @@ + AC_SUBST([ALLOCA_H]) + + AC_CHECK_FUNCS([snprintf vasprintf wcslen]) +-AC_CHECK_DECLS([_snprintf]) ++dnl Use the _snprintf function only if it is declared (because on NetBSD it ++dnl is defined as a weak alias of snprintf; we prefer to use the latter). ++AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>]) + gt_PRINTF_POSIX ++gl_EOVERFLOW + + dnl Check for tools needed for formatting the documentation. + ac_aux_dir_abs=`cd $ac_aux_dir && pwd` diff --git a/packages/gettext/gettext-0.17/gettext-error_print_progname.patch b/packages/gettext/gettext-0.17/gettext-error_print_progname.patch new file mode 100644 index 0000000000..0f67cd0b2e --- /dev/null +++ b/packages/gettext/gettext-0.17/gettext-error_print_progname.patch @@ -0,0 +1,13 @@ +Index: gettext-0.17/gettext-tools/libgettextpo/error.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200 ++++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200 +@@ -49,7 +49,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-extern DLL_VARIABLE void (*error_print_progname) (void); ++void (*error_print_progname) (void); + + /* This variable is incremented each time `error' is called. */ + extern DLL_VARIABLE unsigned int error_message_count; diff --git a/packages/gettext/gettext-0.17/wchar-uclibc.patch b/packages/gettext/gettext-0.17/wchar-uclibc.patch new file mode 100644 index 0000000000..7b3880bf77 --- /dev/null +++ b/packages/gettext/gettext-0.17/wchar-uclibc.patch @@ -0,0 +1,96 @@ +Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200 ++++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 Free Software Foundation, Inc. + + 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif +Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200 ++++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 Free Software Foundation, Inc. + + 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif +Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200 ++++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 Free Software Foundation, Inc. + + 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb new file mode 100644 index 0000000000..c6daf7b782 --- /dev/null +++ b/packages/gettext/gettext-native_0.17.bb @@ -0,0 +1,59 @@ +require gettext_${PV}.bb + +DEPENDS = "" +PROVIDES = "" + +inherit native + +S = "${WORKDIR}/gettext-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}" + +M4 = "\ +ansi-c++.m4 \ +codeset.m4 \ +gettext.m4 \ +glibc21.m4 \ +glibc2.m4 \ +iconv.m4 \ +intdiv0.m4 \ +intldir.m4 \ +intl.m4 \ +intlmacosx.m4 \ +intmax.m4 \ +inttypes_h.m4 \ +inttypes-pri.m4 \ +lcmessage.m4 \ +lock.m4 \ +longlong.m4 \ +nls.m4 \ +po.m4 \ +printf-posix.m4 \ +progtest.m4 \ +size_max.m4 \ +stdint_h.m4 \ +uintmax_t.m4 \ +visibility.m4 \ +wchar_t.m4 \ +wint_t.m4 \ +xsize.m4 \ +lib-ld.m4 \ +lib-link.m4 \ +lib-prefix.m4 \ +" + +do_stage_append() { + for i in ${M4}; do + src="gettext-runtime/m4/$i" + if [ ! -f $src ]; then + src="gettext-tools/m4/$i" + fi + if [ ! -f $src ]; then + src="autoconf-lib-link/m4/$i" + fi + if [ ! -f $src ]; then + echo "can't find $i" >&2 + exit 1 + fi + install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i + done +} diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb new file mode 100644 index 0000000000..ed64c1ea87 --- /dev/null +++ b/packages/gettext/gettext_0.17.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "The GNU internationalization library." +HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" +SECTION = "libs" +LICENSE = "GPL" +PR = "r0" +DEFAULT_PREFERENCE = "-1" +DEPENDS = "virtual/libiconv" +PROVIDES = "virtual/libintl" + +SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ + file://autotools.patch;patch=1 \ + file://wchar-uclibc.patch;patch=1 \ + " + +SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" + +#gettext.class cant be inherit here so use this hack same as in libiconv +DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}" + +EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}" + + +PARALLEL_MAKE = "" + +inherit autotools + +EXTRA_OECONF += "--without-lispdir \ + --disable-csharp \ + --disable-libasprintf \ + --disable-java \ + --disable-native-java \ + --disable-openmp \ + --with-included-glib \ + --without-emacs \ + " +acpaths = '-I ${S}/autoconf-lib-link/m4/ \ + -I ${S}/gettext-runtime/m4 \ + -I ${S}/gettext-tools/m4' + + +# these lack the .x behind the .so, but shouldn't be in the -dev package +# Otherwise you get the following results: +# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# because gettext depends on gettext-dev, which pulls in more -dev packages: +# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk +# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk +# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk +# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk + +PACKAGES =+ "libgettextlib libgettextsrc" +FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb index d53acf46f8..a98cb0a057 100644 --- a/packages/gimp/babl_svn.bb +++ b/packages/gimp/babl_svn.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library." LICENSE = "LGPL" -PV = "0.0.14+svn${SRCDATE}" +SRCREV = "349" +PV = "0.0.23+svn${SRCREV}" PR = "r1" inherit gnome diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb index 91d654d43a..7cdc86ae21 100644 --- a/packages/gimp/gegl_svn.bb +++ b/packages/gimp/gegl_svn.bb @@ -1,8 +1,9 @@ DESCRIPTION = "GEGL (Generic Graphics Library) is a graph based image processing framework." LICENSE = "LGPL" -DEPENDS = "babl glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" +DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" -PV = "0.0.12+svn${SRCDATE}" +SRCREV = "2543" +PV = "0.0.19+svn${SRCREV}" inherit gnome @@ -10,12 +11,10 @@ SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk" S = "${WORKDIR}/trunk" -do_configure_prepend() { - sed -i -e s:tools\ docs:tools:g Makefile.am -} +EXTRA_OECONF = "--disable-docs " -FILES_${PN} += "${libdir}/gegl-1.0" -FILES_${PN}-dbg += "${libdir}/gegl-1.0/.debug" +FILES_${PN} += "${libdir}/gegl-0.0" +FILES_${PN}-dbg += "${libdir}/gegl-0.0/.debug" do_stage() { diff --git a/packages/gimp/gimp_2.5.2.bb b/packages/gimp/gimp_2.5.2.bb new file mode 100644 index 0000000000..18a12b1770 --- /dev/null +++ b/packages/gimp/gimp_2.5.2.bb @@ -0,0 +1,13 @@ +require gimp.inc + +DEPENDS += "lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.5/gimp-${PV}.tar.bz2 \ + " + +do_compile_prepend() { + for i in ca de fr ja oc ru sv; do + echo > ${S}/po/$i.po + done +} + diff --git a/packages/glib-2.0/glib-2.0-2.16.4/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.16.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.16.4/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch @@ -0,0 +1,34 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1265,7 +1265,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/packages/glib-2.0/glib-2.0_2.16.4.bb b/packages/glib-2.0/glib-2.0_2.16.4.bb new file mode 100644 index 0000000000..f70539f18e --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.16.4.bb @@ -0,0 +1,11 @@ +require glib.inc + +# This version requires a newer libtool that isn't default yet +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1 \ + " diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb index 52cb799cf2..9b9db4abb4 100644 --- a/packages/gnome/gconf_2.6.1.bb +++ b/packages/gnome/gconf_2.6.1.bb @@ -1,21 +1,20 @@ -LICENSE = "LGPL" -SECTION = "x11/gnome" DESCRIPTION = "GNOME configuration database system" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ - file://backends.patch;patch=1" +SECTION = "x11/gnome" +LICENSE = "LGPL" DEPENDS = "orbit2 glib-2.0 libxml2" ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" - -FILES_${PN} += " ${libdir}/GConf/*" +PR = "r2" S = "${WORKDIR}/GConf-${PV}" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ + file://backends.patch;patch=1" + EXTRA_OECONF = "--disable-gtk-doc" +HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" inherit autotools pkgconfig gettext -HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" - do_compile() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } @@ -30,3 +29,6 @@ do_stage() { do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } + +FILES_${PN} += " ${libdir}/GConf/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb index 4bc9b848bf..a49f1c468d 100644 --- a/packages/gnuradio/gnuradio_3.1.2.bb +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gstreamer/gst-common.inc b/packages/gstreamer/gst-common.inc index 04f3f309fa..c6a3fd057d 100644 --- a/packages/gstreamer/gst-common.inc +++ b/packages/gstreamer/gst-common.inc @@ -10,26 +10,10 @@ inherit autotools pkgconfig OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - if [ -d ${STAGE_TEMP}/${includedir} ]; then - cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} - fi - for i in $(find ${STAGE_TEMP}/${libdir} -name "*.la") - do - - destdir=$(dirname $(echo $i | sed -e s,${STAGE_TEMP}/${libdir},${STAGING_LIBDIR},g)) - oenote "Installing library $i to $destdir" - oe_libinstall -s -so $(basename $i .la) $destdir - done +AUTOTOOLS_STAGE_PKGCONFIG = "1" - if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then - install -d ${STAGING_DATADIR}/aclocal - cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal - fi - rm -rf ${STAGE_TEMP} +do_stage() { + autotools_stage_all } diff --git a/packages/gstreamer/gstreamer_0.10.17.bb b/packages/gstreamer/gstreamer_0.10.17.bb index b2e5daf671..94f1ef36cb 100644 --- a/packages/gstreamer/gstreamer_0.10.17.bb +++ b/packages/gstreamer/gstreamer_0.10.17.bb @@ -1,6 +1,6 @@ require gstreamer.inc -PR = "r1" +PR = "r2" SRC_URI += "file://po-makefile-fix.patch;patch=1" diff --git a/packages/gtk+/gtk+-2.12.11/.mtn2git_empty b/packages/gtk+/gtk+-2.12.11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/.mtn2git_empty diff --git a/packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch b/packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch new file mode 100644 index 0000000000..4439e69fb6 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch @@ -0,0 +1,32 @@ +Index: gtk/gtkcellrenderer.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v +retrieving revision 1.55 +diff -u -r1.55 gtkcellrenderer.c +--- gtk/gtkcellrenderer.c 14 May 2006 04:25:28 -0000 1.55 ++++ gtk/gtkcellrenderer.c 30 Jun 2006 10:57:43 -0000 +@@ -551,6 +551,7 @@ + + if (cell->cell_background_set && !selected) + { ++#ifdef USE_CAIRO_INTERNALLY + cairo_t *cr = gdk_cairo_create (window); + + gdk_cairo_rectangle (cr, background_area); +@@ -558,6 +559,16 @@ + cairo_fill (cr); + + cairo_destroy (cr); ++#else ++ GdkGC *gc; ++ ++ gc = gdk_gc_new (window); ++ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background); ++ gdk_draw_rectangle (window, gc, TRUE, ++ background_area->x, background_area->y, ++ background_area->width, background_area->height); ++ g_object_unref (gc); ++#endif + } + + GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, diff --git a/packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch b/packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch new file mode 100644 index 0000000000..d44c454ce3 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch @@ -0,0 +1,67 @@ +Index: gtk/gtkcombobox.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v +retrieving revision 1.185 +diff -u -p -r1.185 gtkcombobox.c +--- gtk/gtkcombobox.c 12 Oct 2006 13:48:07 -0000 1.185 ++++ gtk/gtkcombobox.c 1 Nov 2006 19:01:09 -0000 +@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla + FALSE, + GTK_PARAM_READABLE)); + ++ /** ++ * GtkComboBox:arrow-size: ++ * ++ * Sets the minimum size of the arrow in the combo box. Note ++ * that the arrow size is coupled to the font size, so in case ++ * a larger font is used, the arrow will be larger than set ++ * by arrow size. ++ * ++ * Since: 2.12 ++ */ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("arrow-size", ++ P_("Arrow Size"), ++ P_("The minimum size of the arrow in the combo box"), ++ 0, ++ G_MAXINT, ++ 15, ++ GTK_PARAM_READABLE)); ++ + g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); + } + +@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget + { + gint width, height; + gint focus_width, focus_pad; ++ gint font_size; ++ gint arrow_size; + GtkRequisition bin_req; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ PangoFontDescription *font_desc; + + GtkComboBox *combo_box = GTK_COMBO_BOX (widget); + +@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget + gtk_widget_style_get (GTK_WIDGET (widget), + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, ++ "arrow-size", &arrow_size, + NULL); ++ ++ font_desc = GTK_BIN (widget)->child->style->font_desc; ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, font_desc, ++ pango_context_get_language (context)); ++ font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics)); ++ pango_font_metrics_unref (metrics); ++ ++ arrow_size = MAX (arrow_size, font_size); ++ ++ gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); + + if (!combo_box->priv->tree_view) + { diff --git a/packages/gtk+/gtk+-2.12.11/disable-print.patch b/packages/gtk+/gtk+-2.12.11/disable-print.patch new file mode 100644 index 0000000000..21a4be4da8 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/disable-print.patch @@ -0,0 +1,26 @@ +--- gtk+-2.12.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.12.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1554,22 +1554 @@ +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +- +- AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]])) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++AM_CONDITIONAL(HAVE_CUPS, false) diff --git a/packages/gtk+/gtk+-2.12.11/entry-cairo.patch b/packages/gtk+/gtk+-2.12.11/entry-cairo.patch new file mode 100644 index 0000000000..3313e7f132 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/entry-cairo.patch @@ -0,0 +1,103 @@ +Index: gtk/gtkentry.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v +retrieving revision 1.317 +diff -u -r1.317 gtkentry.c +--- gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317 ++++ gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000 +@@ -3337,7 +3337,9 @@ + if (GTK_WIDGET_DRAWABLE (entry)) + { + PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); ++#ifdef USE_CAIRO_INTERNALLY + cairo_t *cr; ++#endif + gint x, y; + gint start_pos, end_pos; + +@@ -3345,23 +3347,35 @@ + + get_layout_position (entry, &x, &y); + ++#ifdef USE_CAIRO_INTERNALLY + cr = gdk_cairo_create (entry->text_area); + + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); + pango_cairo_show_layout (cr, layout); ++#else ++ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], ++ x, y, ++ layout); ++#endif + + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) + { + gint *ranges; + gint n_ranges, i; + PangoRectangle logical_rect; +- GdkColor *selection_color, *text_color; + GtkBorder inner_border; ++#ifdef USE_CAIRO_INTERNALLY ++ GdkColor *selection_color, *text_color; ++#else ++ GdkGC *selection_gc, *text_gc; ++ GdkRegion *clip_region; ++#endif + + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); + ++#ifdef USE_CAIRO_INTERNALLY + if (GTK_WIDGET_HAS_FOCUS (entry)) + { + selection_color = &widget->style->base [GTK_STATE_SELECTED]; +@@ -3390,11 +3404,46 @@ + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, text_color); + pango_cairo_show_layout (cr, layout); +- ++#else ++ if (GTK_WIDGET_HAS_FOCUS (entry)) ++ { ++ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; ++ text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; ++ } ++ else ++ { ++ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; ++ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; ++ } ++ ++ clip_region = gdk_region_new (); ++ for (i = 0; i < n_ranges; ++i) ++ { ++ GdkRectangle rect; ++ ++ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i]; ++ rect.y = y; ++ rect.width = ranges[2 * i + 1]; ++ rect.height = logical_rect.height; ++ ++ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, ++ rect.x, rect.y, rect.width, rect.height); ++ ++ gdk_region_union_with_rect (clip_region, &rect); ++ } ++ ++ gdk_gc_set_clip_region (text_gc, clip_region); ++ gdk_draw_layout (entry->text_area, text_gc, ++ x, y, ++ layout); ++ gdk_gc_set_clip_region (text_gc, NULL); ++ gdk_region_destroy (clip_region); ++#endif + g_free (ranges); + } +- ++#ifdef USE_CAIRO_INTERNALLY + cairo_destroy (cr); ++#endif + } + } + diff --git a/packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch new file mode 100644 index 0000000000..1c2cd0576d --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch @@ -0,0 +1,29 @@ +--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 ++++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 +@@ -371,7 +371,7 @@ + case $enable_explicit_deps in + auto) + export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` ++ deplibs_check_method=`($host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -773,7 +773,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" + pixbuf_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1611,7 +1611,7 @@ + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. + export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.12.11/menu-deactivate.patch b/packages/gtk+/gtk+-2.12.11/menu-deactivate.patch new file mode 100644 index 0000000000..cfb8849e9f --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/menu-deactivate.patch @@ -0,0 +1,51 @@ +--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 +@@ -42,7 +42,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MENU_SHELL_TIMEOUT 500 ++#define MENU_SHELL_TIMEOUT 2000 + + #define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ +@@ -203,6 +203,8 @@ + + G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) + ++static int last_crossing_time; ++ + static void + gtk_menu_shell_class_init (GtkMenuShellClass *klass) + { +@@ -517,6 +519,7 @@ + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; ++ last_crossing_time = 0; + } + } + +@@ -669,6 +672,13 @@ + menu_shell->activate_time = 0; + deactivate = FALSE; + } ++ ++ if (last_crossing_time != 0 ++ && ((event->time - last_crossing_time) < 500)) ++ { ++ last_crossing_time = 0; ++ deactivate = FALSE; ++ } + + if (deactivate) + { +@@ -716,6 +726,8 @@ + { + menu_item = gtk_get_event_widget ((GdkEvent*) event); + ++ last_crossing_time = event->time; ++ + if (!menu_item || + (GTK_IS_MENU_ITEM (menu_item) && + !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.12.11/no-demos.patch b/packages/gtk+/gtk+-2.12.11/no-demos.patch new file mode 100644 index 0000000000..0fc4c48d1a --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/no-demos.patch @@ -0,0 +1,10 @@ +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff new file mode 100644 index 0000000000..63828cec63 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff @@ -0,0 +1,2456 @@ +http://mail.gnome.org/archives/performance-list/2006-October/msg00063.html + +From: Xan Lópe +To: ext Matt Hoosier +Cc: performance-list gnome org +Subject: Re: [patch] Remove pangocairo from Gtk+ 2.8.20 +Date: Mon, 30 Oct 2006 14:31:56 +0200 +Hi, + +I've upgraded your patch against GTK+ 2.10.6, and we are getting great +performance figures compared to GTK+ 2.10.6 with pangocairo too +(basically at the level of GTK+ 2.6.10 again). Right now I'm working on +a python/cairo script to get some nice graphics from a torture test +session with several GTK+s, hope to get it ready soon. + +Index: gtk+-2.10.6/configure.in +=================================================================== +--- gtk+-2.10.6.orig/configure.in 2006-10-30 12:59:28.000000000 +0000 ++++ gtk+-2.10.6/configure.in 2006-10-30 12:59:30.000000000 +0000 +@@ -1435,7 +1435,7 @@ + if test "x$gdktarget" = "xwin32"; then + PANGO_PACKAGES="pangowin32 pangocairo" + else +- PANGO_PACKAGES="pango pangocairo" ++ PANGO_PACKAGES="pango pangocairo pangoxft" + fi + + AC_MSG_CHECKING(Pango flags) +Index: gtk+-2.10.6/gdk/gdkaliasdef.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdkaliasdef.c 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdkaliasdef.c 2006-10-30 12:59:30.000000000 +0000 +@@ -1799,9 +1799,6 @@ + #undef gdk_pango_context_get + extern __typeof (gdk_pango_context_get) gdk_pango_context_get __attribute((alias("IA__gdk_pango_context_get"), visibility("default"))); + +-#undef gdk_pango_context_get_for_screen +-extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); +- + #ifndef GDK_DISABLE_DEPRECATED + #undef gdk_pango_context_set_colormap + extern __typeof (gdk_pango_context_set_colormap) gdk_pango_context_set_colormap __attribute((alias("IA__gdk_pango_context_set_colormap"), visibility("default"))); +@@ -1836,6 +1833,13 @@ + + #endif + #endif ++#if IN_HEADER(__GDK_PANGO_H__) ++#if IN_FILE(__GDK_PANGO_X11_C__) ++#undef gdk_pango_context_get_for_screen ++extern __typeof (gdk_pango_context_get_for_screen) gdk_pango_context_get_for_screen __attribute((alias("IA__gdk_pango_context_get_for_screen"), visibility("default"))); ++ ++#endif ++#endif + #if IN_HEADER(__GDK_PIXBUF_H__) + #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) + #undef gdk_pixbuf_get_from_drawable +Index: gtk+-2.10.6/gdk/gdkalias.h +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdkalias.h 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdkalias.h 2006-10-30 12:59:30.000000000 +0000 +@@ -1796,9 +1796,6 @@ + extern __typeof (gdk_pango_context_get) IA__gdk_pango_context_get __attribute((visibility("hidden"))); + #define gdk_pango_context_get IA__gdk_pango_context_get + +-extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); +-#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen +- + #ifndef GDK_DISABLE_DEPRECATED + extern __typeof (gdk_pango_context_set_colormap) IA__gdk_pango_context_set_colormap __attribute((visibility("hidden"))); + #define gdk_pango_context_set_colormap IA__gdk_pango_context_set_colormap +@@ -1833,6 +1830,13 @@ + + #endif + #endif ++#if IN_HEADER(__GDK_PANGO_H__) ++#if IN_FILE(__GDK_PANGO_X11_C__) ++extern __typeof (gdk_pango_context_get_for_screen) IA__gdk_pango_context_get_for_screen __attribute((visibility("hidden"))); ++#define gdk_pango_context_get_for_screen IA__gdk_pango_context_get_for_screen ++ ++#endif ++#endif + #if IN_HEADER(__GDK_PIXBUF_H__) + #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) + extern __typeof (gdk_pixbuf_get_from_drawable) IA__gdk_pixbuf_get_from_drawable __attribute((visibility("hidden"))); +Index: gtk+-2.10.6/gdk/gdkdraw.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdkdraw.c 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdkdraw.c 2006-10-30 12:59:30.000000000 +0000 +@@ -909,9 +909,9 @@ + { + g_return_if_fail (GDK_IS_DRAWABLE (drawable)); + g_return_if_fail (GDK_IS_GC (gc)); +- +- real_draw_glyphs (drawable, gc, NULL, font, +- x, y, glyphs); ++ ++ ++ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs (drawable, gc, font, x, y, glyphs); + } + + /** +@@ -949,8 +949,9 @@ + g_return_if_fail (GDK_IS_DRAWABLE (drawable)); + g_return_if_fail (GDK_IS_GC (gc)); + +- real_draw_glyphs (drawable, gc, matrix, font, +- x / PANGO_SCALE, y / PANGO_SCALE, glyphs); ++ if (GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed) ++ GDK_DRAWABLE_GET_CLASS (drawable)->draw_glyphs_transformed (drawable, gc, matrix, ++ font, x, y, glyphs); + } + + /** +@@ -974,28 +975,12 @@ + GdkTrapezoid *trapezoids, + gint n_trapezoids) + { +- cairo_t *cr; +- int i; +- + g_return_if_fail (GDK_IS_DRAWABLE (drawable)); + g_return_if_fail (GDK_IS_GC (gc)); + g_return_if_fail (n_trapezoids == 0 || trapezoids != NULL); + +- cr = gdk_cairo_create (drawable); +- _gdk_gc_update_context (gc, cr, NULL, NULL, TRUE); +- +- for (i = 0; i < n_trapezoids; i++) +- { +- cairo_move_to (cr, trapezoids[i].x11, trapezoids[i].y1); +- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y1); +- cairo_line_to (cr, trapezoids[i].x22, trapezoids[i].y2); +- cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y2); +- cairo_close_path (cr); +- } +- +- cairo_fill (cr); +- +- cairo_destroy (cr); ++ GDK_DRAWABLE_GET_CLASS (drawable)->draw_trapezoids (drawable, gc, ++ trapezoids, n_trapezoids); + } + + /** +Index: gtk+-2.10.6/gdk/gdkpango.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdkpango.c 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdkpango.c 2006-10-30 12:59:30.000000000 +0000 +@@ -50,19 +50,34 @@ + GdkBitmap *stipple[MAX_RENDER_PART + 1]; + gboolean embossed; + +- cairo_t *cr; +- PangoRenderPart last_part; ++ /* When switching between the normal and shadow copies when ++ * drawing shadows we can get unexpected recursion into the ++ * drawing functions; the 'in_emboss' flag guards against that. ++ */ ++ gboolean in_emboss; + + /* Current target */ + GdkDrawable *drawable; + GdkGC *base_gc; + + gboolean gc_changed; ++ ++ /* Cached GC, derived from base_gc */ ++ GdkGC *gc; ++ PangoColor gc_color; ++ gboolean gc_color_set; ++ GdkBitmap *gc_stipple; ++ ++ /* we accumulate trapezoids for the same PangoRenderPart */ ++ GArray *trapezoids; ++ PangoRenderPart trapezoid_part; + }; + + static PangoAttrType gdk_pango_attr_stipple_type; + static PangoAttrType gdk_pango_attr_embossed_type; + ++static void flush_trapezoids (GdkPangoRenderer *gdk_renderer); ++ + enum { + PROP_0, + PROP_SCREEN +@@ -77,6 +92,10 @@ + GdkPangoRendererPrivate *priv = gdk_renderer->priv; + int i; + ++ if (priv->gc) ++ g_object_unref (priv->gc); ++ if (priv->gc_stipple) ++ g_object_unref (priv->gc_stipple); + if (priv->base_gc) + g_object_unref (priv->base_gc); + if (priv->drawable) +@@ -86,6 +105,8 @@ + if (priv->stipple[i]) + g_object_unref (priv->stipple[i]); + ++ g_array_free (priv->trapezoids, TRUE); ++ + G_OBJECT_CLASS (gdk_pango_renderer_parent_class)->finalize (object); + } + +@@ -112,25 +133,6 @@ + return object; + } + +-/* Adjusts matrix and color for the renderer to draw the secondary +- * "shadow" copy for embossed text */ +-static void +-emboss_context (cairo_t *cr) +-{ +- cairo_matrix_t tmp_matrix; +- +- /* The gymnastics here to adjust the matrix are because we want +- * to offset by +1,+1 in device-space, not in user-space, +- * so we can't just draw the layout at x + 1, y + 1 +- */ +- cairo_get_matrix (cr, &tmp_matrix); +- tmp_matrix.x0 += 1.0; +- tmp_matrix.y0 += 1.0; +- cairo_set_matrix (cr, &tmp_matrix); +- +- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); +-} +- + static inline gboolean + color_equal (PangoColor *c1, PangoColor *c2) + { +@@ -146,74 +148,154 @@ + return FALSE; + } + +-static cairo_t * +-get_cairo_context (GdkPangoRenderer *gdk_renderer, +- PangoRenderPart part) ++/* Adjusts matrix and color for the renderer to draw the secondar ++ * "shadow" copy for embossed text */ ++static void ++emboss_renderer (PangoRenderer *renderer, ++ PangoRenderPart part, ++ PangoMatrix **save_matrix, ++ PangoColor **save_color) ++{ ++ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; ++ static const PangoColor white = { 0xffff, 0xffff, 0xffff }; ++ PangoMatrix tmp_matrix = PANGO_MATRIX_INIT; ++ ++ priv->in_emboss = TRUE; ++ ++ *save_color = pango_renderer_get_color (renderer, part); ++ if (*save_color) ++ *save_color = pango_color_copy (*save_color); ++ ++ *save_matrix = renderer->matrix; ++ if (*save_matrix) ++ { ++ *save_matrix = pango_matrix_copy (*save_matrix); ++ tmp_matrix = **save_matrix; ++ } ++ ++ /* The gymnastics here to adjust the matrix are because we want ++ * to offset by +1,+1 in device-space, not in user-space, ++ * so we can't just draw the layout at x + 1, y + 1 ++ */ ++ tmp_matrix.x0 += 1; ++ tmp_matrix.y0 += 1; ++ ++ pango_renderer_set_matrix (renderer, &tmp_matrix); ++ pango_renderer_set_color (renderer, part, &white); ++} ++ ++/* Restores from emboss_renderer() */ ++static void ++unemboss_renderer (PangoRenderer *renderer, ++ PangoRenderPart part, ++ PangoMatrix **save_matrix, ++ PangoColor **save_color) ++{ ++ GdkPangoRendererPrivate *priv = GDK_PANGO_RENDERER(renderer)->priv; ++ pango_renderer_set_matrix (renderer, *save_matrix); ++ pango_renderer_set_color (renderer, part, *save_color); ++ ++ if (*save_matrix) ++ pango_matrix_free (*save_matrix); ++ if (*save_color) ++ pango_color_free (*save_color); ++ ++ priv->in_emboss = FALSE; ++} ++ ++/* Gets the GC for drawing @part. This make involve copying the base GC ++ * for the renderer, in which case we keep a one-GC cache. */ ++static GdkGC * ++get_gc (GdkPangoRenderer *gdk_renderer, ++ PangoRenderPart part) + { + PangoRenderer *renderer = PANGO_RENDERER (gdk_renderer); ++ PangoColor *color; ++ GdkBitmap *stipple; + GdkPangoRendererPrivate *priv = gdk_renderer->priv; + +- if (!priv->cr) ++ color = pango_renderer_get_color (renderer, part); ++ ++ if (part <= MAX_RENDER_PART) ++ stipple = priv->stipple[part]; ++ else ++ stipple = NULL; ++ ++ if (!color && !stipple) /* nothing override, use base_gc */ ++ return priv->base_gc; ++ else + { +- const PangoMatrix *matrix; ++ gboolean new_stipple = FALSE; ++ gboolean new_color = FALSE; + +- priv->cr = gdk_cairo_create (priv->drawable); ++ if (stipple != priv->gc_stipple) ++ new_stipple = TRUE; + +- matrix = pango_renderer_get_matrix (renderer); +- if (matrix) ++ if ((priv->gc_color_set && !color) || ++ (!priv->gc_color_set && color) || ++ priv->gc_color.red != color->red || ++ priv->gc_color.green != color->green || ++ priv->gc_color.blue != color->blue) ++ new_color = TRUE; ++ ++ if (!priv->gc) + { +- cairo_matrix_t cairo_matrix; +- +- cairo_matrix_init (&cairo_matrix, +- matrix->xx, matrix->yx, +- matrix->xy, matrix->yy, +- matrix->x0, matrix->y0); +- cairo_set_matrix (priv->cr, &cairo_matrix); ++ priv->gc = gdk_gc_new (priv->drawable); ++ gdk_gc_copy (priv->gc, priv->base_gc); ++ } ++ else if (new_color && priv->gc_color_set && !color) ++ { ++ /* We have to recopy the original GC onto the cached GC ++ * to get the default color */ ++ new_stipple = TRUE; ++ gdk_gc_copy (priv->gc, priv->base_gc); ++ } ++ else if (new_stipple && priv->gc_stipple && !stipple) ++ { ++ /* Similarly, we need to make a new copy to restore to the ++ * default stipple state (the caller may have set a stipple ++ * on the GC, and even if not, gdk_gc_set_stipple (gc, NULL) ++ * doesn't work currently to restore to the default X stipple) */ ++ new_color = TRUE; ++ gdk_gc_copy (priv->gc, priv->base_gc); + } +- } +- +- if (part != priv->last_part) +- { +- PangoColor *pango_color; +- GdkColor *color; +- GdkColor tmp_color; +- gboolean changed; + +- pango_color = pango_renderer_get_color (renderer, part); +- +- if (priv->last_part != -1) +- changed = priv->gc_changed || +- priv->stipple[priv->last_part] != priv->stipple[part] || +- !color_equal (pango_color, +- pango_renderer_get_color (renderer, priv->last_part)); +- else +- changed = TRUE; +- +- if (changed) ++ if (new_color) + { +- if (pango_color) ++ if (color) + { +- tmp_color.red = pango_color->red; +- tmp_color.green = pango_color->green; +- tmp_color.blue = pango_color->blue; ++ GdkColor gdk_color; ++ ++ gdk_color.red = color->red; ++ gdk_color.green = color->green; ++ gdk_color.blue = color->blue; + +- color = &tmp_color; ++ gdk_gc_set_rgb_fg_color (priv->gc, &gdk_color); ++ ++ priv->gc_color = *color; ++ priv->gc_color_set = TRUE; + } + else +- color = NULL; ++ priv->gc_color_set = FALSE; ++ } + +- _gdk_gc_update_context (priv->base_gc, +- priv->cr, +- color, +- priv->stipple[part], +- priv->gc_changed); ++ if (new_stipple) ++ { ++ if (priv->gc_stipple) ++ g_object_unref (priv->gc_stipple); ++ ++ if (stipple) ++ { ++ gdk_gc_set_stipple (priv->gc, stipple); ++ gdk_gc_set_fill (priv->gc, GDK_STIPPLED); ++ priv->gc_stipple = g_object_ref (stipple); ++ } ++ else ++ priv->gc_stipple = NULL; + } + +- priv->last_part = part; +- priv->gc_changed = FALSE; ++ return priv->gc; + } +- +- return priv->cr; + } + + static void +@@ -225,133 +307,78 @@ + { + GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); + GdkPangoRendererPrivate *priv = gdk_renderer->priv; +- cairo_t *cr; + +- cr = get_cairo_context (gdk_renderer, +- PANGO_RENDER_PART_FOREGROUND); ++ flush_trapezoids (gdk_renderer); + +- if (priv->embossed) ++ if (!priv->in_emboss && priv->embossed) + { +- cairo_save (cr); +- emboss_context (cr); +- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); +- pango_cairo_show_glyph_string (cr, font, glyphs); +- cairo_restore (cr); +- } +- +- cairo_move_to (cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE); +- pango_cairo_show_glyph_string (cr, font, glyphs); +-} +- +-/* Draws an error underline that looks like one of: +- * H E H +- * /\ /\ /\ /\ /\ - +- * A/ \ / \ / \ A/ \ / \ | +- * \ \ / \ / /D \ \ / \ | +- * \ \/ C \/ / \ \/ C \ | height = HEIGHT_SQUARES * square +- * \ /\ F / \ F /\ \ | +- * \ / \ / \ / \ \G | +- * \ / \ / \ / \ / | +- * \/ \/ \/ \/ - +- * B B +- * |----| +- * unit_width = (HEIGHT_SQUARES - 1) * square +- * +- * The x, y, width, height passed in give the desired bounding box; +- * x/width are adjusted to make the underline a integer number of units +- * wide. +- */ +-#define HEIGHT_SQUARES 2.5 ++ PangoMatrix *save_matrix; ++ PangoColor *save_color; + +-/* Cut-and-pasted between here and pango/pango/pangocairo-render.c */ ++ emboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); ++ gdk_draw_glyphs_transformed (priv->drawable, ++ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), ++ renderer->matrix, font, x, y, glyphs); ++ unemboss_renderer (renderer, PANGO_RENDER_PART_FOREGROUND, &save_matrix, &save_color); ++ } ++ ++ gdk_draw_glyphs_transformed (priv->drawable, ++ get_gc (gdk_renderer, PANGO_RENDER_PART_FOREGROUND), ++ renderer->matrix, font, x, y, glyphs); ++} ++ ++/* Outputs any pending trapezoids, we do this when the part or ++ * part color changes, when we are about to draw text, etc. */ + static void +-draw_error_underline (cairo_t *cr, +- double x, +- double y, +- double width, +- double height) +-{ +- double square = height / HEIGHT_SQUARES; +- double unit_width = (HEIGHT_SQUARES - 1) * square; +- int width_units = (width + unit_width / 2) / unit_width; +- double y_top, y_bottom; +- int i; ++flush_trapezoids (GdkPangoRenderer *gdk_renderer) ++{ ++ GdkPangoRendererPrivate *priv = gdk_renderer->priv; + +- x += (width - width_units * unit_width) / 2; +- width = width_units * unit_width; ++ if (!priv->trapezoids || priv->trapezoids->len == 0) ++ return; + +- y_top = y; +- y_bottom = y + height; +- +- /* Bottom of squiggle */ +- cairo_move_to (cr, x - square / 2, y_top + square / 2); /* A */ +- for (i = 0; i < width_units; i += 2) +- { +- double x_middle = x + (i + 1) * unit_width; +- double x_right = x + (i + 2) * unit_width; +- +- cairo_line_to (cr, x_middle, y_bottom); /* B */ +- +- if (i + 1 == width_units) +- /* Nothing */; +- else if (i + 2 == width_units) +- cairo_line_to (cr, x_right + square / 2, y_top + square / 2); /* D */ +- else +- cairo_line_to (cr, x_right, y_top + square); /* C */ +- } +- +- /* Top of squiggle */ +- for (i -= 2; i >= 0; i -= 2) +- { +- double x_left = x + i * unit_width; +- double x_middle = x + (i + 1) * unit_width; +- double x_right = x + (i + 2) * unit_width; +- +- if (i + 1 == width_units) +- cairo_line_to (cr, x_middle + square / 2, y_bottom - square / 2); /* G */ +- else { +- if (i + 2 == width_units) +- cairo_line_to (cr, x_right, y_top); /* E */ +- cairo_line_to (cr, x_middle, y_bottom - square); /* F */ +- } +- +- cairo_line_to (cr, x_left, y_top); /* H */ +- } ++ gdk_draw_trapezoids (priv->drawable, ++ get_gc (gdk_renderer, priv->trapezoid_part), ++ (GdkTrapezoid *)priv->trapezoids->data, ++ priv->trapezoids->len); + +- cairo_close_path (cr); +- cairo_fill (cr); ++ g_array_set_size (priv->trapezoids, 0); + } + ++/* Draws a single trapezoid ... we don't draw it immediately, but rather ++ * cache it to join together with other trapezoids that form part of the ++ * same logical shape */ + static void +-gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, +- PangoRenderPart part, +- int x, +- int y, +- int width, +- int height) ++gdk_pango_renderer_draw_trapezoid (PangoRenderer *renderer, ++ PangoRenderPart part, ++ double y1, ++ double x11, ++ double x21, ++ double y2, ++ double x12, ++ double x22) + { + GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); +- GdkPangoRendererPrivate *priv = gdk_renderer->priv; +- cairo_t *cr; +- +- cr = get_cairo_context (gdk_renderer, part); +- +- if (priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) +- { +- cairo_save (cr); +- emboss_context (cr); +- cairo_rectangle (cr, +- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, +- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); ++ GdkTrapezoid trap; + +- cairo_fill (cr); +- cairo_restore (cr); +- } ++ if (!gdk_renderer->priv->trapezoids) ++ gdk_renderer->priv->trapezoids = g_array_new (FALSE, FALSE, ++ sizeof (GdkTrapezoid)); ++ ++ if (gdk_renderer->priv->trapezoids->len > 0 && ++ gdk_renderer->priv->trapezoid_part != part) ++ flush_trapezoids (gdk_renderer); ++ ++ gdk_renderer->priv->trapezoid_part = part; ++ ++ trap.y1 = y1; ++ trap.x11 = x11 / 2; ++ trap.x21 = x21; ++ trap.y2 = y2; ++ trap.x12 = x12; ++ trap.x22 = x22; + +- cairo_rectangle (cr, +- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, +- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); +- cairo_fill (cr); ++ g_array_append_val (gdk_renderer->priv->trapezoids, trap); + } + + static void +@@ -363,23 +390,51 @@ + { + GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); + GdkPangoRendererPrivate *priv = gdk_renderer->priv; +- cairo_t *cr; +- +- cr = get_cairo_context (gdk_renderer, PANGO_RENDER_PART_UNDERLINE); +- +- if (priv->embossed) ++ ++ if (!priv->in_emboss && priv->embossed) + { +- cairo_save (cr); +- emboss_context (cr); +- draw_error_underline (cr, +- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, +- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); +- cairo_restore (cr); ++ PangoMatrix *save_matrix; ++ PangoColor *save_color; ++ ++ emboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); ++ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, ++ x, y, width, height); ++ unemboss_renderer (renderer, PANGO_RENDER_PART_UNDERLINE, &save_matrix, &save_color); + } + +- draw_error_underline (cr, +- (double)x / PANGO_SCALE, (double)y / PANGO_SCALE, +- (double)width / PANGO_SCALE, (double)height / PANGO_SCALE); ++ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_error_underline (renderer, ++ x, y, width, height); ++} ++ ++/* We can't handle embossing at the level of trapezoids, because when an ++ * underline is split into multiple trapezoids, the normal and shadow ++ * trapezoids will be drawn mixed together. Instead, we have to emboss ++ * and entire rectangle or error underline ++ */ ++static void ++gdk_pango_renderer_draw_rectangle (PangoRenderer *renderer, ++ PangoRenderPart part, ++ int x, ++ int y, ++ int width, ++ int height) ++{ ++ GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); ++ GdkPangoRendererPrivate *priv = gdk_renderer->priv; ++ ++ if (!priv->in_emboss && priv->embossed && part != PANGO_RENDER_PART_BACKGROUND) ++ { ++ PangoMatrix *save_matrix; ++ PangoColor *save_color; ++ ++ emboss_renderer (renderer, part, &save_matrix, &save_color); ++ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, ++ x, y, width, height); ++ unemboss_renderer (renderer, part, &save_matrix, &save_color); ++ } ++ ++ PANGO_RENDERER_CLASS (gdk_pango_renderer_parent_class)->draw_rectangle (renderer, part, ++ x, y, width, height); + } + + static void +@@ -388,8 +443,8 @@ + { + GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); + +- if (gdk_renderer->priv->last_part == part) +- gdk_renderer->priv->last_part = (PangoRenderPart)-1; ++ if (part == gdk_renderer->priv->trapezoid_part) ++ flush_trapezoids (gdk_renderer); + } + + static void +@@ -410,13 +465,8 @@ + { + GdkPangoRenderer *gdk_renderer = GDK_PANGO_RENDERER (renderer); + GdkPangoRendererPrivate *priv = gdk_renderer->priv; +- +- if (priv->cr) +- { +- cairo_destroy (priv->cr); +- priv->cr = NULL; +- } +- priv->last_part = (PangoRenderPart)-1; ++ ++ flush_trapezoids (gdk_renderer); + } + + static void +@@ -515,7 +565,6 @@ + GDK_TYPE_PANGO_RENDERER, + GdkPangoRendererPrivate); + +- renderer->priv->last_part = (PangoRenderPart)-1; + renderer->priv->gc_changed = TRUE; + } + +@@ -527,6 +576,7 @@ + PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass); + + renderer_class->draw_glyphs = gdk_pango_renderer_draw_glyphs; ++ renderer_class->draw_trapezoid = gdk_pango_renderer_draw_trapezoid; + renderer_class->draw_rectangle = gdk_pango_renderer_draw_rectangle; + renderer_class->draw_error_underline = gdk_pango_renderer_draw_error_underline; + renderer_class->part_changed = gdk_pango_renderer_part_changed; +@@ -647,6 +697,8 @@ + + priv = gdk_renderer->priv; + ++ flush_trapezoids (gdk_renderer); ++ + if (priv->drawable != drawable) + { + if (priv->drawable) +@@ -681,6 +733,8 @@ + + priv = gdk_renderer->priv; + ++ flush_trapezoids (gdk_renderer); ++ + if (priv->base_gc != gc) + { + if (priv->base_gc) +@@ -689,6 +743,20 @@ + if (priv->base_gc) + g_object_ref (priv->base_gc); + ++ if (priv->gc) ++ { ++ g_object_unref (priv->gc); ++ priv->gc = NULL; ++ } ++ ++ priv->gc_color_set = FALSE; ++ ++ if (priv->gc_stipple) ++ { ++ g_object_unref (priv->gc_stipple); ++ priv->gc_stipple = NULL; ++ } ++ + priv->gc_changed = TRUE; + } + } +@@ -1414,50 +1482,5 @@ + return gdk_pango_context_get_for_screen (gdk_screen_get_default ()); + } + +-/** +- * gdk_pango_context_get_for_screen: +- * @screen: the #GdkScreen for which the context is to be created. +- * +- * Creates a #PangoContext for @screen. +- * +- * The context must be freed when you're finished with it. +- * +- * When using GTK+, normally you should use gtk_widget_get_pango_context() +- * instead of this function, to get the appropriate context for +- * the widget you intend to render text onto. +- * +- * The newly created context will have the default font options +- * (see #cairo_font_options_t) for the screen; if these options +- * change it will not be updated. Using gtk_widget_get_pango_context() +- * is more convenient if you want to keep a context around and track +- * changes to the screen's font rendering settings. +- * +- * Return value: a new #PangoContext for @screen +- * +- * Since: 2.2 +- **/ +-PangoContext * +-gdk_pango_context_get_for_screen (GdkScreen *screen) +-{ +- PangoFontMap *fontmap; +- PangoContext *context; +- const cairo_font_options_t *options; +- double dpi; +- +- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); +- +- fontmap = pango_cairo_font_map_get_default (); +- +- context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap)); +- +- options = gdk_screen_get_font_options (screen); +- pango_cairo_context_set_font_options (context, options); +- +- dpi = gdk_screen_get_resolution (screen); +- pango_cairo_context_set_resolution (context, dpi); +- +- return context; +-} +- + #define __GDK_PANGO_C__ + #include "gdkaliasdef.c" +Index: gtk+-2.10.6/gdk/gdk.symbols +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdk.symbols 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdk.symbols 2006-10-30 12:59:30.000000000 +0000 +@@ -861,7 +861,6 @@ + gdk_pango_attr_embossed_new + gdk_pango_attr_stipple_new + gdk_pango_context_get +-gdk_pango_context_get_for_screen + #ifndef GDK_DISABLE_DEPRECATED + gdk_pango_context_set_colormap + #endif +@@ -877,6 +876,12 @@ + #endif + #endif + ++#if IN_HEADER(__GDK_PANGO_H__) ++#if IN_FILE(__GDK_PANGO_X11_C__) ++gdk_pango_context_get_for_screen ++#endif ++#endif ++ + #if IN_HEADER(__GDK_PIXBUF_H__) + #if IN_FILE(__GDK_PIXBUF_DRAWABLE_C__) + gdk_pixbuf_get_from_drawable +Index: gtk+-2.10.6/gdk/gdkwindow.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/gdkwindow.c 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/gdkwindow.c 2006-10-30 12:59:30.000000000 +0000 +@@ -1834,9 +1834,14 @@ + } + else + { +- method->cr = cairo_create (paint->surface); ++ /*method->cr = cairo_create (paint->surface); + +- gdk_cairo_set_source_color (method->cr, &private->bg_color); ++ gdk_cairo_set_source_color (method->cr, &private->bg_color);*/ ++ GdkGC *gc = _gdk_drawable_get_scratch_gc (paint->pixmap, FALSE); ++ ++ gdk_gc_set_foreground (gc, &(private->bg_color)); ++ ++ method->gc = g_object_ref (gc); + } + } + +Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -190,7 +190,8 @@ + display_x11->leader_window_title_set = FALSE; + + display_x11->have_render = GDK_UNKNOWN; +- ++ display_x11->have_render_with_trapezoids = GDK_UNKNOWN; ++ + #ifdef HAVE_XFIXES + if (XFixesQueryExtension (display_x11->xdisplay, + &display_x11->xfixes_event_base, +Index: gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:58:29.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkdisplay-x11.h 2006-10-30 12:59:30.000000000 +0000 +@@ -78,6 +78,7 @@ + gboolean use_xshm; + gboolean have_shm_pixmaps; + GdkTristate have_render; ++ GdkTristate have_render_with_trapezoids; + gboolean have_xfixes; + gint xfixes_event_base; + +Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -26,6 +26,8 @@ + + #include <config.h> + ++#include <pango/pangoxft.h> ++ + #include "gdkx.h" + #include "gdkregion-generic.h" + +@@ -106,7 +108,21 @@ + GdkGC *gc, + GdkPoint *points, + gint npoints); +- ++ ++static void gdk_x11_draw_glyphs (GdkDrawable *drawable, ++ GdkGC *gc, ++ PangoFont *font, ++ gint x, ++ gint y, ++ PangoGlyphString *glyphs); ++static void gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, ++ GdkGC *gc, ++ PangoMatrix *matrix, ++ PangoFont *font, ++ gint x, ++ gint y, ++ PangoGlyphString *glyphs); ++ + static void gdk_x11_draw_image (GdkDrawable *drawable, + GdkGC *gc, + GdkImage *image, +@@ -129,6 +145,11 @@ + gint x_dither, + gint y_dither); + ++static void gdk_x11_draw_trapezoids (GdkDrawable *drawable, ++ GdkGC *gc, ++ GdkTrapezoid *trapezoids, ++ gint n_trapezoids); ++ + static cairo_surface_t *gdk_x11_ref_cairo_surface (GdkDrawable *drawable); + + static void gdk_x11_set_colormap (GdkDrawable *drawable, +@@ -163,8 +184,11 @@ + drawable_class->draw_points = gdk_x11_draw_points; + drawable_class->draw_segments = gdk_x11_draw_segments; + drawable_class->draw_lines = gdk_x11_draw_lines; ++ drawable_class->draw_glyphs = gdk_x11_draw_glyphs; ++ drawable_class->draw_glyphs_transformed = gdk_x11_draw_glyphs_transformed; + drawable_class->draw_image = gdk_x11_draw_image; + drawable_class->draw_pixbuf = gdk_x11_draw_pixbuf; ++ drawable_class->draw_trapezoids = gdk_x11_draw_trapezoids; + + drawable_class->ref_cairo_surface = gdk_x11_ref_cairo_surface; + +@@ -327,6 +351,72 @@ + return x11display->have_render == GDK_YES; + } + ++gboolean ++_gdk_x11_have_render_with_trapezoids (GdkDisplay *display) ++{ ++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); ++ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); ++ ++ if (x11display->have_render_with_trapezoids == GDK_UNKNOWN) ++ { ++ x11display->have_render_with_trapezoids = GDK_NO; ++ if (_gdk_x11_have_render (display)) ++ { ++ /* ++ * Require protocol >= 0.4 for CompositeTrapezoids support. ++ */ ++ int major_version, minor_version; ++ ++#define XRENDER_TETRAPEZOIDS_MAJOR 0 ++#define XRENDER_TETRAPEZOIDS_MINOR 4 ++ ++ if (XRenderQueryVersion (xdisplay, &major_version, ++ &minor_version)) ++ if ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) && ++ (minor_version >= XRENDER_TETRAPEZOIDS_MINOR)) ++ x11display->have_render_with_trapezoids = GDK_YES; ++ } ++ } ++ ++ return x11display->have_render_with_trapezoids == GDK_YES; ++} ++ ++static XftDraw * ++gdk_x11_drawable_get_xft_draw (GdkDrawable *drawable) ++{ ++ GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable); ++ ++ if (impl->xft_draw == NULL) ++ { ++ GdkColormap *colormap = gdk_drawable_get_colormap (drawable); ++ ++ if (colormap) ++ { ++ GdkVisual *visual; ++ ++ visual = gdk_colormap_get_visual (colormap); ++ ++ impl->xft_draw = XftDrawCreate (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid, ++ GDK_VISUAL_XVISUAL (visual), GDK_COLORMAP_XCOLORMAP (colormap)); ++ } ++ else if (gdk_drawable_get_depth (drawable) == 1) ++ { ++ impl->xft_draw = XftDrawCreateBitmap (GDK_SCREEN_XDISPLAY (impl->screen), impl->xid); ++ } ++ else ++ { ++ g_warning ("Using Xft rendering requires the drawable argument to\n" ++ "have a specified colormap. All windows have a colormap,\n" ++ "however, pixmaps only have colormap by default if they\n" ++ "were created with a non-NULL window argument. Otherwise\n" ++ "a colormap must be set on them with gdk_drawable_set_colormap"); ++ return NULL; ++ } ++ } ++ ++ return impl->xft_draw; ++} ++ + static Picture + gdk_x11_drawable_get_picture (GdkDrawable *drawable) + { +@@ -393,6 +483,57 @@ + } + } + ++static void ++gdk_x11_drawable_update_xft_clip (GdkDrawable *drawable, ++ GdkGC *gc) ++{ ++ XftDraw *xft_draw = gdk_x11_drawable_get_xft_draw (drawable); ++ GdkRegion *clip_region = _gdk_gc_get_clip_region (gc); ++ ++ if (gc && clip_region) ++ { ++ GdkRegionBox *boxes = clip_region->rects; ++ gint n_boxes = clip_region->numRects; ++#if 0 /* Until XftDrawSetClipRectangles is there */ ++ XRectangle *rects = g_new (XRectangle, n_boxes); ++ int i; ++ ++ for (i=0; i < n_boxes; i++) ++ { ++ rects[i].x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); ++ rects[i].y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); ++ rects[i].width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rects[i].x; ++ rects[i].height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rects[i].y; ++ } ++ XftDrawSetClipRectangles (xft_draw, 0, 0, rects, n_boxes); ++ ++ g_free (rects); ++#else ++ Region xregion = XCreateRegion (); ++ int i; ++ ++ for (i=0; i < n_boxes; i++) ++ { ++ XRectangle rect; ++ ++ rect.x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); ++ rect.y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); ++ rect.width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rect.x; ++ rect.height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rect.y; ++ ++ XUnionRectWithRegion (&rect, xregion, xregion); ++ } ++ ++ XftDrawSetClip (xft_draw, xregion); ++ XDestroyRegion (xregion); ++#endif ++ } ++ else ++ { ++ XftDrawSetClip (xft_draw, NULL); ++ } ++} ++ + /***************************************************** + * X11 specific implementations of generic functions * + *****************************************************/ +@@ -780,6 +921,45 @@ + } + + static void ++gdk_x11_draw_glyphs (GdkDrawable *drawable, ++ GdkGC *gc, ++ PangoFont *font, ++ gint x, ++ gint y, ++ PangoGlyphString *glyphs) ++{ ++ gdk_x11_draw_glyphs_transformed (drawable, gc, NULL, ++ font, ++ x * PANGO_SCALE, ++ y * PANGO_SCALE, ++ glyphs); ++} ++ ++static void ++gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, ++ GdkGC *gc, ++ PangoMatrix *matrix, ++ PangoFont *font, ++ gint x, ++ gint y, ++ PangoGlyphString *glyphs) ++{ ++ GdkDrawableImplX11 *impl; ++ PangoRenderer *renderer; ++ ++ impl = GDK_DRAWABLE_IMPL_X11 (drawable); ++ ++ g_return_if_fail (PANGO_XFT_IS_FONT (font)); ++ ++ renderer = _gdk_x11_renderer_get (drawable, gc); ++ if (matrix) ++ pango_renderer_set_matrix (renderer, matrix); ++ pango_renderer_draw_glyphs (renderer, font, glyphs, x, y); ++ if (matrix) ++ pango_renderer_set_matrix (renderer, NULL); ++} ++ ++static void + gdk_x11_draw_image (GdkDrawable *drawable, + GdkGC *gc, + GdkImage *image, +@@ -1444,6 +1624,47 @@ + } + + static void ++gdk_x11_draw_trapezoids (GdkDrawable *drawable, ++ GdkGC *gc, ++ GdkTrapezoid *trapezoids, ++ gint n_trapezoids) ++{ ++ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; ++ GdkDisplay *display = gdk_screen_get_display (screen); ++ XTrapezoid *xtrapezoids; ++ gint i; ++ ++ if (!_gdk_x11_have_render_with_trapezoids (display)) ++ { ++ GdkDrawable *wrapper = GDK_DRAWABLE_IMPL_X11 (drawable)->wrapper; ++ GDK_DRAWABLE_CLASS (_gdk_drawable_impl_x11_parent_class)->draw_trapezoids (wrapper, gc, ++ trapezoids, n_trapezoids); ++ return; ++ } ++ ++ xtrapezoids = g_new (XTrapezoid, n_trapezoids); ++ ++ for (i = 0; i < n_trapezoids; i++) ++ { ++ xtrapezoids[i].top = XDoubleToFixed (trapezoids[i].y1); ++ xtrapezoids[i].bottom = XDoubleToFixed (trapezoids[i].y2); ++ xtrapezoids[i].left.p1.x = XDoubleToFixed (trapezoids[i].x11); ++ xtrapezoids[i].left.p1.y = XDoubleToFixed (trapezoids[i].y1); ++ xtrapezoids[i].left.p2.x = XDoubleToFixed (trapezoids[i].x12); ++ xtrapezoids[i].left.p2.y = XDoubleToFixed (trapezoids[i].y2); ++ xtrapezoids[i].right.p1.x = XDoubleToFixed (trapezoids[i].x21); ++ xtrapezoids[i].right.p1.y = XDoubleToFixed (trapezoids[i].y1); ++ xtrapezoids[i].right.p2.x = XDoubleToFixed (trapezoids[i].x22); ++ xtrapezoids[i].right.p2.y = XDoubleToFixed (trapezoids[i].y2); ++ } ++ ++ _gdk_x11_drawable_draw_xtrapezoids (drawable, gc, ++ xtrapezoids, n_trapezoids); ++ ++ g_free (xtrapezoids); ++} ++ ++static void + gdk_x11_cairo_surface_destroy (void *data) + { + GdkDrawableImplX11 *impl = data; +@@ -1498,5 +1719,89 @@ + return impl->cairo_surface; + } + ++void ++_gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, ++ GdkGC *gc, ++ XTrapezoid *xtrapezoids, ++ int n_trapezoids) ++{ ++ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; ++ GdkDisplay *display = gdk_screen_get_display (screen); ++ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); ++ ++ XftDraw *draw; ++ ++ if (!_gdk_x11_have_render_with_trapezoids (display)) ++ { ++ /* This is the case of drawing the borders of the unknown glyph box ++ * without render on the display, we need to feed it back to ++ * fallback code. Not efficient, but doesn't matter. ++ */ ++ GdkTrapezoid *trapezoids = g_new (GdkTrapezoid, n_trapezoids); ++ int i; ++ ++ for (i = 0; i < n_trapezoids; i++) ++ { ++ trapezoids[i].y1 = XFixedToDouble (xtrapezoids[i].top); ++ trapezoids[i].y2 = XFixedToDouble (xtrapezoids[i].bottom); ++ trapezoids[i].x11 = XFixedToDouble (xtrapezoids[i].left.p1.x); ++ trapezoids[i].x12 = XFixedToDouble (xtrapezoids[i].left.p2.x); ++ trapezoids[i].x21 = XFixedToDouble (xtrapezoids[i].right.p1.x); ++ trapezoids[i].x22 = XFixedToDouble (xtrapezoids[i].right.p2.x); ++ } ++ ++ gdk_x11_draw_trapezoids (drawable, gc, trapezoids, n_trapezoids); ++ g_free (trapezoids); ++ ++ return; ++ } ++ ++ gdk_x11_drawable_update_xft_clip (drawable, gc); ++ draw = gdk_x11_drawable_get_xft_draw (drawable); ++ ++ if (!x11display->mask_format) ++ x11display->mask_format = XRenderFindStandardFormat (x11display->xdisplay, ++ PictStandardA8); ++ ++ XRenderCompositeTrapezoids (x11display->xdisplay, PictOpOver, ++ _gdk_x11_gc_get_fg_picture (gc), ++ XftDrawPicture (draw), ++ x11display->mask_format, ++ - gc->ts_x_origin, - gc->ts_y_origin, ++ xtrapezoids, n_trapezoids); ++} ++ ++void ++_gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, ++ GdkGC *gc, ++ XftFont *xft_font, ++ XftGlyphSpec *glyphs, ++ gint n_glyphs) ++{ ++ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; ++ GdkDisplay *display = gdk_screen_get_display (screen); ++ GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); ++ XftDraw *draw; ++ ++ gdk_x11_drawable_update_xft_clip (drawable, gc); ++ draw = gdk_x11_drawable_get_xft_draw (drawable); ++ ++ if (_gdk_x11_have_render (display)) ++ { ++ XftGlyphSpecRender (x11display->xdisplay, PictOpOver, ++ _gdk_x11_gc_get_fg_picture (gc), ++ xft_font, ++ XftDrawPicture (draw), ++ - gc->ts_x_origin, - gc->ts_y_origin, ++ glyphs, n_glyphs); ++ } ++ else ++ { ++ XftColor color; ++ ++ _gdk_gc_x11_get_fg_xft_color (gc, &color); ++ XftDrawGlyphSpec (draw, &color, xft_font, glyphs, n_glyphs); ++ } ++} + #define __GDK_DRAWABLE_X11_C__ + #include "gdkaliasdef.c" +Index: gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkdrawable-x11.h 2006-10-30 12:59:30.000000000 +0000 +@@ -33,6 +33,7 @@ + + #include <X11/Xlib.h> + #include <X11/extensions/Xrender.h> ++#include <X11/Xft/Xft.h> + + G_BEGIN_DECLS + +@@ -68,6 +69,8 @@ + Window xid; + GdkScreen *screen; + ++ XftDraw *xft_draw; ++ + Picture picture; + cairo_surface_t *cairo_surface; + }; +@@ -92,7 +95,15 @@ + /* Note that the following take GdkDrawableImplX11, not the wrapper drawable */ + void _gdk_x11_drawable_finish (GdkDrawable *drawable); + void _gdk_x11_drawable_update_size (GdkDrawable *drawable); +- ++void _gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, ++ GdkGC *gc, ++ XTrapezoid *xtrapezoids, ++ int n_trapezoids); ++void _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, ++ GdkGC *gc, ++ XftFont *xft_font, ++ XftGlyphSpec *glyphs, ++ gint n_glyphs); + G_END_DECLS + + #endif /* __GDK_DRAWABLE_X11_H__ */ +Index: gtk+-2.10.6/gdk/x11/gdkgc-x11.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkgc-x11.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkgc-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -80,7 +80,10 @@ + gdk_gc_x11_finalize (GObject *object) + { + GdkGCX11 *x11_gc = GDK_GC_X11 (object); +- ++ ++ if (x11_gc->fg_picture != None) ++ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); ++ + XFreeGC (GDK_GC_XDISPLAY (x11_gc), GDK_GC_XGC (x11_gc)); + + G_OBJECT_CLASS (_gdk_gc_x11_parent_class)->finalize (object); +@@ -110,7 +113,7 @@ + + private->dirty_mask = 0; + private->have_clip_mask = FALSE; +- ++ + private->screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; + + private->depth = gdk_drawable_get_depth (drawable); +@@ -339,6 +342,18 @@ + } + + static void ++clear_fg_picture (GdkGC *gc) ++{ ++ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); ++ ++ if (x11_gc->fg_picture != None) ++ { ++ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), x11_gc->fg_picture); ++ x11_gc->fg_picture = None; ++ } ++} ++ ++static void + gdk_x11_gc_set_values (GdkGC *gc, + GdkGCValues *values, + GdkGCValuesMask values_mask) +@@ -367,6 +382,29 @@ + x11_gc->have_clip_mask = values->clip_mask != NULL; + } + ++ if (values_mask & GDK_GC_BACKGROUND) ++ { ++ if (_gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) ++ clear_fg_picture (gc); ++ } ++ ++ if (values_mask & GDK_GC_FILL) ++ { ++ clear_fg_picture (gc); ++ } ++ ++ if (values_mask & GDK_GC_STIPPLE) ++ { ++ if (_gdk_gc_get_fill (gc) == GDK_STIPPLED || _gdk_gc_get_fill (gc) == GDK_OPAQUE_STIPPLED) ++ clear_fg_picture (gc); ++ } ++ ++ if (values_mask & GDK_GC_TILE) ++ { ++ if (_gdk_gc_get_fill (gc) == GDK_TILED) ++ clear_fg_picture (gc); ++ } ++ + gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask); + + XChangeGC (GDK_GC_XDISPLAY (gc), +@@ -642,6 +680,8 @@ + x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask; + x11_dst_gc->have_clip_region = x11_src_gc->have_clip_region; + x11_dst_gc->have_clip_mask = x11_src_gc->have_clip_mask; ++ ++ clear_fg_picture (dst_gc); + } + + /** +@@ -701,5 +741,359 @@ + return gc_x11->xgc; + } + ++/* Various bits of the below are roughly cribbed from XFree86 ++ * lib/Xft/xftdraw.c, Copyright 2000, Keith Packard ++ */ ++ ++static XRenderPictFormat * ++foreground_format (GdkGC *gc) ++{ ++ XRenderPictFormat pf; ++ ++ pf.type = PictTypeDirect; ++ pf.depth = 32; ++ pf.direct.redMask = 0xff; ++ pf.direct.greenMask = 0xff; ++ pf.direct.blueMask = 0xff; ++ pf.direct.alphaMask = 0xff; ++ ++ return XRenderFindFormat (GDK_GC_XDISPLAY (gc), ++ (PictFormatType | ++ PictFormatDepth | ++ PictFormatRedMask | ++ PictFormatGreenMask | ++ PictFormatBlueMask | ++ PictFormatAlphaMask), ++ &pf, ++ 0); ++} ++ ++static Picture ++make_fg_tile_picture (GdkGC *gc) ++{ ++ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); ++ GdkVisual *visual = gdk_drawable_get_visual (_gdk_gc_get_tile (gc)); ++ XRenderPictFormat *format = NULL; ++ ++ if (visual) ++ { ++ format = XRenderFindVisualFormat (GDK_GC_XDISPLAY (gc), ++ GDK_VISUAL_XVISUAL (visual)); ++ } ++ else if (x11_gc->depth == 1) ++ { ++ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), ++ PictStandardA1); ++ } ++ ++ if (format) ++ { ++ XRenderPictureAttributes pa; ++ pa.repeat = True; ++ ++ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), ++ GDK_PIXMAP_XID (_gdk_gc_get_tile (gc)), ++ format, ++ CPRepeat, &pa); ++ } ++ ++ return None; ++} ++ ++static Picture ++make_stipple_picture (GdkGC *gc) ++{ ++ XRenderPictFormat *format = NULL; ++ XRenderPictureAttributes pa; ++ ++ format = XRenderFindStandardFormat (GDK_GC_XDISPLAY (gc), ++ PictStandardA1); ++ ++ pa.repeat = True; ++ return XRenderCreatePicture (GDK_GC_XDISPLAY (gc), ++ GDK_PIXMAP_XID (_gdk_gc_get_stipple (gc)), ++ format, ++ CPRepeat, &pa); ++} ++ ++static Picture ++make_color_picture (GdkGC *gc, ++ XRenderColor *color) ++{ ++ GdkGCX11 *x11_gc = GDK_GC_X11 (gc); ++ XRenderPictureAttributes pa; ++ XRenderPictFormat *pix_format = foreground_format (gc); ++ Pixmap pix; ++ Picture picture; ++ ++ if (!pix_format) ++ return None; ++ ++ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), ++ GDK_SCREEN_XROOTWIN (x11_gc->screen), ++ 1, 1, pix_format->depth); ++ pa.repeat = True; ++ picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), ++ pix, ++ pix_format, ++ CPRepeat, &pa); ++ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); ++ ++ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, ++ picture, color, ++ 0, 0, 1, 1); ++ ++ return picture; ++} ++ ++static void ++get_bg_color (GdkGC *gc, ++ XRenderColor *render_color) ++{ ++ GdkColormap *cmap; ++ ++ cmap = gdk_gc_get_colormap (gc); ++ ++ if (cmap) ++ { ++ GdkColor color; ++ ++ gdk_colormap_query_color (cmap, _gdk_gc_get_bg_pixel (gc), &color); ++ ++ render_color->alpha = 0xffff; ++ render_color->red = color.red; ++ render_color->green = color.green; ++ render_color->blue = color.blue; ++ } ++ else /* Not worth warning, just use black */ ++ { ++ render_color->alpha = 0xffff; ++ render_color->red = 0; ++ render_color->green = 0; ++ render_color->blue = 0; ++ } ++} ++ ++/** ++ * _gdk_x11_gc_get_fg_picture: ++ * @gc: a #GdkGC ++ * ++ * Gets a Xrender Picture object suitable for being the source ++ * drawable for drawing with the foreground the graphics context. ++ * ++ * Return value: a Picture, owned by the GC; this cannot be ++ * used over subsequent modification of the GC. ++ **/ ++Picture ++_gdk_x11_gc_get_fg_picture (GdkGC *gc) ++{ ++ GdkGCX11 *x11_gc; ++ gboolean new = FALSE; ++ XftColor xftcolor; ++ GdkFill fill; ++ int width, height; ++ ++ g_return_val_if_fail (GDK_IS_GC_X11 (gc), None); ++ ++ if (!_gdk_x11_have_render (GDK_GC_DISPLAY (gc))) ++ return None; ++ ++ x11_gc = GDK_GC_X11 (gc); ++ ++ fill = GDK_SOLID; ++ width = 1; ++ height = 1; ++ ++ switch (_gdk_gc_get_fill (gc)) ++ { ++ case GDK_SOLID: ++ break; ++ case GDK_TILED: ++ if (_gdk_gc_get_tile (gc)) ++ { ++ if (!x11_gc->fg_picture) ++ x11_gc->fg_picture = make_fg_tile_picture (gc); ++ ++ if (x11_gc->fg_picture != None) ++ return x11_gc->fg_picture; ++ } ++ break; ++ case GDK_STIPPLED: ++ case GDK_OPAQUE_STIPPLED: ++ if (_gdk_gc_get_stipple (gc)) ++ { ++ gdk_drawable_get_size (_gdk_gc_get_stipple (gc), &width, &height); ++ fill = _gdk_gc_get_fill (gc); ++ } ++ break; ++ } ++ ++ if (x11_gc->fg_picture == None) ++ { ++ XRenderPictureAttributes pa; ++ XRenderPictFormat *pix_format = foreground_format (gc); ++ Pixmap pix; ++ ++ if (!pix_format) ++ return None; ++ ++ pix = XCreatePixmap (GDK_GC_XDISPLAY (gc), ++ GDK_SCREEN_XROOTWIN (x11_gc->screen), ++ width, height, pix_format->depth); ++ pa.repeat = True; ++ x11_gc->fg_picture = XRenderCreatePicture (GDK_GC_XDISPLAY (gc), ++ pix, ++ pix_format, ++ CPRepeat, &pa); ++ XFreePixmap (GDK_GC_XDISPLAY (gc), pix); ++ ++ new = TRUE; ++ } ++ ++ _gdk_gc_x11_get_fg_xft_color (gc, &xftcolor); ++ ++ if (x11_gc->fg_picture_color.alpha != 0xffff || ++ x11_gc->fg_picture_color.red != xftcolor.color.red || ++ x11_gc->fg_picture_color.green != xftcolor.color.green || ++ x11_gc->fg_picture_color.blue != xftcolor.color.blue) ++ { ++ x11_gc->fg_picture_color.alpha = 0xffff; ++ x11_gc->fg_picture_color.red = xftcolor.color.red; ++ x11_gc->fg_picture_color.green = xftcolor.color.green; ++ x11_gc->fg_picture_color.blue = xftcolor.color.blue; ++ ++ new = TRUE; ++ } ++ ++ switch (fill) ++ { ++ case GDK_SOLID: ++ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, ++ x11_gc->fg_picture, &x11_gc->fg_picture_color, ++ 0, 0, width, height); ++ break; ++ case GDK_STIPPLED: ++ { ++ Picture stipple_picture = make_stipple_picture (gc); ++ ++ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, ++ x11_gc->fg_picture, &x11_gc->fg_picture_color, ++ 0, 0, width, height); ++ XRenderComposite (GDK_GC_XDISPLAY (gc), ++ PictOpInReverse, ++ stipple_picture, None, x11_gc->fg_picture, ++ 0, 0, 0, 0, 0, 0, width, height); ++ ++ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); ++ } ++ break; ++ case GDK_OPAQUE_STIPPLED: ++ { ++ XRenderColor bg_color; ++ ++ Picture stipple_picture = make_stipple_picture (gc); ++ Picture fg_picture = make_color_picture (gc, &x11_gc->fg_picture_color); ++ ++ get_bg_color (gc, &bg_color); ++ ++ XRenderFillRectangle (GDK_GC_XDISPLAY (gc), PictOpSrc, ++ x11_gc->fg_picture, &bg_color, ++ 0, 0, width, height); ++ XRenderComposite (GDK_GC_XDISPLAY (gc), ++ PictOpOver, ++ fg_picture, stipple_picture, x11_gc->fg_picture, ++ 0, 0, 0, 0, 0, 0, width, height); ++ ++ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), stipple_picture); ++ XRenderFreePicture (GDK_GC_XDISPLAY (x11_gc), fg_picture); ++ } ++ break; ++ case GDK_TILED: ++ g_assert_not_reached (); /* handled above */ ++ break; ++ } ++ ++ return x11_gc->fg_picture; ++} ++ ++/** ++ * _gdk_gc_x11_get_fg_xft_color: ++ * @gc: a #GdkGC ++ * @xftcolor: location to store the color ++ * ++ * Gets the foreground color of the GC as a XftColor. ++ **/ ++void ++_gdk_gc_x11_get_fg_xft_color (GdkGC *gc, ++ XftColor *xftcolor) ++{ ++ GdkGCX11 *x11_gc; ++ GdkColormap *cmap; ++ GdkColor color; ++ ++ g_return_if_fail (GDK_IS_GC_X11 (gc)); ++ ++ x11_gc = GDK_GC_X11 (gc); ++ ++ cmap = gdk_gc_get_colormap (gc); ++ ++ xftcolor->pixel = _gdk_gc_get_fg_pixel (gc); ++ ++ if (cmap) ++ { ++ gdk_colormap_query_color (cmap, xftcolor->pixel, &color); ++ xftcolor->color.alpha = 0xffff; ++ xftcolor->color.red = color.red; ++ xftcolor->color.green = color.green; ++ xftcolor->color.blue = color.blue; ++ } ++ else if (x11_gc->depth == 1) ++ { ++ /* Drawing with Xft on a bitmap is a bit bizzare; it ++ * takes alpha >= 0x8000 to mean 'set to 1' and ++ * alpha < 0x8000 to mean 'set to 0'. ++ */ ++ if (xftcolor->pixel) ++ { ++ xftcolor->color.red = 0xffff; ++ xftcolor->color.green = 0xffff; ++ xftcolor->color.blue = 0xffff; ++ xftcolor->color.alpha = 0xffff; ++ } ++ else ++ { ++ xftcolor->color.red = 0; ++ xftcolor->color.green = 0; ++ xftcolor->color.blue = 0; ++ xftcolor->color.alpha = 0; ++ } ++ } ++ else ++ { ++ g_warning ("Using Xft rendering requires the GC argument to have a\n" ++ "specified colormap. If the GC was created for a drawable\n" ++ "with a colormap, the colormap will be set on the GC\n" ++ "automatically. Otherwise, a colormap must be set on it with" ++ "gdk_gc_set_colormap"); ++ } ++} ++ ++void ++_gdk_windowing_gc_get_foreground (GdkGC *gc, ++ GdkColor *color) ++{ ++ GdkColormap *cmap; ++ ++ g_return_if_fail (GDK_IS_GC_X11 (gc)); ++ ++ color->pixel = _gdk_gc_get_fg_pixel (gc); ++ ++ cmap = gdk_gc_get_colormap (gc); ++ ++ if (cmap) ++ gdk_colormap_query_color (cmap, _gdk_gc_get_fg_pixel (gc), color); ++ else ++ g_warning ("No colormap in _gdk_windowing_gc_get_foreground"); ++} + #define __GDK_GC_X11_C__ + #include "gdkaliasdef.c" +Index: gtk+-2.10.6/gdk/x11/gdkprivate-x11.h +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkprivate-x11.h 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkprivate-x11.h 2006-10-30 12:59:30.000000000 +0000 +@@ -63,6 +63,9 @@ + guint have_clip_region : 1; + guint have_clip_mask : 1; + guint depth : 8; ++ ++ Picture fg_picture; ++ XRenderColor fg_picture_color; + }; + + struct _GdkGCX11Class +@@ -102,6 +105,11 @@ + GType _gdk_gc_x11_get_type (void); + + gboolean _gdk_x11_have_render (GdkDisplay *display); ++gboolean _gdk_x11_have_render_with_trapezoids (GdkDisplay *display); ++ ++Picture _gdk_x11_gc_get_fg_picture (GdkGC *gc); ++void _gdk_gc_x11_get_fg_xft_color (GdkGC *gc, ++ XftColor *xftcolor); + + GdkGC *_gdk_x11_gc_new (GdkDrawable *drawable, + GdkGCValues *values, +Index: gtk+-2.10.6/gdk/x11/gdkwindow-x11.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkwindow-x11.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkwindow-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -1114,7 +1114,8 @@ + { + GdkWindowObject *private = (GdkWindowObject *)window; + GdkToplevelX11 *toplevel; +- ++ GdkDrawableImplX11 *draw_impl; ++ + g_return_if_fail (GDK_IS_WINDOW (window)); + + _gdk_selection_window_destroyed (window); +@@ -1126,6 +1127,11 @@ + if (toplevel) + gdk_toplevel_x11_free_contents (GDK_WINDOW_DISPLAY (window), toplevel); + ++ draw_impl = GDK_DRAWABLE_IMPL_X11 (private->impl); ++ ++ if (draw_impl->xft_draw) ++ XftDrawDestroy (draw_impl->xft_draw); ++ + _gdk_x11_drawable_finish (private->impl); + + if (!recursing && !foreign_destroy) +Index: gtk+-2.10.6/gdk/x11/Makefile.am +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/Makefile.am 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/Makefile.am 2006-10-30 12:59:30.000000000 +0000 +@@ -37,6 +37,7 @@ + gdkinput.c \ + gdkkeys-x11.c \ + gdkmain-x11.c \ ++ gdkpango-x11.c \ + gdkpixmap-x11.c \ + gdkpixmap-x11.h \ + gdkproperty-x11.c \ +Index: gtk+-2.10.6/gtk/gtkcalendar.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkcalendar.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-10-30 12:59:30.000000000 +0000 +@@ -1821,7 +1821,7 @@ + } + } + +- ++ + /**************************************** + * Repainting * + ****************************************/ +@@ -1831,7 +1831,7 @@ + { + GtkWidget *widget = GTK_WIDGET (calendar); + GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); +- cairo_t *cr; ++ GdkGC *gc; + char buffer[255]; + int x, y; + gint header_width; +@@ -1849,7 +1849,7 @@ + else + year_left = !priv->year_before; + +- cr = gdk_cairo_create (priv->header_win); ++ gc = calendar->gc; + + header_width = widget->allocation.width - 2 * widget->style->xthickness; + +@@ -1902,9 +1902,9 @@ + - (max_year_width - logical_rect.width)/2); + + +- gdk_cairo_set_source_color (cr, HEADER_FG_COLOR (GTK_WIDGET (calendar))); +- cairo_move_to (cr, x, y); +- pango_cairo_show_layout (cr, layout); ++ gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar))); ++ gdk_draw_layout (priv->header_win, gc, x, y, layout); ++ + + /* Draw month */ + g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]); +@@ -1924,19 +1924,19 @@ + else + x = 3 + priv->arrow_width + (max_month_width - logical_rect.width)/2; + +- cairo_move_to (cr, x, y); +- pango_cairo_show_layout (cr, layout); +- ++ gdk_draw_layout (priv->header_win, gc, x, y, layout); ++ ++ gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar))); ++ + g_object_unref (layout); +- cairo_destroy (cr); + } + + static void + calendar_paint_day_names (GtkCalendar *calendar) + { + GtkWidget *widget = GTK_WIDGET (calendar); ++ GdkGC *gc; + GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); +- cairo_t *cr; + char buffer[255]; + int day,i; + int day_width, cal_width; +@@ -1946,8 +1946,7 @@ + gint focus_padding; + gint focus_width; + +- cr = gdk_cairo_create (priv->day_name_win); +- ++ gc = calendar->gc; + gtk_widget_style_get (GTK_WIDGET (widget), + "focus-line-width", &focus_width, + "focus-padding", &focus_padding, +@@ -1961,22 +1960,19 @@ + * Draw rectangles as inverted background for the labels. + */ + +- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); +- cairo_rectangle (cr, +- CALENDAR_MARGIN, CALENDAR_MARGIN, +- cal_width-CALENDAR_MARGIN * 2, +- priv->day_name_h - CALENDAR_MARGIN); +- cairo_fill (cr); +- ++ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); ++ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, ++ CALENDAR_MARGIN, CALENDAR_MARGIN, ++ cal_width-CALENDAR_MARGIN * 2, ++ priv->day_name_h - CALENDAR_MARGIN); ++ + if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS) +- { +- cairo_rectangle (cr, +- CALENDAR_MARGIN, +- priv->day_name_h - CALENDAR_YSEP, +- priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, +- CALENDAR_YSEP); +- cairo_fill (cr); +- } ++ gdk_draw_rectangle (priv->day_name_win, gc, TRUE, ++ CALENDAR_MARGIN, ++ priv->day_name_h - CALENDAR_YSEP, ++ priv->week_width - CALENDAR_YSEP - CALENDAR_MARGIN, ++ CALENDAR_YSEP); ++ + + /* + * Write the labels +@@ -1984,7 +1980,7 @@ + + layout = gtk_widget_create_pango_layout (widget, NULL); + +- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); ++ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); + for (i = 0; i < 7; i++) + { + if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL) +@@ -1997,19 +1993,18 @@ + pango_layout_set_text (layout, buffer, -1); + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + +- cairo_move_to (cr, +- (CALENDAR_MARGIN + +- + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? +- (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) +- : 0) +- + day_wid_sep * i +- + (day_width - logical_rect.width)/2), +- CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y); +- pango_cairo_show_layout (cr, layout); ++ gdk_draw_layout (priv->day_name_win, gc, ++ (CALENDAR_MARGIN + ++ + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? ++ (priv->week_width + (priv->week_width ? CALENDAR_XSEP : 0)) ++ : 0) ++ + day_wid_sep * i ++ + (day_width - logical_rect.width)/2), ++ CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y, ++ layout); + } + + g_object_unref (layout); +- cairo_destroy (cr); + } + + static void +@@ -2017,7 +2012,7 @@ + { + GtkWidget *widget = GTK_WIDGET (calendar); + GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); +- cairo_t *cr; ++ GdkGC *gc; + gint row, week = 0, year; + gint x_loc; + char buffer[32]; +@@ -2027,7 +2022,7 @@ + gint focus_padding; + gint focus_width; + +- cr = gdk_cairo_create (priv->week_win); ++ gc = calendar->gc; + + gtk_widget_style_get (GTK_WIDGET (widget), + "focus-line-width", &focus_width, +@@ -2038,20 +2033,20 @@ + * Draw a rectangle as inverted background for the labels. + */ + +- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); ++ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget)); + if (priv->day_name_win) +- cairo_rectangle (cr, +- CALENDAR_MARGIN, +- 0, +- priv->week_width - CALENDAR_MARGIN, +- priv->main_h - CALENDAR_MARGIN); ++ gdk_draw_rectangle (priv->week_win, gc, TRUE, ++ CALENDAR_MARGIN, ++ 0, ++ priv->week_width - CALENDAR_MARGIN, ++ priv->main_h - CALENDAR_MARGIN); + else +- cairo_rectangle (cr, +- CALENDAR_MARGIN, +- CALENDAR_MARGIN, +- priv->week_width - CALENDAR_MARGIN, +- priv->main_h - 2 * CALENDAR_MARGIN); +- cairo_fill (cr); ++ gdk_draw_rectangle (priv->week_win, gc, TRUE, ++ CALENDAR_MARGIN, ++ CALENDAR_MARGIN, ++ priv->week_width - CALENDAR_MARGIN, ++ priv->main_h - 2 * CALENDAR_MARGIN); ++ + + /* + * Write the labels +@@ -2059,7 +2054,7 @@ + + layout = gtk_widget_create_pango_layout (widget, NULL); + +- gdk_cairo_set_source_color (cr, SELECTED_FG_COLOR (widget)); ++ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget)); + day_height = calendar_row_height (calendar); + for (row = 0; row < 6; row++) + { +@@ -2095,12 +2090,10 @@ + - logical_rect.width + - CALENDAR_XSEP - focus_padding - focus_width); + +- cairo_move_to (cr, x_loc, y_loc); +- pango_cairo_show_layout (cr, layout); ++ gdk_draw_layout (priv->week_win, gc, x_loc, y_loc, layout); + } + + g_object_unref (layout); +- cairo_destroy (cr); + } + + static void +@@ -2149,7 +2142,7 @@ + { + GtkWidget *widget = GTK_WIDGET (calendar); + GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar); +- cairo_t *cr; ++ GdkGC *gc; + GdkColor *text_color; + gchar buffer[32]; + gint day; +@@ -2162,7 +2155,7 @@ + g_return_if_fail (row < 6); + g_return_if_fail (col < 7); + +- cr = gdk_cairo_create (priv->main_win); ++ gc = calendar->gc; + + day = calendar->day[row][col]; + +@@ -2170,11 +2163,11 @@ + + if (calendar->day_month[row][col] == MONTH_PREV) + { +- text_color = PREV_MONTH_COLOR (widget); ++ gdk_gc_set_foreground (gc, PREV_MONTH_COLOR (GTK_WIDGET (calendar))); + } + else if (calendar->day_month[row][col] == MONTH_NEXT) + { +- text_color = NEXT_MONTH_COLOR (widget); ++ gdk_gc_set_foreground (gc, NEXT_MONTH_COLOR (GTK_WIDGET (calendar))); + } + else + { +@@ -2188,16 +2181,16 @@ + #endif + if (calendar->selected_day == day) + { +- gdk_cairo_set_source_color (cr, SELECTED_BG_COLOR (widget)); +- gdk_cairo_rectangle (cr, &day_rect); +- cairo_fill (cr); ++ gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar))); ++ gdk_draw_rectangle (priv->main_win, gc, TRUE, day_rect.x, day_rect.y, ++ day_rect.width, day_rect.height); + } + if (calendar->selected_day == day) +- text_color = SELECTED_FG_COLOR (widget); ++ gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar))); + else if (calendar->marked_date[day-1]) +- text_color = MARKED_COLOR (widget); ++ gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar))); + else +- text_color = NORMAL_DAY_COLOR (widget); ++ gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar))); + } + + /* Translators: this defines whether the day numbers should use +@@ -2219,16 +2212,13 @@ + x_loc -= logical_rect.width; + y_loc = day_rect.y + (day_rect.height - logical_rect.height) / 2; + +- gdk_cairo_set_source_color (cr, text_color); +- cairo_move_to (cr, x_loc, y_loc); +- pango_cairo_show_layout (cr, layout); ++ gdk_draw_layout (priv->main_win, gc, ++ x_loc, y_loc, layout); + + if (calendar->marked_date[day-1] + && calendar->day_month[row][col] == MONTH_CURRENT) +- { +- cairo_move_to (cr, x_loc - 1, y_loc); +- pango_cairo_show_layout (cr, layout); +- } ++ gdk_draw_layout (priv->main_win, gc, ++ x_loc-1, y_loc, layout); + + if (GTK_WIDGET_HAS_FOCUS (calendar) + && calendar->focus_row == row && calendar->focus_col == col) +@@ -2253,7 +2243,6 @@ + } + + g_object_unref (layout); +- cairo_destroy (cr); + } + + static void +Index: gtk+-2.10.6/gtk/gtkentry.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gtk/gtkentry.c 2006-10-30 12:59:30.000000000 +0000 +@@ -3333,7 +3333,6 @@ + if (GTK_WIDGET_DRAWABLE (entry)) + { + PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); +- cairo_t *cr; + gint x, y; + gint start_pos, end_pos; + +@@ -3341,56 +3340,60 @@ + + get_layout_position (entry, &x, &y); + +- cr = gdk_cairo_create (entry->text_area); +- +- cairo_move_to (cr, x, y); +- gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); +- pango_cairo_show_layout (cr, layout); +- ++ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], ++ x, y, ++ layout); ++ + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) + { + gint *ranges; + gint n_ranges, i; + PangoRectangle logical_rect; +- GdkColor *selection_color, *text_color; ++ GdkGC *selection_gc, *text_gc; + GtkBorder inner_border; +- ++ GdkRegion *clip_region; ++ + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); + + if (GTK_WIDGET_HAS_FOCUS (entry)) + { +- selection_color = &widget->style->base [GTK_STATE_SELECTED]; +- text_color = &widget->style->text [GTK_STATE_SELECTED]; ++ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; ++ text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; + } + else + { +- selection_color = &widget->style->base [GTK_STATE_ACTIVE]; +- text_color = &widget->style->text [GTK_STATE_ACTIVE]; ++ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; ++ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; + } +- ++ ++ clip_region = gdk_region_new (); + _gtk_entry_effective_inner_border (entry, &inner_border); + + for (i = 0; i < n_ranges; ++i) +- cairo_rectangle (cr, +- inner_border.left - entry->scroll_offset + ranges[2 * i], +- y, +- ranges[2 * i + 1], +- logical_rect.height); ++ { ++ GdkRectangle rect; + +- cairo_clip (cr); +- +- gdk_cairo_set_source_color (cr, selection_color); +- cairo_paint (cr); ++ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i]; ++ rect.y = y; ++ rect.width = ranges[2 * i + 1]; ++ rect.height = logical_rect.height; ++ ++ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, ++ rect.x, rect.y, rect.width, rect.height); + +- cairo_move_to (cr, x, y); +- gdk_cairo_set_source_color (cr, text_color); +- pango_cairo_show_layout (cr, layout); ++ gdk_region_union_with_rect (clip_region, &rect); ++ } + ++ gdk_gc_set_clip_region (text_gc, clip_region); ++ gdk_draw_layout (entry->text_area, text_gc, ++ x, y, ++ layout); ++ gdk_gc_set_clip_region (text_gc, NULL); ++ ++ gdk_region_destroy (clip_region); + g_free (ranges); + } +- +- cairo_destroy (cr); + } + } + +Index: gtk+-2.10.6/gtk/gtkwidget.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkwidget.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gtk/gtkwidget.c 2006-10-30 12:59:30.000000000 +0000 +@@ -5445,7 +5445,8 @@ + GdkScreen *screen; + + update_pango_context (widget, context); +- ++/* TODO: Figure out the proper way to handle this in a pangoxft setting ++ + screen = gtk_widget_get_screen_unchecked (widget); + if (screen) + { +@@ -5453,7 +5454,7 @@ + gdk_screen_get_resolution (screen)); + pango_cairo_context_set_font_options (context, + gdk_screen_get_font_options (screen)); +- } ++ }*/ + } + } + +Index: gtk+-2.10.6/gdk/x11/gdkpango-x11.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkpango-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -0,0 +1,174 @@ ++/* GDK - The GIMP Drawing Kit ++ * Copyright (C) 2000 Red Hat, Inc. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#include <config.h> ++#include <stdlib.h> ++ ++#include "gdkx.h" ++#include "gdkdisplay-x11.h" ++#include "gdkpango.h" ++#include <pango/pangoxft.h> ++#include <pango/pangoxft-render.h> ++#include "gdkalias.h" ++ ++#include <math.h> ++ ++typedef struct _GdkX11Renderer GdkX11Renderer; ++typedef struct _GdkX11RendererClass GdkX11RendererClass; ++ ++#define GDK_TYPE_X11_RENDERER (_gdk_x11_renderer_get_type()) ++#define GDK_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_RENDERER, GdkX11Renderer)) ++#define GDK_IS_X11_RENDERER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_RENDERER)) ++#define GDK_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) ++#define GDK_IS_X11_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_RENDERER)) ++#define GDK_X11_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_RENDERER, GdkX11RendererClass)) ++ ++#define MAX_RENDER_PART PANGO_RENDER_PART_STRIKETHROUGH ++ ++struct _GdkX11Renderer ++{ ++ PangoXftRenderer parent_instance; ++ ++ XRenderPictFormat *mask_format; ++ ++ GdkDrawable *drawable; ++ GdkGC *gc; ++}; ++ ++struct _GdkX11RendererClass ++{ ++ PangoXftRendererClass parent_class; ++}; ++ ++G_DEFINE_TYPE (GdkX11Renderer, _gdk_x11_renderer, PANGO_TYPE_XFT_RENDERER) ++ ++static void ++gdk_x11_renderer_finalize (GObject *object) ++{ ++ G_OBJECT_CLASS (_gdk_x11_renderer_parent_class)->finalize (object); ++} ++ ++static void ++gdk_x11_renderer_composite_trapezoids (PangoXftRenderer *xftrenderer, ++ PangoRenderPart part, ++ XTrapezoid *trapezoids, ++ int n_trapezoids) ++{ ++ /* Because we only use this renderer for "draw_glyphs()" calls, we ++ * won't hit this code path much. However, it is hit for drawing ++ * the "unknown glyph" hex squares. We can safely ignore the part, ++ */ ++ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); ++ ++ _gdk_x11_drawable_draw_xtrapezoids (x11_renderer->drawable, ++ x11_renderer->gc, ++ trapezoids, n_trapezoids); ++ ++} ++ ++static void ++gdk_x11_renderer_composite_glyphs (PangoXftRenderer *xftrenderer, ++ XftFont *xft_font, ++ XftGlyphSpec *glyphs, ++ gint n_glyphs) ++{ ++ GdkX11Renderer *x11_renderer = GDK_X11_RENDERER (xftrenderer); ++ ++ _gdk_x11_drawable_draw_xft_glyphs (x11_renderer->drawable, ++ x11_renderer->gc, ++ xft_font, glyphs, n_glyphs); ++} ++ ++static void ++_gdk_x11_renderer_init (GdkX11Renderer *renderer) ++{ ++} ++ ++static void ++_gdk_x11_renderer_class_init (GdkX11RendererClass *klass) ++{ ++ PangoXftRendererClass *xftrenderer_class = PANGO_XFT_RENDERER_CLASS (klass); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ xftrenderer_class->composite_glyphs = gdk_x11_renderer_composite_glyphs; ++ xftrenderer_class->composite_trapezoids = gdk_x11_renderer_composite_trapezoids; ++ ++ object_class->finalize = gdk_x11_renderer_finalize; ++} ++ ++PangoRenderer * ++_gdk_x11_renderer_get (GdkDrawable *drawable, ++ GdkGC *gc) ++{ ++ GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; ++ GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); ++ GdkX11Renderer *x11_renderer; ++ ++ if (!screen_x11->renderer) ++ { ++ screen_x11->renderer = g_object_new (GDK_TYPE_X11_RENDERER, ++ "display", GDK_SCREEN_XDISPLAY (screen), ++ "screen", GDK_SCREEN_XNUMBER (screen), ++ NULL); ++ } ++ ++ x11_renderer = GDK_X11_RENDERER (screen_x11->renderer); ++ ++ x11_renderer->drawable = drawable; ++ x11_renderer->gc = gc; ++ ++ return screen_x11->renderer; ++} ++ ++/** ++ * gdk_pango_context_get_for_screen: ++ * @screen: the #GdkScreen for which the context is to be created. ++ * ++ * Creates a #PangoContext for @screen. ++ * ++ * The context must be freed when you're finished with it. ++ * ++ * When using GTK+, normally you should use gtk_widget_get_pango_context() ++ * instead of this function, to get the appropriate context for ++ * the widget you intend to render text onto. ++ * ++ * Return value: a new #PangoContext for @screen ++ * ++ * Since: 2.2 ++ **/ ++PangoContext * ++gdk_pango_context_get_for_screen (GdkScreen *screen) ++{ ++ PangoContext *context; ++ ++ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); ++ ++ if (screen->closed) ++ return NULL; ++ ++ context = pango_xft_get_context (GDK_SCREEN_XDISPLAY (screen), ++ GDK_SCREEN_X11 (screen)->screen_num); ++ ++ g_object_set_data (G_OBJECT (context), "gdk-pango-screen", screen); ++ ++ return context; ++} ++ ++#define __GDK_PANGO_X11_C__ ++#include "gdkaliasdef.c" +Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c +=================================================================== +--- gtk+-2.10.6.orig/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:58:30.000000000 +0000 ++++ gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c 2006-10-30 12:59:30.000000000 +0000 +@@ -119,6 +119,9 @@ + { + GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); + ++ if (draw_impl->xft_draw) ++ XftDrawDestroy (draw_impl->xft_draw); ++ + _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl)); + } + +--- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800 ++++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800 +@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget) + BACKGROUND_COLOR ( GTK_WIDGET ( calendar))); + gdk_window_show (priv->main_win); + gdk_window_set_user_data (priv->main_win, widget); ++ ++ /* Set widgets gc */ ++ calendar->gc = gdk_gc_new (widget->window); ++ + gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget)); + gdk_window_show (widget->window); + gdk_window_set_user_data (widget->window, widget); diff --git a/packages/gtk+/gtk+-2.12.11/range-no-redraw.patch b/packages/gtk+/gtk+-2.12.11/range-no-redraw.patch new file mode 100644 index 0000000000..14387b8a2e --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/range-no-redraw.patch @@ -0,0 +1,127 @@ +5f084ea0849d5967a3c22821542ecaaa8accb398 +diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c +index bd95351..64e0e59 100644 +--- gtk/gtkrange.c ++++ gtk/gtkrange.c +@@ -109,6 +109,8 @@ struct _GtkRangeLayout + GtkSensitivityType upper_sensitivity; + + gdouble fill_level; ++ ++ guint motion_idle_id; + }; + + +@@ -205,6 +207,8 @@ static gboolean gtk_range_real_change_value (GtkRange *range, + static void gtk_range_update_value (GtkRange *range); + static gboolean gtk_range_key_press (GtkWidget *range, + GdkEventKey *event); ++static void gtk_range_add_motion_idle (GtkRange *range); ++static void gtk_range_remove_motion_idle (GtkRange *range); + + + static guint signals[LAST_SIGNAL]; +@@ -1167,6 +1171,7 @@ gtk_range_destroy (GtkObject *object) + + gtk_range_remove_step_timer (range); + gtk_range_remove_update_timer (range); ++ gtk_range_remove_motion_idle (range); + + if (range->adjustment) + { +@@ -1276,6 +1281,7 @@ gtk_range_unrealize (GtkWidget *widget) + + gtk_range_remove_step_timer (range); + gtk_range_remove_update_timer (range); ++ gtk_range_remove_motion_idle (range); + + gdk_window_set_user_data (range->event_window, NULL); + gdk_window_destroy (range->event_window); +@@ -2165,7 +2171,7 @@ gtk_range_motion_notify (GtkWidget *widget, + gtk_widget_queue_draw (widget); + + if (range->layout->grab_location == MOUSE_SLIDER) +- update_slider_position (range, x, y); ++ gtk_range_add_motion_idle (range); + + /* We handled the event if the mouse was in the range_rect */ + return range->layout->mouse_location != MOUSE_OUTSIDE; +@@ -3335,9 +3341,10 @@ initial_timeout (gpointer data) + g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL); + + range = GTK_RANGE (data); +- range->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR, +- second_timeout, +- range); ++ range->timer->timeout_id = ++ gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR, ++ second_timeout, ++ range); + /* remove self */ + return FALSE; + } +@@ -3357,9 +3364,8 @@ gtk_range_add_step_timer (GtkRange *range, + + range->timer = g_new (GtkRangeStepTimer, 1); + +- range->timer->timeout_id = gdk_threads_add_timeout (timeout, +- initial_timeout, +- range); ++ range->timer->timeout_id = ++ gdk_threads_add_timeout (timeout, initial_timeout, range); + range->timer->step = step; + + gtk_range_scroll (range, range->timer->step); +@@ -3397,9 +3403,8 @@ gtk_range_reset_update_timer (GtkRange *range) + { + gtk_range_remove_update_timer (range); + +- range->update_timeout_id = gdk_threads_add_timeout (UPDATE_DELAY, +- update_timeout, +- range); ++ range->update_timeout_id = ++ gdk_threads_add_timeout (UPDATE_DELAY, update_timeout, range); + } + + static void +@@ -3412,5 +3417,40 @@ gtk_range_remove_update_timer (GtkRange *range) + } + } + ++static gboolean ++motion_idle (gpointer data) ++{ ++ GtkRange *range = data; ++ GtkRangeLayout *layout = range->layout; ++ ++ update_slider_position (range, layout->mouse_x, layout->mouse_y); ++ ++ layout->motion_idle_id = 0; ++ ++ return FALSE; ++} ++ ++static void ++gtk_range_add_motion_idle (GtkRange *range) ++{ ++ if (!range->layout->motion_idle_id) ++ { ++ range->layout->motion_idle_id = ++ gdk_threads_add_idle_full (GDK_PRIORITY_REDRAW, ++ motion_idle, range, ++ NULL); ++ } ++} ++ ++static void ++gtk_range_remove_motion_idle (GtkRange *range) ++{ ++ if (range->layout->motion_idle_id != 0) ++ { ++ g_source_remove (range->layout->motion_idle_id); ++ range->layout->motion_idle_id = 0; ++ } ++} ++ + #define __GTK_RANGE_C__ + #include "gtkaliasdef.c" diff --git a/packages/gtk+/gtk+-2.12.11/run-iconcache.patch b/packages/gtk+/gtk+-2.12.11/run-iconcache.patch new file mode 100644 index 0000000000..ac15e9ab24 --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/run-iconcache.patch @@ -0,0 +1,19 @@ +--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 ++++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 +@@ -1128,11 +1128,11 @@ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.12.11/scrolled-placement.patch b/packages/gtk+/gtk+-2.12.11/scrolled-placement.patch new file mode 100644 index 0000000000..a0b50c8cac --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/scrolled-placement.patch @@ -0,0 +1,22 @@ +Index: gdk/x11/gdksettings.c +=================================================================== +--- gdk/x11/gdksettings.c (revision 18493) ++++ gdk/x11/gdksettings.c (working copy) +@@ -65,7 +65,8 @@ + "Xft/RGBA\0" "gtk-xft-rgba\0" + "Xft/DPI\0" "gtk-xft-dpi\0" + "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0" +- "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0"; ++ "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0" ++ "Gtk/ScrolledWindowPlacement\0" "gtk-scrolled-window-placement\0"; + + static const struct + { +@@ -107,5 +108,6 @@ + { 1197, 1206 }, + { 1219, 1227 }, + { 1239, 1261 }, +- { 1285, 1305 } ++ { 1285, 1305 }, ++ { 1326, 1354 } + }; diff --git a/packages/gtk+/gtk+-2.12.11/toggle-font.diff b/packages/gtk+/gtk+-2.12.11/toggle-font.diff new file mode 100644 index 0000000000..59ad150b2f --- /dev/null +++ b/packages/gtk+/gtk+-2.12.11/toggle-font.diff @@ -0,0 +1,100 @@ +Index: gtk/gtkcellrenderertoggle.c +=================================================================== +--- gtk/gtkcellrenderertoggle.c (revision 18523) ++++ gtk/gtkcellrenderertoggle.c (working copy) +@@ -71,6 +71,8 @@ + PROP_INDICATOR_SIZE + }; + ++/* This is a hard-coded default which promptly gets overridden by a size ++ calculated from the font size. */ + #define TOGGLE_WIDTH 13 + + static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; +@@ -80,8 +82,9 @@ + typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; + struct _GtkCellRendererTogglePrivate + { +- gint indicator_size; +- ++ gint indicator_size; /* This is the real size */ ++ gint override_size; /* This is the size set from the indicator-size property */ ++ GtkWidget *cached_widget; + guint inconsistent : 1; + }; + +@@ -104,6 +107,7 @@ + GTK_CELL_RENDERER (celltoggle)->ypad = 2; + + priv->indicator_size = TOGGLE_WIDTH; ++ priv->override_size = 0; + priv->inconsistent = FALSE; + } + +@@ -210,7 +214,7 @@ + g_value_set_boolean (value, celltoggle->radio); + break; + case PROP_INDICATOR_SIZE: +- g_value_set_int (value, priv->indicator_size); ++ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -245,7 +249,7 @@ + celltoggle->radio = g_value_get_boolean (value); + break; + case PROP_INDICATOR_SIZE: +- priv->indicator_size = g_value_get_int (value); ++ priv->override_size = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -273,6 +277,27 @@ + } + + static void ++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data) ++{ ++ GtkCellRendererTogglePrivate *priv = user_data; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ int height; ++ ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, ++ widget->style->font_desc, ++ pango_context_get_language (context)); ++ ++ height = pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics); ++ ++ pango_font_metrics_unref (metrics); ++ ++ priv->indicator_size = PANGO_PIXELS (height * 0.85); ++} ++ ++static void + gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, +@@ -287,6 +312,20 @@ + + priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell); + ++ if (priv->override_size) { ++ priv->indicator_size = priv->override_size; ++ } else if (priv->cached_widget != widget) { ++ if (priv->cached_widget) { ++ g_object_remove_weak_pointer (widget, &priv->cached_widget); ++ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv); ++ } ++ priv->cached_widget = widget; ++ g_object_add_weak_pointer (widget, &priv->cached_widget); ++ g_signal_connect (widget, "style-set", on_widget_style_set, priv); ++ ++ on_widget_style_set (widget, NULL, priv); ++ } ++ + calc_width = (gint) cell->xpad * 2 + priv->indicator_size; + calc_height = (gint) cell->ypad * 2 + priv->indicator_size; + diff --git a/packages/gtk+/gtk+_2.12.11.bb b/packages/gtk+/gtk+_2.12.11.bb new file mode 100644 index 0000000000..642154b207 --- /dev/null +++ b/packages/gtk+/gtk+_2.12.11.bb @@ -0,0 +1,48 @@ +require gtk+.inc + +PR = "r3" + +DEPENDS += "cairo" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ + file://xsettings.patch;patch=1 \ + file://run-iconcache.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://cellrenderer-cairo.patch;patch=1;pnum=0 \ + file://entry-cairo.patch;patch=1;pnum=0 \ + file://toggle-font.diff;patch=1;pnum=0 \ + file://scrolled-placement.patch;patch=1;pnum=0" +# temporary +# file://gtklabel-resize-patch;patch=1 \ +# file://menu-deactivate.patch;patch=1 \ +# file://combo-arrow-size.patch;patch=1;pnum=0 \ +# die die die +# file://pangoxft2.10.6.diff;patch=1" + +EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration" + +LIBV = "2.10.0" + +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" + +python populate_packages_prepend () { + import os.path + + prologue = bb.data.getVar("postinst_prologue", d, 1) + + gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) + loaders_root = os.path.join(gtk_libdir, 'loaders') + immodules_root = os.path.join(gtk_libdir, 'immodules') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') + do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') + do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') + + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) +} diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index e4b2427063..f8000ccdd5 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -1,6 +1,11 @@ # Demo image for beagleboard -XSERVER ?= "xserver-kdrive-fbdev" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" ANGSTROM_EXTRA_INSTALL ?= "" diff --git a/packages/kexecboot/files/.mtn2git_empty b/packages/kexecboot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kexecboot/files/.mtn2git_empty diff --git a/packages/kexecboot/files/rootdelay.patch b/packages/kexecboot/files/rootdelay.patch new file mode 100644 index 0000000000..19a712ab57 --- /dev/null +++ b/packages/kexecboot/files/rootdelay.patch @@ -0,0 +1,11 @@ +--- kexecboot-0.3/kexecboot.c 2008-08-03 17:08:31.000000000 +0200 ++++ kexecboot/kexecboot.c 2008-08-04 13:35:32.167062391 +0200 +@@ -84,7 +84,7 @@ + char command[COMMAND_LINE_SIZE + 60]; + mount(boot->device, "/mnt", boot->fstype, MS_RDONLY, NULL); + if( boot->cmdline ) +- sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s\" -l %s", ++ sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s rootdelay=3\" -l %s", + boot->cmdline, boot->device, boot->fstype, boot->kernelpath); + else + sprintf(command,"kexec -l %s", boot->kernelpath); diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie index 7a22aa4ee1..a65552fbbb 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie +++ b/packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie @@ -251,7 +251,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,115200n8 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y diff --git a/packages/lcms/lcms_1.17.bb b/packages/lcms/lcms_1.17.bb index f4f3dd20ff..2336142a23 100644 --- a/packages/lcms/lcms_1.17.bb +++ b/packages/lcms/lcms_1.17.bb @@ -3,7 +3,11 @@ SECTION = "libs" LICENSE = "LGPL" SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms-${PV}.tar.gz" -inherit autotools pkgconfig +PR = "r2" + +inherit autotools + +AUTOTOOLS_STAGE_PKGCONFIG = "1" do_stage() { autotools_stage_all diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb index 40888df6c3..8382de84f5 100644 --- a/packages/libexif/libexif_0.6.13.bb +++ b/packages/libexif/libexif_0.6.13.bb @@ -2,16 +2,18 @@ DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG p HOMEPAGE = "http://sourceforge.net/projects/libexif" SECTION = "libs" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools do_configure_append() { sed -i s:doc\ binary:binary:g Makefile } +AUTOTOOLS_STAGE_PKGCONFIG = "1" + do_stage() { autotools_stage_all } diff --git a/packages/libexif/libexif_0.6.16.bb b/packages/libexif/libexif_0.6.16.bb new file mode 100644 index 0000000000..2f896352db --- /dev/null +++ b/packages/libexif/libexif_0.6.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/librsvg/librsvg_2.22.2.bb b/packages/librsvg/librsvg_2.22.2.bb new file mode 100644 index 0000000000..2429b50552 --- /dev/null +++ b/packages/librsvg/librsvg_2.22.2.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Library for rendering SVG files" +SECTION = "x11/utils" +DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt" +LICENSE = "LGPL" + +inherit autotools pkgconfig gnome + +EXTRA_OECONF = "--disable-mozilla-plugin" + + +PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" +FILES_${PN} = "${libdir}/*.so.*" +FILES_rsvg = "${bindir}/rsvg \ + ${bindir}/rsvg-view \ + ${bindir}/rsvg-convert \ + ${datadir}/pixmaps/svg-viewer.svg" +FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so" +FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \ + ${libdir}/gtk-2.0/*/*.la \ + ${libdir}/gtk-2.0/*/*/*.la \ + " +FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \ + ${libdir}/gtk-2.0/*/*/.debug" + +pkg_postinst_librsvg-gtk() { +if [ "x$D" != "x" ]; then + exit 1 +fi + gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch b/packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch new file mode 100644 index 0000000000..79eb170c2c --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch @@ -0,0 +1,88 @@ +commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 +Author: Patrick McHardy <kaber@trash.net> +Date: Wed May 21 14:08:38 2008 -0700 + + netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ + + Greg Steuck <greg@nest.cx> points out that some of the netfilter + headers can't be used in userspace without including linux/types.h + first. The headers include their own linux/types.h include statements, + these are stripped by make headers-install because they are inside + #ifdef __KERNEL__ however. Move them out to fix this. + + Reported and Tested by Greg Steuck. + + Signed-off-by: Patrick McHardy <kaber@trash.net> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h +index e4c6659..0c5eb7e 100644 +--- a/include/linux/netfilter.h ++++ b/include/linux/netfilter.h +@@ -3,7 +3,6 @@ + + #ifdef __KERNEL__ + #include <linux/init.h> +-#include <linux/types.h> + #include <linux/skbuff.h> + #include <linux/net.h> + #include <linux/netdevice.h> +@@ -14,6 +13,7 @@ + #include <linux/list.h> + #include <net/net_namespace.h> + #endif ++#include <linux/types.h> + #include <linux/compiler.h> + + /* Responses from hook functions. */ +diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h +index dd9c97f..590ac3d 100644 +--- a/include/linux/netfilter_arp/arp_tables.h ++++ b/include/linux/netfilter_arp/arp_tables.h +@@ -11,11 +11,11 @@ + + #ifdef __KERNEL__ + #include <linux/if.h> +-#include <linux/types.h> + #include <linux/in.h> + #include <linux/if_arp.h> + #include <linux/skbuff.h> + #endif ++#include <linux/types.h> + #include <linux/compiler.h> + #include <linux/netfilter_arp.h> + +diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h +index bfc889f..092bd50 100644 +--- a/include/linux/netfilter_ipv4/ip_tables.h ++++ b/include/linux/netfilter_ipv4/ip_tables.h +@@ -17,11 +17,11 @@ + + #ifdef __KERNEL__ + #include <linux/if.h> +-#include <linux/types.h> + #include <linux/in.h> + #include <linux/ip.h> + #include <linux/skbuff.h> + #endif ++#include <linux/types.h> + #include <linux/compiler.h> + #include <linux/netfilter_ipv4.h> + +diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h +index f2507dc..1089e33 100644 +--- a/include/linux/netfilter_ipv6/ip6_tables.h ++++ b/include/linux/netfilter_ipv6/ip6_tables.h +@@ -17,11 +17,11 @@ + + #ifdef __KERNEL__ + #include <linux/if.h> +-#include <linux/types.h> + #include <linux/in6.h> + #include <linux/ipv6.h> + #include <linux/skbuff.h> + #endif ++#include <linux/types.h> + #include <linux/compiler.h> + #include <linux/netfilter_ipv6.h> + diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb index f47fd08091..0d4163693c 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb @@ -2,11 +2,12 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://reinstate-a.out.h.patch;patch=1 \ file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \ + file://netfilter-include-types_h-in-userspace.patch;patch=1 \ file://procinfo.h" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb index 879c6e23be..73eb1e3b46 100644 --- a/packages/linux/linux-kaiser_2.6.24+git.bb +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -3,9 +3,7 @@ require linux.inc PV = "2.6.24+git${SRCREV}" PR = "r1" -COMPATIBLE_MACHINE = "htckaiser" -COMPATIBLE_MACHINE = "htcpolaris" - +COMPATIBLE_MACHINE = "htckaiser|htcpolaris" SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git" diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig index 1958f1ca0c..17c100fe4f 100644 --- a/packages/linux/linux-neuros/neuros-osd2/defconfig +++ b/packages/linux/linux-neuros/neuros-osd2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.23-davinci1 -# Thu Mar 6 20:08:16 2008 +# Thu Aug 7 13:02:41 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -188,6 +188,7 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set # CONFIG_OUTER_CACHE is not set +CONFIG_FORCE_MAX_ZONEORDER=13 # # Bus support @@ -208,7 +209,8 @@ CONFIG_ARM_THUMB=y # CONFIG_HIGH_RES_TIMERS is not set # CONFIG_PREEMPT is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -231,7 +233,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -252,7 +254,6 @@ CONFIG_CMDLINE="" CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -377,12 +378,17 @@ CONFIG_NETFILTER=y # Wireless # # CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_EXT is not set +CONFIG_WIRELESS_EXT=y # CONFIG_MAC80211 is not set CONFIG_IEEE80211=y +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=y +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +CONFIG_IEEE80211_SOFTMAC=y +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set -CONFIG_IEEE80211_SOFTMAC=y # # Device Drivers @@ -604,17 +610,21 @@ CONFIG_NET_ETHERNET=y # CONFIG_MII is not set # CONFIG_AX88796 is not set # CONFIG_SMC91X is not set +CONFIG_TI_DAVINCI_EMAC=y # CONFIG_DM9000 is not set CONFIG_NETDEV_1000=y CONFIG_NETDEV_10000=y -CONFIG_TI_DAVINCI_EMAC=y # # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y +# CONFIG_LIBERTAS is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set CONFIG_ZD1211RW=y +# CONFIG_ZD1211RW_DEBUG is not set # # USB Network Adapters @@ -680,6 +690,12 @@ CONFIG_KEYBOARD_XTKBD=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_UINPUT is not set CONFIG_INPUT_NEUROS_IR=m # @@ -724,9 +740,9 @@ CONFIG_HW_RANDOM=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set CONFIG_RESIZER=y -CONFIG_THS7313=y -CONFIG_THS8200=y # CONFIG_TCG_TPM is not set +# CONFIG_PREVIEWER is not set +CONFIG_THS7313=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y @@ -766,12 +782,12 @@ CONFIG_SENSORS_TLV320AIC33=y # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_GPIOEXPANDER_DAVINCI is not set +CONFIG_I2C_NEUROS_MSP430=m +CONFIG_I2C_NEUROS_SIL9034HDMI=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_I2C_NEUROS_MSP430=m -CONFIG_I2C_NEUROS_SIL9034HDMI=m # # SPI support @@ -848,10 +864,14 @@ CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_DAVINCI=y CONFIG_VIDEO_TVP5150=y -CONFIG_VIDEO_TVP7000=y +CONFIG_VIDEO_DAVINCI=y + +# +# Video Capture Decoder +# # CONFIG_VIDEO_TVP5146 is not set +CONFIG_VIDEO_TVP7000=y # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_SAA5246A is not set @@ -880,6 +900,7 @@ CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_TEA5761 is not set # CONFIG_USB_DSBR is not set # CONFIG_DVB_CORE is not set +CONFIG_VIDEO_BUF=y CONFIG_DAB=y # CONFIG_USB_DABUSB is not set @@ -894,6 +915,7 @@ CONFIG_DAB=y # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=y +CONFIG_THS8200=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -918,6 +940,7 @@ CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_DAVINCI is not set # CONFIG_FB_VIRTUAL is not set CONFIG_FB_DM=y + # # Console display driver support # @@ -929,10 +952,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound @@ -951,7 +971,8 @@ CONFIG_SOUND_PRIME=y # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_DAVINCI=y -CONFIG_SOUND_DAVINCI_AIC32=y +CONFIG_SOUND_DAVINCI_AIC32=m +# CONFIG_SOUND_DAVINCI_AIC33 is not set # # DaVinci Audio Options @@ -1003,9 +1024,10 @@ CONFIG_USB_MUSB_SOC=y # DaVinci 644x USB support # CONFIG_USB_MUSB_HOST=y -# CONFIG_USB_MUSB_PERIPHERAL=y +# CONFIG_USB_MUSB_PERIPHERAL is not set # CONFIG_USB_MUSB_OTG is not set -CONFIG_USB_GADGET_MUSB_HDRC=y +# CONFIG_USB_GADGET_MUSB_HDRC is not set +CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_INVENTRA_DMA is not set CONFIG_USB_TI_CPPI_DMA=y @@ -1092,7 +1114,8 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_M66592=y +CONFIG_USB_M66592=m # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -1339,7 +1362,8 @@ CONFIG_NLS_UTF8=m # # Profiling support # -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=y # # Kernel hacking @@ -1360,7 +1384,44 @@ CONFIG_FRAME_POINTER=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_MANAGER=y +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_HW=y # # Library routines diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb index 77b68decf6..0a7996b614 100644 --- a/packages/linux/linux-neuros_git.bb +++ b/packages/linux/linux-neuros_git.bb @@ -2,10 +2,10 @@ require linux.inc DESCRIPTION = "Linux kernel for Neuros OSD devices" -SRCREV = "3560f6dca0c8dd97d9e2a935f68303effb3b8cc5" +SRCREV = "3ed322c3979aa3df112f9d41415fa8c95b904500" PV = "2.6.23-${PR}+git${SRCREV}" -PR = "r10" +PR = "r13" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch deleted file mode 100644 index c361c33d61..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch +++ /dev/null @@ -1,43 +0,0 @@ -TWL4030: remove superfluous PWR interrupt status clear before masking - -From: Paul Walmsley <paul@pwsan.com> - -twl_irq_init() clears PWR interrupt status bits, then masks the interrupts -off, then clears the PWR interrupt status bits again. The first clear -seems unnecessary, so, remove it. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 18 ------------------ - 1 files changed, 0 insertions(+), 18 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index adc45d4..ff662bc 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -719,24 +719,6 @@ static void twl_init_irq(void) - char *msg = "Unable to register interrupt subsystem"; - unsigned int irq_num; - -- /* -- * We end up with interrupts from other modules before -- * they get a chance to handle them... -- */ -- /* PWR_ISR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x00); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -- -- /* PWR_ISR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x02); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -- - /* PWR_IMR1 */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1); - if (res < 0) { diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch deleted file mode 100644 index 48a59b945b..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch +++ /dev/null @@ -1,71 +0,0 @@ -TWL4030: clear TWL GPIO interrupt status registers - -From: Paul Walmsley <paul@pwsan.com> - -twl_init_irq() does not clear the TWL GPIO ISR registers, but the PIH -ISR thinks that it has. This causes any previously-latched GPIO interrupts -to be stuck on until twl4030-gpio.c initializes, often drowning the console in - - TWL4030 module irq 368 is disabled but can't be masked! - -messages. This seems to be a particular problem when booting on Beagle. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 42 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 42 insertions(+), 0 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index ff662bc..dfc3805 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -857,6 +857,48 @@ static void twl_init_irq(void) - return; - } - -+ /* GPIO_ISR1A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x19); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* GPIO_ISR2A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1a); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* GPIO_ISR3A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1b); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* GPIO_ISR1B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1f); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* GPIO_ISR2B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x20); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* GPIO_ISR3B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x21); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ - /* install an irq handler for each of the PIH modules */ - for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) { - set_irq_chip(i, &twl4030_irq_chip); diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch deleted file mode 100644 index fe1bea5398..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch +++ /dev/null @@ -1,82 +0,0 @@ -TWL4030: use correct register addresses for BCI IMR registers - -From: Paul Walmsley <paul@pwsan.com> - -The existing code to mask and clear BCI interrupts in twl_init_irq() is -wrong. It uses the wrong register offsets, it does not mask all of the -BCI IMR registers, and it does not clear all of the BCI ISR registers. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 40 ++++++++++++++++++++++++++++++++------ - 1 files changed, 34 insertions(+), 6 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index dfc3805..bb0732c 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -750,29 +750,57 @@ static void twl_init_irq(void) - /* POWER HACK (END) */ - /* Slave address 0x4A */ - -- /* BCIIMR1_1 */ -+ /* BCIIMR1A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x2); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* BCIIMR2A */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x3); - if (res < 0) { - pr_err("%s[%d][%d]\n", msg, res, __LINE__); - return; - } - -- /* BCIIMR1_2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4); -+ /* BCIIMR1B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x6); - if (res < 0) { - pr_err("%s[%d][%d]\n", msg, res, __LINE__); - return; - } - -- /* BCIIMR2_1 */ -+ /* BCIIMR2B */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x7); - if (res < 0) { - pr_err("%s[%d][%d]\n", msg, res, __LINE__); - return; - } - -- /* BCIIMR2_2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x8); -+ /* BCIISR1A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x0); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* BCIISR2A */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x1); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* BCIISR1B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* BCIISR2B */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x5); - if (res < 0) { - pr_err("%s[%d][%d]\n", msg, res, __LINE__); - return; diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch deleted file mode 100644 index fb65ac98bb..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch +++ /dev/null @@ -1,38 +0,0 @@ -TWL4030: clear MADC interrupt status registers upon init - -From: Paul Walmsley <paul@pwsan.com> - -twl_init_irq() does not clear MADC interrupt status registers upon init - -fix. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index bb0732c..9d93524 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -821,6 +821,20 @@ static void twl_init_irq(void) - return; - } - -+ /* MADC_ISR1 */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x61); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ -+ /* MADC_ISR2 */ -+ res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x63); -+ if (res < 0) { -+ pr_err("%s[%d][%d]\n", msg, res, __LINE__); -+ return; -+ } -+ - /* key Pad */ - /* KEYPAD - IMR1 */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x12)); diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch deleted file mode 100644 index 02a72ed9df..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch +++ /dev/null @@ -1,303 +0,0 @@ -TWL4030: use *_SIH_CTRL.COR bit to determine whether to read or write ISR to clear - -From: Paul Walmsley <paul@pwsan.com> - -TWL4030 interrupt status register bits can be cleared in one of two ways: -either by reading from the register, or by writing a 1 to the -appropriate bit(s) in the register. This behavior can be altered at any -time by the <twlmodule>_SIH_CTRL.COR register bit ("clear-on-read"). - -The TWL4030 TRM is deeply confused as to whether COR=1 means that the -registers are cleared on reads, or cleared on writes. Peter De -Schrijver <peter.de-schrijver> confirms that COR=1 means that the registers -are cleared on read. - -So, for each TWL4030 SIH, check the value of the *_SIH_CTRL.COR bit, and if -it is 1, use reads to clear the ISRs; if it is 0, use writes. - -Also, use WARN_ON() to warn if the read/write failed, and don't skip -the rest of the initialization on failure either. - -Thanks to Peter for his help with this patch. - - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 183 ++++++++++++++++++++++---------------- - 1 files changed, 106 insertions(+), 77 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index 9d93524..eae0634 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -133,6 +133,16 @@ - /* on I2C-1 for 2430SDP */ - #define CONFIG_I2C_TWL4030_ID 1 - -+/* SIH_CTRL registers */ -+#define TWL4030_INT_PWR_SIH_CTRL 0x07 -+#define TWL4030_INTERRUPTS_BCISIHCTRL 0x0d -+#define TWL4030_MADC_MADC_SIH_CTRL 0x67 -+#define TWL4030_KEYPAD_KEYP_SIH_CTRL 0x17 -+#define TWL4030_GPIO_GPIO_SIH_CTRL 0x2d -+ -+#define TWL4030_SIH_CTRL_COR_MASK (1 << 2) -+ -+ - /* Helper functions */ - static int - twl4030_detect_client(struct i2c_adapter *adapter, unsigned char sid); -@@ -712,13 +722,61 @@ static int power_companion_init(void) - return e; - } - -+/** -+ * twl4030_i2c_clear_isr - clear TWL4030 SIH ISR regs via read + write -+ * @mod_no: TWL4030 module number -+ * @reg: register index to clear -+ * @cor: value of the <module>_SIH_CTRL.COR bit (1 or 0) -+ * -+ * Either reads (cor == 1) or writes (cor == 0) to a TWL4030 interrupt -+ * status register to ensure that any prior interrupts are cleared. -+ * Returns the status from the I2C read operation. -+ */ -+static int twl4030_i2c_clear_isr(u8 mod_no, u8 reg, u8 cor) -+{ -+ u8 tmp; -+ -+ return (cor) ? twl4030_i2c_read_u8(mod_no, &tmp, reg) : -+ twl4030_i2c_write_u8(mod_no, 0xff, reg); -+} -+ -+/** -+ * twl4030_read_cor_bit - are TWL module ISRs cleared by reads or writes? -+ * @mod_no: TWL4030 module number -+ * @reg: register index to clear -+ * -+ * Returns 1 if the TWL4030 SIH interrupt status registers (ISRs) for -+ * the specified TWL module are cleared by reads, or 0 if cleared by -+ * writes. -+ */ -+static int twl4030_read_cor_bit(u8 mod_no, u8 reg) -+{ -+ u8 tmp = 0; -+ -+ WARN_ON(twl4030_i2c_read_u8(mod_no, &tmp, reg) < 0); -+ -+ tmp &= TWL4030_SIH_CTRL_COR_MASK; -+ tmp >>= __ffs(TWL4030_SIH_CTRL_COR_MASK); -+ -+ return tmp; -+} -+ - static void twl_init_irq(void) - { - int i = 0; - int res = 0; -+ int cor; - char *msg = "Unable to register interrupt subsystem"; - unsigned int irq_num; - -+ /* -+ * For each TWL4030 module with ISR/IMR registers, mask all -+ * interrupts and then clear any existing interrupt status bits, -+ * since we initially do not have any TWL4030 module interrupt -+ * handlers present. -+ */ -+ -+ - /* PWR_IMR1 */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1); - if (res < 0) { -@@ -734,20 +792,18 @@ static void twl_init_irq(void) - } - - /* Clear off any other pending interrupts on power */ -+ -+ /* Are PWR interrupt status bits cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(TWL4030_MODULE_INT, -+ TWL4030_INT_PWR_SIH_CTRL); -+ WARN_ON(cor < 0); -+ - /* PWR_ISR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x00); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x00, cor) < 0); - - /* PWR_ISR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x02); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -- /* POWER HACK (END) */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x02, cor) < 0); -+ - /* Slave address 0x4A */ - - /* BCIIMR1A */ -@@ -778,33 +834,22 @@ static void twl_init_irq(void) - return; - } - -+ /* Are BCI interrupt status bits cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS, -+ TWL4030_INTERRUPTS_BCISIHCTRL); -+ WARN_ON(cor < 0); -+ - /* BCIISR1A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x0); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0, cor) < 0); - - /* BCIISR2A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x1); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x1, cor) < 0); - - /* BCIISR1B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x4); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x4, cor) < 0); - - /* BCIISR2B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x5); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x5, cor) < 0); - - /* MAD C */ - /* MADC_IMR1 */ -@@ -821,19 +866,16 @@ static void twl_init_irq(void) - return; - } - -+ /* Are MADC interrupt status bits cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC, -+ TWL4030_MADC_MADC_SIH_CTRL); -+ WARN_ON(cor < 0); -+ - /* MADC_ISR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x61); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61, cor) < 0); - - /* MADC_ISR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x63); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x63, cor) < 0); - - /* key Pad */ - /* KEYPAD - IMR1 */ -@@ -842,12 +884,15 @@ static void twl_init_irq(void) - pr_err("%s[%d][%d]\n", msg, res, __LINE__); - return; - } -- { -- u8 clear; -- /* Clear ISR */ -- twl4030_i2c_read_u8(TWL4030_MODULE_KEYPAD, &clear, 0x11); -- twl4030_i2c_read_u8(TWL4030_MODULE_KEYPAD, &clear, 0x11); -- } -+ -+ /* Are keypad interrupt status bits cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD, -+ TWL4030_KEYPAD_KEYP_SIH_CTRL); -+ WARN_ON(cor < 0); -+ -+ /* KEYPAD - ISR1 */ -+ /* XXX does this still need to be done twice for some reason? */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11, cor) < 0); - - /* KEYPAD - IMR2 */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14)); -@@ -856,6 +901,9 @@ static void twl_init_irq(void) - return; - } - -+ /* KEYPAD - ISR2 */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13, cor) < 0); -+ - /* Slave address 0x49 */ - /* GPIO_IMR1A */ - res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1C)); -@@ -899,47 +947,28 @@ static void twl_init_irq(void) - return; - } - -+ /* Are GPIO interrupt status bits cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO, -+ TWL4030_GPIO_GPIO_SIH_CTRL); -+ WARN_ON(cor < 0); -+ - /* GPIO_ISR1A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x19); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x19, cor) < 0); - - /* GPIO_ISR2A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1a); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1a, cor) < 0); - - /* GPIO_ISR3A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1b); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1b, cor) < 0); - - /* GPIO_ISR1B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1f); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1f, cor) < 0); - - /* GPIO_ISR2B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x20); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x20, cor) < 0); - - /* GPIO_ISR3B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x21); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x21, cor) < 0); - - /* install an irq handler for each of the PIH modules */ - for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) { diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch deleted file mode 100644 index 67b837c454..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch +++ /dev/null @@ -1,179 +0,0 @@ -TWL4030: change init-time IMR mask code to WARN if error - -From: Paul Walmsley <paul@pwsan.com> - -twl_init_irq() prints error messages and returns if any interrupt mask -register writes fail. Change this to generate a warning traceback and -to continue execution rather than skipping TWL init. (These mask -writes should not fail at all unless either the I2C bus or the TWL4030 -is somehow wedged.) - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 100 +++++++------------------------------- - 1 files changed, 18 insertions(+), 82 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index eae0634..99cc143 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -778,18 +778,10 @@ static void twl_init_irq(void) - - - /* PWR_IMR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x1); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x1) < 0); - - /* PWR_IMR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xFF, 0x3); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x3) < 0); - - /* Clear off any other pending interrupts on power */ - -@@ -807,32 +799,16 @@ static void twl_init_irq(void) - /* Slave address 0x4A */ - - /* BCIIMR1A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x2); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x2) < 0); - -- /* BCIIMR2A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x3); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ /* BCIIMR2A */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x3) < 0); - -- /* BCIIMR1B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x6); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ /* BCIIMR2A */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x6) < 0); - - /* BCIIMR2B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xFF, 0x7); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x7) < 0); - - /* Are BCI interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS, -@@ -853,18 +829,10 @@ static void twl_init_irq(void) - - /* MAD C */ - /* MADC_IMR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x62); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x62) < 0); - - /* MADC_IMR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xFF, 0x64); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x64) < 0); - - /* Are MADC interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC, -@@ -879,11 +847,7 @@ static void twl_init_irq(void) - - /* key Pad */ - /* KEYPAD - IMR1 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x12)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x12) < 0); - - /* Are keypad interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD, -@@ -895,57 +859,29 @@ static void twl_init_irq(void) - WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11, cor) < 0); - - /* KEYPAD - IMR2 */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xFF, (0x14)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x14) < 0); - - /* KEYPAD - ISR2 */ - WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13, cor) < 0); - - /* Slave address 0x49 */ - /* GPIO_IMR1A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1C)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1c) < 0); - - /* GPIO_IMR2A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1D)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1d) < 0); - - /* GPIO_IMR3A */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x1E)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1e) < 0); - - /* GPIO_IMR1B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x22)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x22) < 0); - - /* GPIO_IMR2B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x23)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x23) < 0); - - /* GPIO_IMR3B */ -- res = twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xFF, (0x24)); -- if (res < 0) { -- pr_err("%s[%d][%d]\n", msg, res, __LINE__); -- return; -- } -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x24) < 0); - - /* Are GPIO interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO, diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch deleted file mode 100644 index 8e4c4d6be4..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch +++ /dev/null @@ -1,274 +0,0 @@ -TWL4030: move TWL module register defs into separate include files - -From: Paul Walmsley <paul@pwsan.com> - -twl_init_irq() uses "magic numbers" to access TWL module IMR and ISR -registers. Symbolic constants are definitely preferred. - -Rather than duplicating already existing symbolic constants in -twl4030-gpio.c and twl4030-pwrirq.c, move the existing constants out -into include files. This patch should not change kernel behavior. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-gpio.c | 48 ----------------------- - drivers/i2c/chips/twl4030-pwrirq.c | 15 +++---- - include/linux/i2c/twl4030-gpio.h | 76 ++++++++++++++++++++++++++++++++++++ - include/linux/i2c/twl4030-pwrirq.h | 37 ++++++++++++++++++ - 4 files changed, 121 insertions(+), 55 deletions(-) - create mode 100644 include/linux/i2c/twl4030-gpio.h - create mode 100644 include/linux/i2c/twl4030-pwrirq.h - -diff --git a/drivers/i2c/chips/twl4030-gpio.c b/drivers/i2c/chips/twl4030-gpio.c -index f16a48b..9d17f45 100644 ---- a/drivers/i2c/chips/twl4030-gpio.c -+++ b/drivers/i2c/chips/twl4030-gpio.c -@@ -38,6 +38,7 @@ - - #include <linux/i2c.h> - #include <linux/i2c/twl4030.h> -+#include <linux/i2c/twl4030-gpio.h> - #include <linux/slab.h> - - #include <asm/arch/irqs.h> -@@ -47,53 +48,6 @@ - - #include <linux/device.h> - --/* -- * GPIO Block Register definitions -- */ -- --#define REG_GPIODATAIN1 0x0 --#define REG_GPIODATAIN2 0x1 --#define REG_GPIODATAIN3 0x2 --#define REG_GPIODATADIR1 0x3 --#define REG_GPIODATADIR2 0x4 --#define REG_GPIODATADIR3 0x5 --#define REG_GPIODATAOUT1 0x6 --#define REG_GPIODATAOUT2 0x7 --#define REG_GPIODATAOUT3 0x8 --#define REG_CLEARGPIODATAOUT1 0x9 --#define REG_CLEARGPIODATAOUT2 0xA --#define REG_CLEARGPIODATAOUT3 0xB --#define REG_SETGPIODATAOUT1 0xC --#define REG_SETGPIODATAOUT2 0xD --#define REG_SETGPIODATAOUT3 0xE --#define REG_GPIO_DEBEN1 0xF --#define REG_GPIO_DEBEN2 0x10 --#define REG_GPIO_DEBEN3 0x11 --#define REG_GPIO_CTRL 0x12 --#define REG_GPIOPUPDCTR1 0x13 --#define REG_GPIOPUPDCTR2 0x14 --#define REG_GPIOPUPDCTR3 0x15 --#define REG_GPIOPUPDCTR4 0x16 --#define REG_GPIOPUPDCTR5 0x17 --#define REG_GPIO_ISR1A 0x19 --#define REG_GPIO_ISR2A 0x1A --#define REG_GPIO_ISR3A 0x1B --#define REG_GPIO_IMR1A 0x1C --#define REG_GPIO_IMR2A 0x1D --#define REG_GPIO_IMR3A 0x1E --#define REG_GPIO_ISR1B 0x1F --#define REG_GPIO_ISR2B 0x20 --#define REG_GPIO_ISR3B 0x21 --#define REG_GPIO_IMR1B 0x22 --#define REG_GPIO_IMR2B 0x23 --#define REG_GPIO_IMR3B 0x24 --#define REG_GPIO_EDR1 0x28 --#define REG_GPIO_EDR2 0x29 --#define REG_GPIO_EDR3 0x2A --#define REG_GPIO_EDR4 0x2B --#define REG_GPIO_EDR5 0x2C --#define REG_GPIO_SIH_CTRL 0x2D -- - /* BitField Definitions */ - - /* Data banks : 3 banks for 8 gpios each */ -diff --git a/drivers/i2c/chips/twl4030-pwrirq.c b/drivers/i2c/chips/twl4030-pwrirq.c -index a4d2e92..1afdb65 100644 ---- a/drivers/i2c/chips/twl4030-pwrirq.c -+++ b/drivers/i2c/chips/twl4030-pwrirq.c -@@ -27,10 +27,8 @@ - #include <linux/random.h> - #include <linux/kthread.h> - #include <linux/i2c/twl4030.h> -+#include <linux/i2c/twl4030-pwrirq.h> - --#define PWR_ISR1 0 --#define PWR_IMR1 1 --#define PWR_SIH_CTRL 7 - #define PWR_SIH_CTRL_COR (1<<2) - - static u8 twl4030_pwrirq_mask; -@@ -93,7 +91,8 @@ static void do_twl4030_pwrmodule_irq(unsigned int irq, irq_desc_t *desc) - twl4030_pwrirq_mask |= 1 << (irq - TWL4030_PWR_IRQ_BASE); - local_irq_enable(); - twl4030_i2c_write_u8(TWL4030_MODULE_INT, -- twl4030_pwrirq_mask, PWR_IMR1); -+ twl4030_pwrirq_mask, -+ TWL4030_INT_PWR_IMR1); - } - } - } -@@ -115,7 +114,7 @@ static void do_twl4030_pwrirq(unsigned int irq, irq_desc_t *desc) - - local_irq_enable(); - ret = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &pwr_isr, -- PWR_ISR1); -+ TWL4030_INT_PWR_ISR1); - if (ret) { - printk(KERN_WARNING - "I2C error %d while reading TWL4030" -@@ -151,7 +150,7 @@ static int twl4030_pwrirq_thread(void *data) - twl4030_pwrirq_mask &= ~local_unmask; - - twl4030_i2c_write_u8(TWL4030_MODULE_INT, twl4030_pwrirq_mask, -- PWR_IMR1); -+ TWL4030_INT_PWR_IMR1); - - local_irq_disable(); - if (!twl4030_pwrirq_pending_unmask) -@@ -172,14 +171,14 @@ static int __init twl4030_pwrirq_init(void) - twl4030_pwrirq_pending_unmask = 0; - - err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, twl4030_pwrirq_mask, -- PWR_IMR1); -+ TWL4030_INT_PWR_IMR1); - if (err) - return err; - - /* Enable clear on read */ - - err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, PWR_SIH_CTRL_COR, -- PWR_SIH_CTRL); -+ TWL4030_INT_PWR_SIH_CTRL); - if (err) - return err; - -diff --git a/include/linux/i2c/twl4030-gpio.h b/include/linux/i2c/twl4030-gpio.h -new file mode 100644 -index 0000000..7cbf610 ---- /dev/null -+++ b/include/linux/i2c/twl4030-gpio.h -@@ -0,0 +1,76 @@ -+/* -+ * twl4030-gpio.h - header for TWL4030 GPIO module -+ * -+ * Copyright (C) 2005-2006, 2008 Texas Instruments, Inc. -+ * Copyright (C) 2008 Nokia Corporation -+ * -+ * Based on tlv320aic23.c: -+ * Copyright (c) by Kai Svahn <kai.svahn@nokia.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 -+ * -+ */ -+ -+#ifndef __TWL4030_GPIO_H_ -+#define __TWL4030_GPIO_H_ -+ -+/* -+ * GPIO Block Register definitions -+ */ -+ -+#define REG_GPIODATAIN1 0x0 -+#define REG_GPIODATAIN2 0x1 -+#define REG_GPIODATAIN3 0x2 -+#define REG_GPIODATADIR1 0x3 -+#define REG_GPIODATADIR2 0x4 -+#define REG_GPIODATADIR3 0x5 -+#define REG_GPIODATAOUT1 0x6 -+#define REG_GPIODATAOUT2 0x7 -+#define REG_GPIODATAOUT3 0x8 -+#define REG_CLEARGPIODATAOUT1 0x9 -+#define REG_CLEARGPIODATAOUT2 0xA -+#define REG_CLEARGPIODATAOUT3 0xB -+#define REG_SETGPIODATAOUT1 0xC -+#define REG_SETGPIODATAOUT2 0xD -+#define REG_SETGPIODATAOUT3 0xE -+#define REG_GPIO_DEBEN1 0xF -+#define REG_GPIO_DEBEN2 0x10 -+#define REG_GPIO_DEBEN3 0x11 -+#define REG_GPIO_CTRL 0x12 -+#define REG_GPIOPUPDCTR1 0x13 -+#define REG_GPIOPUPDCTR2 0x14 -+#define REG_GPIOPUPDCTR3 0x15 -+#define REG_GPIOPUPDCTR4 0x16 -+#define REG_GPIOPUPDCTR5 0x17 -+#define REG_GPIO_ISR1A 0x19 -+#define REG_GPIO_ISR2A 0x1A -+#define REG_GPIO_ISR3A 0x1B -+#define REG_GPIO_IMR1A 0x1C -+#define REG_GPIO_IMR2A 0x1D -+#define REG_GPIO_IMR3A 0x1E -+#define REG_GPIO_ISR1B 0x1F -+#define REG_GPIO_ISR2B 0x20 -+#define REG_GPIO_ISR3B 0x21 -+#define REG_GPIO_IMR1B 0x22 -+#define REG_GPIO_IMR2B 0x23 -+#define REG_GPIO_IMR3B 0x24 -+#define REG_GPIO_EDR1 0x28 -+#define REG_GPIO_EDR2 0x29 -+#define REG_GPIO_EDR3 0x2A -+#define REG_GPIO_EDR4 0x2B -+#define REG_GPIO_EDR5 0x2C -+#define REG_GPIO_SIH_CTRL 0x2D -+ -+#endif /* End of __TWL4030_GPIO_H */ -diff --git a/include/linux/i2c/twl4030-pwrirq.h b/include/linux/i2c/twl4030-pwrirq.h -new file mode 100644 -index 0000000..7a13368 ---- /dev/null -+++ b/include/linux/i2c/twl4030-pwrirq.h -@@ -0,0 +1,37 @@ -+/* -+ * twl4030-gpio.h - header for TWL4030 GPIO module -+ * -+ * Copyright (C) 2008 Texas Instruments, Inc. -+ * Copyright (C) 2008 Nokia Corporation -+ * -+ * 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 -+ * -+ */ -+ -+#ifndef __TWL4030_PWRIRQ_H_ -+#define __TWL4030_PWRIRQ_H_ -+ -+/* -+ * INT Module Register definitions -+ * (not all registers are defined below) -+ */ -+ -+#define TWL4030_INT_PWR_ISR1 0x0 -+#define TWL4030_INT_PWR_IMR1 0x1 -+#define TWL4030_INT_PWR_ISR2 0x2 -+#define TWL4030_INT_PWR_IMR2 0x3 -+#define TWL4030_INT_PWR_SIH_CTRL 0x7 -+ -+#endif /* End of __TWL4030_PWRIRQ_H */ diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch deleted file mode 100644 index 9af25a762d..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch +++ /dev/null @@ -1,278 +0,0 @@ -TWL4030: use symbolic ISR/IMR register names during twl_init_irq() - -From: Paul Walmsley <paul@pwsan.com> - -twl_init_irq() uses a bunch of magic numbers as register indices; this -has already led to several errors, fixed earlier in this patch series. -Now use descriptive macros instead of magic numbers. This patch should -not change kernel behavior. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 188 +++++++++++++++++++------------------- - 1 files changed, 96 insertions(+), 92 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index 99cc143..38c227a 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -40,6 +40,9 @@ - - #include <linux/i2c.h> - #include <linux/i2c/twl4030.h> -+#include <linux/i2c/twl4030-gpio.h> -+#include <linux/i2c/twl4030-madc.h> -+#include <linux/i2c/twl4030-pwrirq.h> - #include <linux/slab.h> - #include <linux/clk.h> - #include <linux/device.h> -@@ -114,6 +117,23 @@ - #define TWL4030_BASEADD_RTC 0x001C - #define TWL4030_BASEADD_SECURED_REG 0x0000 - -+/* TWL4030 BCI registers */ -+#define TWL4030_INTERRUPTS_BCIIMR1A 0x2 -+#define TWL4030_INTERRUPTS_BCIIMR2A 0x3 -+#define TWL4030_INTERRUPTS_BCIIMR1B 0x6 -+#define TWL4030_INTERRUPTS_BCIIMR2B 0x7 -+#define TWL4030_INTERRUPTS_BCIISR1A 0x0 -+#define TWL4030_INTERRUPTS_BCIISR2A 0x1 -+#define TWL4030_INTERRUPTS_BCIISR1B 0x4 -+#define TWL4030_INTERRUPTS_BCIISR2B 0x5 -+ -+/* TWL4030 keypad registers */ -+#define TWL4030_KEYPAD_KEYP_IMR1 0x12 -+#define TWL4030_KEYPAD_KEYP_IMR2 0x14 -+#define TWL4030_KEYPAD_KEYP_ISR1 0x11 -+#define TWL4030_KEYPAD_KEYP_ISR2 0x13 -+ -+ - /* Triton Core internal information (END) */ - - /* Few power values */ -@@ -133,12 +153,10 @@ - /* on I2C-1 for 2430SDP */ - #define CONFIG_I2C_TWL4030_ID 1 - --/* SIH_CTRL registers */ --#define TWL4030_INT_PWR_SIH_CTRL 0x07 -+/* SIH_CTRL registers that aren't defined elsewhere */ - #define TWL4030_INTERRUPTS_BCISIHCTRL 0x0d - #define TWL4030_MADC_MADC_SIH_CTRL 0x67 - #define TWL4030_KEYPAD_KEYP_SIH_CTRL 0x17 --#define TWL4030_GPIO_GPIO_SIH_CTRL 0x2d - - #define TWL4030_SIH_CTRL_COR_MASK (1 << 2) - -@@ -776,135 +794,121 @@ static void twl_init_irq(void) - * handlers present. - */ - -- -- /* PWR_IMR1 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x1) < 0); -- -- /* PWR_IMR2 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, 0x3) < 0); -- -- /* Clear off any other pending interrupts on power */ -+ /* Mask INT (PWR) interrupts at TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, -+ TWL4030_INT_PWR_IMR1) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, -+ TWL4030_INT_PWR_IMR2) < 0); - - /* Are PWR interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_INT, - TWL4030_INT_PWR_SIH_CTRL); - WARN_ON(cor < 0); - -- /* PWR_ISR1 */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x00, cor) < 0); -- -- /* PWR_ISR2 */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, 0x02, cor) < 0); -+ /* Clear TWL4030 INT (PWR) ISRs */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, -+ TWL4030_INT_PWR_ISR1, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, -+ TWL4030_INT_PWR_ISR2, cor) < 0); - - /* Slave address 0x4A */ - -- /* BCIIMR1A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x2) < 0); -- -- /* BCIIMR2A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x3) < 0); -- -- /* BCIIMR2A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x6) < 0); -- -- /* BCIIMR2B */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, 0x7) < 0); -+ /* Mask BCI interrupts at TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -+ TWL4030_INTERRUPTS_BCIIMR1A) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -+ TWL4030_INTERRUPTS_BCIIMR2A) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -+ TWL4030_INTERRUPTS_BCIIMR1B) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -+ TWL4030_INTERRUPTS_BCIIMR2B) < 0); - - /* Are BCI interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS, - TWL4030_INTERRUPTS_BCISIHCTRL); - WARN_ON(cor < 0); - -- /* BCIISR1A */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x0, cor) < 0); -- -- /* BCIISR2A */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x1, cor) < 0); -- -- /* BCIISR1B */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x4, cor) < 0); -- -- /* BCIISR2B */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, 0x5, cor) < 0); -+ /* Clear TWL4030 BCI ISRs */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -+ TWL4030_INTERRUPTS_BCIISR1A, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -+ TWL4030_INTERRUPTS_BCIISR2A, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -+ TWL4030_INTERRUPTS_BCIISR1B, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -+ TWL4030_INTERRUPTS_BCIISR2B, cor) < 0); - - /* MAD C */ -- /* MADC_IMR1 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x62) < 0); -- -- /* MADC_IMR2 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, 0x64) < 0); -+ /* Mask MADC interrupts at TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, -+ TWL4030_MADC_IMR1) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, -+ TWL4030_MADC_IMR2) < 0); - - /* Are MADC interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC, - TWL4030_MADC_MADC_SIH_CTRL); - WARN_ON(cor < 0); - -- /* MADC_ISR1 */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x61, cor) < 0); -- -- /* MADC_ISR2 */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, 0x63, cor) < 0); -+ /* Clear TWL4030 MADC ISRs */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, -+ TWL4030_MADC_ISR1, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, -+ TWL4030_MADC_ISR2, cor) < 0); - - /* key Pad */ -- /* KEYPAD - IMR1 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x12) < 0); -+ /* Mask keypad interrupts at TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, -+ TWL4030_KEYPAD_KEYP_IMR1) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, -+ TWL4030_KEYPAD_KEYP_IMR2) < 0); - - /* Are keypad interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD, - TWL4030_KEYPAD_KEYP_SIH_CTRL); - WARN_ON(cor < 0); - -- /* KEYPAD - ISR1 */ -+ /* Clear TWL4030 keypad ISRs */ - /* XXX does this still need to be done twice for some reason? */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x11, cor) < 0); -- -- /* KEYPAD - IMR2 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, 0x14) < 0); -- -- /* KEYPAD - ISR2 */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, 0x13, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, -+ TWL4030_KEYPAD_KEYP_ISR1, cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, -+ TWL4030_KEYPAD_KEYP_ISR2, cor) < 0); - - /* Slave address 0x49 */ -- /* GPIO_IMR1A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1c) < 0); -- -- /* GPIO_IMR2A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1d) < 0); -- -- /* GPIO_IMR3A */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x1e) < 0); -- -- /* GPIO_IMR1B */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x22) < 0); - -- /* GPIO_IMR2B */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x23) < 0); -- -- /* GPIO_IMR3B */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, 0x24) < 0); -+ /* Mask GPIO interrupts at TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR1A) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR2A) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR3A) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR1B) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR2B) < 0); -+ WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -+ REG_GPIO_IMR3B) < 0); - - /* Are GPIO interrupt status bits cleared by reads or writes? */ - cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO, -- TWL4030_GPIO_GPIO_SIH_CTRL); -+ REG_GPIO_SIH_CTRL); - WARN_ON(cor < 0); - -- /* GPIO_ISR1A */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x19, cor) < 0); -- -- /* GPIO_ISR2A */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1a, cor) < 0); -- -- /* GPIO_ISR3A */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1b, cor) < 0); -- -- /* GPIO_ISR1B */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x1f, cor) < 0); -- -- /* GPIO_ISR2B */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x20, cor) < 0); -- -- /* GPIO_ISR3B */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, 0x21, cor) < 0); -+ /* Clear TWL4030 GPIO ISRs */ -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR1A, -+ cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR2A, -+ cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR3A, -+ cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR1B, -+ cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR2B, -+ cor) < 0); -+ WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR3B, -+ cor) < 0); - - /* install an irq handler for each of the PIH modules */ - for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) { diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch deleted file mode 100644 index ab6cc6d87b..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch +++ /dev/null @@ -1,341 +0,0 @@ -TWL4030: convert early interrupt mask/clear funcs to use array - -From: Paul Walmsley <paul@pwsan.com> - -Mask/clear TWL module IMRs/ISRs by iterating through arrays rather than -using a block of cut-and-pasted commands. Removes 1056 bytes of bloat. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/chips/twl4030-core.c | 302 +++++++++++++++++++++++--------------- - 1 files changed, 180 insertions(+), 122 deletions(-) - -diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c -index 38c227a..776b1dd 100644 ---- a/drivers/i2c/chips/twl4030-core.c -+++ b/drivers/i2c/chips/twl4030-core.c -@@ -160,6 +160,136 @@ - - #define TWL4030_SIH_CTRL_COR_MASK (1 << 2) - -+/** -+ * struct twl4030_mod_iregs - TWL module IMR/ISR regs to mask/clear at init -+ * @mod_no: TWL4030 module number (e.g., TWL4030_MODULE_GPIO) -+ * @sih_ctrl: address of module SIH_CTRL register -+ * @reg_cnt: number of IMR/ISR regs -+ * @imrs: pointer to array of TWL module interrupt mask register indices -+ * @isrs: pointer to array of TWL module interrupt status register indices -+ * -+ * Ties together TWL4030 modules and lists of IMR/ISR registers to mask/clear -+ * during twl_init_irq(). -+ */ -+struct twl4030_mod_iregs { -+ const u8 mod_no; -+ const u8 sih_ctrl; -+ const u8 reg_cnt; -+ const u8 *imrs; -+ const u8 *isrs; -+}; -+ -+/* TWL4030 INT module interrupt mask registers */ -+static const u8 __initconst twl4030_int_imr_regs[] = { -+ TWL4030_INT_PWR_IMR1, -+ TWL4030_INT_PWR_IMR2, -+}; -+ -+/* TWL4030 INT module interrupt status registers */ -+static const u8 __initconst twl4030_int_isr_regs[] = { -+ TWL4030_INT_PWR_ISR1, -+ TWL4030_INT_PWR_ISR2, -+}; -+ -+/* TWL4030 INTERRUPTS module interrupt mask registers */ -+static const u8 __initconst twl4030_interrupts_imr_regs[] = { -+ TWL4030_INTERRUPTS_BCIIMR1A, -+ TWL4030_INTERRUPTS_BCIIMR1B, -+ TWL4030_INTERRUPTS_BCIIMR2A, -+ TWL4030_INTERRUPTS_BCIIMR2B, -+}; -+ -+/* TWL4030 INTERRUPTS module interrupt status registers */ -+static const u8 __initconst twl4030_interrupts_isr_regs[] = { -+ TWL4030_INTERRUPTS_BCIISR1A, -+ TWL4030_INTERRUPTS_BCIISR1B, -+ TWL4030_INTERRUPTS_BCIISR2A, -+ TWL4030_INTERRUPTS_BCIISR2B, -+}; -+ -+/* TWL4030 MADC module interrupt mask registers */ -+static const u8 __initconst twl4030_madc_imr_regs[] = { -+ TWL4030_MADC_IMR1, -+ TWL4030_MADC_IMR2, -+}; -+ -+/* TWL4030 MADC module interrupt status registers */ -+static const u8 __initconst twl4030_madc_isr_regs[] = { -+ TWL4030_MADC_ISR1, -+ TWL4030_MADC_ISR2, -+}; -+ -+/* TWL4030 keypad module interrupt mask registers */ -+static const u8 __initconst twl4030_keypad_imr_regs[] = { -+ TWL4030_KEYPAD_KEYP_IMR1, -+ TWL4030_KEYPAD_KEYP_IMR2, -+}; -+ -+/* TWL4030 keypad module interrupt status registers */ -+static const u8 __initconst twl4030_keypad_isr_regs[] = { -+ TWL4030_KEYPAD_KEYP_ISR1, -+ TWL4030_KEYPAD_KEYP_ISR2, -+}; -+ -+/* TWL4030 GPIO module interrupt mask registers */ -+static const u8 __initconst twl4030_gpio_imr_regs[] = { -+ REG_GPIO_IMR1A, -+ REG_GPIO_IMR1B, -+ REG_GPIO_IMR2A, -+ REG_GPIO_IMR2B, -+ REG_GPIO_IMR3A, -+ REG_GPIO_IMR3B, -+}; -+ -+/* TWL4030 GPIO module interrupt status registers */ -+static const u8 __initconst twl4030_gpio_isr_regs[] = { -+ REG_GPIO_ISR1A, -+ REG_GPIO_ISR1B, -+ REG_GPIO_ISR2A, -+ REG_GPIO_ISR2B, -+ REG_GPIO_ISR3A, -+ REG_GPIO_ISR3B, -+}; -+ -+/* TWL4030 modules that have IMR/ISR registers that must be masked/cleared */ -+static const struct twl4030_mod_iregs __initconst twl4030_mod_regs[] = { -+ { -+ .mod_no = TWL4030_MODULE_INT, -+ .sih_ctrl = TWL4030_INT_PWR_SIH_CTRL, -+ .reg_cnt = ARRAY_SIZE(twl4030_int_imr_regs), -+ .imrs = twl4030_int_imr_regs, -+ .isrs = twl4030_int_isr_regs, -+ }, -+ { -+ .mod_no = TWL4030_MODULE_INTERRUPTS, -+ .sih_ctrl = TWL4030_INTERRUPTS_BCISIHCTRL, -+ .reg_cnt = ARRAY_SIZE(twl4030_interrupts_imr_regs), -+ .imrs = twl4030_interrupts_imr_regs, -+ .isrs = twl4030_interrupts_isr_regs, -+ }, -+ { -+ .mod_no = TWL4030_MODULE_MADC, -+ .sih_ctrl = TWL4030_MADC_MADC_SIH_CTRL, -+ .reg_cnt = ARRAY_SIZE(twl4030_madc_imr_regs), -+ .imrs = twl4030_madc_imr_regs, -+ .isrs = twl4030_madc_isr_regs, -+ }, -+ { -+ .mod_no = TWL4030_MODULE_KEYPAD, -+ .sih_ctrl = TWL4030_KEYPAD_KEYP_SIH_CTRL, -+ .reg_cnt = ARRAY_SIZE(twl4030_keypad_imr_regs), -+ .imrs = twl4030_keypad_imr_regs, -+ .isrs = twl4030_keypad_isr_regs, -+ }, -+ { -+ .mod_no = TWL4030_MODULE_GPIO, -+ .sih_ctrl = REG_GPIO_SIH_CTRL, -+ .reg_cnt = ARRAY_SIZE(twl4030_gpio_imr_regs), -+ .imrs = twl4030_gpio_imr_regs, -+ .isrs = twl4030_gpio_isr_regs, -+ }, -+}; -+ - - /* Helper functions */ - static int -@@ -779,136 +909,64 @@ static int twl4030_read_cor_bit(u8 mod_no, u8 reg) - return tmp; - } - -+/** -+ * twl4030_mask_clear_intrs - mask and clear all TWL4030 interrupts -+ * @t: pointer to twl4030_mod_iregs array -+ * @t_sz: ARRAY_SIZE(t) (starting at 1) -+ * -+ * Mask all TWL4030 interrupt mask registers (IMRs) and clear all -+ * interrupt status registers (ISRs). No return value, but will WARN if -+ * any I2C operations fail. -+ */ -+static void __init twl4030_mask_clear_intrs(const struct twl4030_mod_iregs *t, -+ const u8 t_sz) -+{ -+ int i, j; -+ -+ /* -+ * N.B. - further efficiency is possible here. Eight I2C -+ * operations on BCI and GPIO modules are avoidable if I2C -+ * burst read/write transactions were implemented. Would -+ * probably save about 1ms of boot time and a small amount of -+ * power. -+ */ -+ for (i = 0; i < t_sz; i++) { -+ const struct twl4030_mod_iregs tmr = t[i]; -+ -+ for (j = 0; j < tmr.reg_cnt; j++) { -+ int cor; -+ -+ /* Mask interrupts at the TWL4030 */ -+ WARN_ON(twl4030_i2c_write_u8(tmr.mod_no, 0xff, -+ tmr.imrs[j]) < 0); -+ -+ /* Are ISRs cleared by reads or writes? */ -+ cor = twl4030_read_cor_bit(tmr.mod_no, tmr.sih_ctrl); -+ WARN_ON(cor < 0); -+ -+ /* Clear TWL4030 ISRs */ -+ WARN_ON(twl4030_i2c_clear_isr(tmr.mod_no, -+ tmr.isrs[j], cor) < 0); -+ } -+ } -+ -+ return; -+} -+ -+ - static void twl_init_irq(void) - { -- int i = 0; -+ int i; - int res = 0; -- int cor; - char *msg = "Unable to register interrupt subsystem"; - unsigned int irq_num; - - /* -- * For each TWL4030 module with ISR/IMR registers, mask all -- * interrupts and then clear any existing interrupt status bits, -- * since we initially do not have any TWL4030 module interrupt -- * handlers present. -+ * Mask and clear all TWL4030 interrupts since initially we do -+ * not have any TWL4030 module interrupt handlers present - */ -- -- /* Mask INT (PWR) interrupts at TWL4030 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, -- TWL4030_INT_PWR_IMR1) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INT, 0xff, -- TWL4030_INT_PWR_IMR2) < 0); -- -- /* Are PWR interrupt status bits cleared by reads or writes? */ -- cor = twl4030_read_cor_bit(TWL4030_MODULE_INT, -- TWL4030_INT_PWR_SIH_CTRL); -- WARN_ON(cor < 0); -- -- /* Clear TWL4030 INT (PWR) ISRs */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, -- TWL4030_INT_PWR_ISR1, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INT, -- TWL4030_INT_PWR_ISR2, cor) < 0); -- -- /* Slave address 0x4A */ -- -- /* Mask BCI interrupts at TWL4030 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -- TWL4030_INTERRUPTS_BCIIMR1A) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -- TWL4030_INTERRUPTS_BCIIMR2A) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -- TWL4030_INTERRUPTS_BCIIMR1B) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, -- TWL4030_INTERRUPTS_BCIIMR2B) < 0); -- -- /* Are BCI interrupt status bits cleared by reads or writes? */ -- cor = twl4030_read_cor_bit(TWL4030_MODULE_INTERRUPTS, -- TWL4030_INTERRUPTS_BCISIHCTRL); -- WARN_ON(cor < 0); -- -- /* Clear TWL4030 BCI ISRs */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -- TWL4030_INTERRUPTS_BCIISR1A, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -- TWL4030_INTERRUPTS_BCIISR2A, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -- TWL4030_INTERRUPTS_BCIISR1B, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_INTERRUPTS, -- TWL4030_INTERRUPTS_BCIISR2B, cor) < 0); -- -- /* MAD C */ -- /* Mask MADC interrupts at TWL4030 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, -- TWL4030_MADC_IMR1) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_MADC, 0xff, -- TWL4030_MADC_IMR2) < 0); -- -- /* Are MADC interrupt status bits cleared by reads or writes? */ -- cor = twl4030_read_cor_bit(TWL4030_MODULE_MADC, -- TWL4030_MADC_MADC_SIH_CTRL); -- WARN_ON(cor < 0); -- -- /* Clear TWL4030 MADC ISRs */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, -- TWL4030_MADC_ISR1, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_MADC, -- TWL4030_MADC_ISR2, cor) < 0); -- -- /* key Pad */ -- /* Mask keypad interrupts at TWL4030 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, -- TWL4030_KEYPAD_KEYP_IMR1) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_KEYPAD, 0xff, -- TWL4030_KEYPAD_KEYP_IMR2) < 0); -- -- /* Are keypad interrupt status bits cleared by reads or writes? */ -- cor = twl4030_read_cor_bit(TWL4030_MODULE_KEYPAD, -- TWL4030_KEYPAD_KEYP_SIH_CTRL); -- WARN_ON(cor < 0); -- -- /* Clear TWL4030 keypad ISRs */ -- /* XXX does this still need to be done twice for some reason? */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, -- TWL4030_KEYPAD_KEYP_ISR1, cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_KEYPAD, -- TWL4030_KEYPAD_KEYP_ISR2, cor) < 0); -- -- /* Slave address 0x49 */ -- -- /* Mask GPIO interrupts at TWL4030 */ -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR1A) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR2A) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR3A) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR1B) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR2B) < 0); -- WARN_ON(twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0xff, -- REG_GPIO_IMR3B) < 0); -- -- /* Are GPIO interrupt status bits cleared by reads or writes? */ -- cor = twl4030_read_cor_bit(TWL4030_MODULE_GPIO, -- REG_GPIO_SIH_CTRL); -- WARN_ON(cor < 0); -- -- /* Clear TWL4030 GPIO ISRs */ -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR1A, -- cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR2A, -- cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR3A, -- cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR1B, -- cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR2B, -- cor) < 0); -- WARN_ON(twl4030_i2c_clear_isr(TWL4030_MODULE_GPIO, REG_GPIO_ISR3B, -- cor) < 0); -+ twl4030_mask_clear_intrs(twl4030_mod_regs, -+ ARRAY_SIZE(twl4030_mod_regs)); - - /* install an irq handler for each of the PIH modules */ - for (i = TWL4030_IRQ_BASE; i < TWL4030_IRQ_END; i++) { diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 0adc452746..d01d473ed5 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Wed Jul 30 14:28:15 2008 +# Tue Aug 5 20:34:54 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -187,9 +187,8 @@ CONFIG_OMAP_BOOT_REASON=y CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MMU_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set -# CONFIG_OMAP_MPU_TIMER is not set -CONFIG_OMAP_32K_TIMER=y -CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set @@ -256,7 +255,7 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set -CONFIG_HZ=128 +CONFIG_HZ=100 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set @@ -859,6 +858,7 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y +# CONFIG_I2C2_OMAP_BEAGLE is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set diff --git a/packages/linux/linux-omap2-git/beagleboard/flash.patch b/packages/linux/linux-omap2-git/beagleboard/flash.patch deleted file mode 100644 index 4c76cd97bd..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/flash.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index 13d0043..d582b8f 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -44,7 +44,8 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ - board-omap3evm-flash.o - obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ - usb-musb.o usb-ehci.o \ -- hsmmc.o -+ hsmmc.o \ -+ board-omap3beagle-flash.o - obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ - hsmmc.o \ - usb-musb.o -diff --git a/arch/arm/mach-omap2/board-omap3beagle-flash.c b/arch/arm/mach-omap2/board-omap3beagle-flash.c -new file mode 100644 -index 0000000..5346df0 ---- /dev/null -+++ b/arch/arm/mach-omap2/board-omap3beagle-flash.c -@@ -0,0 +1,119 @@ -+/* -+ * board-omap3beagle-flash.c -+ * -+ * Copyright (c) 2008 Texas Instruments -+ * -+ * Modified from board-omap3evm-flash.c -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+#include <linux/mtd/nand.h> -+#include <linux/types.h> -+#include <linux/io.h> -+ -+#include <asm/mach/flash.h> -+#include <asm/arch/board.h> -+#include <asm/arch/gpmc.h> -+#include <asm/arch/nand.h> -+ -+#define GPMC_CS0_BASE 0x60 -+#define GPMC_CS_SIZE 0x30 -+ -+static struct mtd_partition omap3beagle_nand_partitions[] = { -+ /* All the partition sizes are listed in terms of NAND block size */ -+ { -+ .name = "X-Loader", -+ .offset = 0, -+ .size = 4*(64 * 2048), -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ { -+ .name = "U-Boot", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ -+ .size = 15*(64 * 2048), -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ { -+ .name = "U-Boot Env", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */ -+ .size = 1*(64 * 2048), -+ }, -+ { -+ .name = "Kernel", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ -+ .size = 32*(64 * 2048), -+ }, -+ { -+ .name = "File System", -+ .offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */ -+ .size = MTDPART_SIZ_FULL, -+ }, -+}; -+ -+static struct omap_nand_platform_data omap3beagle_nand_data = { -+ .parts = omap3beagle_nand_partitions, -+ .nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions), -+ .dma_channel = -1, /* disable DMA in OMAP NAND driver */ -+ .nand_setup = NULL, -+ .dev_ready = NULL, -+}; -+ -+static struct resource omap3beagle_nand_resource = { -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device omap3beagle_nand_device = { -+ .name = "omap2-nand", -+ .id = -1, -+ .dev = { -+ .platform_data = &omap3beagle_nand_data, -+ }, -+ .num_resources = 1, -+ .resource = &omap3beagle_nand_resource, -+}; -+ -+ -+void __init omap3beagle_flash_init(void) -+{ -+ u8 cs = 0; -+ u8 nandcs = GPMC_CS_NUM + 1; -+ -+ u32 gpmc_base_add = OMAP34XX_GPMC_VIRT; -+ -+ /* find out the chip-select on which NAND exists */ -+ while (cs < GPMC_CS_NUM) { -+ u32 ret = 0; -+ ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1); -+ -+ if ((ret & 0xC00) == 0x800) { -+ printk(KERN_INFO "Found NAND on CS%d\n", cs); -+ if (nandcs > GPMC_CS_NUM) -+ nandcs = cs; -+ } -+ cs++; -+ } -+ -+ if (nandcs > GPMC_CS_NUM) { -+ printk(KERN_INFO "NAND: Unable to find configuration " -+ "in GPMC\n "); -+ return; -+ } -+ -+ if (nandcs < GPMC_CS_NUM) { -+ omap3beagle_nand_data.cs = nandcs; -+ omap3beagle_nand_data.gpmc_cs_baseaddr = (void *)(gpmc_base_add + -+ GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE); -+ omap3beagle_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add); -+ -+ printk(KERN_INFO "Registering NAND on CS%d\n", nandcs); -+ if (platform_device_register(&omap3beagle_nand_device) < 0) -+ printk(KERN_ERR "Unable to register NAND device\n"); -+ } -+} -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index c992cc7..99e042e 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -94,6 +94,7 @@ static void __init omap3_beagle_init(void) - hsmmc_init(); - usb_musb_init(); - usb_ehci_init(); -+ omap3beagle_flash_init(); - } - - arch_initcall(omap3_beagle_i2c_init); -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 3d5e432..02b9ced 100644 ---- a/drivers/mtd/nand/Kconfig -+++ b/drivers/mtd/nand/Kconfig -@@ -71,7 +71,7 @@ config MTD_NAND_AMS_DELTA - - config MTD_NAND_OMAP2 - tristate "NAND Flash device on OMAP 2420H4/2430SDP boards" -- depends on (ARM && ARCH_OMAP2 && MTD_NAND) -+ depends on ARM && MTD_NAND && (ARCH_OMAP2 || ARCH_OMAP3) - help - Support for NAND flash on Texas Instruments 2430SDP/2420H4 platforms. - -diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c -index 3b7307c..3aac1d2 100644 ---- a/drivers/mtd/nand/omap2.c -+++ b/drivers/mtd/nand/omap2.c -@@ -111,15 +111,6 @@ - static const char *part_probes[] = { "cmdlinepart", NULL }; - #endif - --static int hw_ecc = 1; -- --/* new oob placement block for use with hardware ecc generation */ --static struct nand_ecclayout omap_hw_eccoob = { -- .eccbytes = 12, -- .eccpos = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, -- .oobfree = {{16, 32}, {33, 63} }, --}; -- - struct omap_nand_info { - struct nand_hw_control controller; - struct omap_nand_platform_data *pdata; -@@ -133,6 +124,13 @@ struct omap_nand_info { - void __iomem *gpmc_cs_baseaddr; - void __iomem *gpmc_baseaddr; - }; -+ -+/* -+ * omap_nand_wp - This function enable or disable the Write Protect feature on -+ * NAND device -+ * @mtd: MTD device structure -+ * @mode: WP ON/OFF -+ */ - static void omap_nand_wp(struct mtd_info *mtd, int mode) - { - struct omap_nand_info *info = container_of(mtd, -@@ -189,11 +187,11 @@ static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) - } - - /* --* omap_read_buf - read data from NAND controller into buffer --* @mtd: MTD device structure --* @buf: buffer to store date --* @len: number of bytes to read --*/ -+ * omap_read_buf - read data from NAND controller into buffer -+ * @mtd: MTD device structure -+ * @buf: buffer to store date -+ * @len: number of bytes to read -+ */ - static void omap_read_buf(struct mtd_info *mtd, u_char *buf, int len) - { - struct omap_nand_info *info = container_of(mtd, -@@ -207,11 +205,11 @@ static void omap_read_buf(struct mtd_info *mtd, u_char *buf, int len) - } - - /* --* omap_write_buf - write buffer to NAND controller --* @mtd: MTD device structure --* @buf: data buffer --* @len: number of bytes to write --*/ -+ * omap_write_buf - write buffer to NAND controller -+ * @mtd: MTD device structure -+ * @buf: data buffer -+ * @len: number of bytes to write -+ */ - static void omap_write_buf(struct mtd_info *mtd, const u_char * buf, int len) - { - struct omap_nand_info *info = container_of(mtd, -@@ -250,10 +248,16 @@ static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len) - return 0; - } - -+#ifdef CONFIG_MTD_NAND_OMAP_HWECC -+/* -+ * omap_hwecc_init-Initialize the Hardware ECC for NAND flash in GPMC controller -+ * @mtd: MTD device structure -+ */ - static void omap_hwecc_init(struct mtd_info *mtd) - { - struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, - mtd); -+ register struct nand_chip *chip = mtd->priv; - unsigned long val = 0x0; - - /* Read from ECC Control Register */ -@@ -264,16 +268,15 @@ static void omap_hwecc_init(struct mtd_info *mtd) - - /* Read from ECC Size Config Register */ - val = __raw_readl(info->gpmc_baseaddr + GPMC_ECC_SIZE_CONFIG); -- /* ECCSIZE1=512 | ECCSIZE0=8bytes | Select eccResultsize[0123] */ -- val = ((0x000000FF<<22) | (0x00000003<<12) | (0x0000000F)); -+ /* ECCSIZE1=512 | Select eccResultsize[0-3] */ -+ val = ((((chip->ecc.size >> 1) - 1) << 22) | (0x0000000F)); - __raw_writel(val, info->gpmc_baseaddr + GPMC_ECC_SIZE_CONFIG); -- -- - } - - /* -- * This function will generate true ECC value, which can be used -+ * gen_true_ecc - This function will generate true ECC value, which can be used - * when correcting data read from NAND flash memory core -+ * @ecc_buf: buffer to store ecc code - */ - static void gen_true_ecc(u8 *ecc_buf) - { -@@ -289,8 +292,12 @@ static void gen_true_ecc(u8 *ecc_buf) - } - - /* -- * This function compares two ECC's and indicates if there is an error. -- * If the error can be corrected it will be corrected to the buffer -+ * omap_compare_ecc - This function compares two ECC's and indicates if there -+ * is an error. If the error can be corrected it will be corrected to the -+ * buffer -+ * @ecc_data1: ecc code from nand spare area -+ * @ecc_data2: ecc code from hardware register obtained from hardware ecc -+ * @page_data: page data - */ - static int omap_compare_ecc(u8 *ecc_data1, /* read from NAND memory */ - u8 *ecc_data2, /* read from register */ -@@ -409,6 +416,14 @@ static int omap_compare_ecc(u8 *ecc_data1, /* read from NAND memory */ - } - } - -+/* -+ * omap_correct_data - Compares the ecc read from nand spare area with ECC -+ * registers values and corrects one bit error if it has occured -+ * @mtd: MTD device structure -+ * @dat: page data -+ * @read_ecc: ecc read from nand flash -+ * @calc_ecc: ecc read from ECC registers -+ */ - static int omap_correct_data(struct mtd_info *mtd, u_char * dat, - u_char * read_ecc, u_char * calc_ecc) - { -@@ -436,65 +451,64 @@ static int omap_correct_data(struct mtd_info *mtd, u_char * dat, - } - - /* --** Generate non-inverted ECC bytes. --** --** Using noninverted ECC can be considered ugly since writing a blank --** page ie. padding will clear the ECC bytes. This is no problem as long --** nobody is trying to write data on the seemingly unused page. --** --** Reading an erased page will produce an ECC mismatch between --** generated and read ECC bytes that has to be dealt with separately. --*/ -+ * omap_calcuate_ecc - Generate non-inverted ECC bytes. -+ * Using noninverted ECC can be considered ugly since writing a blank -+ * page ie. padding will clear the ECC bytes. This is no problem as long -+ * nobody is trying to write data on the seemingly unused page. Reading -+ * an erased page will produce an ECC mismatch between generated and read -+ * ECC bytes that has to be dealt with separately. -+ * @mtd: MTD device structure -+ * @dat: The pointer to data on which ecc is computed -+ * @ecc_code: The ecc_code buffer -+ */ - static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, - u_char *ecc_code) - { - struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, - mtd); - unsigned long val = 0x0; -- unsigned long reg, n; -- -- /* Ex NAND_ECC_HW12_2048 */ -- if ((info->nand.ecc.mode == NAND_ECC_HW) && -- (info->nand.ecc.size == 2048)) -- n = 4; -- else -- n = 1; -+ unsigned long reg; - - /* Start Reading from HW ECC1_Result = 0x200 */ - reg = (unsigned long)(info->gpmc_baseaddr + GPMC_ECC1_RESULT); -- while (n--) { -- val = __raw_readl(reg); -- *ecc_code++ = val; /* P128e, ..., P1e */ -- *ecc_code++ = val >> 16; /* P128o, ..., P1o */ -- /* P2048o, P1024o, P512o, P256o, P2048e, P1024e, P512e, P256e */ -- *ecc_code++ = ((val >> 8) & 0x0f) | ((val >> 20) & 0xf0); -- reg += 4; -- } -+ val = __raw_readl(reg); -+ *ecc_code++ = val; /* P128e, ..., P1e */ -+ *ecc_code++ = val >> 16; /* P128o, ..., P1o */ -+ /* P2048o, P1024o, P512o, P256o, P2048e, P1024e, P512e, P256e */ -+ *ecc_code++ = ((val >> 8) & 0x0f) | ((val >> 20) & 0xf0); -+ reg += 4; - - return 0; --} /* omap_calculate_ecc */ -+} - -+/* -+ * omap_enable_hwecc - This function enables the hardware ecc functionality -+ * @mtd: MTD device structure -+ * @mode: Read/Write mode -+ */ - static void omap_enable_hwecc(struct mtd_info *mtd, int mode) - { - struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, - mtd); -+ register struct nand_chip *chip = mtd->priv; -+ unsigned int dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0; - unsigned long val = __raw_readl(info->gpmc_baseaddr + GPMC_ECC_CONFIG); - - switch (mode) { - case NAND_ECC_READ : - __raw_writel(0x101, info->gpmc_baseaddr + GPMC_ECC_CONTROL); -- /* ECC 16 bit col) | ( CS 0 ) | ECC Enable */ -- val = (1 << 7) | (0x0) | (0x1) ; -+ /* (ECC 16 or 8 bit col) | ( CS ) | ECC Enable */ -+ val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1); - break; - case NAND_ECC_READSYN : -- __raw_writel(0x100, info->gpmc_baseaddr + GPMC_ECC_CONTROL); -- /* ECC 16 bit col) | ( CS 0 ) | ECC Enable */ -- val = (1 << 7) | (0x0) | (0x1) ; -+ __raw_writel(0x100, info->gpmc_baseaddr + GPMC_ECC_CONTROL); -+ /* (ECC 16 or 8 bit col) | ( CS ) | ECC Enable */ -+ val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1); - break; - case NAND_ECC_WRITE : - __raw_writel(0x101, info->gpmc_baseaddr + GPMC_ECC_CONTROL); -- /* ECC 16 bit col) | ( CS 0 ) | ECC Enable */ -- val = (1 << 7) | (0x0) | (0x1) ; -+ /* (ECC 16 or 8 bit col) | ( CS ) | ECC Enable */ -+ val = (dev_width << 7) | (info->gpmc_cs << 1) | (0x1); - break; - default: - DEBUG(MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n", -@@ -504,7 +518,38 @@ static void omap_enable_hwecc(struct mtd_info *mtd, int mode) - - __raw_writel(val, info->gpmc_baseaddr + GPMC_ECC_CONFIG); - } -+#endif - -+/* -+ * omap_wait - Wait function is called during Program and erase -+ * operations and the way it is called from MTD layer, we should wait -+ * till the NAND chip is ready after the programming/erase operation -+ * has completed. -+ * @mtd: MTD device structure -+ * @chip: NAND Chip structure -+ */ -+static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) -+{ -+ register struct nand_chip *this = mtd->priv; -+ struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, -+ mtd); -+ int status = 0; -+ -+ this->IO_ADDR_W = (void *) info->gpmc_cs_baseaddr + -+ GPMC_CS_NAND_COMMAND; -+ this->IO_ADDR_R = (void *) info->gpmc_cs_baseaddr + GPMC_CS_NAND_DATA; -+ -+ while (!(status & 0x40)) { -+ __raw_writeb(NAND_CMD_STATUS & 0xFF, this->IO_ADDR_W); -+ status = __raw_readb(this->IO_ADDR_R); -+ } -+ return status; -+} -+ -+/* -+ * omap_dev_ready - calls the platform specific dev_ready function -+ * @mtd: MTD device structure -+ */ - static int omap_dev_ready(struct mtd_info *mtd) - { - struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, -@@ -534,7 +579,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) - struct omap_nand_info *info; - struct omap_nand_platform_data *pdata; - int err; -- unsigned long val; -+ unsigned long val; - - - pdata = pdev->dev.platform_data; -@@ -568,15 +613,20 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) - } - - /* Enable RD PIN Monitoring Reg */ -- val = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1); -- val |= WR_RD_PIN_MONITORING; -- gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val); -+ if (pdata->dev_ready) { -+ val = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1); -+ val |= WR_RD_PIN_MONITORING; -+ gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val); -+ } - - val = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG7); - val &= ~(0xf << 8); - val |= (0xc & 0xf) << 8; - gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG7, val); - -+ /* NAND write protect off */ -+ omap_nand_wp(&info->mtd, NAND_WP_OFF); -+ - if (!request_mem_region(info->phys_base, NAND_IO_SIZE, - pdev->dev.driver->name)) { - err = -EBUSY; -@@ -597,29 +647,39 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) - info->nand.write_buf = omap_write_buf; - info->nand.verify_buf = omap_verify_buf; - -- info->nand.dev_ready = omap_dev_ready; -- info->nand.chip_delay = 0; -- -- /* Options */ -- info->nand.options = NAND_BUSWIDTH_16; -- info->nand.options |= NAND_SKIP_BBTSCAN; -- -- if (hw_ecc) { -- /* init HW ECC */ -- omap_hwecc_init(&info->mtd); -- -- info->nand.ecc.calculate = omap_calculate_ecc; -- info->nand.ecc.hwctl = omap_enable_hwecc; -- info->nand.ecc.correct = omap_correct_data; -- info->nand.ecc.mode = NAND_ECC_HW; -- info->nand.ecc.bytes = 12; -- info->nand.ecc.size = 2048; -- info->nand.ecc.layout = &omap_hw_eccoob; -- -+ /* -+ * If RDY/BSY line is connected to OMAP then use the omap ready funcrtion -+ * and the generic nand_wait function which reads the status register -+ * after monitoring the RDY/BSY line.Otherwise use a standard chip delay -+ * which is slightly more than tR (AC Timing) of the NAND device and read -+ * status register until you get a failure or success -+ */ -+ if (pdata->dev_ready) { -+ info->nand.dev_ready = omap_dev_ready; -+ info->nand.chip_delay = 0; - } else { -- info->nand.ecc.mode = NAND_ECC_SOFT; -+ info->nand.waitfunc = omap_wait; -+ info->nand.chip_delay = 50; - } - -+ info->nand.options |= NAND_SKIP_BBTSCAN; -+ if ((gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1) & 0x3000) -+ == 0x1000) -+ info->nand.options |= NAND_BUSWIDTH_16; -+ -+#ifdef CONFIG_MTD_NAND_OMAP_HWECC -+ info->nand.ecc.bytes = 3; -+ info->nand.ecc.size = 512; -+ info->nand.ecc.calculate = omap_calculate_ecc; -+ info->nand.ecc.hwctl = omap_enable_hwecc; -+ info->nand.ecc.correct = omap_correct_data; -+ info->nand.ecc.mode = NAND_ECC_HW; -+ -+ /* init HW ECC */ -+ omap_hwecc_init(&info->mtd); -+#else -+ info->nand.ecc.mode = NAND_ECC_SOFT; -+#endif - - /* DIP switches on some boards change between 8 and 16 bit - * bus widths for flash. Try the other width if the first try fails. -@@ -636,14 +696,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) - err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); - if (err > 0) - add_mtd_partitions(&info->mtd, info->parts, err); -- else if (err < 0 && pdata->parts) -+ else if (err <= 0 && pdata->parts) - add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts); - else - #endif - add_mtd_device(&info->mtd); - -- omap_nand_wp(&info->mtd, NAND_WP_OFF); -- - platform_set_drvdata(pdev, &info->mtd); - - return 0; -diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h -index 46dff31..26ecfb8 100644 ---- a/include/asm-arm/arch-omap/board-omap3beagle.h -+++ b/include/asm-arm/arch-omap/board-omap3beagle.h -@@ -29,5 +29,7 @@ - #ifndef __ASM_ARCH_OMAP3_BEAGLE_H - #define __ASM_ARCH_OMAP3_BEAGLE_H - -+extern void omap3beagle_flash_init(void); -+ - #endif /* __ASM_ARCH_OMAP3_BEAGLE_H */ - diff --git a/packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff b/packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff deleted file mode 100644 index 6eb33f76b7..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff +++ /dev/null @@ -1,118 +0,0 @@ -From linux-omap-owner@vger.kernel.org Tue Jul 15 21:23:13 2008 -Received: from localhost - ([127.0.0.1] helo=dominion ident=koen) - by dominion.dominion.void with esmtp (Exim 4.69) - (envelope-from <linux-omap-owner@vger.kernel.org>) - id 1KIq7E-0004FX-VS - for koen@localhost; Tue, 15 Jul 2008 21:23:13 +0200 -Received: from xs.service.utwente.nl [130.89.5.250] - by dominion with POP3 (fetchmail-6.3.6) - for <koen@localhost> (single-drop); Tue, 15 Jul 2008 21:23:12 +0200 (CEST) -Received: from mail.service.utwente.nl ([130.89.5.254]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 15 Jul 2008 21:01:02 +0200 -Received: from mx.utwente.nl ([130.89.2.12]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 15 Jul 2008 21:01:01 +0200 -Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) - by mx.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m6FJ0qDf031889 - for <k.kooi@student.utwente.nl>; Tue, 15 Jul 2008 21:00:52 +0200 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1756776AbYGOTAV (ORCPT <rfc822;k.kooi@student.utwente.nl>); - Tue, 15 Jul 2008 15:00:21 -0400 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755065AbYGOTAV - (ORCPT <rfc822;linux-omap-outgoing>); - Tue, 15 Jul 2008 15:00:21 -0400 -Received: from utopia.booyaka.com ([72.9.107.138]:35569 "EHLO - utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1756776AbYGOTAU (ORCPT - <rfc822;linux-omap@vger.kernel.org>); Tue, 15 Jul 2008 15:00:20 -0400 -Received: (qmail 2982 invoked by uid 526); 15 Jul 2008 19:00:18 -0000 -Date: Tue, 15 Jul 2008 13:00:18 -0600 (MDT) -From: Paul Walmsley <paul@pwsan.com> -To: linux-omap@vger.kernel.org -Subject: [PATCH] i2c-omap: close suspected race between omap_i2c_idle() and - omap_i2c_isr() -Message-ID: <alpine.DEB.1.00.0807151259180.467@utopia.booyaka.com> -User-Agent: Alpine 1.00 (DEB 882 2007-12-20) -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -Sender: linux-omap-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-omap.vger.kernel.org> -X-Mailing-List: linux-omap@vger.kernel.org -X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information. -X-UTwente-MailScanner: Found to be clean -X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org -X-Spam-Status: No -X-OriginalArrivalTime: 15 Jul 2008 19:01:01.0610 (UTC) FILETIME=[1FBA68A0:01C8E6AD] - - -omap_i2c_idle() sets an internal flag, "dev->idle", instructing its -ISR to decline interrupts. It sets this flag before it actually masks -the interrupts on the I2C controller. This is problematic, since an -I2C interrupt could arrive after dev->idle is set, but before the -interrupt source is masked. When this happens, Linux disables the I2C -controller's IRQ, causing all future transactions on the bus to fail. - -Symptoms, happening on about 7% of boots: - - irq 56: nobody cared (try booting with the "irqpoll" option) - <warning traceback here> - Disabling IRQ #56 - i2c_omap i2c_omap.1: controller timed out - -In omap_i2c_idle(), this patch sets dev->idle only after the interrupt -mask write to the I2C controller has left the ARM write buffer. -That's probably the major offender. For additional prophylaxis, in -omap_i2c_unidle(), the patch clears the dev->idle flag before -interrupts are enabled, rather than afterwards. - -The patch has survived twenty-two reboots on the 3430SDP here without -wedging I2C1. Not absolutely dispositive, but promising! - - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - drivers/i2c/busses/i2c-omap.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c -index 55779f5..ed7e9ad 100644 ---- a/drivers/i2c/busses/i2c-omap.c -+++ b/drivers/i2c/busses/i2c-omap.c -@@ -209,22 +209,28 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev) - if (dev->iclk != NULL) - clk_enable(dev->iclk); - clk_enable(dev->fclk); -+ dev->idle = 0; - if (dev->iestate) - omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate); -- dev->idle = 0; - } - - static void omap_i2c_idle(struct omap_i2c_dev *dev) - { - u16 iv; - -- dev->idle = 1; - dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG); - omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0); - if (dev->rev1) - iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG); - else - omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, dev->iestate); -+ /* -+ * The wmb() is to ensure that the I2C interrupt mask write -+ * reaches the I2C controller before the dev->idle store -+ * occurs. -+ */ -+ wmb(); -+ dev->idle = 1; - clk_disable(dev->fclk); - if (dev->iclk != NULL) - clk_disable(dev->iclk); --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 670cd0f073..4008102f09 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,19 +2,18 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3" +SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r54" +PR = "r58" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \ - file://flash.patch;patch=1 \ - file://0001-omap3-cpuidle.patch;patch=1 \ + file://0001-omap3-cpuidle.patch;patch=1 \ file://0002-omap3-cpuidle.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ file://ASoC-TWL4030-codec-driver.patch;patch=1 \ @@ -31,21 +30,10 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://06-ensure-fclk.diff;patch=1 \ file://07-set-burst-size.diff;patch=1 \ file://cache-display-fix.patch;patch=1 \ - file://i2c-omap-race-fix.diff;patch=1 \ - file://TWL4030-01.patch;patch=1 \ - file://TWL4030-02.patch;patch=1 \ - file://TWL4030-03.patch;patch=1 \ - file://TWL4030-04.patch;patch=1 \ - file://TWL4030-05.patch;patch=1 \ - file://TWL4030-06.patch;patch=1 \ - file://TWL4030-07.patch;patch=1 \ - file://TWL4030-08.patch;patch=1 \ - file://TWL4030-09.patch;patch=1 \ file://mru-clocks1.diff;patch=1 \ file://mru-clocks2.diff;patch=1 \ file://mru-clocks3.diff;patch=1 \ file://4bitmmc.diff;patch=1 \ - file://400khz-i2c.diff;patch=1 \ file://no-cortex-deadlock.patch;patch=1 \ file://01-gptimer_clear_isrs_on_init;patch=1 \ file://02-gptimer_use_match_for_tick;patch=1 \ diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index b56746880f..7e7548491f 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -14,7 +14,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV} SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \ ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \ - http://developer.ezaurus.com/sl_j/source/c860/${SHARPV}/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \ + http://openzaurus.org/mirror/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \ file://piro.patch;patch=1 \ file://swap-performance.patch;patch=1 \ file://bluetooth-2.4.18-mh15.patch;patch=1 \ diff --git a/packages/motion/motion_3.2.9.bb b/packages/motion/motion_3.2.10.1.bb index f5f5b62708..dc7c0ecdbb 100644 --- a/packages/motion/motion_3.2.9.bb +++ b/packages/motion/motion_3.2.10.1.bb @@ -16,4 +16,5 @@ inherit autotools EXTRA_OECONF = " --with-ffmpeg=${STAGING_LIBDIR} \ --with-mysql-lib=${STAGING_LIBDIR} \ --with-mysql-include=${STAGING_INCDIR}/mysql \ - --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix} " + --with-pgsql-lib=${STAGING_LIBDIR} \ + --with-pgsql-include=${STAGING_INCDIR} " diff --git a/packages/mozilla/files/arm/jsautocfg.h b/packages/mozilla/files/arm/jsautocfg.h index 7e8171fc23..e9d37dee91 100644 --- a/packages/mozilla/files/arm/jsautocfg.h +++ b/packages/mozilla/files/arm/jsautocfg.h @@ -1,7 +1,7 @@ #ifndef js_cpucfg___ #define js_cpucfg___ -/* AUTOMATICALLY GENERATED - DO NOT EDIT */ +/* AUTOMATICALLY GENERATED - DO NOT EDIT, unless you are an OE dev :) */ #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN @@ -49,4 +49,6 @@ #define JS_STACK_GROWTH_DIRECTION (-1) +#define JS_HAVE_LONG_LONG + #endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox-3.0.1/configure-wchart.patch b/packages/mozilla/firefox-3.0.1/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1/configure-wchart.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2008-04-15 12:56:35.000000000 +0300 ++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 +@@ -2743,7 +2743,7 @@ + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_LINK([#include <stddef.h> ++ [AC_TRY_COMPILE([#include <stddef.h> + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/packages/mozilla/firefox-3.0.1/wchart.diff b/packages/mozilla/firefox-3.0.1/wchart.diff new file mode 100644 index 0000000000..61ef5928d2 --- /dev/null +++ b/packages/mozilla/firefox-3.0.1/wchart.diff @@ -0,0 +1,5850 @@ +--- iceweasel-3.0.1.orig/configure ++++ iceweasel-3.0.1/configure +@@ -1110,7 +1110,7 @@ + MSMANIFEST_TOOL= + + MISSING_X= +-for ac_prog in gawk mawk nawk awk ++for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -1897,57 +1897,6 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include <stdlib.h>' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext <<EOF +-#line 1911 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <<EOF +-#line 1929 "configure" +-#include "confdefs.h" +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + + case "$build:$target" in + powerpc-apple-darwin8*:i?86-apple-darwin*) +@@ -1961,7 +1910,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1965: checking for $ac_word" >&5 ++echo "configure:1914: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1996,7 +1945,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2000: checking for $ac_word" >&5 ++echo "configure:1949: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2031,7 +1980,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2035: checking for $ac_word" >&5 ++echo "configure:1984: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2072,7 +2021,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2076: checking for $ac_word" >&5 ++echo "configure:2025: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2107,7 +2056,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2111: checking for $ac_word" >&5 ++echo "configure:2060: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2142,7 +2091,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2146: checking for $ac_word" >&5 ++echo "configure:2095: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2180,7 +2129,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2184: checking for $ac_word" >&5 ++echo "configure:2133: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2210,7 +2159,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2214: checking for $ac_word" >&5 ++echo "configure:2163: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2261,7 +2210,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2265: checking for $ac_word" >&5 ++echo "configure:2214: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2293,7 +2242,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2304,12 +2253,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2308 "configure" ++#line 2257 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2335,12 +2284,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2339: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2344: checking whether we are using GNU C" >&5 ++echo "configure:2293: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2349,7 +2298,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2368,7 +2317,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2372: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2404,7 +2353,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2408: checking for $ac_word" >&5 ++echo "configure:2357: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2436,7 +2385,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2389: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2447,12 +2396,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2451 "configure" ++#line 2400 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2478,12 +2427,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2482: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2487: checking whether we are using GNU C++" >&5 ++echo "configure:2436: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2492,7 +2441,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -2511,7 +2460,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2515: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2464: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2542,61 +2491,10 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include <stdlib.h>' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext <<EOF +-#line 2556 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <<EOF +-#line 2574 "configure" +-#include "confdefs.h" +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:2581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2600: checking for $ac_word" >&5 ++echo "configure:2498: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2628,7 +2526,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2632: checking for $ac_word" >&5 ++echo "configure:2530: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2669,7 +2567,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2673: checking for $ac_word" >&5 ++echo "configure:2571: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2704,7 +2602,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2708: checking for $ac_word" >&5 ++echo "configure:2606: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2739,7 +2637,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2743: checking for $ac_word" >&5 ++echo "configure:2641: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2774,7 +2672,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2778: checking for $ac_word" >&5 ++echo "configure:2676: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2907,7 +2805,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2911: checking for $ac_word" >&5 ++echo "configure:2809: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2949,14 +2847,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext <<EOF +-#line 2953 "configure" ++#line 2851 "configure" + #include "confdefs.h" + #include <stdio.h> + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2974,14 +2872,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <<EOF +-#line 2978 "configure" ++#line 2876 "configure" + #include "confdefs.h" + #include <new.h> + int main() { + unsigned *test = new unsigned(42); + ; return 0; } + EOF +-if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -3096,7 +2994,7 @@ + _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` + # Add flags if necessary + echo $ac_n "checking for midl flags""... $ac_c" 1>&6 +-echo "configure:3100: checking for midl flags" >&5 ++echo "configure:2998: checking for midl flags" >&5 + if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then + # Starting with MIDL version 6.0.359, the MIDL compiler + # generates /Oicf /robust stubs by default, which is not +@@ -3118,9 +3016,9 @@ + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` + _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` + echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 +-echo "configure:3122: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:3020: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext <<EOF +-#line 3124 "configure" ++#line 3022 "configure" + #include "confdefs.h" + #include <w32api.h> + int main() { +@@ -3132,7 +3030,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else +@@ -3148,7 +3046,7 @@ + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3152: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:3050: checking for windres version >= $WINDRES_VERSION" >&5 + _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` + echo "$ac_t""$_WINDRES_VERSION" 1>&6 + _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` +@@ -3187,10 +3085,10 @@ + if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:3191: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3089: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:3194: checking whether cc understands -c and -o together" >&5 ++echo "configure:3092: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -3202,16 +3100,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:3206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:3214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -3247,7 +3145,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3251: checking how to run the C preprocessor" >&5 ++echo "configure:3149: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3262,13 +3160,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +-#line 3266 "configure" ++#line 3164 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3279,13 +3177,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +-#line 3283 "configure" ++#line 3181 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3296,13 +3194,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +-#line 3300 "configure" ++#line 3198 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3327,7 +3225,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3331: checking how to run the C++ preprocessor" >&5 ++echo "configure:3229: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3340,12 +3238,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext <<EOF +-#line 3344 "configure" ++#line 3242 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3400,7 +3298,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:3404: checking for a BSD compatible install" >&5 ++echo "configure:3302: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3453,7 +3351,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3457: checking whether ln -s works" >&5 ++echo "configure:3355: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3478,7 +3376,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3482: checking for $ac_word" >&5 ++echo "configure:3380: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3519,7 +3417,7 @@ + + if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3523: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3421: checking for minimum required perl version >= $PERL_VERSION" >&5 + _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + echo "$ac_t""$_perl_version" 1>&6 +@@ -3530,7 +3428,7 @@ + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3534: checking for full perl installation" >&5 ++echo "configure:3432: checking for full perl installation" >&5 + _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + if test "$_perl_res" != 0; then +@@ -3545,7 +3443,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3549: checking for $ac_word" >&5 ++echo "configure:3447: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3590,7 +3488,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3594: checking for $ac_word" >&5 ++echo "configure:3492: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3635,7 +3533,7 @@ + # Extract the first word of "doxygen", so it can be a program name with args. + set dummy doxygen; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3639: checking for $ac_word" >&5 ++echo "configure:3537: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3671,7 +3569,7 @@ + # Extract the first word of "whoami", so it can be a program name with args. + set dummy whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3675: checking for $ac_word" >&5 ++echo "configure:3573: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3707,7 +3605,7 @@ + # Extract the first word of "autoconf", so it can be a program name with args. + set dummy autoconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3711: checking for $ac_word" >&5 ++echo "configure:3609: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3743,7 +3641,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3747: checking for $ac_word" >&5 ++echo "configure:3645: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3781,7 +3679,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3785: checking for $ac_word" >&5 ++echo "configure:3683: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3822,7 +3720,7 @@ + # Extract the first word of "makedepend", so it can be a program name with args. + set dummy makedepend; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3826: checking for $ac_word" >&5 ++echo "configure:3724: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3857,7 +3755,7 @@ + # Extract the first word of "xargs", so it can be a program name with args. + set dummy xargs; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3861: checking for $ac_word" >&5 ++echo "configure:3759: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3918,7 +3816,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3922: checking for $ac_word" >&5 ++echo "configure:3820: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3968,7 +3866,7 @@ + # Extract the first word of "sdp", so it can be a program name with args. + set dummy sdp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3972: checking for $ac_word" >&5 ++echo "configure:3870: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4089,7 +3987,7 @@ + + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:4093: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3991: checking for valid compiler/Mac OS X SDK combination" >&5 + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -4098,7 +3996,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <<EOF +-#line 4102 "configure" ++#line 4000 "configure" + #include "confdefs.h" + #include <new> + int main() { return 0; } +@@ -4106,7 +4004,7 @@ + result=yes + ; return 0; } + EOF +-if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else +@@ -4137,7 +4035,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4141: checking for $ac_word" >&5 ++echo "configure:4039: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4180,7 +4078,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4184: checking for $ac_word" >&5 ++echo "configure:4082: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4248,7 +4146,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. + # --without-x overrides everything else, but does not touch the cache. + echo $ac_n "checking for X""... $ac_c" 1>&6 +-echo "configure:4252: checking for X" >&5 ++echo "configure:4150: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -4310,12 +4208,12 @@ + + # First, try using that file with no special directory specified. + cat > conftest.$ac_ext <<EOF +-#line 4314 "configure" ++#line 4212 "configure" + #include "confdefs.h" + #include <$x_direct_test_include> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4384,14 +4282,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4388 "configure" ++#line 4286 "configure" + #include "confdefs.h" + + int main() { + ${x_direct_test_function}() + ; return 0; } + EOF +-if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" + # We can link X programs with no special library path. +@@ -4497,17 +4395,17 @@ + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +-echo "configure:4501: checking whether -R must be followed by a space" >&5 ++echo "configure:4399: checking whether -R must be followed by a space" >&5 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + cat > conftest.$ac_ext <<EOF +-#line 4504 "configure" ++#line 4402 "configure" + #include "confdefs.h" + + int main() { + + ; return 0; } + EOF +-if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else +@@ -4523,14 +4421,14 @@ + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <<EOF +-#line 4527 "configure" ++#line 4425 "configure" + #include "confdefs.h" + + int main() { + + ; return 0; } + EOF +-if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else +@@ -4562,7 +4460,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4566: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4464: checking for dnet_ntoa in -ldnet" >&5 + ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4570,7 +4468,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4574 "configure" ++#line 4472 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4581,7 +4479,7 @@ + dnet_ntoa() + ; return 0; } + EOF +-if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4603,7 +4501,7 @@ + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:4607: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4505: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4611,7 +4509,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4615 "configure" ++#line 4513 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4622,7 +4520,7 @@ + dnet_ntoa() + ; return 0; } + EOF +-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4651,12 +4549,12 @@ + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:4655: checking for gethostbyname" >&5 ++echo "configure:4553: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4660 "configure" ++#line 4558 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname(); below. */ +@@ -4679,7 +4577,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -4700,7 +4598,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4704: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4602: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4708,7 +4606,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4712 "configure" ++#line 4610 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4719,7 +4617,7 @@ + gethostbyname() + ; return 0; } + EOF +-if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4749,12 +4647,12 @@ + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +-echo "configure:4753: checking for connect" >&5 ++echo "configure:4651: checking for connect" >&5 + if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4758 "configure" ++#line 4656 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect(); below. */ +@@ -4777,7 +4675,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" + else +@@ -4798,7 +4696,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4802: checking for connect in -lsocket" >&5 ++echo "configure:4700: checking for connect in -lsocket" >&5 + ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4806,7 +4704,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4810 "configure" ++#line 4708 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4817,7 +4715,7 @@ + connect() + ; return 0; } + EOF +-if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4841,12 +4739,12 @@ + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4845: checking for remove" >&5 ++echo "configure:4743: checking for remove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4850 "configure" ++#line 4748 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove(); below. */ +@@ -4869,7 +4767,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" + else +@@ -4890,7 +4788,7 @@ + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4894: checking for remove in -lposix" >&5 ++echo "configure:4792: checking for remove in -lposix" >&5 + ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4898,7 +4796,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lposix $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4902 "configure" ++#line 4800 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4909,7 +4807,7 @@ + remove() + ; return 0; } + EOF +-if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4933,12 +4831,12 @@ + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4937: checking for shmat" >&5 ++echo "configure:4835: checking for shmat" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4942 "configure" ++#line 4840 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat(); below. */ +@@ -4961,7 +4859,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" + else +@@ -4982,7 +4880,7 @@ + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4986: checking for shmat in -lipc" >&5 ++echo "configure:4884: checking for shmat in -lipc" >&5 + ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4990,7 +4888,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lipc $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4994 "configure" ++#line 4892 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -5001,7 +4899,7 @@ + shmat() + ; return 0; } + EOF +-if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5034,7 +4932,7 @@ + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +-echo "configure:5038: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4936: checking for IceConnectionNumber in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5042,7 +4940,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5046 "configure" ++#line 4944 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -5053,7 +4951,7 @@ + IceConnectionNumber() + ; return 0; } + EOF +-if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5521,7 +5419,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5525: checking whether ld has archive extraction flags" >&5 ++echo "configure:5423: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5538,14 +5436,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <<EOF +-#line 5542 "configure" ++#line 5440 "configure" + #include "confdefs.h" + + int main() { + + ; return 0; } + EOF +-if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -5578,7 +5476,7 @@ + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:5582: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5480: checking that static assertion macros used in autoconf tests work" >&5 + if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5592,14 +5490,14 @@ + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <<EOF +-#line 5596 "configure" ++#line 5494 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(1) + ; return 0; } + EOF +-if { (eval echo configure:5603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5609,14 +5507,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <<EOF +-#line 5613 "configure" ++#line 5511 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(0) + ; return 0; } + EOF +-if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5632,14 +5530,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <<EOF +-#line 5636 "configure" ++#line 5534 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(1) + ; return 0; } + EOF +-if { (eval echo configure:5643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5649,14 +5547,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <<EOF +-#line 5653 "configure" ++#line 5551 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(0) + ; return 0; } + EOF +-if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5691,16 +5589,16 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5695: checking for 64-bit OS" >&5 ++echo "configure:5593: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <<EOF +-#line 5697 "configure" ++#line 5595 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(sizeof(long) == 8) + ; return 0; } + EOF +-if { (eval echo configure:5704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -5873,9 +5771,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5877: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5775: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 + cat > conftest.$ac_ext <<EOF +-#line 5879 "configure" ++#line 5777 "configure" + #include "confdefs.h" + + int main() { +@@ -5884,7 +5782,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:5888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5922,17 +5820,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5926: checking for $ac_hdr" >&5 ++echo "configure:5824: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5931 "configure" ++#line 5829 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5974,7 +5872,7 @@ + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5978: checking for main in -lbind" >&5 ++echo "configure:5876: checking for main in -lbind" >&5 + ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5982,14 +5880,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5986 "configure" ++#line 5884 "configure" + #include "confdefs.h" + + int main() { + main() + ; return 0; } + EOF +-if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6010,7 +5908,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:6014: checking for main in -lzeta" >&5 ++echo "configure:5912: checking for main in -lzeta" >&5 + ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6018,14 +5916,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6022 "configure" ++#line 5920 "configure" + #include "confdefs.h" + + int main() { + main() + ; return 0; } + EOF +-if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6094,18 +5992,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:6098: checking for -dead_strip option to ld" >&5 ++echo "configure:5996: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <<EOF +-#line 6102 "configure" ++#line 6000 "configure" + #include "confdefs.h" + + int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6630,17 +6528,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6634: checking for $ac_hdr" >&5 ++echo "configure:6532: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6639 "configure" ++#line 6537 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6679,17 +6577,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6683: checking for $ac_hdr" >&5 ++echo "configure:6581: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6688 "configure" ++#line 6586 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6935,19 +6833,19 @@ + _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" + + echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 +-echo "configure:6939: checking for __declspec(dllexport)" >&5 ++echo "configure:6837: checking for __declspec(dllexport)" >&5 + if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6944 "configure" ++#line 6842 "configure" + #include "confdefs.h" + __declspec(dllexport) void ac_os2_declspec(void) {} + int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_os2_declspec="yes" + else +@@ -7133,14 +7031,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext <<EOF +-#line 7137 "configure" ++#line 7035 "configure" + #include "confdefs.h" + #include <stdio.h> + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -7169,7 +7067,7 @@ + CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:7173: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:7071: checking for Forte compiler version >= WS6U2" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -7179,7 +7077,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <<EOF +-#line 7183 "configure" ++#line 7081 "configure" + #include "confdefs.h" + + int main() { +@@ -7188,7 +7086,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:7192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -7339,12 +7237,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:7343: checking for ANSI C header files" >&5 ++echo "configure:7241: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7348 "configure" ++#line 7246 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -7352,7 +7250,7 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7369,7 +7267,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 7373 "configure" ++#line 7271 "configure" + #include "confdefs.h" + #include <string.h> + EOF +@@ -7387,7 +7285,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 7391 "configure" ++#line 7289 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF +@@ -7408,7 +7306,7 @@ + : + else + cat > conftest.$ac_ext <<EOF +-#line 7412 "configure" ++#line 7310 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7419,7 +7317,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7443,12 +7341,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7447: checking for working const" >&5 ++echo "configure:7345: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7452 "configure" ++#line 7350 "configure" + #include "confdefs.h" + + int main() { +@@ -7497,7 +7395,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:7501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7518,12 +7416,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7522: checking for mode_t" >&5 ++echo "configure:7420: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7527 "configure" ++#line 7425 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7551,12 +7449,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7555: checking for off_t" >&5 ++echo "configure:7453: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7560 "configure" ++#line 7458 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7584,12 +7482,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7588: checking for pid_t" >&5 ++echo "configure:7486: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7593 "configure" ++#line 7491 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7617,12 +7515,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7621: checking for size_t" >&5 ++echo "configure:7519: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7626 "configure" ++#line 7524 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7650,12 +7548,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7654: checking for st_blksize in struct stat" >&5 ++echo "configure:7552: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7659 "configure" ++#line 7557 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/stat.h> +@@ -7663,7 +7561,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7684,12 +7582,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7688: checking for siginfo_t" >&5 ++echo "configure:7586: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7693 "configure" ++#line 7591 "configure" + #include "confdefs.h" + #define _POSIX_C_SOURCE 199506L + #include <signal.h> +@@ -7697,7 +7595,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7731,12 +7629,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7735: checking for int16_t" >&5 ++echo "configure:7633: checking for int16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7740 "configure" ++#line 7638 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7744,7 +7642,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else +@@ -7766,12 +7664,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7770: checking for int32_t" >&5 ++echo "configure:7668: checking for int32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7775 "configure" ++#line 7673 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7779,7 +7677,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7801,12 +7699,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7805: checking for int64_t" >&5 ++echo "configure:7703: checking for int64_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7810 "configure" ++#line 7708 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7814,7 +7712,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7836,12 +7734,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7840: checking for int64" >&5 ++echo "configure:7738: checking for int64" >&5 + if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7845 "configure" ++#line 7743 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7849,7 +7747,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7871,12 +7769,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7875: checking for uint" >&5 ++echo "configure:7773: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7880 "configure" ++#line 7778 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7884,7 +7782,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7906,12 +7804,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7910: checking for uint_t" >&5 ++echo "configure:7808: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7915 "configure" ++#line 7813 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7919,7 +7817,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7941,12 +7839,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7945: checking for uint16_t" >&5 ++echo "configure:7843: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7950 "configure" ++#line 7848 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -7954,7 +7852,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7985,12 +7883,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7989: checking for uname.domainname" >&5 ++echo "configure:7887: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7994 "configure" ++#line 7892 "configure" + #include "confdefs.h" + #include <sys/utsname.h> + int main() { +@@ -7998,7 +7896,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:8002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -8022,12 +7920,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:8026: checking for uname.__domainname" >&5 ++echo "configure:7924: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8031 "configure" ++#line 7929 "configure" + #include "confdefs.h" + #include <sys/utsname.h> + int main() { +@@ -8035,7 +7933,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:8039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -8068,12 +7966,12 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:8072: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7970: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8077 "configure" ++#line 7975 "configure" + #include "confdefs.h" + #include <stddef.h> + $configure_static_assert_macros +@@ -8082,7 +7980,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:8086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" + else +@@ -8101,7 +7999,7 @@ + EOF + + HAVE_CPP_2BYTE_WCHAR_T=1 +-else ++elif false; then + + + ac_ext=C +@@ -8115,12 +8013,12 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:8119: checking for compiler -fshort-wchar option" >&5 ++echo "configure:8017: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8124 "configure" ++#line 8022 "configure" + #include "confdefs.h" + #include <stddef.h> + $configure_static_assert_macros +@@ -8129,7 +8027,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:8133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" + else +@@ -8163,7 +8061,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:8167: checking for visibility(hidden) attribute" >&5 ++echo "configure:8065: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8188,7 +8086,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:8192: checking for visibility(default) attribute" >&5 ++echo "configure:8090: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8213,7 +8111,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:8217: checking for visibility pragma support" >&5 ++echo "configure:8115: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8238,7 +8136,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 +-echo "configure:8242: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:8140: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8266,7 +8164,7 @@ + echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:8270: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:8168: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8314,12 +8212,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:8318: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:8216: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8323 "configure" ++#line 8221 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$ac_hdr> +@@ -8327,7 +8225,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:8331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -8352,7 +8250,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:8356: checking for opendir in -ldir" >&5 ++echo "configure:8254: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8360,7 +8258,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8364 "configure" ++#line 8262 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8371,7 +8269,7 @@ + opendir() + ; return 0; } + EOF +-if { (eval echo configure:8375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8393,7 +8291,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:8397: checking for opendir in -lx" >&5 ++echo "configure:8295: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8401,7 +8299,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8405 "configure" ++#line 8303 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8412,7 +8310,7 @@ + opendir() + ; return 0; } + EOF +-if { (eval echo configure:8416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8444,17 +8342,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8448: checking for $ac_hdr" >&5 ++echo "configure:8346: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8453 "configure" ++#line 8351 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8484,17 +8382,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8488: checking for $ac_hdr" >&5 ++echo "configure:8386: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8493 "configure" ++#line 8391 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8524,17 +8422,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8528: checking for $ac_hdr" >&5 ++echo "configure:8426: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8533 "configure" ++#line 8431 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8564,17 +8462,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8568: checking for $ac_hdr" >&5 ++echo "configure:8466: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8573 "configure" ++#line 8471 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8604,17 +8502,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8608: checking for $ac_hdr" >&5 ++echo "configure:8506: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8613 "configure" ++#line 8511 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8645,17 +8543,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8649: checking for $ac_hdr" >&5 ++echo "configure:8547: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8654 "configure" ++#line 8552 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8686,17 +8584,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8690: checking for $ac_hdr" >&5 ++echo "configure:8588: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8695 "configure" ++#line 8593 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8733,17 +8631,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8737: checking for new" >&5 ++echo "configure:8635: checking for new" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8742 "configure" ++#line 8640 "configure" + #include "confdefs.h" + #include <new> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8785,17 +8683,17 @@ + if test "x$enable_dtrace" = "xyes"; then + ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 +-echo "configure:8789: checking for sys/sdt.h" >&5 ++echo "configure:8687: checking for sys/sdt.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8794 "configure" ++#line 8692 "configure" + #include "confdefs.h" + #include <sys/sdt.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8835,17 +8733,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8839: checking for $ac_hdr" >&5 ++echo "configure:8737: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8844 "configure" ++#line 8742 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8879,7 +8777,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8883: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8781: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8887,7 +8785,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8891 "configure" ++#line 8789 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8898,7 +8796,7 @@ + gethostbyname_r() + ; return 0; } + EOF +-if { (eval echo configure:8902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8935,7 +8833,7 @@ + ;; + *) + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8939: checking for atan in -lm" >&5 ++echo "configure:8837: checking for atan in -lm" >&5 + ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8943,7 +8841,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8947 "configure" ++#line 8845 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8954,7 +8852,7 @@ + atan() + ; return 0; } + EOF +-if { (eval echo configure:8958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8982,7 +8880,7 @@ + fi + + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8986: checking for dlopen in -ldl" >&5 ++echo "configure:8884: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8990,7 +8888,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8994 "configure" ++#line 8892 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9001,7 +8899,7 @@ + dlopen() + ; return 0; } + EOF +-if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9018,17 +8916,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:9022: checking for dlfcn.h" >&5 ++echo "configure:8920: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9027 "configure" ++#line 8925 "configure" + #include "confdefs.h" + #include <dlfcn.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9065,12 +8963,12 @@ + for ac_func in dladdr + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9069: checking for $ac_func" >&5 ++echo "configure:8967: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9074 "configure" ++#line 8972 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -9093,7 +8991,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -9124,7 +9022,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:9128: checking for demangle in -lC_r" >&5 ++echo "configure:9026: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9132,7 +9030,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9136 "configure" ++#line 9034 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9143,7 +9041,7 @@ + demangle() + ; return 0; } + EOF +-if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9173,7 +9071,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:9177: checking for demangle in -lC" >&5 ++echo "configure:9075: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9181,7 +9079,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9185 "configure" ++#line 9083 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9192,7 +9090,7 @@ + demangle() + ; return 0; } + EOF +-if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9223,7 +9121,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:9227: checking for socket in -lsocket" >&5 ++echo "configure:9125: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9231,7 +9129,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9235 "configure" ++#line 9133 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9242,7 +9140,7 @@ + socket() + ; return 0; } + EOF +-if { (eval echo configure:9246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9287,7 +9185,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:9291: checking for XDrawLines in -lX11" >&5 ++echo "configure:9189: checking for XDrawLines in -lX11" >&5 + ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9295,7 +9193,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9299 "configure" ++#line 9197 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9306,7 +9204,7 @@ + XDrawLines() + ; return 0; } + EOF +-if { (eval echo configure:9310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9328,7 +9226,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:9332: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:9230: checking for XextAddDisplay in -lXext" >&5 + ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9336,7 +9234,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9340 "configure" ++#line 9238 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9347,7 +9245,7 @@ + XextAddDisplay() + ; return 0; } + EOF +-if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9371,7 +9269,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9375: checking for XtFree in -lXt" >&5 ++echo "configure:9273: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9379,7 +9277,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9383 "configure" ++#line 9281 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9390,7 +9288,7 @@ + XtFree() + ; return 0; } + EOF +-if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9411,7 +9309,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:9415: checking for IceFlush in -lICE" >&5 ++echo "configure:9313: checking for IceFlush in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9419,7 +9317,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9423 "configure" ++#line 9321 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9430,7 +9328,7 @@ + IceFlush() + ; return 0; } + EOF +-if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9451,7 +9349,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:9455: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9353: checking for SmcCloseConnection in -lSM" >&5 + ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9459,7 +9357,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9463 "configure" ++#line 9361 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9470,7 +9368,7 @@ + SmcCloseConnection() + ; return 0; } + EOF +-if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9491,7 +9389,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9495: checking for XtFree in -lXt" >&5 ++echo "configure:9393: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9499,7 +9397,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9503 "configure" ++#line 9401 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9510,7 +9408,7 @@ + XtFree() + ; return 0; } + EOF +-if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9544,7 +9442,7 @@ + esac + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9548: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9446: checking for XShmCreateImage in -lXext" >&5 + ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9552,7 +9450,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9556 "configure" ++#line 9454 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9563,7 +9461,7 @@ + XShmCreateImage() + ; return 0; } + EOF +-if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9585,17 +9483,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9589: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9487: checking for X11/extensions/XShm.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9594 "configure" ++#line 9492 "configure" + #include "confdefs.h" + #include <X11/extensions/XShm.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9625,7 +9523,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9629: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9527: checking for XieFloGeometry in -lXIE" >&5 + ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9633,7 +9531,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 9637 "configure" ++#line 9535 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -9644,7 +9542,7 @@ + XieFloGeometry() + ; return 0; } + EOF +-if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9666,17 +9564,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9670: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9568: checking for X11/extensions/XIElib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9675 "configure" ++#line 9573 "configure" + #include "confdefs.h" + #include <X11/extensions/XIElib.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9750,7 +9648,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9754: checking for $ac_word" >&5 ++echo "configure:9652: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9786,7 +9684,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9790: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9688: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9834,7 +9732,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 9838 "configure" ++#line 9736 "configure" + #include "confdefs.h" + + #include <ft2build.h> +@@ -9860,7 +9758,7 @@ + } + + EOF +-if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9910,12 +9808,12 @@ + CFLAGS="$CFLAGS $FT2_CFLAGS" + + echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6 +-echo "configure:9914: checking for FT_Bitmap_Size.y_ppem" >&5 ++echo "configure:9812: checking for FT_Bitmap_Size.y_ppem" >&5 + if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9919 "configure" ++#line 9817 "configure" + #include "confdefs.h" + #include <ft2build.h> + #include FT_FREETYPE_H +@@ -9925,7 +9823,7 @@ + return 1 + ; return 0; } + EOF +-if { (eval echo configure:9929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_member_FT_Bitmap_Size_y_ppem=yes + else +@@ -9951,12 +9849,12 @@ + for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:9955: checking for $ac_func" >&5 ++echo "configure:9853: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 9960 "configure" ++#line 9858 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -9979,7 +9877,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10022,7 +9920,7 @@ + *) + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:10026: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9924: checking for pthread_create in -lpthreads" >&5 + echo " + #include <pthread.h> + #include <stdlib.h> +@@ -10045,7 +9943,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:10049: checking for pthread_create in -lpthread" >&5 ++echo "configure:9947: checking for pthread_create in -lpthread" >&5 + echo " + #include <pthread.h> + #include <stdlib.h> +@@ -10068,7 +9966,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:10072: checking for pthread_create in -lc_r" >&5 ++echo "configure:9970: checking for pthread_create in -lc_r" >&5 + echo " + #include <pthread.h> + #include <stdlib.h> +@@ -10091,7 +9989,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:10095: checking for pthread_create in -lc" >&5 ++echo "configure:9993: checking for pthread_create in -lc" >&5 + echo " + #include <pthread.h> + #include <stdlib.h> +@@ -10150,7 +10048,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:10154: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:10052: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -10173,7 +10071,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:10177: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:10075: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -10268,7 +10166,7 @@ + fi + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:10272: checking whether mmap() sees write()s" >&5 ++echo "configure:10170: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -10307,11 +10205,11 @@ + result="yes" + else + cat > conftest.$ac_ext <<EOF +-#line 10311 "configure" ++#line 10209 "configure" + #include "confdefs.h" + $mmap_test_prog + EOF +-if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -10336,13 +10234,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:10340: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:10238: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext <<EOF +-#line 10346 "configure" ++#line 10244 "configure" + #include "confdefs.h" + #include <sgtty.h> + Autoconf TIOCGETP +@@ -10360,7 +10258,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext <<EOF +-#line 10364 "configure" ++#line 10262 "configure" + #include "confdefs.h" + #include <termio.h> + Autoconf TCGETA +@@ -10382,7 +10280,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:10386: checking for 8-bit clean memcmp" >&5 ++echo "configure:10284: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10390,7 +10288,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <<EOF +-#line 10394 "configure" ++#line 10292 "configure" + #include "confdefs.h" + + main() +@@ -10400,7 +10298,7 @@ + } + + EOF +-if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -10420,12 +10318,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10424: checking for $ac_func" >&5 ++echo "configure:10322: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10429 "configure" ++#line 10327 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -10448,7 +10346,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10475,12 +10373,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10479: checking for $ac_func" >&5 ++echo "configure:10377: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10484 "configure" ++#line 10382 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -10503,7 +10401,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10532,12 +10430,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10536: checking for $ac_func" >&5 ++echo "configure:10434: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10541 "configure" ++#line 10439 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -10560,7 +10458,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10596,19 +10494,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10600: checking for wcrtomb" >&5 ++echo "configure:10498: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10605 "configure" ++#line 10503 "configure" + #include "confdefs.h" + #include <wchar.h> + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10628,19 +10526,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10632: checking for mbrtowc" >&5 ++echo "configure:10530: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10637 "configure" ++#line 10535 "configure" + #include "confdefs.h" + #include <wchar.h> + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10669,12 +10567,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10673: checking for res_ninit()" >&5 ++echo "configure:10571: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10678 "configure" ++#line 10576 "configure" + #include "confdefs.h" + + #ifdef linux +@@ -10686,7 +10584,7 @@ + int foo = res_ninit(&_res); + ; return 0; } + EOF +-if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -10716,12 +10614,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10720: checking for gnu_get_libc_version()" >&5 ++echo "configure:10618: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10725 "configure" ++#line 10623 "configure" + #include "confdefs.h" + + #ifdef HAVE_GNU_LIBC_VERSION_H +@@ -10732,7 +10630,7 @@ + const char *glibc_version = gnu_get_libc_version(); + ; return 0; } + EOF +-if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -10761,7 +10659,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10765: checking for iconv in -lc" >&5 ++echo "configure:10663: checking for iconv in -lc" >&5 + ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10769,7 +10667,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 10773 "configure" ++#line 10671 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus +@@ -10783,7 +10681,7 @@ + iconv() + ; return 0; } + EOF +-if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10802,7 +10700,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10806: checking for iconv in -liconv" >&5 ++echo "configure:10704: checking for iconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10810,7 +10708,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 10814 "configure" ++#line 10712 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus +@@ -10824,7 +10722,7 @@ + iconv() + ; return 0; } + EOF +-if { (eval echo configure:10828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10843,7 +10741,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10847: checking for libiconv in -liconv" >&5 ++echo "configure:10745: checking for libiconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10851,7 +10749,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 10855 "configure" ++#line 10753 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus +@@ -10865,7 +10763,7 @@ + libiconv() + ; return 0; } + EOF +-if { (eval echo configure:10869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10892,12 +10790,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10896: checking for iconv()" >&5 ++echo "configure:10794: checking for iconv()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10901 "configure" ++#line 10799 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -10911,7 +10809,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10935,12 +10833,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10939: checking for iconv() with const input" >&5 ++echo "configure:10837: checking for iconv() with const input" >&5 + if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10944 "configure" ++#line 10842 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -10955,7 +10853,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10984,19 +10882,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10988: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10886: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 10993 "configure" ++#line 10891 "configure" + #include "confdefs.h" + #include <langinfo.h> + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } + EOF +-if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -11028,7 +10926,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:11032: checking for an implementation of va_copy()" >&5 ++echo "configure:10930: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11038,7 +10936,7 @@ + + else + cat > conftest.$ac_ext <<EOF +-#line 11042 "configure" ++#line 10940 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -11052,7 +10950,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -11069,7 +10967,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:11073: checking for an implementation of __va_copy()" >&5 ++echo "configure:10971: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11079,7 +10977,7 @@ + + else + cat > conftest.$ac_ext <<EOF +-#line 11083 "configure" ++#line 10981 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -11093,7 +10991,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -11110,7 +11008,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:11114: checking whether va_lists can be copied by value" >&5 ++echo "configure:11012: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11120,7 +11018,7 @@ + + else + cat > conftest.$ac_ext <<EOF +-#line 11124 "configure" ++#line 11022 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -11134,7 +11032,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:11138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -11233,7 +11131,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:11237: checking for C++ exceptions flag" >&5 ++echo "configure:11135: checking for C++ exceptions flag" >&5 + + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11268,12 +11166,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:11272: checking for gcc 3.0 ABI" >&5 ++echo "configure:11170: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11277 "configure" ++#line 11175 "configure" + #include "confdefs.h" + + int main() { +@@ -11286,7 +11184,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -11310,12 +11208,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:11314: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:11212: checking for C++ \"explicit\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11319 "configure" ++#line 11217 "configure" + #include "confdefs.h" + class X { + public: explicit X(int i) : i_(i) {} +@@ -11325,7 +11223,7 @@ + X x(3); + ; return 0; } + EOF +-if { (eval echo configure:11329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -11346,12 +11244,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:11350: checking for C++ \"typename\" keyword" >&5 ++echo "configure:11248: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11355 "configure" ++#line 11253 "configure" + #include "confdefs.h" + class param { + public: +@@ -11370,7 +11268,7 @@ + A.foo(0); + ; return 0; } + EOF +-if { (eval echo configure:11374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -11391,12 +11289,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:11395: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:11293: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11400 "configure" ++#line 11298 "configure" + #include "confdefs.h" + template <class T> struct X { int a; }; + class Y {}; +@@ -11406,7 +11304,7 @@ + X<Y> y_x; + ; return 0; } + EOF +-if { (eval echo configure:11410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -11428,12 +11326,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:11432: checking whether partial template specialization works" >&5 ++echo "configure:11330: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11437 "configure" ++#line 11335 "configure" + #include "confdefs.h" + template <class T> class Foo {}; + template <class T> class Foo<T*> {}; +@@ -11441,7 +11339,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -11462,12 +11360,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:11466: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:11364: checking whether operators must be re-defined for templates derived from templates" >&5 + if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11471 "configure" ++#line 11369 "configure" + #include "confdefs.h" + template <class T> class Base { }; + template <class T> +@@ -11479,7 +11377,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -11501,12 +11399,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:11505: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11403: checking whether we need to cast a derived template to pass as its base class" >&5 + if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11510 "configure" ++#line 11408 "configure" + #include "confdefs.h" + template <class T> class Base { }; + template <class T> class Derived : public Base<T> { }; +@@ -11515,7 +11413,7 @@ + Derived<char> bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -11536,12 +11434,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11540: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11438: checking whether the compiler can resolve const ambiguities for templates" >&5 + if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11545 "configure" ++#line 11443 "configure" + #include "confdefs.h" + + template <class T> class ptrClass { +@@ -11562,7 +11460,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11584,12 +11482,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11588: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11486: checking whether the C++ \"using\" keyword can change access" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11593 "configure" ++#line 11491 "configure" + #include "confdefs.h" + class A { protected: int foo() { return 0; } }; + class B : public A { public: using A::foo; }; +@@ -11597,10 +11495,10 @@ + B b; return b.foo(); + ; return 0; } + EOF +-if { (eval echo configure:11601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat > conftest.$ac_ext <<EOF +-#line 11604 "configure" ++#line 11502 "configure" + #include "confdefs.h" + class A { public: int foo() { return 1; } }; + class B : public A { private: using A::foo; }; +@@ -11608,7 +11506,7 @@ + B b; return b.foo(); + ; return 0; } + EOF +-if { (eval echo configure:11612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11636,12 +11534,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11640: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11538: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11645 "configure" ++#line 11543 "configure" + #include "confdefs.h" + class X { + public: int go(const X&) {return 3;} +@@ -11657,7 +11555,7 @@ + X x; Y y; y.jo(x); + ; return 0; } + EOF +-if { (eval echo configure:11661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11678,19 +11576,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11682: checking for \"std::\" namespace" >&5 ++echo "configure:11580: checking for \"std::\" namespace" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11687 "configure" ++#line 11585 "configure" + #include "confdefs.h" + #include <algorithm> + int main() { + return std::min(0, 1); + ; return 0; } + EOF +-if { (eval echo configure:11694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11711,12 +11609,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11715: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11613: checking whether standard template operator!=() is ambiguous" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11720 "configure" ++#line 11618 "configure" + #include "confdefs.h" + #include <algorithm> + struct T1 {}; +@@ -11726,7 +11624,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11748,12 +11646,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11752: checking for C++ reinterpret_cast" >&5 ++echo "configure:11650: checking for C++ reinterpret_cast" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11757 "configure" ++#line 11655 "configure" + #include "confdefs.h" + struct X { int i; }; + struct Y { int i; }; +@@ -11761,7 +11659,7 @@ + X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z); + ; return 0; } + EOF +-if { (eval echo configure:11765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11782,7 +11680,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11786: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11684: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11790,8 +11688,11 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <<EOF +-#line 11794 "configure" ++#line 11692 "configure" + #include "confdefs.h" ++#ifdef __cplusplus ++extern "C" void exit(int); ++#endif + class X { int i; public: virtual ~X() { } }; + class Y { int j; public: virtual ~Y() { } }; + class Z : public X, public Y { int k; }; +@@ -11806,7 +11707,7 @@ + ((void*)&mdo == dynamic_cast<void*>(suby)))); + } + EOF +-if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11830,19 +11731,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11834: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11735: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11839 "configure" ++#line 11740 "configure" + #include "confdefs.h" + class X {private: virtual void never_called();}; + int main() { + X x; + ; return 0; } + EOF +-if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11865,12 +11766,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11869: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11770: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11874 "configure" ++#line 11775 "configure" + #include "confdefs.h" + #include <algorithm> + template <class T> class Foo {}; +@@ -11881,7 +11782,7 @@ + Foo<int> f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11913,19 +11814,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11917: checking for LC_MESSAGES" >&5 ++echo "configure:11818: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 11922 "configure" ++#line 11823 "configure" + #include "confdefs.h" + #include <locale.h> + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:11929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -12028,7 +11929,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12032: checking for $ac_word" >&5 ++echo "configure:11933: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12063,7 +11964,7 @@ + + min_nspr_version=4.7.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 +-echo "configure:12067: checking for NSPR - version >= $min_nspr_version" >&5 ++echo "configure:11968: checking for NSPR - version >= $min_nspr_version" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -12114,7 +12015,7 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $NSPR_CFLAGS" + cat > conftest.$ac_ext <<EOF +-#line 12118 "configure" ++#line 12019 "configure" + #include "confdefs.h" + #include "prlog.h" + int main() { +@@ -12123,7 +12024,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:12127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + MOZ_NATIVE_NSPR=1 + else +@@ -12135,6 +12036,10 @@ + rm -f conftest* + CFLAGS=$_SAVE_CFLAGS + else ++ if test -n "$LIBXUL_SDK"; then ++ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" ++ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" ++ else + NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' + # explicitly set libs for Visual Age C++ for OS/2 + if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then +@@ -12152,6 +12057,7 @@ + else + NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' + fi ++ fi + fi + + +@@ -12205,7 +12111,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12209: checking for $ac_word" >&5 ++echo "configure:12115: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12240,7 +12146,7 @@ + + min_nss_version=3.12.0 + echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 +-echo "configure:12244: checking for NSS - version >= $min_nss_version" >&5 ++echo "configure:12150: checking for NSS - version >= $min_nss_version" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -12331,7 +12237,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:12335: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:12241: checking for jpeg_destroy_compress in -ljpeg" >&5 + ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12339,7 +12245,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12343 "configure" ++#line 12249 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -12350,7 +12256,7 @@ + jpeg_destroy_compress() + ; return 0; } + EOF +-if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12376,7 +12282,7 @@ + if test "$SYSTEM_JPEG" = 1; then + LIBS="$JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12380 "configure" ++#line 12286 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -12387,7 +12293,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:12391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SYSTEM_JPEG=1 + else +@@ -12425,7 +12331,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:12429: checking for gzread in -lz" >&5 ++echo "configure:12335: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12433,7 +12339,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12437 "configure" ++#line 12343 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -12444,7 +12350,7 @@ + gzread() + ; return 0; } + EOF +-if { (eval echo configure:12448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12469,7 +12375,7 @@ + if test "$SYSTEM_ZLIB" = 1; then + LIBS="$ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12473 "configure" ++#line 12379 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <string.h> +@@ -12480,7 +12386,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:12484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SYSTEM_ZLIB=1 + else +@@ -12518,7 +12424,7 @@ + SYSTEM_BZ2= + else + echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 +-echo "configure:12522: checking for BZ2_bzread in -lbz2" >&5 ++echo "configure:12428: checking for BZ2_bzread in -lbz2" >&5 + ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12526,7 +12432,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbz2 $BZ2_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12530 "configure" ++#line 12436 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -12537,7 +12443,7 @@ + BZ2_bzread() + ; return 0; } + EOF +-if { (eval echo configure:12541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12589,7 +12495,7 @@ + else + _SAVE_PNG_LIBS=$PNG_LIBS + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:12593: checking for png_get_valid in -lpng" >&5 ++echo "configure:12499: checking for png_get_valid in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12597,7 +12503,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12601 "configure" ++#line 12507 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -12608,7 +12514,7 @@ + png_get_valid() + ; return 0; } + EOF +-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12630,7 +12536,7 @@ + fi + + echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6 +-echo "configure:12634: checking for png_get_acTL in -lpng" >&5 ++echo "configure:12540: checking for png_get_acTL in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12638,7 +12544,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12642 "configure" ++#line 12548 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -12649,7 +12555,7 @@ + png_get_acTL() + ; return 0; } + EOF +-if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12681,7 +12587,7 @@ + if test "$SYSTEM_PNG" = 1; then + LIBS="$PNG_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 12685 "configure" ++#line 12591 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <sys/types.h> +@@ -12695,7 +12601,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:12699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SYSTEM_PNG=1 + else +@@ -12737,7 +12643,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12741: checking for $ac_word" >&5 ++echo "configure:12647: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12781,19 +12687,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for hunspell""... $ac_c" 1>&6 +-echo "configure:12785: checking for hunspell" >&5 ++echo "configure:12691: checking for hunspell" >&5 + + if $PKG_CONFIG --exists "hunspell" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12792: checking MOZ_HUNSPELL_CFLAGS" >&5 ++echo "configure:12698: checking MOZ_HUNSPELL_CFLAGS" >&5 + MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` + echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 +-echo "configure:12797: checking MOZ_HUNSPELL_LIBS" >&5 ++echo "configure:12703: checking MOZ_HUNSPELL_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 +@@ -13161,7 +13067,7 @@ + # Allow the application to influence configure with a confvars.sh script. + + echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6 +-echo "configure:13165: checking if app-specific confvars.sh exists" >&5 ++echo "configure:13071: checking if app-specific confvars.sh exists" >&5 + if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then + echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6 + . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" +@@ -13284,6 +13190,10 @@ + + # Toolkit Options + ++if test -n "$LIBXUL_SDK"; then ++ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` ++else ++ + # Check whether --enable-default-toolkit or --disable-default-toolkit was given. + if test "${enable_default_toolkit+set}" = set; then + enableval="$enable_default_toolkit" +@@ -13309,6 +13219,7 @@ + { echo "configure: error: Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported)." 1>&2; exit 1; } + fi + fi ++fi # LIBXUL_SDK + + cat >> confdefs.h <<EOF + #define MOZ_DEFAULT_TOOLKIT "$MOZ_WIDGET_TOOLKIT" +@@ -13404,7 +13315,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13408: checking for $ac_word" >&5 ++echo "configure:13319: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13448,19 +13359,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 +-echo "configure:13452: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 ++echo "configure:13363: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13459: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:13370: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +-echo "configure:13464: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:13375: checking MOZ_GTK2_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 +@@ -13495,6 +13406,7 @@ + + + ++if test -z "$LIBXUL_SDK"; then + if test "$MOZ_ENABLE_GTK2" + then + MOZ_ENABLE_STARTUP_NOTIFICATION= +@@ -13519,7 +13431,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13523: checking for $ac_word" >&5 ++echo "configure:13435: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13563,19 +13475,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 +-echo "configure:13567: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 ++echo "configure:13479: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 + + if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13574: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 ++echo "configure:13486: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 + MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` + echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 +-echo "configure:13579: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ++echo "configure:13491: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 +@@ -13621,6 +13533,7 @@ + + TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" + fi ++fi + + + +@@ -13639,7 +13552,7 @@ + + + +-if test "$MOZ_ENABLE_GTK2" ++if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" + then + cat >> confdefs.h <<\EOF + #define MOZ_X11 1 +@@ -13779,7 +13692,7 @@ + + + +-if test "$MOZ_ENABLE_GTK2" ++if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" + then + succeeded=no + +@@ -13787,7 +13700,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13791: checking for $ac_word" >&5 ++echo "configure:13704: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13831,19 +13744,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13835: checking for xft" >&5 ++echo "configure:13748: checking for xft" >&5 + + if $PKG_CONFIG --exists "xft" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13842: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13755: checking MOZ_XFT_CFLAGS" >&5 + MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` + echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +-echo "configure:13847: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13760: checking MOZ_XFT_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 +@@ -13881,7 +13794,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13885: checking for $ac_word" >&5 ++echo "configure:13798: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -13925,19 +13838,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6 +-echo "configure:13929: checking for pango >= $PANGO_VERSION" >&5 ++echo "configure:13842: checking for pango >= $PANGO_VERSION" >&5 + + if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13936: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13849: checking _PANGOCHK_CFLAGS" >&5 + _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"` + echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 + + echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13941: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13854: checking _PANGOCHK_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 +@@ -13972,7 +13885,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:13976: checking for $ac_word" >&5 ++echo "configure:13889: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14016,19 +13929,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION""... $ac_c" 1>&6 +-echo "configure:14020: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 ++echo "configure:13933: checking for pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" >&5 + + if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14027: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13940: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:14032: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13945: checking MOZ_PANGO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangocairo >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 +@@ -14075,6 +13988,7 @@ + + + ++if test -z "$LIBXUL_SDK"; then + if test "$MOZ_X11" + then + if test "$MOZ_ENABLE_GTK2" +@@ -14105,7 +14019,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14109: checking for $ac_word" >&5 ++echo "configure:14023: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14149,19 +14063,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:14153: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14067: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 + + if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14160: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14074: checking MOZ_GNOMEVFS_CFLAGS" >&5 + MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +-echo "configure:14165: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14079: checking MOZ_GNOMEVFS_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 +@@ -14212,7 +14126,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14216: checking for $ac_word" >&5 ++echo "configure:14130: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14256,19 +14170,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:14260: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14174: checking for gconf-2.0 >= $GCONF_VERSION" >&5 + + if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14267: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14181: checking MOZ_GCONF_CFLAGS" >&5 + MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` + echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +-echo "configure:14272: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14186: checking MOZ_GCONF_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 +@@ -14323,7 +14237,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14327: checking for $ac_word" >&5 ++echo "configure:14241: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14367,19 +14281,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14371: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14285: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14378: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14292: checking MOZ_LIBGNOME_CFLAGS" >&5 + MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` + echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +-echo "configure:14383: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14297: checking MOZ_LIBGNOME_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 +@@ -14457,7 +14371,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14461: checking for $ac_word" >&5 ++echo "configure:14375: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14501,19 +14415,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14505: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14419: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14512: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14426: checking MOZ_GNOMEUI_CFLAGS" >&5 + MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +-echo "configure:14517: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14431: checking MOZ_GNOMEUI_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 +@@ -14590,7 +14504,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14594: checking for $ac_word" >&5 ++echo "configure:14508: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14634,19 +14548,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6 +-echo "configure:14638: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 ++echo "configure:14552: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 + + if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14645: checking MOZ_DBUS_GLIB_CFLAGS" >&5 ++echo "configure:14559: checking MOZ_DBUS_GLIB_CFLAGS" >&5 + MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"` + echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:14650: checking MOZ_DBUS_GLIB_LIBS" >&5 ++echo "configure:14564: checking MOZ_DBUS_GLIB_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 +@@ -14685,6 +14599,9 @@ + + + ++fi # LIBXUL_SDK ++ ++ + # Check whether --enable-crypto or --disable-crypto was given. + if test "${enable_crypto+set}" = set; then + enableval="$enable_crypto" +@@ -15149,7 +15066,7 @@ + # Extract the first word of "java", so it can be a program name with args. + set dummy java; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15153: checking for $ac_word" >&5 ++echo "configure:15070: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15185,7 +15102,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15189: checking for $ac_word" >&5 ++echo "configure:15106: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15221,7 +15138,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15225: checking for $ac_word" >&5 ++echo "configure:15142: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15295,7 +15212,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15299: checking for $ac_word" >&5 ++echo "configure:15216: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15339,19 +15256,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 +-echo "configure:15343: checking for gthread-2.0" >&5 ++echo "configure:15260: checking for gthread-2.0" >&5 + + if $PKG_CONFIG --exists "gthread-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 +-echo "configure:15350: checking MOZ_GTHREAD_CFLAGS" >&5 ++echo "configure:15267: checking MOZ_GTHREAD_CFLAGS" >&5 + MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` + echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 +-echo "configure:15355: checking MOZ_GTHREAD_LIBS" >&5 ++echo "configure:15272: checking MOZ_GTHREAD_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 +@@ -15387,17 +15304,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:15391: checking for $ac_hdr" >&5 ++echo "configure:15308: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 15396 "configure" ++#line 15313 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:15401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:15318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -15747,7 +15664,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15751: checking for $ac_word" >&5 ++echo "configure:15668: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15792,7 +15709,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15796: checking for $ac_word" >&5 ++echo "configure:15713: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15840,13 +15757,13 @@ + + + echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 +-echo "configure:15844: checking for tar archiver" >&5 ++echo "configure:15761: checking for tar archiver" >&5 + for ac_prog in gnutar gtar tar + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15850: checking for $ac_word" >&5 ++echo "configure:15767: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15901,13 +15818,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15905: checking for iconv" >&5 ++echo "configure:15822: checking for iconv" >&5 + for ac_prog in $HOST_ICONV "iconv" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15911: checking for $ac_word" >&5 ++echo "configure:15828: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -16247,7 +16164,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:16251: checking for $ac_word" >&5 ++echo "configure:16168: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -16291,19 +16208,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6 +-echo "configure:16295: checking for sqlite3 >= $SQLITE_VERSION" >&5 ++echo "configure:16212: checking for sqlite3 >= $SQLITE_VERSION" >&5 + + if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6 +-echo "configure:16302: checking SQLITE_CFLAGS" >&5 ++echo "configure:16219: checking SQLITE_CFLAGS" >&5 + SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"` + echo "$ac_t""$SQLITE_CFLAGS" 1>&6 + + echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6 +-echo "configure:16307: checking SQLITE_LIBS" >&5 ++echo "configure:16224: checking SQLITE_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$SQLITE_LIBS" 1>&6 +@@ -16493,18 +16410,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:16497: checking for valid debug flags" >&5 ++echo "configure:16414: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext <<EOF +-#line 16501 "configure" ++#line 16418 "configure" + #include "confdefs.h" + #include <stdio.h> + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -16545,18 +16462,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:16549: checking for valid optimization flags" >&5 ++echo "configure:16466: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext <<EOF +-#line 16553 "configure" ++#line 16470 "configure" + #include "confdefs.h" + #include <stdio.h> + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -16706,7 +16623,7 @@ + fi + + +-if test "$NS_TRACE_MALLOC"; then ++if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then + MOZ_MEMORY= + fi + +@@ -16726,7 +16643,7 @@ + fi + else + echo $ac_n "checking size of int *""... $ac_c" 1>&6 +-echo "configure:16730: checking size of int *" >&5 ++echo "configure:16647: checking size of int *" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -16734,18 +16651,19 @@ + ac_cv_sizeof_int_p=4 + else + cat > conftest.$ac_ext <<EOF +-#line 16738 "configure" ++#line 16655 "configure" + #include "confdefs.h" + #include <stdio.h> +-int main() ++#include <sys/types.h> ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int *)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:16749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_int_p=`cat conftestval` + else +@@ -16875,17 +16793,17 @@ + + ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 +-echo "configure:16879: checking for valgrind/valgrind.h" >&5 ++echo "configure:16797: checking for valgrind/valgrind.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 16884 "configure" ++#line 16802 "configure" + #include "confdefs.h" + #include <valgrind/valgrind.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:16889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -16962,7 +16880,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:16966: checking for malloc in -lefence" >&5 ++echo "configure:16884: checking for malloc in -lefence" >&5 + ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -16970,7 +16888,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 16974 "configure" ++#line 16892 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -16981,7 +16899,7 @@ + malloc() + ; return 0; } + EOF +-if { (eval echo configure:16985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -17113,12 +17031,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:17117: checking for $ac_func" >&5 ++echo "configure:17035: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 17122 "configure" ++#line 17040 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -17144,7 +17062,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -17363,12 +17281,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:17367: checking for $ac_func" >&5 ++echo "configure:17285: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 17372 "configure" ++#line 17290 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -17394,7 +17312,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:17398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -17442,17 +17360,17 @@ + if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then + ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 +-echo "configure:17446: checking for unwind.h" >&5 ++echo "configure:17364: checking for unwind.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 17451 "configure" ++#line 17369 "configure" + #include "confdefs.h" + #include <unwind.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:17456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:17374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -17471,12 +17389,12 @@ + for ac_func in _Unwind_Backtrace + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:17475: checking for $ac_func" >&5 ++echo "configure:17393: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 17480 "configure" ++#line 17398 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -17499,7 +17417,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:17503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -17621,7 +17539,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:17625: checking for gcc -pipe support" >&5 ++echo "configure:17543: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include <stdio.h>' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c +@@ -17636,14 +17554,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext <<EOF +-#line 17640 "configure" ++#line 17558 "configure" + #include "confdefs.h" + #include <stdio.h> + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:17647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -17685,16 +17603,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:17689: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:17607: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <<EOF +-#line 17691 "configure" ++#line 17609 "configure" + #include "confdefs.h" + + int main() { + return(0); + ; return 0; } + EOF +-if { (eval echo configure:17698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" +@@ -17730,16 +17648,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:17734: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:17652: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <<EOF +-#line 17736 "configure" ++#line 17654 "configure" + #include "confdefs.h" + + int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:17743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -17759,16 +17677,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:17763: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:17681: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <<EOF +-#line 17765 "configure" ++#line 17683 "configure" + #include "confdefs.h" + + int main() { + return 0; + ; return 0; } + EOF +-if { (eval echo configure:17772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -17838,16 +17756,16 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:17842: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:17760: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <<EOF +-#line 17844 "configure" ++#line 17762 "configure" + #include "confdefs.h" + $configure_static_assert_macros + int main() { + CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) + ; return 0; } + EOF +-if { (eval echo configure:17851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else +@@ -17872,13 +17790,16 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:17876: checking for correct temporary object destruction order" >&5 ++echo "configure:17794: checking for correct temporary object destruction order" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <<EOF +-#line 17881 "configure" ++#line 17799 "configure" + #include "confdefs.h" ++#ifdef __cplusplus ++extern "C" void exit(int); ++#endif + class A { + public: A(int& x) : mValue(x) {} + ~A() { mValue--; } +@@ -17897,7 +17818,7 @@ + } + + EOF +-if { (eval echo configure:17901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -17918,12 +17839,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:17922: checking for correct overload resolution with const and templates" >&5 ++echo "configure:17843: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 17927 "configure" ++#line 17848 "configure" + #include "confdefs.h" + + template <class T> +@@ -17953,7 +17874,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:17957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -18216,7 +18137,7 @@ + ;; + esac + +-if test -z "$COMPILE_ENVIRONMENT"; then ++if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then + SKIP_IDL_CHECK="yes" + fi + +@@ -18256,7 +18177,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18260: checking for $ac_word" >&5 ++echo "configure:18181: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18300,19 +18221,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 +-echo "configure:18304: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 ++echo "configure:18225: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18311: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18232: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18316: checking LIBIDL_LIBS" >&5 ++echo "configure:18237: checking LIBIDL_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 +@@ -18436,7 +18357,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18440: checking for $ac_word" >&5 ++echo "configure:18361: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18471,7 +18392,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18475: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18396: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18494,7 +18415,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 18498 "configure" ++#line 18419 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -18570,7 +18491,7 @@ + } + + EOF +-if { (eval echo configure:18574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18604,7 +18525,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 18608 "configure" ++#line 18529 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -18614,7 +18535,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18658,7 +18579,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18662: checking for $ac_word" >&5 ++echo "configure:18583: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18693,7 +18614,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:18697: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18618: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -18720,7 +18641,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 18724 "configure" ++#line 18645 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -18806,7 +18727,7 @@ + } + + EOF +-if { (eval echo configure:18810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18840,7 +18761,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 18844 "configure" ++#line 18765 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -18851,7 +18772,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -18891,7 +18812,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18895: checking for $ac_word" >&5 ++echo "configure:18816: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18935,19 +18856,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18939: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18860: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18946: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18867: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18951: checking LIBIDL_LIBS" >&5 ++echo "configure:18872: checking LIBIDL_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 +@@ -18984,7 +18905,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18988: checking for $ac_word" >&5 ++echo "configure:18909: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19021,7 +18942,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:19025: checking for ORBit libIDL usability" >&5 ++echo "configure:18946: checking for ORBit libIDL usability" >&5 + _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` + _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` + _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` +@@ -19038,7 +18959,7 @@ + result="maybe" + else + cat > conftest.$ac_ext <<EOF +-#line 19042 "configure" ++#line 18963 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -19053,7 +18974,7 @@ + } + + EOF +-if { (eval echo configure:19057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + _LIBIDL_FOUND=1 + result="yes" +@@ -19100,7 +19021,7 @@ + fi + fi + +-if test -z "$SKIP_PATH_CHECKS"; then ++if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then + if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then + if test "$MOZ_ENABLE_GTK2"; then + succeeded=no +@@ -19109,7 +19030,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19113: checking for $ac_word" >&5 ++echo "configure:19034: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19153,19 +19074,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 +-echo "configure:19157: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 ++echo "configure:19078: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19164: checking GLIB_CFLAGS" >&5 ++echo "configure:19085: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:19169: checking GLIB_LIBS" >&5 ++echo "configure:19090: checking GLIB_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$GLIB_LIBS" 1>&6 +@@ -19250,7 +19171,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19254: checking for $ac_word" >&5 ++echo "configure:19175: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19285,7 +19206,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:19289: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:19210: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -19308,7 +19229,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext <<EOF +-#line 19312 "configure" ++#line 19233 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -19384,7 +19305,7 @@ + } + + EOF +-if { (eval echo configure:19388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -19418,7 +19339,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 19422 "configure" ++#line 19343 "configure" + #include "confdefs.h" + + #include <glib.h> +@@ -19428,7 +19349,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:19432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -19508,19 +19429,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:19512: checking for working alloca.h" >&5 ++echo "configure:19433: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 19517 "configure" ++#line 19438 "configure" + #include "confdefs.h" + #include <alloca.h> + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:19524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -19541,12 +19462,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:19545: checking for alloca" >&5 ++echo "configure:19466: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 19550 "configure" ++#line 19471 "configure" + #include "confdefs.h" + + #ifdef __GNUC__ +@@ -19574,7 +19495,7 @@ + char *p = (char *) alloca(1); + ; return 0; } + EOF +-if { (eval echo configure:19578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -19606,12 +19527,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:19610: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19531: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 19615 "configure" ++#line 19536 "configure" + #include "confdefs.h" + #if defined(CRAY) && ! defined(CRAY2) + webecray +@@ -19636,12 +19557,12 @@ + if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:19640: checking for $ac_func" >&5 ++echo "configure:19561: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 19645 "configure" ++#line 19566 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -19664,7 +19585,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:19668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -19691,7 +19612,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:19695: checking stack direction for C alloca" >&5 ++echo "configure:19616: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19699,7 +19620,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <<EOF +-#line 19703 "configure" ++#line 19624 "configure" + #include "confdefs.h" + find_stack_direction () + { +@@ -19718,7 +19639,7 @@ + exit (find_stack_direction() < 0); + } + EOF +-if { (eval echo configure:19722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -19765,17 +19686,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:19769: checking for $ac_hdr" >&5 ++echo "configure:19690: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 19774 "configure" ++#line 19695 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:19779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -19853,7 +19774,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19857: checking for $ac_word" >&5 ++echo "configure:19778: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19897,19 +19818,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6 +-echo "configure:19901: checking for fontconfig freetype2" >&5 ++echo "configure:19822: checking for fontconfig freetype2" >&5 + + if $PKG_CONFIG --exists "fontconfig freetype2" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19908: checking CAIRO_FT_CFLAGS" >&5 ++echo "configure:19829: checking CAIRO_FT_CFLAGS" >&5 + CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"` + echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6 +-echo "configure:19913: checking CAIRO_FT_LIBS" >&5 ++echo "configure:19834: checking CAIRO_FT_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$CAIRO_FT_LIBS" 1>&6 +@@ -20000,7 +19921,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:20004: checking for $ac_word" >&5 ++echo "configure:19925: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -20044,19 +19965,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6 +-echo "configure:20048: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 ++echo "configure:19969: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:20055: checking CAIRO_CFLAGS" >&5 ++echo "configure:19976: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +-echo "configure:20060: checking CAIRO_LIBS" >&5 ++echo "configure:19981: checking CAIRO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$CAIRO_LIBS" 1>&6 +@@ -20094,7 +20015,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:20098: checking for $ac_word" >&5 ++echo "configure:20019: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -20138,19 +20059,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:20142: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++echo "configure:20063: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 +-echo "configure:20149: checking CAIRO_XRENDER_CFLAGS" >&5 ++echo "configure:20070: checking CAIRO_XRENDER_CFLAGS" >&5 + CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 +-echo "configure:20154: checking CAIRO_XRENDER_LIBS" >&5 ++echo "configure:20075: checking CAIRO_XRENDER_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 +@@ -20221,7 +20142,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:20225: checking for $ac_word" >&5 ++echo "configure:20146: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -20265,19 +20186,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for lcms >= $LCMS_VERSION""... $ac_c" 1>&6 +-echo "configure:20269: checking for lcms >= $LCMS_VERSION" >&5 ++echo "configure:20190: checking for lcms >= $LCMS_VERSION" >&5 + + if $PKG_CONFIG --exists "lcms >= $LCMS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LCMS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:20276: checking LCMS_CFLAGS" >&5 ++echo "configure:20197: checking LCMS_CFLAGS" >&5 + LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= $LCMS_VERSION"` + echo "$ac_t""$LCMS_CFLAGS" 1>&6 + + echo $ac_n "checking LCMS_LIBS""... $ac_c" 1>&6 +-echo "configure:20281: checking LCMS_LIBS" >&5 ++echo "configure:20202: checking LCMS_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + LCMS_LIBS="`$PKG_CONFIG --libs \"lcms >= $LCMS_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$LCMS_LIBS" 1>&6 +@@ -20625,14 +20546,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext <<EOF +-#line 20629 "configure" ++#line 20550 "configure" + #include "confdefs.h" + #include <gmodule.h> + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:20636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20946,7 +20867,7 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $XCFLAGS" + cat > conftest.$ac_ext <<EOF +-#line 20950 "configure" ++#line 20871 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -20964,7 +20885,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:20968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -21187,34 +21108,15 @@ + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-# +-# If the first sed substitution is executed (which looks for macros that +-# take arguments), then we branch to the quote section. Otherwise, +-# look for a macro that doesn't take arguments. +-cat >confdef2opt.sed <<\_ACEOF +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +-t quote +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +-t quote +-d +-: quote +-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +-s,\[,\\&,g +-s,\],\\&,g +-s,\$,$$,g +-p +-_ACEOF +-# We use echo to avoid assuming a particular line-breaking character. +-# The extra dot is to prevent the shell from consuming trailing +-# line-breaks from the sub-command output. A line-break within +-# single-quotes doesn't work because, if this script is created in a +-# platform that uses two characters for line-breaks (e.g., DOS), tr +-# would break. +-ac_LF_and_DOT=`echo; echo .` +-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +-rm -f confdef2opt.sed ++cat > conftest.defs <<\EOF ++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g ++s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++s%\[%\\&%g ++s%\]%\\&%g ++s%\$%$$%g ++EOF ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++rm -f conftest.defs + + MOZ_DEFINES=$DEFS + +@@ -22081,7 +21983,7 @@ + unset MAKEFILES + unset CONFIG_FILES + +-if test "$COMPILE_ENVIRONMENT"; then ++if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then + if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" + if test -z "$MOZ_DEBUG"; then +@@ -22190,7 +22092,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -22333,7 +22235,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +--- iceweasel-3.0.1.orig/configure.in ++++ iceweasel-3.0.1/configure.in +@@ -2759,7 +2759,7 @@ + if test "$ac_cv_have_usable_wchar_v2" = "yes"; then + AC_DEFINE(HAVE_CPP_2BYTE_WCHAR_T) + HAVE_CPP_2BYTE_WCHAR_T=1 +-else ++elif false; then + dnl This is really gcc-only + dnl Do this test using CXX only since some versions of gcc + dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions +@@ -4000,6 +4000,10 @@ + AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT])) + CFLAGS=$_SAVE_CFLAGS + else ++ if test -n "$LIBXUL_SDK"; then ++ NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" ++ NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" ++ else + NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`' + # explicitly set libs for Visual Age C++ for OS/2 + if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then +@@ -4017,6 +4021,7 @@ + else + NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`' + fi ++ fi + fi + + dnl ======================================================== +@@ -4641,6 +4646,10 @@ + dnl ======================================================== + MOZ_ARG_HEADER(Toolkit Options) + ++if test -n "$LIBXUL_SDK"; then ++ MOZ_WIDGET_TOOLKIT=`perl -e 'while (<>) { /MOZ_DEFAULT_TOOLKIT *\"(.*)\"/ && print $1; }' $LIBXUL_SDK_DIR/include/mozilla-config.h` ++else ++ + dnl ======================================================== + dnl = Select the default toolkit + dnl ======================================================== +@@ -4676,6 +4685,7 @@ + AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).]) + fi + fi ++fi # LIBXUL_SDK + + AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT") + +@@ -4754,6 +4764,7 @@ + dnl = startup-notification support module + dnl ======================================================== + ++if test -z "$LIBXUL_SDK"; then + if test "$MOZ_ENABLE_GTK2" + then + MOZ_ENABLE_STARTUP_NOTIFICATION= +@@ -4781,6 +4792,7 @@ + + TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" + fi ++fi + AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) + AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) + AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) +@@ -4799,7 +4811,7 @@ + + AC_SUBST(MOC) + +-if test "$MOZ_ENABLE_GTK2" ++if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" + then + AC_DEFINE(MOZ_X11) + MOZ_X11=1 +@@ -4921,7 +4933,7 @@ + dnl ======================================================== + dnl = Xft and Pango + dnl ======================================================== +-if test "$MOZ_ENABLE_GTK2" ++if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" + then + PKG_CHECK_MODULES(MOZ_XFT, xft) + AC_SUBST(MOZ_XFT_CFLAGS) +@@ -4945,6 +4957,7 @@ + dnl = GnomeVFS support module + dnl ======================================================== + ++if test -z "$LIBXUL_SDK"; then + if test "$MOZ_X11" + then + dnl build the gnomevfs extension by default only when the +@@ -5081,6 +5094,9 @@ + AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) + AC_SUBST(MOZ_DBUS_GLIB_LIBS) + ++fi # LIBXUL_SDK ++ ++ + dnl ======================================================== + dnl = Build Personal Security Manager + dnl ======================================================== +@@ -6245,7 +6261,7 @@ + MOZ_MEMORY=1, + MOZ_MEMORY=) + +-if test "$NS_TRACE_MALLOC"; then ++if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then + MOZ_MEMORY= + fi + +@@ -7113,7 +7129,7 @@ + ;; + esac + +-if test -z "$COMPILE_ENVIRONMENT"; then ++if test -z "$COMPILE_ENVIRONMENT" || test "$LIBXUL_SDK"; then + SKIP_IDL_CHECK="yes" + fi + +@@ -7220,7 +7236,7 @@ + fi + fi + +-if test -z "$SKIP_PATH_CHECKS"; then ++if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then + if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then + if test "$MOZ_ENABLE_GTK2"; then + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) +@@ -8260,7 +8276,7 @@ + unset MAKEFILES + unset CONFIG_FILES + +-if test "$COMPILE_ENVIRONMENT"; then ++if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then + if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla" + if test -z "$MOZ_DEBUG"; then + + diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index 7ad0c28db7..182d65dc16 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -8,10 +8,11 @@ FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ ${libdir}/firefox-${PV}/defaults/preferences/inspector* \ " FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults" -FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config" -FILES_${PN}-dbg += " ${libdir}/firefox-${PV}/.debug \ - ${libdir}/firefox-${PV}/*/.debug \ - ${libdir}/firefox-${PV}/*/*/*/.debug \ +FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config ${libdir}/firefox-devel-${PV}" +FILES_${PN}-dbg += " ${libdir}/firefox-*/.debug \ + ${libdir}/firefox-*/*/.debug \ + ${libdir}/firefox-*/*/*/.debug \ + ${libdir}/firefox-*/*/*/*/.debug \ ${bindir}/.debug \ " @@ -21,12 +22,12 @@ do_install() { install -d ${D}${datadir}/pixmaps install -m 0644 ${WORKDIR}/mozilla-firefox.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/mozilla-firefox.png ${D}${datadir}/pixmaps/ - rm -f ${D}${libdir}/firefox-${PV}/TestGtkEmbed + rm -f ${D}${libdir}/firefox-*/TestGtkEmbed } pkg_postinst_firefox() { # work around requirement for root access on first startup - chmod -R a+w ${libdir}/firefox* + chmod -R a+w ${libdir}/firefox* ||true } do_stage() { diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb index 7952247322..3bf4f92e35 100644 --- a/packages/mozilla/firefox_3.0.1.bb +++ b/packages/mozilla/firefox_3.0.1.bb @@ -1,5 +1,5 @@ DEPENDS += "cairo" -PR = "r2" +PR = "r5" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ @@ -10,9 +10,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://Bug405992.atomic.nspr.diff;patch=1 \ file://random_to_urandom.diff;patch=1 \ file://jemalloc-tls.patch;patch=1 \ - http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0~rc2-2.diff.gz;patch=1 \ - file://0001-Remove-Werror-from-build.patch;patch=1 \ - file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ + file://wchart.diff;patch=1 \ + file://0001-Remove-Werror-from-build.patch;patch=1 \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ " S = "${WORKDIR}/mozilla" @@ -23,6 +23,7 @@ inherit mozilla require firefox.inc export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb index c16cbeb036..8c3b3d2eaa 100644 --- a/packages/neuros-public/neuros-mainmenu_git.bb +++ b/packages/neuros-public/neuros-mainmenu_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" PV = "0.0+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "r1" DEPENDS = "qt-embedded" @@ -18,6 +18,9 @@ do_install() { install -d ${D}/${sysconfdir}/menu install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu + + install -d ${D}/${sysconfdir}/nwm + echo "${bindir}/mainmenu" > ${D}/${sysconfdir}/nwm/startup } diff --git a/packages/neuros-public/neuros-nwm/.mtn2git_empty b/packages/neuros-public/neuros-nwm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/neuros-public/neuros-nwm/.mtn2git_empty diff --git a/packages/neuros-public/neuros-nwm/init b/packages/neuros-public/neuros-nwm/init new file mode 100644 index 0000000000..5ab8f7a248 --- /dev/null +++ b/packages/neuros-public/neuros-nwm/init @@ -0,0 +1,31 @@ +#!/bin/sh +###############################################################################$ +# +# Filename: /etc/init.d/nwm +# +# File Description: Qt Neuros server Startup Script +# +# @author Tom Bruno tbruno@neuros.us +# @version $Revision: 1.0 $ +# +###############################################################################$ + +[ "$1" != "" ] && action=$1 +if [ "$action" = "" ] +then + echo "Usage: $0 <action start|stop>" >&2 + exit 1 +fi + +if [ "$action" = "start" ] +then + + QWS_KEYBOARD="osdir" QWS_DISPLAY="LinuxFb:/dev/fb2" /usr/local/bin/nwm & + +else + if [ "$action" = "stop" ] + then + killall nwm + fi +fi + diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb index 0f0dcf857d..4290ae38be 100644 --- a/packages/neuros-public/neuros-nwm_git.bb +++ b/packages/neuros-public/neuros-nwm_git.bb @@ -2,18 +2,23 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" PV = "0.0+${PR}+gitr${SRCREV}" -PR = "r4" +PR = "r6" DEPENDS = "qt-embedded" -inherit qtopia4core +inherit qtopia4core update-rc.d SRCREV = "e6c30ba6e5be217ca4bf7e98e00f87bb7241872c" -SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git" +SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git \ + file://init" + +INITSCRIPT_NAME = "neuros-nwm" + S = "${WORKDIR}/git/" do_configure_prepend() { rm ${S}/src/Makefile || true + sed -i -e s:/usr/locl/bin:${bindir}:g ${WORKDIR}/init } do_install() { @@ -21,6 +26,9 @@ do_install() { install -m 0755 ${S}/build/nwm ${D}/${bindir} install -d ${D}/${libdir} ln -sf ${datadir}/fonts ${D}/${libdir}/fonts + + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/neuros-nwm } FILES_${PN} += "${libdir}/fonts" diff --git a/packages/numptyphysics/numptyphysics/.mtn2git_empty b/packages/numptyphysics/numptyphysics/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/numptyphysics/numptyphysics/.mtn2git_empty diff --git a/packages/numptyphysics/numptyphysics/gcc43.diff b/packages/numptyphysics/numptyphysics/gcc43.diff new file mode 100644 index 0000000000..2658771555 --- /dev/null +++ b/packages/numptyphysics/numptyphysics/gcc43.diff @@ -0,0 +1,50 @@ +--- /tmp/Common.h 2008-08-08 15:47:57.000000000 +0200 ++++ trunk/Common.h 2008-08-08 15:48:08.403198000 +0200 +@@ -14,6 +14,7 @@ + * + */ + ++#include <cstring> + #ifndef COMMON_H + #define COMMON_H + +--- /tmp/b2Body.h 2008-08-08 15:51:13.000000000 +0200 ++++ trunk/Box2D/Source/Dynamics/b2Body.h 2008-08-08 15:52:26.583198000 +0200 +@@ -24,6 +24,7 @@ + #include "../Collision/b2Shape.h"
+
+ #include <memory>
++#include <cstring>
+
+ class b2Joint;
+ class b2Contact;
+--- /tmp/b2BroadPhase.cpp 2008-08-08 15:53:43.000000000 +0200 ++++ trunk/Box2D/Source/Collision/b2BroadPhase.cpp 2008-08-08 15:54:04.913198000 +0200 +@@ -18,6 +18,7 @@ +
+ #include "b2BroadPhase.h"
+ #include <algorithm>
++#include <cstring>
+
+ // Notes:
+ // - we use bound arrays instead of linked lists for cache coherence.
+--- /tmp/b2PolyContact.cpp 2008-08-08 15:55:01.000000000 +0200 ++++ trunk/Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp 2008-08-08 15:56:15.553198000 +0200 +@@ -21,6 +21,7 @@ +
+ #include <memory>
+ #include <new>
++#include <cstring>
+
+ b2Contact* b2PolyContact::Create(b2Shape* shape1, b2Shape* shape2, b2BlockAllocator* allocator)
+ {
+--- /tmp/b2BlockAllocator.cpp 2008-08-08 15:57:02.000000000 +0200 ++++ trunk/Box2D/Source/Common/b2BlockAllocator.cpp 2008-08-08 15:57:35.833198000 +0200 +@@ -20,6 +20,7 @@ + #include <cstdlib>
+ #include <memory>
+ #include <climits>
++#include <cstring>
+
+ int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] =
+ {
diff --git a/packages/numptyphysics/numptyphysics_svn.bb b/packages/numptyphysics/numptyphysics_svn.bb index 976028befe..6c833c2f01 100644 --- a/packages/numptyphysics/numptyphysics_svn.bb +++ b/packages/numptyphysics/numptyphysics_svn.bb @@ -9,6 +9,7 @@ PV = "0.2+svnr${SRCREV}" SRC_URI = "\ svn://garage.maemo.org/svn/${PN};module=trunk;proto=https \ http://wwwpub.zih.tu-dresden.de/~mkluge/numptyphysics_setup.tgz \ + file://gcc43.diff;patch=1 \ " S = "${WORKDIR}/trunk" @@ -16,7 +17,7 @@ EXTRA_S = "${WORKDIR}/local/packages/numptyphysics" # what an ugly buildsystem... handcrafted Makefiles... back to the stoneage export CCOPTS = "${CFLAGS} -I Box2D/Include" -export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image" +export LDOPTS = "${LDFLAGS} -lSDL -lSDL_image -lX11" do_configure() { for i in Config.h Makefile Game.cpp; do diff --git a/packages/openmax/.mtn2git_empty b/packages/openmax/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmax/.mtn2git_empty diff --git a/packages/openmax/gst-openmax/.mtn2git_empty b/packages/openmax/gst-openmax/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmax/gst-openmax/.mtn2git_empty diff --git a/packages/openmax/gst-openmax/check.diff b/packages/openmax/gst-openmax/check.diff new file mode 100644 index 0000000000..9e74abf537 --- /dev/null +++ b/packages/openmax/gst-openmax/check.diff @@ -0,0 +1,11 @@ +--- /tmp/gst-check.m4 2008-08-05 17:46:09.000000000 +0200 ++++ gst-openmax-0.10.0.4/common/m4/gst-check.m4 2008-08-05 17:46:29.000000000 +0200 +@@ -114,7 +114,7 @@ + + AC_DEFUN([AG_GST_CHECK_GST_CHECK], + [ +- AG_GST_CHECK_MODULES(GST_CHECK, gstreamer-check-[$1], [$2], ++ AG_GST_CHECK_MODULES(GST_CHECK, gstreamer-check, [$2], + [GStreamer Check unittest Library], [$3]) + ]) + diff --git a/packages/openmax/gst-openmax_0.10.0.4.bb b/packages/openmax/gst-openmax_0.10.0.4.bb new file mode 100644 index 0000000000..39f35380bc --- /dev/null +++ b/packages/openmax/gst-openmax_0.10.0.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "GstOpenMAX is a GStreamer plug-in that allows communication with OpenMAX IL components" +LICENSE = "LGPLv2" +DEPENDS = "gstreamer libomxil-bellagio" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/pre/gst-openmax-${PV}.tar.bz2 \ + file://check.diff;patch=1 \ + " + +inherit autotools + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.*a" + diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb new file mode 100644 index 0000000000..af14ef14e9 --- /dev/null +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos group." +LICENSE = "LGPLv2" +DEPENDS = "libmad alsa-lib ffmpeg" + +SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" + +inherit autotools + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + + +FILES_${PN} += "${libdir}/bellagio/*.so ${libdir}/bellagio/*.la" +FILES_${PN}-dev += "${libdir}/bellagio/*.a" +FILES_${PN}-dbg += "${libdir}/bellagio/.debug" + diff --git a/packages/oprofile/oprofile/0.9.4-armv7a.diff b/packages/oprofile/oprofile/0.9.4-armv7a.diff new file mode 100644 index 0000000000..dd95ec732b --- /dev/null +++ b/packages/oprofile/oprofile/0.9.4-armv7a.diff @@ -0,0 +1,451 @@ +Index: oprofile-0.9.4/ChangeLog +=================================================================== +--- oprofile-0.9.4.orig/ChangeLog 2008-07-18 01:04:22.000000000 +0200 ++++ oprofile-0.9.4/ChangeLog 2008-08-08 15:32:15.226950589 +0200 +@@ -1,3 +1,14 @@ ++2008-08-08 Jean Pihet <jpihet@mvista.com> ++ ++ * events/arm/armv7/events: ++ * events/arm/armv7/unit_masks: ++ * libop/op_cpu_type.c: ++ * libop/op_cpu_type.h: ++ * libop/op_events.c: ++ * utils/ophelp.c: Added ARMv7 support to be consistent with the ++ kernel, remove some duplicate code and add some extra events ++ * event/Makefile.am: Install armv7 stuff. ++ + 2008-07-17 Maynard Johnson <maynardj@us.ibm.com> + + * configure.in: bump version in AM_INIT_AUTOMAKE to 0.9.4 +Index: oprofile-0.9.4/events/arm/armv7/events +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ oprofile-0.9.4/events/arm/armv7/events 2008-08-08 15:32:15.226950589 +0200 +@@ -0,0 +1,53 @@ ++# ARM V7 events ++# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1) ++# ++event:0x00 counters:1,2,3,4 um:zero minimum:500 name:PMNC_SW_INCR : Software increment of PMNC registers ++event:0x01 counters:1,2,3,4 um:zero minimum:500 name:IFETCH_MISS : Instruction fetch misses from cache or normal cacheable memory ++event:0x02 counters:1,2,3,4 um:zero minimum:500 name:ITLB_MISS : Instruction fetch misses from TLB ++event:0x03 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_REFILL : Data R/W operation that causes a refill from cache or normal cacheable memory ++event:0x04 counters:1,2,3,4 um:zero minimum:500 name:DCACHE_ACCESS : Data R/W from cache ++event:0x05 counters:1,2,3,4 um:zero minimum:500 name:DTLB_REFILL : Data R/W that causes a TLB refill ++event:0x06 counters:1,2,3,4 um:zero minimum:500 name:DREAD : Data read architecturally executed (note: architecturally executed = for instructions that are unconditional or that pass the condition code) ++event:0x07 counters:1,2,3,4 um:zero minimum:500 name:DWRITE : Data write architecturally executed ++event:0x08 counters:1,2,3,4 um:zero minimum:500 name:INSTR_EXECUTED : All executed instructions ++event:0x09 counters:1,2,3,4 um:zero minimum:500 name:EXC_TAKEN : Exception taken ++event:0x0A counters:1,2,3,4 um:zero minimum:500 name:EXC_EXECUTED : Exception return architecturally executed ++event:0x0B counters:1,2,3,4 um:zero minimum:500 name:CID_WRITE : Instruction that writes to the Context ID Register architecturally executed ++event:0x0C counters:1,2,3,4 um:zero minimum:500 name:PC_WRITE : SW change of PC, architecturally executed (not by exceptions) ++event:0x0D counters:1,2,3,4 um:zero minimum:500 name:PC_IMM_BRANCH : Immediate branch instruction executed (taken or not) ++event:0x0E counters:1,2,3,4 um:zero minimum:500 name:PC_PROC_RETURN : Procedure return architecturally executed (not by exceptions) ++event:0x0F counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS : Unaligned access architecturally executed ++event:0x10 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_PRED : Branch mispredicted or not predicted. Counts pipeline flushes because of misprediction ++event:0x12 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_MIS_USED : Branch or change in program flow that could have been predicted ++event:0x40 counters:1,2,3,4 um:zero minimum:500 name:WRITE_BUFFER_FULL : Any write buffer full cycle ++event:0x41 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_MERGED : Any store that is merged in L2 cache ++event:0x42 counters:1,2,3,4 um:zero minimum:500 name:L2_STORE_BUFF : Any bufferable store from load/store to L2 cache ++event:0x43 counters:1,2,3,4 um:zero minimum:500 name:L2_ACCESS : Any access to L2 cache ++event:0x44 counters:1,2,3,4 um:zero minimum:500 name:L2_CACH_MISS : Any cacheable miss in L2 cache ++event:0x45 counters:1,2,3,4 um:zero minimum:500 name:AXI_READ_CYCLES : Number of cycles for an active AXI read ++event:0x46 counters:1,2,3,4 um:zero minimum:500 name:AXI_WRITE_CYCLES : Number of cycles for an active AXI write ++event:0x47 counters:1,2,3,4 um:zero minimum:500 name:MEMORY_REPLAY : Any replay event in the memory subsystem ++event:0x48 counters:1,2,3,4 um:zero minimum:500 name:UNALIGNED_ACCESS_REPLAY : Unaligned access that causes a replay ++event:0x49 counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_MISS : L1 data cache miss as a result of the hashing algorithm ++event:0x4A counters:1,2,3,4 um:zero minimum:500 name:L1_INST_MISS : L1 instruction cache miss as a result of the hashing algorithm ++event:0x4B counters:1,2,3,4 um:zero minimum:500 name:L1_DATA_COLORING : L1 data access in which a page coloring alias occurs ++event:0x4C counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_DATA : NEON data access that hits L1 cache ++event:0x4D counters:1,2,3,4 um:zero minimum:500 name:L1_NEON_CACH_DATA : NEON cacheable data access that hits L1 cache ++event:0x4E counters:1,2,3,4 um:zero minimum:500 name:L2_NEON : L2 access as a result of NEON memory access ++event:0x4F counters:1,2,3,4 um:zero minimum:500 name:L2_NEON_HIT : Any NEON hit in L2 cache ++event:0x50 counters:1,2,3,4 um:zero minimum:500 name:L1_INST : Any L1 instruction cache access, excluding CP15 cache accesses ++event:0x51 counters:1,2,3,4 um:zero minimum:500 name:PC_RETURN_MIS_PRED : Return stack misprediction at return stack pop (incorrect target address) ++event:0x52 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_FAILED : Branch prediction misprediction ++event:0x53 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_TAKEN : Any predicted branch that is taken ++event:0x54 counters:1,2,3,4 um:zero minimum:500 name:PC_BRANCH_EXECUTED : Any taken branch that is executed ++event:0x55 counters:1,2,3,4 um:zero minimum:500 name:OP_EXECUTED : Number of operations executed (in instruction or mutli-cycle instruction) ++event:0x56 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST_STALL : Cycles where no instruction available ++event:0x57 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_INST : Number of instructions issued in a cycle ++event:0x58 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_DATA_STALL : Number of cycles the processor waits on MRC data from NEON ++event:0x59 counters:1,2,3,4 um:zero minimum:500 name:CYCLES_NEON_INST_STALL : Number of cycles the processor waits on NEON instruction queue or NEON load queue ++event:0x5A counters:1,2,3,4 um:zero minimum:500 name:NEON_CYCLES : Number of cycles NEON and integer processors are not idle ++event:0x70 counters:1,2,3,4 um:zero minimum:500 name:PMU0_EVENTS : Number of events from external input source PMUEXTIN[0] ++event:0x71 counters:1,2,3,4 um:zero minimum:500 name:PMU1_EVENTS : Number of events from external input source PMUEXTIN[1] ++event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1] ++event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles ++ +Index: oprofile-0.9.4/events/arm/armv7/unit_masks +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ oprofile-0.9.4/events/arm/armv7/unit_masks 2008-08-08 15:32:15.273760932 +0200 +@@ -0,0 +1,4 @@ ++# ARM V7 PMNC possible unit masks ++# ++name:zero type:mandatory default:0x00 ++ 0x00 No unit mask +Index: oprofile-0.9.4/events/Makefile.in +=================================================================== +--- oprofile-0.9.4.orig/events/Makefile.in 2008-07-18 01:14:45.000000000 +0200 ++++ oprofile-0.9.4/events/Makefile.in 2008-08-08 15:32:34.971961074 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,20 +34,8 @@ + subdir = events + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/binutils.m4 \ +- $(top_srcdir)/m4/builtinexpect.m4 \ +- $(top_srcdir)/m4/cellspubfdsupport.m4 \ +- $(top_srcdir)/m4/compileroption.m4 \ +- $(top_srcdir)/m4/configmodule.m4 \ +- $(top_srcdir)/m4/copyifchange.m4 $(top_srcdir)/m4/docbook.m4 \ +- $(top_srcdir)/m4/extradirs.m4 $(top_srcdir)/m4/findkernel.m4 \ +- $(top_srcdir)/m4/kerneloption.m4 \ +- $(top_srcdir)/m4/kernelversion.m4 \ +- $(top_srcdir)/m4/mallocattribute.m4 \ +- $(top_srcdir)/m4/poptconst.m4 \ +- $(top_srcdir)/m4/precompiledheader.m4 $(top_srcdir)/m4/qt.m4 \ +- $(top_srcdir)/m4/resultyn.m4 $(top_srcdir)/m4/sstream.m4 \ +- $(top_srcdir)/m4/typedef.m4 $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +@@ -61,8 +45,6 @@ + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ +@@ -70,10 +52,7 @@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BFD_LIBS = @BFD_LIBS@ +-BUILD_JVMPI_AGENT_FALSE = @BUILD_JVMPI_AGENT_FALSE@ +-BUILD_JVMPI_AGENT_TRUE = @BUILD_JVMPI_AGENT_TRUE@ +-BUILD_JVMTI_AGENT_FALSE = @BUILD_JVMTI_AGENT_FALSE@ +-BUILD_JVMTI_AGENT_TRUE = @BUILD_JVMTI_AGENT_TRUE@ ++BUILD_HAMMER = @BUILD_HAMMER@ + CAT_ENTRY_END = @CAT_ENTRY_END@ + CAT_ENTRY_START = @CAT_ENTRY_START@ + CC = @CC@ +@@ -90,16 +69,17 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DOCBOOK_ROOT = @DOCBOOK_ROOT@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXTRA_CFLAGS_MODULE = @EXTRA_CFLAGS_MODULE@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -114,17 +94,23 @@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MOC = @MOC@ + MODINSTALLDIR = @MODINSTALLDIR@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + OPROFILE_DIR = @OPROFILE_DIR@ + OPROFILE_MODULE_ARCH = @OPROFILE_MODULE_ARCH@ + OP_CFLAGS = @OP_CFLAGS@ + OP_CXXFLAGS = @OP_CXXFLAGS@ + OP_DOCDIR = @OP_DOCDIR@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -139,13 +125,13 @@ + QT_LIB = @QT_LIB@ + QT_VERSION = @QT_VERSION@ + RANLIB = @RANLIB@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + SIZE_T_TYPE = @SIZE_T_TYPE@ + STRIP = @STRIP@ + UIC = @UIC@ + VERSION = @VERSION@ +-XMKMF = @XMKMF@ + XML_CATALOG = @XML_CATALOG@ + XSLTPROC = @XSLTPROC@ + XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +@@ -153,13 +139,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -171,15 +157,12 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ +-have_qt_FALSE = @have_qt_FALSE@ +-have_qt_TRUE = @have_qt_TRUE@ +-have_xsltproc_FALSE = @have_xsltproc_FALSE@ +-have_xsltproc_TRUE = @have_xsltproc_TRUE@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ +@@ -189,12 +172,11 @@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ +-kernel_support_FALSE = @kernel_support_FALSE@ +-kernel_support_TRUE = @kernel_support_TRUE@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -204,8 +186,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + topdir = @topdir@ + event_files = \ + alpha/ev4/events alpha/ev4/unit_masks \ +@@ -298,10 +283,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -310,23 +291,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/avr32 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e300 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -371,7 +350,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -385,12 +364,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -409,17 +396,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + install-data-local: +Index: oprofile-0.9.4/libop/op_cpu_type.c +=================================================================== +--- oprofile-0.9.4.orig/libop/op_cpu_type.c 2008-02-22 17:17:48.000000000 +0100 ++++ oprofile-0.9.4/libop/op_cpu_type.c 2008-08-08 15:32:15.307120161 +0200 +@@ -71,6 +71,7 @@ + { "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 }, + { "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 }, + { "ARM V6 PMU", "arm/armv6", CPU_ARM_V6, 3 }, ++ { "ARM V7 PMNC", "arm/armv7", CPU_ARM_V7, 5 }, + { "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 }, + { "e300", "ppc/e300", CPU_PPC_E300, 4 }, + { "AVR32", "avr32", CPU_AVR32, 3 }, +Index: oprofile-0.9.4/libop/op_cpu_type.h +=================================================================== +--- oprofile-0.9.4.orig/libop/op_cpu_type.h 2008-02-22 17:17:48.000000000 +0100 ++++ oprofile-0.9.4/libop/op_cpu_type.h 2008-08-08 15:32:15.322934386 +0200 +@@ -69,6 +69,7 @@ + CPU_PPC64_PA6T, /**< ppc64 PA6T */ + CPU_ARM_MPCORE, /**< ARM MPCore */ + CPU_ARM_V6, /**< ARM V6 */ ++ CPU_ARM_V7, /**< ARM V7 */ + CPU_PPC64_POWER5pp, /**< ppc64 Power5++ family */ + CPU_PPC_E300, /**< e300 */ + CPU_AVR32, /**< AVR32 */ +Index: oprofile-0.9.4/libop/op_events.c +=================================================================== +--- oprofile-0.9.4.orig/libop/op_events.c 2008-02-22 17:17:48.000000000 +0100 ++++ oprofile-0.9.4/libop/op_events.c 2008-08-08 15:32:15.347934528 +0200 +@@ -793,6 +793,7 @@ + case CPU_ARM_XSCALE2: + case CPU_ARM_MPCORE: + case CPU_ARM_V6: ++ case CPU_ARM_V7: + case CPU_AVR32: + descr->name = "CPU_CYCLES"; + break; +Index: oprofile-0.9.4/utils/ophelp.c +=================================================================== +--- oprofile-0.9.4.orig/utils/ophelp.c 2008-02-22 17:17:49.000000000 +0100 ++++ oprofile-0.9.4/utils/ophelp.c 2008-08-08 15:32:15.362934395 +0200 +@@ -433,6 +433,11 @@ + printf("See ARM11 Technical Reference Manual\n"); + break; + ++ case CPU_ARM_V7: ++ printf("See ARM11 Technical Reference Manual\n" ++ "Cortex A8 DDI (ARM DDI 0344B, revision r1p1)\n"); ++ break; ++ + case CPU_PPC64_PA6T: + printf("See PA6T Power Implementation Features Book IV\n" + "Chapter 7 Performance Counters\n"); +Index: oprofile-0.9.4/events/Makefile.am +=================================================================== +--- oprofile-0.9.4.orig/events/Makefile.am 2008-08-08 15:35:37.318966302 +0200 ++++ oprofile-0.9.4/events/Makefile.am 2008-08-08 15:35:57.259878132 +0200 +@@ -31,6 +31,7 @@ + arm/xscale1/events arm/xscale1/unit_masks \ + arm/xscale2/events arm/xscale2/unit_masks \ + arm/armv6/events arm/armv6/unit_masks \ ++ arm/armv7/events arm/armv7/unit_masks \ + arm/mpcore/events arm/mpcore/unit_masks \ + avr32/events avr32/unit_masks \ + mips/20K/events mips/20K/unit_masks \ diff --git a/packages/oprofile/oprofile/armv7a.diff b/packages/oprofile/oprofile/armv7a.diff index cb53e5e791..d6dccc16c6 100644 --- a/packages/oprofile/oprofile/armv7a.diff +++ b/packages/oprofile/oprofile/armv7a.diff @@ -1,6 +1,7 @@ -diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog ---- oprofile-0.9.3/ChangeLog 2007-07-16 20:22:17.000000000 +0200 -+++ oprofile-0.9.3.armv7/ChangeLog 2008-04-23 18:38:40.000000000 +0200 +Index: oprofile-0.9.3/ChangeLog +=================================================================== +--- oprofile-0.9.3.orig/ChangeLog 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3/ChangeLog 2008-08-08 15:41:09.194935711 +0200 @@ -1,3 +1,14 @@ + +2008-04-23 Jean Pihet <jpihet@mvista.com> @@ -16,9 +17,10 @@ diff -urN oprofile-0.9.3/ChangeLog oprofile-0.9.3.armv7/ChangeLog 2007-07-09 Maynard Johnson <maynardj@us.ibm.com> * doc/opreport.xsd: -diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm/armv7/events ---- oprofile-0.9.3/events/arm/armv7/events 1970-01-01 01:00:00.000000000 +0100 -+++ oprofile-0.9.3.armv7/events/arm/armv7/events 2008-04-24 15:06:48.000000000 +0200 +Index: oprofile-0.9.3/events/arm/armv7/events +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ oprofile-0.9.3/events/arm/armv7/events 2008-08-08 15:41:09.198936463 +0200 @@ -0,0 +1,53 @@ +# ARM V7 events +# From Cortex A8 DDI (ARM DDI 0344B, revision r1p1) @@ -73,37 +75,19 @@ diff -urN oprofile-0.9.3/events/arm/armv7/events oprofile-0.9.3.armv7/events/arm +event:0x72 counters:1,2,3,4 um:zero minimum:500 name:PMU_EVENTS : Number of events from both external input sources PMUEXTIN[0] and PMUEXTIN[1] +event:0xFF counters:0 um:zero minimum:500 name:CPU_CYCLES : Number of CPU cycles + -diff -urN oprofile-0.9.3/events/arm/armv7/unit_masks oprofile-0.9.3.armv7/events/arm/armv7/unit_masks ---- oprofile-0.9.3/events/arm/armv7/unit_masks 1970-01-01 01:00:00.000000000 +0100 -+++ oprofile-0.9.3.armv7/events/arm/armv7/unit_masks 2008-04-01 10:52:00.000000000 +0200 +Index: oprofile-0.9.3/events/arm/armv7/unit_masks +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ oprofile-0.9.3/events/arm/armv7/unit_masks 2008-08-08 15:41:09.210955689 +0200 @@ -0,0 +1,4 @@ +# ARM V7 PMNC possible unit masks +# +name:zero type:mandatory default:0x00 + 0x00 No unit mask -diff -urN oprofile-0.9.3/events/Makefile.in oprofile-0.9.3.armv7/events/Makefile.in ---- oprofile-0.9.3/events/Makefile.in 2007-07-16 20:23:28.000000000 +0200 -+++ oprofile-0.9.3.armv7/events/Makefile.in 2008-04-24 15:11:52.000000000 +0200 -@@ -211,6 +211,7 @@ - arm/xscale1/events arm/xscale1/unit_masks \ - arm/xscale2/events arm/xscale2/unit_masks \ - arm/armv6/events arm/armv6/unit_masks \ -+ arm/armv7/events arm/armv7/unit_masks \ - arm/mpcore/events arm/mpcore/unit_masks \ - mips/20K/events mips/20K/unit_masks \ - mips/24K/events mips/24K/unit_masks \ -@@ -270,7 +271,7 @@ - - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer -+ $(mkdir_p) $(distdir)/alpha/ev4 $(distdir)/alpha/ev5 $(distdir)/alpha/ev6 $(distdir)/alpha/ev67 $(distdir)/alpha/pca56 $(distdir)/arm/armv6 $(distdir)/arm/armv7 $(distdir)/arm/mpcore $(distdir)/arm/xscale1 $(distdir)/arm/xscale2 $(distdir)/i386/athlon $(distdir)/i386/core $(distdir)/i386/core_2 $(distdir)/i386/p4 $(distdir)/i386/p4-ht $(distdir)/i386/p6_mobile $(distdir)/i386/pii $(distdir)/i386/piii $(distdir)/i386/ppro $(distdir)/ia64/ia64 $(distdir)/ia64/itanium $(distdir)/ia64/itanium2 $(distdir)/mips/20K $(distdir)/mips/24K $(distdir)/mips/25K $(distdir)/mips/34K $(distdir)/mips/5K $(distdir)/mips/r10000 $(distdir)/mips/r12000 $(distdir)/mips/rm7000 $(distdir)/mips/rm9000 $(distdir)/mips/sb1 $(distdir)/mips/vr5432 $(distdir)/mips/vr5500 $(distdir)/ppc/7450 $(distdir)/ppc/e500 $(distdir)/ppc/e500v2 $(distdir)/ppc64/970 $(distdir)/ppc64/970MP $(distdir)/ppc64/cell-be $(distdir)/ppc64/pa6t $(distdir)/ppc64/power4 $(distdir)/ppc64/power5 $(distdir)/ppc64/power5+ $(distdir)/ppc64/power5++ $(distdir)/ppc64/power6 $(distdir)/rtc $(distdir)/x86-64/family10 $(distdir)/x86-64/hammer - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ -diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_type.c ---- oprofile-0.9.3/libop/op_cpu_type.c 2007-07-16 20:22:17.000000000 +0200 -+++ oprofile-0.9.3.armv7/libop/op_cpu_type.c 2008-04-23 18:31:56.000000000 +0200 +Index: oprofile-0.9.3/libop/op_cpu_type.c +=================================================================== +--- oprofile-0.9.3.orig/libop/op_cpu_type.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3/libop/op_cpu_type.c 2008-08-08 15:41:09.242955608 +0200 @@ -71,6 +71,7 @@ { "ppc64 PA6T", "ppc64/pa6t", CPU_PPC64_PA6T, 6 }, { "ARM MPCore", "arm/mpcore", CPU_ARM_MPCORE, 2 }, @@ -112,9 +96,10 @@ diff -urN oprofile-0.9.3/libop/op_cpu_type.c oprofile-0.9.3.armv7/libop/op_cpu_t { "ppc64 POWER5++", "ppc64/power5++", CPU_PPC64_POWER5pp, 6 }, }; -diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_type.h ---- oprofile-0.9.3/libop/op_cpu_type.h 2007-07-16 20:22:17.000000000 +0200 -+++ oprofile-0.9.3.armv7/libop/op_cpu_type.h 2008-04-23 18:34:37.000000000 +0200 +Index: oprofile-0.9.3/libop/op_cpu_type.h +=================================================================== +--- oprofile-0.9.3.orig/libop/op_cpu_type.h 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3/libop/op_cpu_type.h 2008-08-08 15:41:09.262956072 +0200 @@ -69,6 +69,7 @@ CPU_PPC64_PA6T, /**< ppc64 PA6T */ CPU_ARM_MPCORE, /**< ARM MPCore */ @@ -123,9 +108,10 @@ diff -urN oprofile-0.9.3/libop/op_cpu_type.h oprofile-0.9.3.armv7/libop/op_cpu_t CPU_PPC64_POWER5pp, /**< ppc64 Power5++ family */ MAX_CPU_TYPE } op_cpu; -diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events.c ---- oprofile-0.9.3/libop/op_events.c 2007-07-16 20:22:17.000000000 +0200 -+++ oprofile-0.9.3.armv7/libop/op_events.c 2008-04-23 18:39:30.000000000 +0200 +Index: oprofile-0.9.3/libop/op_events.c +=================================================================== +--- oprofile-0.9.3.orig/libop/op_events.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3/libop/op_events.c 2008-08-08 15:41:09.278955619 +0200 @@ -788,6 +788,7 @@ case CPU_ARM_XSCALE2: case CPU_ARM_MPCORE: @@ -134,9 +120,10 @@ diff -urN oprofile-0.9.3/libop/op_events.c oprofile-0.9.3.armv7/libop/op_events. descr->name = "CPU_CYCLES"; break; -diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c ---- oprofile-0.9.3/utils/ophelp.c 2007-07-16 20:22:17.000000000 +0200 -+++ oprofile-0.9.3.armv7/utils/ophelp.c 2008-04-23 19:17:51.000000000 +0200 +Index: oprofile-0.9.3/utils/ophelp.c +=================================================================== +--- oprofile-0.9.3.orig/utils/ophelp.c 2007-07-16 20:22:17.000000000 +0200 ++++ oprofile-0.9.3/utils/ophelp.c 2008-08-08 15:41:09.294934552 +0200 @@ -433,6 +433,11 @@ printf("See ARM11 Technical Reference Manual\n"); break; @@ -149,3 +136,15 @@ diff -urN oprofile-0.9.3/utils/ophelp.c oprofile-0.9.3.armv7/utils/ophelp.c case CPU_PPC64_PA6T: printf("See PA6T Power Implementation Features Book IV\n" "Chapter 7 Performance Counters\n"); +Index: oprofile-0.9.3/events/Makefile.am +=================================================================== +--- oprofile-0.9.3.orig/events/Makefile.am 2008-08-08 15:41:24.746955563 +0200 ++++ oprofile-0.9.3/events/Makefile.am 2008-08-08 15:41:43.465544495 +0200 +@@ -31,6 +31,7 @@ + arm/xscale1/events arm/xscale1/unit_masks \ + arm/xscale2/events arm/xscale2/unit_masks \ + arm/armv6/events arm/armv6/unit_masks \ ++ arm/armv7/events arm/armv7/unit_masks \ + arm/mpcore/events arm/mpcore/unit_masks \ + mips/20K/events mips/20K/unit_masks \ + mips/24K/events mips/24K/unit_masks \ diff --git a/packages/oprofile/oprofile/opjitconv-execvp-fix.diff b/packages/oprofile/oprofile/opjitconv-execvp-fix.diff new file mode 100644 index 0000000000..5e6d271cc5 --- /dev/null +++ b/packages/oprofile/oprofile/opjitconv-execvp-fix.diff @@ -0,0 +1,23 @@ +status: applied upstream http://sourceforge.net/tracker/index.php?func=detail&aid=2040417&group_id=16191&atid=116191 +applied in: >0.9.4 +Index: oprofile-0.9.4/daemon/init.c +=================================================================== +--- oprofile-0.9.4.orig/daemon/init.c 2008-08-06 17:59:43.126578165 +0200 ++++ oprofile-0.9.4/daemon/init.c 2008-08-06 18:00:10.694789667 +0200 +@@ -170,14 +170,14 @@ + sprintf(end_time_str, "%llu", end_time); + sprintf(opjitconv_path, "%s/%s", OP_BINDIR, "opjitconv"); + arg_num = 0; +- exec_args[arg_num++] = opjitconv_path; ++ exec_args[arg_num++] = "opjitconv"; + if (vmisc) + exec_args[arg_num++] = "-d"; + exec_args[arg_num++] = session_dir; + exec_args[arg_num++] = start_time_str; + exec_args[arg_num++] = end_time_str; + exec_args[arg_num] = (char *) NULL; +- execvp("opjitconv", exec_args); ++ execvp(opjitconv_path, exec_args); + fprintf(stderr, "Failed to exec %s: %s\n", + exec_args[0], strerror(errno)); + /* We don't want any cleanup in the child */ diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb index 4d6af997af..7ffcec3b99 100644 --- a/packages/oprofile/oprofile_0.9.3.bb +++ b/packages/oprofile/oprofile_0.9.3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "popt binutils" RDEPENDS = "binutils-symlinks" RRECOMMENDS = "kernel-vmlinux" -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://armv6_fix.patch;patch=1 \ diff --git a/packages/oprofile/oprofile_0.9.4.bb b/packages/oprofile/oprofile_0.9.4.bb new file mode 100644 index 0000000000..f8fb744fcc --- /dev/null +++ b/packages/oprofile/oprofile_0.9.4.bb @@ -0,0 +1,40 @@ +SECTION = "devel" +DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ +of profiling all running code at low overhead." +LICENSE = "GPL" +DEPENDS = "popt binutils" +RDEPENDS = "binutils-symlinks" +RRECOMMENDS = "kernel-vmlinux" +PR = "r0" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ + file://opjitconv-execvp-fix.diff;patch=1 \ + file://0.9.4-armv7a.diff;patch=1 \ + file://acinclude.m4 \ + " + +inherit autotools + +EXTRA_OECONF = " \ + --with-kernel-support \ + --without-x \ + " + +do_configure () { + cp ${WORKDIR}/acinclude.m4 ${S}/ + autotools_do_configure +} + +do_stage () { + # As of 0.9.4 there is a libopagent library to compile and link against. + autotools_stage_all +} + +PACKAGES = "${PN}-dev ${PN}-doc ${PN}-dbg ${PN}" + +FILES_${PN}-dev += "\ + ${libdir}/oprofile/lib*.so \ + ${libdir}/oprofile/lib*.a \ + ${libdir}/oprofile/lib*.la \ +" diff --git a/packages/perl/liburi-perl_1.35.bb b/packages/perl/liburi-perl_1.35.bb index 23116aced9..5c1c427c24 100644 --- a/packages/perl/liburi-perl_1.35.bb +++ b/packages/perl/liburi-perl_1.35.bb @@ -2,10 +2,14 @@ DESCRIPTION = "Manipulates and accesses URI strings" SECTION = "libs" LICENSE = "Artistic|GPL" #RDEPENDS += " libmime-base64-perl libnet-perl" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz" S = "${WORKDIR}/URI-${PV}" inherit cpan + +do_configure_append() { + sed -i -e "s|PERL_ARCHLIB = /usr/lib/perl/5.8|PERL_ARCHLIB = ${STAGING_LIBDIR_NATIVE}/perl/5.8.8|" Makefile +} diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb index 2bea48a2d0..2bc9b76f9b 100644 --- a/packages/perl/libwww-perl_5.808.bb +++ b/packages/perl/libwww-perl_5.808.bb @@ -3,10 +3,14 @@ SECTION = "libs" LICENSE = "Artistic" DEPENDS = "liburi-perl-native" RDEPENDS = "liburi-perl" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" S = "${WORKDIR}/libwww-perl-${PV}" inherit cpan + +do_configure_append() { + sed -i -e "s|PERL_ARCHLIB = /usr/lib/perl/5.8|PERL_ARCHLIB = ${STAGING_LIBDIR_NATIVE}/perl/5.8.8|" Makefile +} diff --git a/packages/pkgconfig/pkgconfig-0.22/autofoo.patch b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch index 97293cee1f..8d1869a407 100644 --- a/packages/pkgconfig/pkgconfig-0.22/autofoo.patch +++ b/packages/pkgconfig/pkgconfig-0.22/autofoo.patch @@ -1,3 +1,5 @@ +upstream: more recent version is in OE + --- glib-1.2.8/acglib.m4 | 12 +- glib-1.2.8/configure.in | 212 ++++++++++++++++++++++++++++++------------------ diff --git a/packages/postgresql/postgresql.inc b/packages/postgresql/postgresql.inc index 9f1335b2bd..b30ff3fbf9 100644 --- a/packages/postgresql/postgresql.inc +++ b/packages/postgresql/postgresql.inc @@ -18,9 +18,7 @@ do_compile_append() { do_stage() { autotools_stage_includes - mkdir -p ${STAGING_LIBDIR}/pgsql - oe_libinstall -a -so -C src/interfaces/libpq libpq ${STAGING_LIBDIR}/pgsql - + oe_libinstall -a -so -C src/interfaces/libpq libpq ${STAGING_LIBDIR} oe_libinstall -a -so -C src/interfaces/ecpg/ecpglib libecpg ${STAGING_LIBDIR} oe_libinstall -a -so -C src/interfaces/ecpg/compatlib libecpg_compat ${STAGING_LIBDIR} oe_libinstall -a -so -C src/interfaces/ecpg/pgtypeslib libpgtypes ${STAGING_LIBDIR} diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb index eb03642085..cfb0162bb4 100644 --- a/packages/postgresql/postgresql_8.1.4.bb +++ b/packages/postgresql/postgresql_8.1.4.bb @@ -1,3 +1,3 @@ require postgresql.inc -PR = "r2" +PR = "r3" diff --git a/packages/postgresql/postgresql_8.1.8.bb b/packages/postgresql/postgresql_8.1.8.bb index eb03642085..cfb0162bb4 100644 --- a/packages/postgresql/postgresql_8.1.8.bb +++ b/packages/postgresql/postgresql_8.1.8.bb @@ -1,3 +1,3 @@ require postgresql.inc -PR = "r2" +PR = "r3" diff --git a/packages/postgresql/postgresql_8.2.4.bb b/packages/postgresql/postgresql_8.2.4.bb index 6e778e5b49..9b60b2b6a7 100644 --- a/packages/postgresql/postgresql_8.2.4.bb +++ b/packages/postgresql/postgresql_8.2.4.bb @@ -1,6 +1,6 @@ require postgresql.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \ diff --git a/packages/qmake/qmake2-sdk_2.10a.bb b/packages/qmake/qmake2-sdk_2.10a.bb index b16159c8d9..5e5bfc631f 100644 --- a/packages/qmake/qmake2-sdk_2.10a.bb +++ b/packages/qmake/qmake2-sdk_2.10a.bb @@ -1,4 +1,4 @@ -QTVERSION="4.3.3" +QTVERSION="4.4.1" require qmake2-native.inc inherit sdk diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index de941df1df..75b5b5735d 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -17,9 +17,9 @@ do_stage_append() { sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la install -d ${STAGING_DIR_TARGET}/qt4/bin - cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ + cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ || true for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do - ln -sf $qttool ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) + ln -sf $qttool ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) done } diff --git a/packages/quake/quetoo_0.6.1.bb b/packages/quake/quetoo_0.6.1.bb index 931b002d1c..33a7075799 100644 --- a/packages/quake/quetoo_0.6.1.bb +++ b/packages/quake/quetoo_0.6.1.bb @@ -8,13 +8,24 @@ inherit autotools pkgconfig EXTRA_OECONF = "\ - --with-sdl \ + --with-games=baseq2 \ + --with-sdl \ --with-zlib \ " do_configure() { - gnu-configize - libtoolize --force + for i in ctf qmass vanctf ; do + mkdir -p ${S}/data/$i/sound + mkdir -p ${S}/data/$i/maps + mkdir -p ${S}/src/$i + touch ${S}/data/$i/Makefile.in + touch ${S}/data/$i/sound/Makefile.in + touch ${S}/data/$i/maps/Makefile.in + touch ${S}/src/$i/Makefile.in + done + + sed -i -e s:-Werror::g ${S}/configure + gnu-configize --force oe_runconf rm config.log } diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb index 408cf50fbf..11968ea609 100644 --- a/packages/rrdtool/rrdtool_1.0.49.bb +++ b/packages/rrdtool/rrdtool_1.0.49.bb @@ -10,7 +10,7 @@ SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = "rd_cv_ieee_works=yes --enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" +EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" do_install_append() { install -d ${D}${docdir}/rrdtool/ diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 69dfd0133d..8ca1991ee4 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r71" +PR = "r72" inherit task diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index cd82234955..31da8117f7 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -3,10 +3,10 @@ SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "sqlite" -PR = "r2" +PR = "r3" SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \ - file://${FILESDIR}/${palmtopdir}" + file://${FILESDIR}/opt/QtPalmtop" S = "${WORKDIR}/txdrug-tar" inherit palmtop @@ -14,11 +14,16 @@ inherit palmtop EXTRA_QMAKEVARS_POST += "LIBS+=-lsqlite TARGET=txdrug" do_configure_prepend() { - rm -f Makefile && qmake -project + rm -f Makefile && qmake -project +} + +do_configure_append() { + sed -i "s/\-I\/usr\/include\/sqlite\ //g" Makefile } do_install() { install -d ${D}${palmtopdir} - cp -Pfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ + cp -Pfr `ls -dp ${WORKDIR}/opt/QtPalmtop/*|grep -v SCCS` ${D}${palmtopdir}/ install -D -m 755 txdrug ${D}${palmtopdir}/bin/txdrug } + diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index ea2f024d33..04eb7eb2e8 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,10 +1,10 @@ require u-boot.inc -PR="r13" +PR="r16" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" -SRCREV_beagleboard = "2d77381a184df7b5017b4a1301d2c02300f3ca3d" -SRCREV_neuros-osd2 = "a56f1723a6869428996038ff0496a093a04af157" +SRCREV_beagleboard = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae" +SRCREV_neuros-osd2 = "bc66414cd99154a40949db1bd2f45a62b8febca9" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " diff --git a/packages/vala/vala-native_0.3.4.bb b/packages/vala/vala-native_0.3.4.bb new file mode 100644 index 0000000000..f097e7db74 --- /dev/null +++ b/packages/vala/vala-native_0.3.4.bb @@ -0,0 +1,5 @@ +require vala_${PV}.bb + +inherit native +DEPENDS = "glib-2.0-native" + diff --git a/packages/vala/vala_0.3.4.bb b/packages/vala/vala_0.3.4.bb new file mode 100644 index 0000000000..37ad4b4cfe --- /dev/null +++ b/packages/vala/vala_0.3.4.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. Vala compiles to C" +SECTION = "devel" +DEPENDS = "glib-2.0" +HOMEPAGE = "http://live.gnome.org/Vala" +LICENSE = "LGPL" + +SRC_URI = "http://download.gnome.org/sources/vala/0.3/vala-${PV}.tar.bz2" +S = "${WORKDIR}/vala-${PV}" + +inherit autotools lib_package + +do_stage() { + autotools_stage_all +} + diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb index ab926eddca..b6ab851460 100644 --- a/packages/x-load/x-load_git.bb +++ b/packages/x-load/x-load_git.bb @@ -2,10 +2,10 @@ require x-load.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" -SRCREV = "04ad40d5c8bca196aa4a5dfe945a007e21f1b149" +SRCREV = "73eb0caf065b3b3f407d8af5c4836624e5cc7b69" -PV = "1.41+${PR}+git${SRCREV}" -PR="r6" +PV = "1.42+${PR}+git${SRCREV}" +PR="r7" SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git" diff --git a/packages/xorg-font/xorg-minimal-fonts.bb b/packages/xorg-font/xorg-minimal-fonts.bb new file mode 100644 index 0000000000..cef0ed53b8 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts.bb @@ -0,0 +1,13 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/fonts" +LICENSE = "MIT-X" + +SRC_URI = "file://misc" + +do_install() { + install -d ${D}/${datadir}/fonts/X11/misc + install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir}/fonts/X11/" diff --git a/packages/xorg-font/xorg-minimal-fonts/.mtn2git_empty b/packages/xorg-font/xorg-minimal-fonts/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/.mtn2git_empty diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty b/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz Binary files differnew file mode 100644 index 0000000000..8bc8570a4a --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz Binary files differnew file mode 100644 index 0000000000..8fa8290152 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz Binary files differnew file mode 100644 index 0000000000..bb1c5e138d --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz Binary files differnew file mode 100644 index 0000000000..842fa1b41a --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz Binary files differnew file mode 100644 index 0000000000..cd119b66da --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz Binary files differnew file mode 100644 index 0000000000..25fe84a0ed --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz Binary files differnew file mode 100644 index 0000000000..e362c70cea --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz Binary files differnew file mode 100644 index 0000000000..176a7591cc --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz Binary files differnew file mode 100644 index 0000000000..a4faf1a6cc --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz Binary files differnew file mode 100644 index 0000000000..96ddd15255 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz Binary files differnew file mode 100644 index 0000000000..541a2ad2c7 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz Binary files differnew file mode 100644 index 0000000000..a4986f4066 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz Binary files differnew file mode 100644 index 0000000000..3f89abe774 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz Binary files differnew file mode 100644 index 0000000000..432b536222 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz Binary files differnew file mode 100644 index 0000000000..e7fcb898e1 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz Binary files differnew file mode 100644 index 0000000000..2df6355374 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz Binary files differnew file mode 100644 index 0000000000..a263c5dd38 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz Binary files differnew file mode 100644 index 0000000000..a1a7d37e62 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz Binary files differnew file mode 100644 index 0000000000..a148e99bce --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz Binary files differnew file mode 100644 index 0000000000..8791b8ca34 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz Binary files differnew file mode 100644 index 0000000000..8604508684 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz Binary files differnew file mode 100644 index 0000000000..f28b1f1c4a --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz Binary files differnew file mode 100644 index 0000000000..fd1e6cfe9f --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz Binary files differnew file mode 100644 index 0000000000..672b759421 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz Binary files differnew file mode 100644 index 0000000000..d90a4330d6 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz Binary files differnew file mode 100644 index 0000000000..775e7c18b4 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz Binary files differnew file mode 100644 index 0000000000..ac12fd98a2 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz Binary files differnew file mode 100644 index 0000000000..42bbd52217 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz Binary files differnew file mode 100644 index 0000000000..690d31f860 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz Binary files differnew file mode 100644 index 0000000000..d4c3184c72 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz Binary files differnew file mode 100644 index 0000000000..884b5130c5 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz Binary files differnew file mode 100644 index 0000000000..cbb1a9d704 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz Binary files differnew file mode 100644 index 0000000000..78c8580cfe --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz Binary files differnew file mode 100644 index 0000000000..0e90f3ee16 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz Binary files differnew file mode 100644 index 0000000000..bd1273e1ff --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz Binary files differnew file mode 100644 index 0000000000..5100b429ac --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz Binary files differnew file mode 100644 index 0000000000..ec5bbed297 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz Binary files differnew file mode 100644 index 0000000000..06c835ee68 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz Binary files differnew file mode 100644 index 0000000000..478541c2af --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz Binary files differnew file mode 100644 index 0000000000..1c593ce0cf --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz Binary files differnew file mode 100644 index 0000000000..335cf5fc3e --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz Binary files differnew file mode 100644 index 0000000000..099423e640 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz Binary files differnew file mode 100644 index 0000000000..4a546ddb1a --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz Binary files differnew file mode 100644 index 0000000000..72eb72bbec --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias b/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias new file mode 100644 index 0000000000..3900036739 --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias @@ -0,0 +1,80 @@ +!! fonts.alias -- automatically generated file. DO NOT EDIT. +!! To modify, see update-fonts-alias(8). +!! /etc/X11/fonts/misc/xfonts-base.alias +! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $ +fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 +5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 +5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 +6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +6x10 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 +6x12 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 +6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 +7x13 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +7x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 +7x13euro -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 +7x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 +7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 +7x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 +8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 +8x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 +8x16 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 +9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 +10x20 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 +12x24 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 +nil2 -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific + +heb6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 +heb8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 + +k14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0 +a14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1 +r14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0 +rk14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0 +r16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 +rk16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0 +r24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0 +rk24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0 +kana14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0 +8x16kana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 +8x16romankana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 +12x24kana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 +12x24romankana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 +kanji16 -jis-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0 +kanji24 -jis-fixed-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0 + +hanzigb16st "-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0" +hanzigb24st "-isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0" +hanzigb16fs "-isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0" + +olcursor "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1" +olglyph-10 "-sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1" +olglyph-12 "-sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1" +olglyph-14 "-sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1" +olglyph-19 "-sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1" + +-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 +-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 +-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 +-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 +-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 +-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +-misc-fixed-bold-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 +-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 +-misc-fixed-bold-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 +-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 +-misc-fixed-medium-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +-misc-fixed-bold-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 +-misc-fixed-medium-r-normal--20-140-100-100-c-100-iso8859-1 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 +-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-8 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 +-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-8 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 +-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 +-sony-fixed-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 +-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-1 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 +-sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 +-jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 +-jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 diff --git a/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir new file mode 100644 index 0000000000..0a2718f7ba --- /dev/null +++ b/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir @@ -0,0 +1,410 @@ +409 +10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 +10x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10 +10x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11 +10x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13 +10x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14 +10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 +10x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16 +10x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2 +10x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3 +10x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4 +10x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5 +10x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7 +10x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8 +10x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9 +10x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r +10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 +12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 +12x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1 +12x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0 +18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 +18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 +4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 +4x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10 +4x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13 +4x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14 +4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 +4x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16 +4x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2 +4x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3 +4x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4 +4x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5 +4x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7 +4x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8 +4x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9 +4x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r +4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 +5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 +5x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10 +5x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13 +5x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14 +5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 +5x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16 +5x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2 +5x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3 +5x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4 +5x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5 +5x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7 +5x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8 +5x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9 +5x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r +5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 +5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 +5x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10 +5x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13 +5x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14 +5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 +5x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16 +5x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2 +5x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3 +5x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4 +5x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5 +5x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7 +5x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8 +5x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9 +5x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 +6x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10 +6x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13 +6x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14 +6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 +6x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16 +6x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2 +6x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3 +6x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4 +6x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5 +6x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7 +6x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8 +6x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9 +6x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r +6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 +6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 +6x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10 +6x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13 +6x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14 +6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 +6x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16 +6x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2 +6x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3 +6x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4 +6x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5 +6x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7 +6x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8 +6x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9 +6x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r +6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 +6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11 +6x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8 +6x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8 +6x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10 +6x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13 +6x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14 +6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16 +6x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2 +6x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3 +6x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4 +6x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5 +6x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7 +6x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9 +6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 +6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +6x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10 +6x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13 +6x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14 +6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 +6x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16 +6x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2 +6x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3 +6x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4 +6x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5 +6x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7 +6x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8 +6x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9 +6x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 +7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +7x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10 +7x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11 +7x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13 +7x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14 +7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 +7x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16 +7x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2 +7x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3 +7x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4 +7x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5 +7x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7 +7x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8 +7x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9 +7x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r +7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 +7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 +7x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10 +7x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11 +7x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13 +7x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14 +7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 +7x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16 +7x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2 +7x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3 +7x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4 +7x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5 +7x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7 +7x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8 +7x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9 +7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 +7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 +7x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10 +7x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11 +7x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13 +7x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14 +7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 +7x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16 +7x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2 +7x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3 +7x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4 +7x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5 +7x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7 +7x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9 +7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 +7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 +7x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10 +7x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11 +7x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13 +7x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14 +7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 +7x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16 +7x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2 +7x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3 +7x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4 +7x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5 +7x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7 +7x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8 +7x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9 +7x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 +7x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 +7x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10 +7x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11 +7x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13 +7x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14 +7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 +7x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16 +7x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2 +7x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3 +7x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4 +7x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5 +7x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7 +7x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8 +7x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9 +7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 +8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 +8x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10 +8x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13 +8x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14 +8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 +8x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16 +8x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2 +8x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3 +8x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4 +8x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5 +8x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7 +8x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8 +8x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9 +8x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r +8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 +8x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10 +8x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13 +8x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14 +8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 +8x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16 +8x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2 +8x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3 +8x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4 +8x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5 +8x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7 +8x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8 +8x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9 +8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 +8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 +8x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10 +8x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13 +8x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14 +8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 +8x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16 +8x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2 +8x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3 +8x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4 +8x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5 +8x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7 +8x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9 +8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 +8x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1 +8x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0 +9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +9x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10 +9x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11 +9x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13 +9x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14 +9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 +9x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16 +9x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2 +9x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3 +9x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4 +9x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5 +9x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7 +9x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8 +9x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9 +9x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r +9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 +9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 +9x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10 +9x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11 +9x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13 +9x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14 +9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 +9x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16 +9x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2 +9x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3 +9x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4 +9x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5 +9x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7 +9x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8 +9x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9 +9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 +9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 +9x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10 +9x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11 +9x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13 +9x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14 +9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 +9x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16 +9x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2 +9x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3 +9x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4 +9x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5 +9x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7 +9x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8 +9x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9 +9x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r +9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 +9x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10 +9x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13 +9x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14 +9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 +9x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16 +9x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2 +9x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3 +9x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4 +9x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5 +9x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7 +9x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8 +9x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9 +9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 +arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1 +clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv +clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv +clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv +clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv +clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv +clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv +clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv +clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv +clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv +clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv +clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv +clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv +clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv +clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv +clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv +clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv +clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1 +clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10 +clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13 +clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14 +clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15 +clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16 +clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2 +clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3 +clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4 +clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5 +clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7 +clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8 +clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9 +clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r +clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1 +clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv +clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv +clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv +clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv +clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv +clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv +clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv +clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv +clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv +clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv +clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv +clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv +clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv +clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv +cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1 +cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0 +cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0 +cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0 +cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1 +cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1 +cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1 +cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0 +cursor.pcf.gz cursor +deccurs.pcf.gz decw$cursor +decsess.pcf.gz decw$session +gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 +gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0 +gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0 +hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 +hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0 +hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0 +jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0 +jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0 +k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 +micro.pcf.gz micro +nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific +olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1 +olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1 +olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1 +olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1 +olgl19.pcf.gz -sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1 diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 819be742d4..bd191eadfe 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -RDEPENDS_${PN} = "rgb" +RDEPENDS_${PN} = "rgb xorg-minimal-fonts" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ @@ -36,11 +36,14 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " +CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" + do_stage() { autotools_stage_all } do_install_append () { - install -d ${D}/etc/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/ + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ + ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf index 34f4465764..4b327022f6 100644 --- a/packages/xorg-xserver/xserver-xorg/xorg.conf +++ b/packages/xorg-xserver/xserver-xorg/xorg.conf @@ -67,10 +67,8 @@ EndSection Section "InputDevice" Identifier "Mouse0" Driver "mouse" - Option "Protocol" "PS/2" -# Option "Protocol" "IMPS/2" - Option "Device" "/dev/psaux" -# Option "Device" "/dev/input/mice" + Option "Protocol" "IMPS/2" + Option "Device" "/dev/input/mice" Option "ZAxisMapping" "4 5" Option "Emulate3Buttons" "yes" EndSection @@ -101,28 +99,16 @@ EndSection Section "Device" - Identifier "Videocard0" - Driver "s3" -# Driver "nv" - VendorName "Videocard vendor" - BoardName "S3 driver" - #BoardName "NVidia driver" -EndSection - -Section "Device" Identifier "FBDev" Driver "fbdev" #Option "shadowfb" "off" - VideoRam 4096 EndSection Section "Screen" Identifier "Screen0" - Device "Videocard0" + Device "FBDev" Monitor "Monitor0" -# DefaultDepth 8 DefaultDepth 16 -# DefaultDepth 24 SubSection "Display" Depth 8 diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 489e01742e..6e643a9138 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,6 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" +PR = "r1" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 6e643a9138..0a61cb2c7e 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r1" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/site/common b/site/common index dab8d7f18c..c14ad80d66 100644 --- a/site/common +++ b/site/common @@ -4,3 +4,5 @@ mr_cv_target_elf=${mr_cv_target_elf=yes} # Normally kernels have /dev/random enabled ac_cv_file__dev_random=${ac_cv_file__dev_random=yes} +# does compiler handle IEEE math? +rd_cv_ieee_works=${rd_cv_ieee_works=yes} |