Georg GH. Hopp / ghopp-overlay · Commits

Commit dbe8882df1008655f558b691290ef91b4d3e976c

Authored by Georg Hopp
1 parent 0d2d8ea1

update form portage

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