From dbe8882df1008655f558b691290ef91b4d3e976c Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Sun, 10 Apr 2016 07:37:34 +0200 Subject: [PATCH] update form portage --- app-doc/doxygen/ChangeLog | 5 + app-doc/doxygen/Manifest | 26 +- app-doc/doxygen/doxygen-1.8.11-r9999.ebuild | 189 ++++++++++++++ app-doc/doxygen/doxygen-1.8.4-r9999.ebuild | 245 ------------------ app-doc/doxygen/doxygen-1.8.5-r9999.ebuild | 234 ----------------- .../doxygen/files/1.4.7/01_all_cp1251.patch | 35 --- .../files/1.4.7/05_all_system-libpng.patch | 124 --------- .../doxygen/files/1.4.7/06_all_qtools.patch | 44 ---- .../doxygen/files/doxygen-1.5-dot-eps.patch | 67 ----- .../files/doxygen-1.5-legacy-patches.diff | 203 --------------- .../doxygen/files/doxygen-1.5-qtlibdir.patch | 11 - .../files/doxygen-1.5-system-libpng.patch | 105 -------- .../files/doxygen-1.5.6-prefix-misc-alt.patch | 78 ------ .../doxygen/files/doxygen-1.5.8-kdedocs.patch | 32 --- .../files/doxygen-1.8.10-fix_flex_check.patch | 96 +++++++ .../doxygen-1.8.10-link_with_pthread.patch | 32 +++ .../doxygen-1.8.11-link_with_pthread.patch | 32 +++ ...patch => doxygen-1.8.11.taskrambler.patch} | 32 ++- .../files/doxygen-1.8.4-infinite_loop.patch | 26 -- .../files/doxygen-1.8.4-libreoffice.patch | 30 --- .../files/doxygen-1.8.4-taskrambler.patch | 90 ------- .../doxygen-1.8.9.1-empty-line-sigsegv.patch | 20 ++ 22 files changed, 397 insertions(+), 1359 deletions(-) create mode 100644 app-doc/doxygen/doxygen-1.8.11-r9999.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.8.4-r9999.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.8.5-r9999.ebuild delete mode 100644 app-doc/doxygen/files/1.4.7/01_all_cp1251.patch delete mode 100644 app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch delete mode 100644 app-doc/doxygen/files/1.4.7/06_all_qtools.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5-dot-eps.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff delete mode 100644 app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5-system-libpng.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch create mode 100644 app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch create mode 100644 app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch create mode 100644 app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch rename app-doc/doxygen/files/{doxygen-1.8.5-taskrambler.patch => doxygen-1.8.11.taskrambler.patch} (69%) delete mode 100644 app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.8.4-taskrambler.patch create mode 100644 app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index d6561cb..792c353 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.254 2013/09/05 19:44:49 mgorny Exp $ +*doxygen-1.8.11-r9999 (26 Jun 2013) + + 10 Apr 2016; Georg Hopp +doxygen-1.8.11-r9999.ebuild: + Copy latest ebuild from portage and patch with taskrambler class patch. + 05 Sep 2013; Michał Górny doxygen-1.8.3.1.ebuild, doxygen-1.8.4-r2.ebuild: Clean up PYTHON_COMPAT from old implementations. diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 94c199a..7c8d9d1 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,22 +1,12 @@ -AUX 1.4.7/01_all_cp1251.patch 683 SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e SHA512 4b449be072c86423e202089f945416f660a704e505c9bf2823750266214ccdcf88784520798a1dd2383ce9cf68d096ae2c599a73acd26aeabedc49aa98009931 WHIRLPOOL 4538085b8b4a022ff0ea94fb0f7212526ff17d81dbeb4cb626427ce06cb5a73ff3ccf6c69ad4b07edb9b3e45f418dc46f77f5bf782dbce3977680fa3f59465d4 -AUX 1.4.7/05_all_system-libpng.patch 5329 SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 SHA512 8fd67518302665a15ddc089152cdb04340eb416d3695b4374a49a6868e45268a8141c426b2b9c9e0f9e1818e28398aa98993cb21621947401bbf890f3d317017 WHIRLPOOL 92299f58fbc00b7187381b2b04d55f2fe6a9c68cd44f73d979254ec3875e2b7b54bced0c16824f328ee91bb34792760b27c1466d2126c58888484cc93fc62bfa -AUX 1.4.7/06_all_qtools.patch 1230 SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2 SHA512 bd6044c2625b134da0bb5811266c46de87b37ceadfeb9241718251a47d0a6578d031d8b67b88e376b084bdd20c5de65a6f560d188554f8fa8d3be12734a75a99 WHIRLPOOL a5df06702dd77f9b7c6ce32bdebc5c5271f565273d44f07dfea553a0b4604e0089d52a61b26d6b4ff4ab0d2be3f91b87bf651b28352e80101597df9e6d0cd106 -AUX doxygen-1.5-dot-eps.patch 2247 SHA256 6dc47978298a39bc520a1f48206be26f76657842f14aba3413768352c7e87d45 SHA512 2e14a99cdd47fb72886b4531d6c099a7de4fdd7f8f86c7d512fff5ec724ce02fc998b794037800ae92ae1a2bb5adc5c4607bdd39a979a5de275566d2590f989f WHIRLPOOL 980e1404265735aa293090b6765358c3507faa5271b3b2a5a1b77e54cd12acf66b1d99de77297665db81e8c3b2fabd20ecd7d0633f21cb7747794a5264866def -AUX doxygen-1.5-legacy-patches.diff 7242 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114 SHA512 75b0de308ff9935e612851bc18de31fa286155321f29d63c6e54750309b402d793aaead558de6b2a2697b95950e09fc62f0ec7fc435df20170fdbc79acf0ebdb WHIRLPOOL 25d3bb9d42ed2e912f7e172f0309973ee55afae2d37976a18c3f7ecde4cd8e9a1ef56ff73f25e9c11476000f9e0059fabe49991d2ada03983676671f0420be68 -AUX doxygen-1.5-qtlibdir.patch 354 SHA256 602038066a93ffd163c7f18b15362a9f2443bb7e842675d7de81bf5026ca9c2e SHA512 426d2e818d3a1e50141595cc275931166699301891921bd7a19569f47db7b7ac43b18a77a3c09027342ca7569c356f084b790a75fb6ac0f67e1f855bc7172669 WHIRLPOOL 45abeb9f24ea8671cace33fc4f2952bc03d0e70322111ac81d643078d6341293f2c1f7682c429a1fd19cdd02331c6b19dd2314e5ba77fb5ecbde8ae76c57eae9 -AUX doxygen-1.5-system-libpng.patch 5332 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab SHA512 b6e4193ce647131204a714cc5c5743b875ed699fb377aca77b1812cf0a143c8500d414752f1865b9633f099f8c05953c363ca542eb01e7d19a5cae0bd450b319 WHIRLPOOL 21b479c31ba3168347a828e8f6b2b23762c0b10f6b77dcfb68be2eac8dc9cf963d62da2492339b9d59a16b6afe65621674960c5dc888d250ceaf70993eabd322 -AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 SHA256 ee4b8c11c8af9bc3dfb365eff06addf3d7ec73931a234ac3651be2ba28ad3b44 SHA512 06791799913363348cd1de1bc1f36da4af75e7b322d10aeae24b68811f3028043b0fa39575e6ddf3e91a8938bcf220c2a9a5c5452922881dae65f9a9620091e6 WHIRLPOOL 10134d46e211648001553f420e8f201a870538dcd3e7002b7542221de710b307133e35671af1417014aed893cc9439a6a00f73220eaff5763771896492771f90 -AUX doxygen-1.5.8-kdedocs.patch 854 SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c SHA512 10dc047c049203dad2b4e2d602310d1296498a90cacb5a3599387dc0cbc845b591abe543954960b50bd3fa054c3516fb23789ae450bb8b4cdb45d45bb6130f86 WHIRLPOOL 736c568c5f11cbcf1aa9a7ed840bdcff506c6b162e6da8ccf92950a029de63ef32fd7764b317f155a3871567cee2230e59ba0c53c4af6825a705cfc0975f12ae AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 SHA256 3e888815a63ff804053711cf31f25130abc509e9b52cb4263b209764b70b633b SHA512 2b0c28168ab2d173ecf9cad03d5b5c684a0e8d15f80d937836440a72d301d64816ab9c61e958e8eef771c2c2ea6fcc1c8d2a62737ffcfa25f3166e52ce8fe245 WHIRLPOOL 2b5898621ae4868a75e0266e551f2c706e94483e91f9e22a7c68efd5e6d18af32178f5112d3059472bcf520f51907577254fc39191052a2ccb2fcc867140127d +AUX doxygen-1.8.10-fix_flex_check.patch 4833 SHA256 d912f166f9c47015a9ba36d108ea59b9a9ad3c7b04e169ce5cb501cb61540f70 SHA512 5dd35c3633d5a9e1296c7ac60e7756e0a2ee2e5c6731dfcb3a1d0460702dc96b3f9b54b6f3344fa6908c5b2b60e616f320e3505a5c97ebec43ccc613bba268a9 WHIRLPOOL 9512317a54b06ed99a48279def7ffc6edf3b48959f1b12d2821d590a551f332e7cc63a0dd69e28255a31b41a63785aeb2c2e9bffdfe5b3d5f3d3ee9c0d0481bf +AUX doxygen-1.8.10-link_with_pthread.patch 1009 SHA256 13d1dcf8517a152e0da6dcfa4bf2b13b1ada7d4f384a0cbcad4f334d633c45e2 SHA512 d706b229acf5b914d2281573f2ca69b05154ac8dec0dd0e5744db6d88a742309dcbe213f693b2037234237b4aed634b5b18c366a769c9ca29e561ff2cb2281d7 WHIRLPOOL 2fed7e299ef3c430b4a7f4db8428d7cd394c18c8afbe3427c4f41bc3d0a5de7e81bb626eea8acf00be9d7981bf2b29169a888ce51cb856f87f2e843dff9118d4 +AUX doxygen-1.8.11-link_with_pthread.patch 1078 SHA256 32572502132272a9cbabbf6767e3958a251daaad4a5eb647af906aae49e11b45 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831 WHIRLPOOL afdf19a528dd97d4ee5421376b3c3599d77bf86c10c4d0d5a03e26ffb66cd11c994736f013d9bd139c62bfd44869585656ee4c3efc9bb144ebeb23188690ee58 +AUX doxygen-1.8.11.taskrambler.patch 5256 SHA256 f4fbb7c3a85d1dc812667e5df9ddb94e3d0c8e8b6473058743d397e3feadc26e SHA512 ecf8f17fcc3a87fa953636718dcd25d89426caddb2305769e2c205cbae59a47b9b2d964c1cbbf6e2c477c824568863a67c1a64a19a9727cd50a2726fb1618286 WHIRLPOOL d57d4dfb92e1bd7abac4e30a8e497b2aaf78820c25d1c758234029c2acc93c7a6db9cfadaff6fe901f028f703df9f8c5b4d129634562cb315d7bb7be9ce4bb1b AUX doxygen-1.8.3.1-empty-line-sigsegv.patch 483 SHA256 d0d3e2f1e1d450b8b31fb9553fcf38d74816c36673ffe455959dacc7f9c01384 SHA512 777e26fe365226d8640eac89c3f11883f7cdca17cf667b32c8f7ed50b2160794620a312c4098e6e53a1af6c799fc9bd067d4846014381189de23bc84210cc752 WHIRLPOOL 072d65e3f619994bfaf170904f3699e40682f2d45a7ad3a600ba871f52ceb2ea1273b3919e008d7070a37f8beed198cf87c81a83babbdf0265e0105ff6a2940e -AUX doxygen-1.8.4-infinite_loop.patch 570 SHA256 189af23ec4580b84de7227dd91ae9fccb5645bd94fca43f401eb8d9a02d59e67 SHA512 5a5df6399098683c0f507e3120c4d1f8379707b0f24eafa836b7874adb73de65cd12d41f6d635e9dbcfa428ea4da684dbd2428a679529eee0e93c37db73380ad WHIRLPOOL 28667004d6b923981ef03eaba9a5a1913445fe8a13a24fde7f555dd8d7dd7f4fa7cac9162063b7aca87d518e39954fe0a39dc6fbf4d764e11c7cb26e0d1dd04f -AUX doxygen-1.8.4-libreoffice.patch 1362 SHA256 c73bd1e543b333f2fad202459c3b2bb71d7ebab6aae56d2828696ceda2331840 SHA512 d05d3f7e5dea817e42f45d9c82497877792efe8e09b8579afcaedaf2ccc36649470ed8eb40768ed65dbf625da33128ef512df5ff64ac439bc88a008019b8411e WHIRLPOOL a0593826c5c651912f87347ccb5f4e602efe976613c664ee59739ffee07d548896c80d6d4c8fb52bd756ca63155d099e855baa09dab3cfd94488fef82f973a81 -AUX doxygen-1.8.4-taskrambler.patch 5381 SHA256 4ca37d9c49da3d07388e3fbf15d4da08de45840a8b24abd19300372b7dbe40c3 SHA512 2db539fb55dd5f0a9adf26c59a6dccebb2a4ef952500ae95aa5145637ffbcfa6d2cfd0289ca0035f5c0e6dc12528b829dcd500abd84928b62d219387d82377f5 WHIRLPOOL aed7a7836c08ce5b6f7b757830dbd32c78c1759a24fbfce4203181106c0e84de6efc40a81bb3cc06aba62d9af795e251c93c6b1cbf0fea58a3e6305db839de4d -AUX doxygen-1.8.5-taskrambler.patch 5375 SHA256 1103f1e06a24b6c25469c32c92a43d0cb0634650c4f71d962cbc97a776faa156 SHA512 a27d7bc4aff416c3c1212754c1834820638ad6ee06a59a52374617e29a9a4a0f730c3392a16d70e6f04307762724f51d59238005e97da90d67725484d760e4f1 WHIRLPOOL aba53831ad9924413a5bf3cb05629e27afc1b6a08dc01af3cd8ed3ab6087211edefa6e5d7f91bea34c2bbb5256f8741a167462aa925211efab4fe0093602799b -DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c -DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182 +AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 SHA256 5195bc11afe48641de38f8e5a3574ce93654cb854be97f38bc6322fcaaaddfc3 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef WHIRLPOOL f048801c198d65dff3d2a16eed895c2d9f266034c082b60cdf50f9476e3d79103d3a29d005480a0b7c4b3f6a341e7c5fadca6893d7b817cfd0db09e394c7468f +DIST doxygen-1.8.11.src.tar.gz 4834291 SHA256 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 SHA512 44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e WHIRLPOOL 240c84bd02ea3ab747e59bb8db434e40e743ed24cbb8ca78b8846d3bb4f7672497106fd620c14851c06d80e474301811978def5d85db5b01df97b40a4ec74813 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb -EBUILD doxygen-1.8.4-r9999.ebuild 6992 SHA256 c9331fa4a2393c4f35840699b3521ba007617517d379ba94e9030443703ee8f1 SHA512 31196854db2d459a90d0dc0250b49d501229a89e9016c0d6a4beb3a5e00ac9d67d1c30d6b554da3554efad2294cbf82b8b2def06fb64b1c6ea848c27f632b99f WHIRLPOOL 397547fab0fe43566e42e5c8604dd9548b09f7cb446ae6e1e514fa2ff5d775f01300abd346b52acb9ee303e83488f6a6084d0e45ef79c43ededbed2213646a56 -EBUILD doxygen-1.8.5-r9999.ebuild 6641 SHA256 6e5495bdf66bfd3ff40b9c2410639d305ac8c7c68a3a12e66cbeaf87207bd41b SHA512 748e6c972f10947cef5a07cfa8c238ed4e2210b62b53645a9213ebed3fd79d324012a0aee0b68928d7604da72e16a1f904538c5e35d541055aaffc5d651e7209 WHIRLPOOL 2e83a5ecf84a0a6ab9800a4e707c8b7f1e2eedc2914702b40a28c5fe801edb722df1f3dedeaf0e3e95fddf125b4316f8fe8b4d92cbbce7a8613420c948b14a86 -MISC ChangeLog 42672 SHA256 61baf0432f9b55892c2526b0c7335488ec1d8288af8de70f3b1bdf2391915e0a SHA512 a573221599a8dc01e496f88de745405b89b0629d7dc26bfd9c899d048304bcac0c1a1d77360e46ddabdf0cc09df75001bb3979cb4d02718b79e82f8855971c18 WHIRLPOOL 5ca5173641a357f615548ffde37fb0866f9e102c72cfb84b7b3c9f221716e0d946d82e1184ef3aba7d33a934c5a9980f9878409a7e848781b5295c6f8b082ddc +EBUILD doxygen-1.8.11-r9999.ebuild 4803 SHA256 d38406afecd5c7518eb2e0bdb436c37572bd696d39bf695f3009203195bf0c33 SHA512 5a776cba2e7ddf20bd53f1b066741859b63fb5cd8fd95ddf1f709677ee549ed8e20e64fed6756e5c646f249fc4b162c178955080ebfaf50c1f5203b51e69ca52 WHIRLPOOL 1d31f15473468ce0308e3ad9626462d711573e8a9a5c17a2a4630e43338a4f728906bfbbd887e19c1e446f89a32fba4f56e9b4e5e11e54d269120dc058abf067 +MISC ChangeLog 42861 SHA256 1dc74745647cbee80746a1084c0a63169aee42a66560da90554cc8ac9d530b8d SHA512 0b8daab7bc361f33f5c6c6217eb56b15567d81c646c98025cc67362ee487094b81a57ce8d5c67eeb266502cacad21c0ca4ca21d4d8ed5b2bd02bf869d46fb5ab WHIRLPOOL 3f6ecc6bc822dfc91b3dcbd77c809f79f323bf6d83813a409b70a5caac946d7f621a70aed47cb79185fa03a488f3dc3022b9bf5bfbe213d67ffc900655afce8d MISC metadata.xml 833 SHA256 a1612d5400b6e418c45fa45da7b064d391bef410cf31b47b72f2808e7af25b44 SHA512 69c56f20d98619a74f0ab9e19b06b5251a77738e806db61ad3c5fc7874add0163f087d5f074d2d8e1141e5e919c3fd965bce39b23f55d42d28b7726602b25cae WHIRLPOOL fc799fb6c0e8ef4facea0766797a0c1324a012d2f7aa299991687ac2b2c1163bc7d8b2ed9e938317967899a80bc66ecf17ca83470bf1d46442f5d68cf8defa75 diff --git a/app-doc/doxygen/doxygen-1.8.11-r9999.ebuild b/app-doc/doxygen/doxygen-1.8.11-r9999.ebuild new file mode 100644 index 0000000..6c19fd3 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.8.11-r9999.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/doxygen/doxygen.git" + SRC_URI="" + KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +else + SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +fi +SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="http://www.doxygen.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" + +#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional +LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk +nl nb pl pt ro ru sl sk sr sv tr uk vi af) +for X in "${LANGS[@]}" ; do + IUSE="${IUSE} linguas_${X}" +done + +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( sys-devel/clang ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doxysearch? ( =dev-libs/xapian-1.2* ) + latex? ( app-text/texlive[extra] ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + sqlite? ( dev-db/sqlite:3 ) + " + +REQUIRED_USE="doc? ( latex )" + +DEPEND="sys-apps/sed + sys-devel/flex + sys-devel/bison + doc? ( ${PYTHON_DEPS} ) + ${RDEPEND}" + +# src_test() defaults to make -C testing but there is no such directory (bug #504448) +RESTRICT="test" +EPATCH_SUFFIX="patch" + +get_langs() { + # using only user set linguas also fixes #263641 + my_linguas=() + for lingua in ${LINGUAS}; do + if has ${lingua} "${LANGS[@]}"; then + case ${lingua} in + hy) lingua=am ;; + pt_BR) lingua=br ;; + zh*) lingua=cn ;; + cs) lingua=cz ;; + da) lingua=dk ;; + el*) lingua=gr ;; + ja*) lingua=jp ;; + ko) lingua=kr ;; + nb) lingua=no ;; + sl) lingua=si ;; + tr*) lingua=tr ;; + uk) lingua=ua ;; + af) lingua=za ;; + esac + has ${lingua} "${my_linguas[@]}" || + my_linguas+=(${lingua}) + fi + done + f_langs="${my_linguas[@]^^}" + echo ${f_langs// /;} +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + # Ensure we link to -liconv + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + for pro in */*.pro.in */*/*.pro.in; do + echo "unix:LIBS += -liconv" >> "${pro}" + done + fi + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348 + + epatch "${FILESDIR}"/${P}-link_with_pthread.patch + epatch "${FILESDIR}"/${P}-taskrambler.patch + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + echo + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + echo + elog "Continuing with -O2 instead ..." + echo + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR="share/doc/${P}" + -DLANG_CODES="$(get_langs)" + $(cmake-utils_use clang use_libclang) + $(cmake-utils_use doc build_doc) + $(cmake-utils_use doxysearch build_search) + $(cmake-utils_use qt5 build_wizard) + $(cmake-utils_use sqlite use_sqlite3) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + # generate html and pdf documents. errors here are not considered + # fatal, hence the ewarn message. + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {Doxyfile,doc/Doxyfile} \ + || ewarn "disabling dot failed" + fi + cd "${BUILD_DIR}" && emake docs + fi +} + +src_install() { + if use qt5; then + doicon "${DISTDIR}/doxywizard.png" + make_desktop_entry doxywizard "DoxyWizard ${PV}" \ + "/usr/share/pixmaps/doxywizard.png" \ + "Development" + fi + + dodoc LANGUAGE.HOWTO README.md + + cmake-utils_src_install +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + elog + elog "For examples and other goodies, see the source tarball. For some" + elog "example output, run doxygen on the doxygen source using the" + elog "Doxyfile provided in the top-level source dir." + elog + elog "Disabling the dot USE flag will remove the GraphViz dependency," + elog "along with Doxygen's ability to generate diagrams in the docs." + elog "See the Doxygen homepage for additional helper tools to parse" + elog "more languages." + elog +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/app-doc/doxygen/doxygen-1.8.4-r9999.ebuild b/app-doc/doxygen/doxygen-1.8.4-r9999.ebuild deleted file mode 100644 index 18fe8f5..0000000 --- a/app-doc/doxygen/doxygen-1.8.4-r9999.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r2.ebuild,v 1.3 2013/09/05 19:44:49 mgorny Exp $ - -EAPI=4 - -PYTHON_COMPAT=( python{2_6,2_7} ) -inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="http://www.doxygen.org/" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz - http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU" - -#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional - -LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk -nl nb pl pt ro ru sl sk sr sv tr uk vi af) -for X in "${LANGS[@]}" ; do - IUSE="${IUSE} linguas_${X}" -done - -RDEPEND="qt4? ( dev-qt/qtgui:4 ) - latex? ( app-text/texlive[extra] ) - dev-lang/perl - virtual/libiconv - media-libs/libpng - app-text/ghostscript-gpl - sqlite? ( dev-db/sqlite:3 ) - dot? ( - media-gfx/graphviz - media-libs/freetype - )" - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${RDEPEND}" - -RESTRICT="mirror" -EPATCH_SUFFIX="patch" - -get_langs() { - # using only user set linguas also fixes #263641 - my_linguas=() - for lingua in ${LINGUAS}; do - if has ${lingua} "${LANGS[@]}"; then - case ${lingua} in - hy) lingua=am ;; - pt_BR) lingua=br ;; - zh*) lingua=cn ;; - cs) lingua=cz ;; - da) lingua=dk ;; - el*) lingua=gr ;; - ja*) lingua=jp ;; - ko) lingua=kr ;; - nb) lingua=no ;; - sl) lingua=si ;; - tr*) lingua=tr ;; - uk) lingua=ua ;; - af) lingua=za ;; - esac - has ${lingua} "${my_linguas[@]}" || - my_linguas+=(${lingua}) - fi - done - f_langs="${my_linguas[@]}" - echo ${f_langs// /,} -} - -pkg_setup() { - tc-export CC CXX - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - # use CFLAGS, CXXFLAGS, LDFLAGS - export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" - - sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ - -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \ - -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ - tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \ - || die - - # Ensure we link to -liconv - if use elibc_FreeBSD; then - for pro in */*.pro.in */*/*.pro.in; do - echo "unix:LIBS += -liconv" >> "${pro}" - done - fi - - # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 - sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die - - # prefix search tools patch, plus OSX fixes - epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch - epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348 - - # patch to detect taskrambler classes as structs. - epatch "${FILESDIR}"/${PN}-1.8.4-taskrambler.patch - - # patches applied upstream - epatch "${FILESDIR}"/${P}-libreoffice.patch \ - "${FILESDIR}"/${P}-infinite_loop.patch #474716 - - # fix final DESTDIR issue - sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ - -e "s/all: Makefile.doxywizard/all:/g" \ - addon/doxywizard/Makefile.in || die - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \ - -i Makefile.in || die #428280 - - if is-flagq "-O3" ; then - echo - ewarn "Compiling with -O3 is known to produce incorrectly" - ewarn "optimized code which breaks doxygen." - echo - elog "Continuing with -O2 instead ..." - echo - replace-flags "-O3" "-O2" - fi -} - -src_configure() { - # set ./configure options (prefix, Qt based wizard, docdir) - - local my_conf="--shared --enable-langs $(get_langs)" - - if use debug ; then - my_conf="${my_conf} --debug" - else - my_conf="${my_conf} --release " - fi - - use qt4 && my_conf="${my_conf} --with-doxywizard" - - use sqlite && my_conf="${my_conf} --with-sqlite3" - - # On non GNU userland (e.g. BSD), configure script picks up make and bails - # out because it is not GNU make, so we force the right value. - use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install" - - export LINK="${QMAKE_LINK}" - export LINK_SHLIB="${QMAKE_CXX}" - - if use qt4 ; then - pushd addon/doxywizard &> /dev/null - eqmake4 doxywizard.pro -o Makefile.doxywizard - popd &> /dev/null - fi - - ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ - || die -} - -src_compile() { - - emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \ - LFLAGS+="${ELDFLAGS}" all - - # generate html and pdf (if tetex in use) documents. - # errors here are not considered fatal, hence the ewarn message - # TeX's font caching in /var/cache/fonts causes sandbox warnings, - # so we allow it. - if use doc; then - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {Doxyfile,doc/Doxyfile} \ - || ewarn "disabling dot failed" - fi - if use latex; then - addwrite /var/cache/fonts - addwrite /var/cache/fontconfig - addwrite /usr/share/texmf/fonts/pk - addwrite /usr/share/texmf/ls-R - make pdf || ewarn '"make pdf docs" failed.' - else - cp doc/Doxyfile doc/Doxyfile.orig - cp doc/Makefile doc/Makefile.orig - sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \ - doc/Doxyfile - sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile - make docs || ewarn '"make docs" failed.' - fi - fi -} - -src_install() { - emake DESTDIR="${D}" MAN1DIR=share/man/man1 install - - if use qt4; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi - - dodoc INSTALL LANGUAGE.HOWTO README - - # pdf and html manuals - if use doc; then - dohtml -r html/* - use latex && dodoc latex/doxygen_manual.pdf - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "The USE flags qt4, doc, and latex will enable doxywizard, or" - elog "the html and pdf documentation, respectively. For examples" - elog "and other goodies, see the source tarball. For some example" - elog "output, run doxygen on the doxygen source using the Doxyfile" - elog "provided in the top-level source dir." - elog - elog "Disabling the dot USE flag will remove the GraphViz dependency," - elog "along with Doxygen's ability to generate diagrams in the docs." - elog "See the Doxygen homepage for additional helper tools to parse" - elog "more languages." - elog -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-doc/doxygen/doxygen-1.8.5-r9999.ebuild b/app-doc/doxygen/doxygen-1.8.5-r9999.ebuild deleted file mode 100644 index 5585070..0000000 --- a/app-doc/doxygen/doxygen-1.8.5-r9999.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.2 2013/11/06 07:50:09 xarthisius Exp $ - -EAPI=4 -PYTHON_COMPAT=( python{2_6,2_7} ) - -inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="http://www.doxygen.org/" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz - http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU" - -#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional - -LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk -nl nb pl pt ro ru sl sk sr sv tr uk vi af) -for X in "${LANGS[@]}" ; do - IUSE="${IUSE} linguas_${X}" -done - -RDEPEND="qt4? ( dev-qt/qtgui:4 ) - latex? ( app-text/texlive[extra] ) - dev-lang/perl - virtual/libiconv - media-libs/libpng - app-text/ghostscript-gpl - sqlite? ( dev-db/sqlite:3 ) - dot? ( - media-gfx/graphviz - media-libs/freetype - )" - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${RDEPEND}" - -RESTRICT="mirror" -EPATCH_SUFFIX="patch" - -get_langs() { - # using only user set linguas also fixes #263641 - my_linguas=() - for lingua in ${LINGUAS}; do - if has ${lingua} "${LANGS[@]}"; then - case ${lingua} in - hy) lingua=am ;; - pt_BR) lingua=br ;; - zh*) lingua=cn ;; - cs) lingua=cz ;; - da) lingua=dk ;; - el*) lingua=gr ;; - ja*) lingua=jp ;; - ko) lingua=kr ;; - nb) lingua=no ;; - sl) lingua=si ;; - tr*) lingua=tr ;; - uk) lingua=ua ;; - af) lingua=za ;; - esac - has ${lingua} "${my_linguas[@]}" || - my_linguas+=(${lingua}) - fi - done - f_langs="${my_linguas[@]}" - echo ${f_langs// /,} -} - -pkg_setup() { - tc-export CC CXX - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - # use CFLAGS, CXXFLAGS, LDFLAGS - export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" - - sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ - -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \ - -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ - tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \ - || die - - # Ensure we link to -liconv - if use elibc_FreeBSD; then - for pro in */*.pro.in */*/*.pro.in; do - echo "unix:LIBS += -liconv" >> "${pro}" - done - fi - - # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 - sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die - - # prefix search tools patch, plus OSX fixes - epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch - epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348 - epatch "${FILESDIR}"/${P}-taskrambler.patch - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \ - -i Makefile.in || die #428280 - - if is-flagq "-O3" ; then - echo - ewarn "Compiling with -O3 is known to produce incorrectly" - ewarn "optimized code which breaks doxygen." - echo - elog "Continuing with -O2 instead ..." - echo - replace-flags "-O3" "-O2" - fi -} - -src_configure() { - # set ./configure options (prefix, Qt based wizard, docdir) - - local my_conf="--shared --enable-langs $(get_langs)" - - if use debug ; then - my_conf="${my_conf} --debug" - else - my_conf="${my_conf} --release " - fi - - use qt4 && my_conf="${my_conf} --with-doxywizard" - - use sqlite && my_conf="${my_conf} --with-sqlite3" - - # On non GNU userland (e.g. BSD), configure script picks up make and bails - # out because it is not GNU make, so we force the right value. - use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install" - - export LINK="${QMAKE_LINK}" - export LINK_SHLIB="${QMAKE_CXX}" - - if use qt4 ; then - pushd addon/doxywizard &> /dev/null - eqmake4 doxywizard.pro -o Makefile.doxywizard - popd &> /dev/null - fi - - ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ - || die -} - -src_compile() { - - emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \ - LFLAGS+="${ELDFLAGS}" all - - # generate html and pdf (if tetex in use) documents. - # errors here are not considered fatal, hence the ewarn message - # TeX's font caching in /var/cache/fonts causes sandbox warnings, - # so we allow it. - if use doc; then - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {Doxyfile,doc/Doxyfile} \ - || ewarn "disabling dot failed" - fi - if use latex; then - addwrite /var/cache/fonts - addwrite /var/cache/fontconfig - addwrite /usr/share/texmf/fonts/pk - addwrite /usr/share/texmf/ls-R - make pdf || ewarn '"make pdf docs" failed.' - else - cp doc/Doxyfile doc/Doxyfile.orig - cp doc/Makefile doc/Makefile.orig - sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \ - doc/Doxyfile - sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile - make docs || ewarn '"make docs" failed.' - fi - fi -} - -src_install() { - emake DESTDIR="${D}" MAN1DIR=share/man/man1 install - - if use qt4; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi - - dodoc LANGUAGE.HOWTO README.md - - # pdf and html manuals - if use doc; then - dohtml -r html/* - use latex && dodoc latex/doxygen_manual.pdf - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "The USE flags qt4, doc, and latex will enable doxywizard, or" - elog "the html and pdf documentation, respectively. For examples" - elog "and other goodies, see the source tarball. For some example" - elog "output, run doxygen on the doxygen source using the Doxyfile" - elog "provided in the top-level source dir." - elog - elog "Disabling the dot USE flag will remove the GraphViz dependency," - elog "along with Doxygen's ability to generate diagrams in the docs." - elog "See the Doxygen homepage for additional helper tools to parse" - elog "more languages." - elog -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch deleted file mode 100644 index 0ffed14..0000000 --- a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 -+++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 -@@ -1321,7 +1321,7 @@ - - - --#ifndef QT_NO_CODECS -+// #ifndef QT_NO_CODECS - - class QSimpleTextCodec: public QTextCodec - { -@@ -1948,7 +1948,7 @@ - } - - --#endif // QT_NO_CODECS -+// #endif // QT_NO_CODECS - - class QLatin1Codec: public QTextCodec - { -@@ -2048,12 +2048,13 @@ - { - (void)new QLatin1Codec; - --#ifndef QT_NO_CODECS -+ - int i = 0; - do { - (void)new QSimpleTextCodec( i ); - } while( unicodevalues[i++].mib != LAST_MIB ); - -+#ifndef QT_NO_CODECS - (void)new QEucJpCodec; - (void)new QSjisCodec; - (void)new QJisCodec; diff --git a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch deleted file mode 100644 index 491e3a2..0000000 --- a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch -+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch -@@ -0,0 +1,121 @@ -+#! /bin/sh -e -+ -+# DP: Use the system libpng library -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p1 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp -+--- ./src/pngenc.cpp.orig 2004-01-06 04:40:25.000000000 +0100 -++++ ./src/pngenc.cpp 2004-09-21 09:04:40.000000000 +0200 -+@@ -25,7 +25,7 @@ -+ #endif -+ -+ #define ALL_STATIC -+-#include <../libpng/png.h> -++#include -+ #include -+ #include -+ #include -+diff -u ./Makefile.in.orig ./Makefile.in -+--- ./Makefile.in.orig 2003-11-13 04:40:21.000000000 +0100 -++++ ./Makefile.in 2004-09-21 09:04:40.000000000 +0200 -+@@ -7,7 +7,6 @@ -+ cd doc ; $(MAKE) clean -+ cd qtools ; $(MAKE) clean -+ cd src ; $(MAKE) clean -+- cd libpng ; $(MAKE) clean -+ cd libmd5 ; $(MAKE) clean -+ cd addon/doxywizard ; $(MAKE) clean -+ cd addon/doxmlparser/src ; $(MAKE) clean -+@@ -18,7 +17,6 @@ -+ -+ distclean: clean -+ cd src ; $(MAKE) distclean -+- cd libpng ; $(MAKE) distclean -+ cd libmd5 ; $(MAKE) distclean -+ cd addon/doxywizard ; $(MAKE) distclean -+ cd addon/doxmlparser/src ; $(MAKE) distclean -+@@ -31,11 +29,10 @@ -+ -rm -f objects/*.o -+ -rm -f src/Makefile.doxygen src/Makefile.libdoxygen -+ -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -+- -rm -f libpng/Makefile.libpng -+ -rm -f libmd5/Makefile.libmd5 -+ -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile -+ -rm -f .makeconfig .tmakeconfig -+- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro -+ -rm -f src/version.cpp -+ -rm -r addon/doxywizard/Makefile -+ -rm -f addon/doxywizard/Makefile.doxywizard -+diff -u ./configure.orig ./configure -+--- ./configure.orig 2004-09-14 04:40:12.000000000 +0200 -++++ ./configure 2004-09-21 09:09:06.000000000 +0200 -+@@ -457,7 +457,7 @@ -+ EOF -+ fi -+ -+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in" -++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in" -+ -+ for i in $f_inmakefiles ; do -+ SRC=$i -+@@ -474,7 +474,6 @@ -+ echo "" >> $DST -+ echo "all: src/version.cpp " >> $DST -+ echo " \$(MAKE) -C qtools" >> $DST -+- echo " \$(MAKE) -C libpng" >> $DST -+ echo " \$(MAKE) -C libmd5" >> $DST -+ echo " \$(MAKE) -C src" >> $DST -+ if test $f_wizard = YES; then -+@@ -491,7 +490,7 @@ -+ echo " Created $DST from $SRC..." -+ done -+ -+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" -++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" -+ -+ for i in $f_inprofiles ; do -+ SRC=$i -+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in -+--- ./src/doxygen.pro.in.orig 2004-05-18 04:40:13.000000000 +0200 -++++ ./src/doxygen.pro.in 2004-09-21 09:58:06.000000000 +0200 -+@@ -28,7 +28,7 @@ -+ win32:TMAKE_CXXFLAGS += -DQT_NODLL -+ win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -++INCLUDEPATH += ../qtools ../libmd5 . -+ #win32-g++:INCLUDEPATH -= ../libpng -+ DESTDIR = ../bin -+ TARGET = doxygen -+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in -+--- ./src/libdoxygen.pro.in.orig 2004-08-25 04:40:18.000000000 +0200 -++++ ./src/libdoxygen.pro.in 2004-09-21 09:58:55.000000000 +0200 -+@@ -189,7 +189,6 @@ -+ win32-msvc:TMAKE_CXXFLAGS += -Zm200 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+ INCLUDEPATH += ../qtools -+-INCLUDEPATH += ../libpng -+ INCLUDEPATH += ../libmd5 -+ win32:INCLUDEPATH += . -+ win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 diff --git a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch b/app-doc/doxygen/files/1.4.7/06_all_qtools.patch deleted file mode 100644 index 38a4fcb..0000000 --- a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch -+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch -@@ -0,0 +1,41 @@ -+#! /bin/sh -e -+ -+# DP: Remove unused code that does not build with gcc 4.0 (#338099). -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p0 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+--- qtools/qstring.h.orig 2004-12-01 19:26:16.000000000 +0000 -++++ qtools/qstring.h 2005-12-04 20:09:01.000000000 +0000 -+@@ -163,8 +163,13 @@ -+ bool isLetterOrNumber() const; -+ bool isDigit() const; -+ -++ // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM, -++ // so they have been removed; the methods are not needed for doxygen -++#if 0 -+ uchar& cell() { return cl; } -+ uchar& row() { return rw; } -++#endif -++ -+ uchar cell() const { return cl; } -+ uchar row() const { return rw; } -+ diff --git a/app-doc/doxygen/files/doxygen-1.5-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.5-dot-eps.patch deleted file mode 100644 index bee288f..0000000 --- a/app-doc/doxygen/files/doxygen-1.5-dot-eps.patch +++ /dev/null @@ -1,67 +0,0 @@ -Pass -Teps instead of -Tps to graphviz dot. -Supposed to work with graphviz version 2.20.0 and later. - -2009-08-20 Martin von Gagern - -References: -http://bugs.gentoo.org/282150 -http://bugzilla.gnome.org/show_bug.cgi?id=592516 - -Index: doxygen-1.5.8/src/dot.cpp -=================================================================== ---- doxygen-1.5.8.orig/src/dot.cpp -+++ doxygen-1.5.8/src/dot.cpp -@@ -1887,7 +1887,7 @@ QCString DotClassGraph::writeGraph(QText - else if (format==EPS) // run dot to create a .eps image - { - DotRunner dotRun(baseName+".dot"); -- dotRun.addJob("ps",baseName+".eps"); -+ dotRun.addJob("eps",baseName+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); -@@ -2221,7 +2221,7 @@ QCString DotInclDepGraph::writeGraph(QTe - { - // run dot to create a .eps image - DotRunner dotRun(baseName+".dot"); -- dotRun.addJob("ps",baseName+".eps"); -+ dotRun.addJob("eps",baseName+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); -@@ -2515,7 +2515,7 @@ QCString DotCallGraph::writeGraph(QTextS - { - // run dot to create a .eps image - DotRunner dotRun(baseName+".dot"); -- dotRun.addJob("ps",baseName+".eps"); -+ dotRun.addJob("eps",baseName+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); -@@ -2657,7 +2657,7 @@ QCString DotDirDeps::writeGraph(QTextStr - { - // run dot to create a .eps image - DotRunner dotRun(baseName+".dot"); -- dotRun.addJob("ps",baseName+".eps"); -+ dotRun.addJob("eps",baseName+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); -@@ -2824,7 +2824,7 @@ void writeDotGraphFromFile(const char *i - if (format==BITMAP) - dotRun.addJob(imgExt,imgName); - else // format==EPS -- dotRun.addJob("ps",QCString(outFile)+".eps"); -+ dotRun.addJob("eps",QCString(outFile)+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); -@@ -3185,7 +3185,7 @@ QCString DotGroupCollaboration::writeGra - else if (format==EPS) - { - DotRunner dotRun(baseName+".dot"); -- dotRun.addJob("ps",baseName+".eps"); -+ dotRun.addJob("eps",baseName+".eps"); - if (!dotRun.run()) - { - QDir::setCurrent(oldDir); diff --git a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff deleted file mode 100644 index 2ceb262..0000000 --- a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff +++ /dev/null @@ -1,203 +0,0 @@ ---- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 -+++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 -@@ -1321,7 +1321,7 @@ - - - --#ifndef QT_NO_CODECS -+// #ifndef QT_NO_CODECS - - class QSimpleTextCodec: public QTextCodec - { -@@ -1948,7 +1948,7 @@ - } - - --#endif // QT_NO_CODECS -+// #endif // QT_NO_CODECS - - class QLatin1Codec: public QTextCodec - { -@@ -2048,12 +2048,13 @@ - { - (void)new QLatin1Codec; - --#ifndef QT_NO_CODECS -+ - int i = 0; - do { - (void)new QSimpleTextCodec( i ); - } while( unicodevalues[i++].mib != LAST_MIB ); - -+#ifndef QT_NO_CODECS - (void)new QEucJpCodec; - (void)new QSjisCodec; - (void)new QJisCodec; ---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch -+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch -@@ -0,0 +1,121 @@ -+#! /bin/sh -e -+ -+# DP: Use the system libpng library -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p1 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp -+--- ./src/pngenc.cpp.orig 2004-01-06 04:40:25.000000000 +0100 -++++ ./src/pngenc.cpp 2004-09-21 09:04:40.000000000 +0200 -+@@ -25,7 +25,7 @@ -+ #endif -+ -+ #define ALL_STATIC -+-#include <../libpng/png.h> -++#include -+ #include -+ #include -+ #include -+diff -u ./Makefile.in.orig ./Makefile.in -+--- ./Makefile.in.orig 2003-11-13 04:40:21.000000000 +0100 -++++ ./Makefile.in 2004-09-21 09:04:40.000000000 +0200 -+@@ -7,7 +7,6 @@ -+ cd doc ; $(MAKE) clean -+ cd qtools ; $(MAKE) clean -+ cd src ; $(MAKE) clean -+- cd libpng ; $(MAKE) clean -+ cd libmd5 ; $(MAKE) clean -+ cd addon/doxywizard ; $(MAKE) clean -+ cd addon/doxmlparser/src ; $(MAKE) clean -+@@ -18,7 +17,6 @@ -+ -+ distclean: clean -+ cd src ; $(MAKE) distclean -+- cd libpng ; $(MAKE) distclean -+ cd libmd5 ; $(MAKE) distclean -+ cd addon/doxywizard ; $(MAKE) distclean -+ cd addon/doxmlparser/src ; $(MAKE) distclean -+@@ -31,11 +29,10 @@ -+ -rm -f objects/*.o -+ -rm -f src/Makefile.doxygen src/Makefile.libdoxygen -+ -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -+- -rm -f libpng/Makefile.libpng -+ -rm -f libmd5/Makefile.libmd5 -+ -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile -+ -rm -f .makeconfig .tmakeconfig -+- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro -+ -rm -f src/version.cpp -+ -rm -r addon/doxywizard/Makefile -+ -rm -f addon/doxywizard/Makefile.doxywizard -+diff -u ./configure.orig ./configure -+--- ./configure.orig 2004-09-14 04:40:12.000000000 +0200 -++++ ./configure 2004-09-21 09:09:06.000000000 +0200 -+@@ -457,7 +457,7 @@ -+ EOF -+ fi -+ -+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in" -++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in" -+ -+ for i in $f_inmakefiles ; do -+ SRC=$i -+@@ -474,7 +474,6 @@ -+ echo "" >> $DST -+ echo "all: src/version.cpp " >> $DST -+ echo " \$(MAKE) -C qtools" >> $DST -+- echo " \$(MAKE) -C libpng" >> $DST -+ echo " \$(MAKE) -C libmd5" >> $DST -+ echo " \$(MAKE) -C src" >> $DST -+ if test $f_wizard = YES; then -+@@ -491,7 +490,7 @@ -+ echo " Created $DST from $SRC..." -+ done -+ -+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" -++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" -+ -+ for i in $f_inprofiles ; do -+ SRC=$i -+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in -+--- ./src/doxygen.pro.in.orig 2004-05-18 04:40:13.000000000 +0200 -++++ ./src/doxygen.pro.in 2004-09-21 09:58:06.000000000 +0200 -+@@ -28,7 +28,7 @@ -+ win32:TMAKE_CXXFLAGS += -DQT_NODLL -+ win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -++INCLUDEPATH += ../qtools ../libmd5 . -+ #win32-g++:INCLUDEPATH -= ../libpng -+ DESTDIR = ../bin -+ TARGET = doxygen -+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in -+--- ./src/libdoxygen.pro.in.orig 2004-08-25 04:40:18.000000000 +0200 -++++ ./src/libdoxygen.pro.in 2004-09-21 09:58:55.000000000 +0200 -+@@ -189,7 +189,6 @@ -+ win32-msvc:TMAKE_CXXFLAGS += -Zm200 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+ INCLUDEPATH += ../qtools -+-INCLUDEPATH += ../libpng -+ INCLUDEPATH += ../libmd5 -+ win32:INCLUDEPATH += . -+ win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 ---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch -+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch -@@ -0,0 +1,41 @@ -+#! /bin/sh -e -+ -+# DP: Remove unused code that does not build with gcc 4.0 (#338099). -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p0 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+--- qtools/qstring.h.orig 2004-12-01 19:26:16.000000000 +0000 -++++ qtools/qstring.h 2005-12-04 20:09:01.000000000 +0000 -+@@ -163,8 +163,13 @@ -+ bool isLetterOrNumber() const; -+ bool isDigit() const; -+ -++ // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM, -++ // so they have been removed; the methods are not needed for doxygen -++#if 0 -+ uchar& cell() { return cl; } -+ uchar& row() { return rw; } -++#endif -++ -+ uchar cell() const { return cl; } -+ uchar row() const { return rw; } -+ diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch deleted file mode 100644 index 34aaef4..0000000 --- a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-02-15 18:40:57.000000000 -0800 -+++ configure 2008-02-15 19:06:13.000000000 -0800 -@@ -276,6 +276,8 @@ - echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!" - exit 2 - fi -+ fi -+ if test -d "$QTDIR/lib64"; then - LIBDIR=lib64 - fi - if test ! -d "$QTDIR/include"; then diff --git a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch deleted file mode 100644 index dbd95b8..0000000 --- a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -ur doxygen-1.5.1/configure doxygen-fixed/configure ---- doxygen-1.5.1/configure 2006-11-01 22:52:27.711364356 +0200 -+++ doxygen-fixed/configure 2006-11-01 22:54:09.086952924 +0200 -@@ -525,7 +525,7 @@ - EOF - fi - --f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" -+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" - - for i in $f_inmakefiles ; do - SRC=$i -@@ -542,7 +542,6 @@ - echo "" >> $DST - echo "all: src/version.cpp " >> $DST - echo " \$(MAKE) -C qtools" >> $DST -- echo " \$(MAKE) -C libpng" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST - echo " \$(MAKE) -C src" >> $DST - if test $f_wizard = YES; then -@@ -562,7 +561,7 @@ - echo " Created $DST from $SRC..." - done - --f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" -+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" - - for i in $f_inprofiles ; do - SRC=$i -diff -ur doxygen-1.5.1/Makefile.in doxygen-fixed/Makefile.in ---- doxygen-1.5.1/Makefile.in 2006-11-01 22:52:31.257825212 +0200 -+++ doxygen-fixed/Makefile.in 2006-11-01 22:53:44.182738940 +0200 -@@ -7,7 +7,6 @@ - cd doc ; $(MAKE) clean - cd qtools ; $(MAKE) clean - cd src ; $(MAKE) clean -- cd libpng ; $(MAKE) clean - cd libmd5 ; $(MAKE) clean - cd addon/doxywizard ; $(MAKE) clean - cd addon/doxmlparser/src ; $(MAKE) clean -@@ -18,7 +17,6 @@ - - distclean: clean - cd src ; $(MAKE) distclean -- cd libpng ; $(MAKE) distclean - cd libmd5 ; $(MAKE) distclean - cd addon/doxywizard ; $(MAKE) distclean - cd addon/doxmlparser/src ; $(MAKE) distclean -@@ -32,11 +30,10 @@ - -rm -f objects/*.o - -rm -f src/Makefile.doxygen src/Makefile.libdoxygen - -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -- -rm -f libpng/Makefile.libpng - -rm -f libmd5/Makefile.libmd5 - -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile - -rm -f .makeconfig .tmakeconfig -- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro - -rm -f src/version.cpp - -rm -r addon/doxywizard/Makefile - -rm -f addon/doxywizard/Makefile.doxywizard -@@ -81,7 +78,7 @@ - pdf: docs - cd latex ; $(MAKE) - --DISTFILES = Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \ -+DISTFILES = Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \ - qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ - Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \ - VERSION packages winbuild -diff -ur doxygen-1.5.1/src/doxygen.pro.in doxygen-fixed/src/doxygen.pro.in ---- doxygen-1.5.1/src/doxygen.pro.in 2006-11-01 22:52:32.611619404 +0200 -+++ doxygen-fixed/src/doxygen.pro.in 2006-11-01 22:54:39.508328172 +0200 -@@ -28,7 +28,7 @@ - win32:TMAKE_CXXFLAGS += -DQT_NODLL - win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti --INCLUDEPATH += ../qtools ../libpng ../libmd5 . -+INCLUDEPATH += ../qtools ../libmd5 . - #win32-g++:INCLUDEPATH -= ../libpng - DESTDIR = ../bin - TARGET = doxygen -diff -ur doxygen-1.5.1/src/libdoxygen.pro.in doxygen-fixed/src/libdoxygen.pro.in ---- doxygen-1.5.1/src/libdoxygen.pro.in 2006-11-01 22:52:33.704453268 +0200 -+++ doxygen-fixed/src/libdoxygen.pro.in 2006-11-01 22:54:50.479660276 +0200 -@@ -207,7 +207,6 @@ - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - INCLUDEPATH += ../qtools --INCLUDEPATH += ../libpng - INCLUDEPATH += ../libmd5 - win32:INCLUDEPATH += . - win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -diff -ur doxygen-1.5.1/src/pngenc.cpp doxygen-fixed/src/pngenc.cpp ---- doxygen-1.5.1/src/pngenc.cpp 2006-11-01 22:52:34.006407364 +0200 -+++ doxygen-fixed/src/pngenc.cpp 2006-11-01 22:53:13.023475868 +0200 -@@ -25,7 +25,7 @@ - #endif - - #define ALL_STATIC --#include <../libpng/png.h> -+#include - #include - #include - #include diff --git a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch b/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch deleted file mode 100644 index 04d69e8..0000000 --- a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch +++ /dev/null @@ -1,78 +0,0 @@ -* make sure we always look for tools in the path, no "do it yourself paths" - ---- configure -+++ configure -@@ -169,21 +169,12 @@ - ;; - Darwin:*) - f_platform=macosx-c++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - FreeBSD:*) - f_platform=freebsd-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - HP-UX:*) - f_platform=hpux-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - IRIX64:*) - f_platform=irix-64 -@@ -214,9 +205,6 @@ - ;; - SunOS:5*) - f_platform=solaris-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - ULTRIX:*) - f_platform=ultrix-g++ -@@ -311,8 +299,8 @@ - - echo -n " Checking for GNU make tool... " - if test "$f_make" = NO; then -- make_names="gmake make" -- make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ make_names="make" -+ make_dirs="$bin_dirs" - make_prog=NO - for i in $make_names; do - for j in $make_dirs; do -@@ -338,8 +326,8 @@ - - echo -n " Checking for GNU install tool... " - if test "$f_insttool" = NO; then -- install_names="ginstall install" -- install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb" -+ install_names="install" -+ install_dirs="$bin_dirs" - install_prog=NO - install_found=NO - for i in $install_names; do -@@ -397,7 +385,7 @@ - echo -n " Checking for perl... " - if test "$f_perl" = NO; then - perl_names="perl perl5" -- perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ perl_dirs="$bin_dirs" - perl_prog=NO - perl_found=NO - for i in $perl_names; do -@@ -550,10 +538,6 @@ - cat >> .tmakeconfig <> .tmakeconfig <> .tmakeconfig < nonSymlinks; - QDict known; - QCString result = path; -+ QCString oldPrefix = "/"; - do - { - #ifdef WIN32 -@@ -8637,7 +8638,7 @@ - QString target = fi.readLink(); - if (QFileInfo(target).isRelative()) - { -- target = QDir::cleanDirPath(prefix+"/"+target.data()); -+ target = QDir::cleanDirPath(oldPrefix+"/"+target.data()); - } - if (sepPos!=-1) - { -@@ -8656,6 +8657,7 @@ - { - nonSymlinks.insert(prefix,(void*)0x8); - } -+ oldPrefix = prefix; - } - } - while (sepPos!=-1); diff --git a/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch b/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch new file mode 100644 index 0000000..24a3b64 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch @@ -0,0 +1,96 @@ +From 5fcb13572417a3b4a05217e9023c683864f35643 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 19 Nov 2015 12:00:54 +0100 +Subject: [PATCH] Support flex-2.6.0 + +The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not +take YY_FLEX_MINOR_VERSION into account, which made them fail with +flex-2.6.0. + +diff --git a/src/code.l b/src/code.l +index 3323580..25719af 100644 +--- a/src/code.l ++++ b/src/code.l +@@ -3700,7 +3700,7 @@ void codeFreeScanner() + extern "C" { // some bogus code to keep the compiler happy + void codeYYdummy() { yy_flex_realloc(0,0); } + } +-#elif YY_FLEX_SUBMINOR_VERSION<33 ++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33 + #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" + #endif + +diff --git a/src/commentscan.l b/src/commentscan.l +index cf892a0..2629857 100644 +--- a/src/commentscan.l ++++ b/src/commentscan.l +@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" + // but we need to know the position in the input buffer where this + // rule matched. + // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE +-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 ++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 + inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf); + #else + inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf); +@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" + g_memberGroupHeader.resize(0); + parseMore=TRUE; + needNewEntry = TRUE; +-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 ++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33 + inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext); + #else + inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext); +diff --git a/src/fortrancode.l b/src/fortrancode.l +index fb91a83..352912b 100644 +--- a/src/fortrancode.l ++++ b/src/fortrancode.l +@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri + extern "C" { // some bogus code to keep the compiler happy + void fortrancodeYYdummy() { yy_flex_realloc(0,0); } + } +-#elif YY_FLEX_SUBMINOR_VERSION<33 ++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33 + #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" + #else + extern "C" { // some bogus code to keep the compiler happy +diff --git a/src/pycode.l b/src/pycode.l +index 3c41a69..f58f7c1 100644 +--- a/src/pycode.l ++++ b/src/pycode.l +@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/, + extern "C" { // some bogus code to keep the compiler happy + void pycodeYYdummy() { yy_flex_realloc(0,0); } + } +-#elif YY_FLEX_SUBMINOR_VERSION<33 ++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33 + #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." + #endif + +diff --git a/src/vhdlcode.l b/src/vhdlcode.l +index 369ae48..6957048 100644 +--- a/src/vhdlcode.l ++++ b/src/vhdlcode.l +@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner() + extern "C" { // some bogus code to keep the compiler happy + void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } + } +-#elif YY_FLEX_SUBMINOR_VERSION<33 ++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33 + #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" + #endif + +diff --git a/src/xmlcode.l b/src/xmlcode.l +index 15b5d7e..2bef4a0 100644 +--- a/src/xmlcode.l ++++ b/src/xmlcode.l +@@ -407,7 +407,7 @@ void resetXmlCodeParserState() + extern "C" { // some bogus code to keep the compiler happy + void xmlcodeYYdummy() { yy_flex_realloc(0,0); } + } +-#elif YY_FLEX_SUBMINOR_VERSION<33 ++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33 + #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." + #endif + diff --git a/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch new file mode 100644 index 0000000..a2ce345 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch @@ -0,0 +1,32 @@ +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index 055aac3..b66bde7 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -73,6 +73,7 @@ ${doxywizard_RESOURCES_RCC} + ) + target_link_libraries(doxywizard + ${QT_LIBRARIES} ++pthread + ) + + install(TARGETS doxywizard DESTINATION bin) +diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt +index 33e01c1..165fc3e 100644 +--- a/addon/doxysearch/CMakeLists.txt ++++ b/addon/doxysearch/CMakeLists.txt +@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} + qtools ++ pthread + ) + + add_executable(doxysearch.cgi +@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ++ pthread + ) + + install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) diff --git a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch new file mode 100644 index 0000000..cdc630c --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch @@ -0,0 +1,32 @@ +diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt +index 33e01c1..165fc3e 100644 +--- a/addon/doxysearch/CMakeLists.txt ++++ b/addon/doxysearch/CMakeLists.txt +@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} + qtools ++ pthread + ) + + add_executable(doxysearch.cgi +@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ++ pthread + ) + + install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index bf2eda8..8eb2a1c 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC} + qt_use_modules(doxywizard Core Gui Widgets Xml) + target_link_libraries(doxywizard + ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ++pthread + ) + + install(TARGETS doxywizard DESTINATION bin) diff --git a/app-doc/doxygen/files/doxygen-1.8.5-taskrambler.patch b/app-doc/doxygen/files/doxygen-1.8.11.taskrambler.patch similarity index 69% rename from app-doc/doxygen/files/doxygen-1.8.5-taskrambler.patch rename to app-doc/doxygen/files/doxygen-1.8.11.taskrambler.patch index e0c9b6e..7cfc76a 100644 --- a/app-doc/doxygen/files/doxygen-1.8.5-taskrambler.patch +++ b/app-doc/doxygen/files/doxygen-1.8.11.taskrambler.patch @@ -1,16 +1,17 @@ -diff -Naur doxygen-1.8.5.orig/src/code.l doxygen-1.8.5/src/code.l ---- doxygen-1.8.5.orig/src/code.l 2013-07-02 13:08:08.000000000 +0100 -+++ doxygen-1.8.5/src/code.l 2013-11-29 15:13:06.237105125 +0000 -@@ -1750,7 +1750,7 @@ +diff -Naur doxygen-1.8.11.orig/src/code.l doxygen-1.8.11/src/code.l +--- doxygen-1.8.11.orig/src/code.l 2015-12-12 10:40:51.000000000 +0100 ++++ doxygen-1.8.11/src/code.l 2016-04-10 07:24:30.620949984 +0200 +@@ -1781,7 +1781,8 @@ SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID}) SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+ KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property") --KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) -+KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"TR_CLASS"|"TR_INTERFACE"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) +-KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) ++KEYWORD_TRCLASS ("TR_CLASS"|"TR_INTERFACE") ++KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}|{KEYWORD_TRCLASS}) FLOWKW ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally") TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr") CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast") -@@ -1829,6 +1829,13 @@ +@@ -1861,6 +1862,13 @@ codifyLines(yytext); endFontClass(); } @@ -24,7 +25,7 @@ diff -Naur doxygen-1.8.5.orig/src/code.l doxygen-1.8.5/src/code.l (KEYWORD_CPPCLI_DATATYPE|("partial"{B}+)?"class"|"struct"|"union"|"namespace"|"interface"){B}+ { startFontClass("keyword"); codifyLines(yytext); -@@ -2106,6 +2113,10 @@ +@@ -2143,6 +2151,10 @@ BEGIN( ClassVar ); } } @@ -35,10 +36,10 @@ diff -Naur doxygen-1.8.5.orig/src/code.l doxygen-1.8.5/src/code.l "(" { g_bracketCount=1; g_code->codify(yytext); -diff -Naur doxygen-1.8.5.orig/src/scanner.l doxygen-1.8.5/src/scanner.l ---- doxygen-1.8.5.orig/src/scanner.l 2013-08-23 14:38:23.000000000 +0100 -+++ doxygen-1.8.5/src/scanner.l 2013-11-29 15:13:58.415030686 +0000 -@@ -600,7 +600,7 @@ +diff -Naur doxygen-1.8.11.orig/src/scanner.l doxygen-1.8.11/src/scanner.l +--- doxygen-1.8.11.orig/src/scanner.l 2015-12-28 19:55:12.000000000 +0100 ++++ doxygen-1.8.11/src/scanner.l 2016-04-10 07:29:50.644953768 +0200 +@@ -594,7 +594,7 @@ /* start command character */ CMD ("\\"|"@") @@ -47,7 +48,7 @@ diff -Naur doxygen-1.8.5.orig/src/scanner.l doxygen-1.8.5/src/scanner.l BN [ \t\n\r] BL [ \t\r]*"\n" B [ \t] -@@ -635,6 +635,7 @@ +@@ -629,6 +629,7 @@ %x DefineEnd %x CompoundName %x ClassVar @@ -55,7 +56,7 @@ diff -Naur doxygen-1.8.5.orig/src/scanner.l doxygen-1.8.5/src/scanner.l %x CSConstraintName %x CSConstraintType %x CSIndexer -@@ -1704,8 +1705,30 @@ +@@ -1742,6 +1743,27 @@ if (yytext[yyleng-1]=='{') unput('{'); BEGIN( CompoundName ) ; } @@ -82,7 +83,4 @@ diff -Naur doxygen-1.8.5.orig/src/scanner.l doxygen-1.8.5/src/scanner.l + } {B}*"value struct{" | // C++/CLI extension {B}*"value struct"{BN}+ { -+ printf("DEBUG: myclass 3\n"); isTypedef=FALSE; - current->section = Entry::CLASS_SEC; - current->spec = Entry::Struct | Entry::Value; diff --git a/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch b/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch deleted file mode 100644 index 840baa8..0000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix inifite loop - -https://bugs.gentoo.org/show_bug.cgi?id=474716 -https://bugzilla.gnome.org/show_bug.cgi?id=701295 - -Patch written by Dimitri van Heesch - ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) - ++templateDepth; - pos=nextOpenPos-1; - } -- else -+ else if (nextClosePos!=-1) - { - --templateDepth; - pos=nextClosePos-1; - } -+ else // more >'s than <'s, see bug701295 -+ { -+ return -1; -+ } - } - else - { diff --git a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch b/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch deleted file mode 100644 index 7aa7baa..0000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b3e1f10a2d795d0cf31f6efb3f88a31ad4c68980 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 29 May 2013 16:29:04 +0200 -Subject: [PATCH] fix "Constant Groups" regression on file pages - -Due to a copy/paste error in the UNO IDL patch the "Namespaces" -listed on the "File Reference" pages are erroneously duplicated. -(thanks to Stephan Bergmann for finding this problem) - -Signed-off-by: Dimitri van Heesch ---- - src/layout.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/layout.cpp b/src/layout.cpp -index c2b1ac5..010c850 100644 ---- a/src/layout.cpp -+++ b/src/layout.cpp -@@ -582,7 +582,7 @@ class LayoutParser : public QXmlDefaultHandler - SrcLangExt_Fortran,theTranslator->trModules() - ))); - m_sHandler.insert("file/memberdecl/constantgroups", -- new StartElementHandlerSection(this,LayoutDocEntry::FileNamespaces,&LayoutParser::startSectionEntry, -+ new StartElementHandlerSection(this,LayoutDocEntry::FileConstantGroups,&LayoutParser::startSectionEntry, - theTranslator->trConstantGroups())); - m_sHandler.insert("file/memberdecl/defines", - new StartElementHandlerMember(this,&LayoutParser::startMemberDeclEntry, --- -1.8.1.6 - diff --git a/app-doc/doxygen/files/doxygen-1.8.4-taskrambler.patch b/app-doc/doxygen/files/doxygen-1.8.4-taskrambler.patch deleted file mode 100644 index 55c5b26..0000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-taskrambler.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/src/code.l b/src/code.l -index 01636fa..0f98649 100644 ---- a/src/code.l -+++ b/src/code.l -@@ -1753,7 +1753,7 @@ TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">" - SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID}) - SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+ - KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property") --KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) -+KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"TR_CLASS"|"TR_INTERFACE"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC}) - FLOWKW ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally") - TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr") - CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast") -@@ -1832,6 +1832,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" - codifyLines(yytext); - endFontClass(); - } -+TR_CLASS"(" { -+ startFontClass("keyword"); -+ codifyLines(yytext); -+ endFontClass(); -+ if (!g_insideTemplate) -+ BEGIN( ClassName ); -+ } - (KEYWORD_CPPCLI_DATATYPE|("partial"{B}+)?"class"|"struct"|"union"|"namespace"|"interface"){B}+ { - startFontClass("keyword"); - codifyLines(yytext); -@@ -2109,6 +2116,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" - BEGIN( ClassVar ); - } - } -+")" { -+ g_code->codify(yytext); -+ BEGIN( ClassVar ); -+ } - "(" { - g_bracketCount=1; - g_code->codify(yytext); -diff --git a/src/scanner.l b/src/scanner.l -index b3cdfb9..c3dedc5 100644 ---- a/src/scanner.l -+++ b/src/scanner.l -@@ -605,7 +605,7 @@ static int yyread(char *buf,int max_size) - - /* start command character */ - CMD ("\\"|"@") --SECTIONCMD {CMD}("image"|"author"|"internal"|"version"|"date"|"deprecated"|"param"|"exception"|"return"[s]?|"retval"|"bug"|"warning"|"par"|"sa"|"see"|"pre"|"post"|"invariant"|"note"|"remark"[s]?|"todo"|"test"|"xrefitem"|"ingroup"|"callgraph"|"callergraph"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"manonly"|"{"|"verbatim"|"dotfile"|"dot"|"defgroup"|"addtogroup"|"weakgroup"|"class"|"namespace"|"union"|"struct"|"fn"|"var"|"details"|"typedef"|"def"|"overload")|("<"{PRE}">") -+SECTIONCMD {CMD}("image"|"author"|"internal"|"version"|"date"|"deprecated"|"param"|"exception"|"return"[s]?|"retval"|"bug"|"warning"|"par"|"sa"|"see"|"pre"|"post"|"invariant"|"note"|"remark"[s]?|"todo"|"test"|"xrefitem"|"ingroup"|"callgraph"|"callergraph"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"manonly"|"{"|"verbatim"|"dotfile"|"dot"|"defgroup"|"addtogroup"|"weakgroup"|"class"|"namespace"|"union"|"struct"|"TR_CLASS"|"TR_INTERFACE"|"fn"|"var"|"details"|"typedef"|"def"|"overload")|("<"{PRE}">") - BN [ \t\n\r] - BL [ \t\r]*"\n" - B [ \t] -@@ -635,6 +635,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" - %x DefineEnd - %x CompoundName - %x ClassVar -+%x CClassName - %x CSConstraintName - %x CSConstraintType - %x CSIndexer -@@ -1703,8 +1704,30 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" - if (yytext[yyleng-1]=='{') unput('{'); - BEGIN( CompoundName ) ; - } -+{B}*"TR_CLASS(" { -+ current->section = Entry::CLASS_SEC ; -+ current->spec = Entry::Struct | -+ (current->spec & Entry::Published); // preserve UNO IDL -+ addType( current ) ; -+ current->type += " CLASS" ; -+ current->fileName = yyFileName; -+ current->startLine = yyLineNr; -+ current->startColumn = yyColNr; -+ current->bodyLine = yyLineNr; -+ lineCount() ; -+ BEGIN( CClassName ) ; -+ } -+{SCOPENAME} { -+ current->name = yytext ; -+ lineCount(); -+ BEGIN( CClassName ); -+ } -+")" { -+ BEGIN( ClassVar ); -+ } - {B}*"value struct{" | // C++/CLI extension - {B}*"value struct"{BN}+ { -+ printf("DEBUG: myclass 3\n"); - isTypedef=FALSE; - current->section = Entry::CLASS_SEC; - current->spec = Entry::Struct | Entry::Value; diff --git a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch new file mode 100644 index 0000000..cfa5617 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch @@ -0,0 +1,20 @@ +removeEmptyLines() segfaults on empty string + +https://bugs.gentoo.org/show_bug.cgi?id=454348 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423 + +Patch written by Thibaut Paumard +--- a/src/htmlgen.cpp ++++ b/src/htmlgen.cpp +@@ -1022,6 +1022,11 @@ + static QCString removeEmptyLines(const QCString &s) + { + BufStr out(s.length()+1); ++ if (s.length()==0) ++ { ++ out.addChar('\0'); ++ return out.data(); ++ } + const char *p=s.data(); + if (p) + {