diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-03-12 19:38:37 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-03-12 19:38:37 +0000 |
| commit | 5f228243132dbd2b8850993d6581d61361a9efe5 (patch) | |
| tree | 5ee59e7992a305731afb28e3aeb45883c29f7fa5 /dev-util | |
| parent | Remove useless use of epunt_cxx wrt #460976 by Roman Žilka (diff) | |
| download | historical-5f228243132dbd2b8850993d6581d61361a9efe5.tar.gz historical-5f228243132dbd2b8850993d6581d61361a9efe5.tar.bz2 historical-5f228243132dbd2b8850993d6581d61361a9efe5.zip | |
finally fix syntax highlighting
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/ninja-ide/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/ninja-ide/Manifest | 20 | ||||
| -rw-r--r-- | dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch | 24 | ||||
| -rw-r--r-- | dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild (renamed from dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild) | 2 |
4 files changed, 38 insertions, 16 deletions
diff --git a/dev-util/ninja-ide/ChangeLog b/dev-util/ninja-ide/ChangeLog index b059e4ef165a..38ef913a0bc3 100644 --- a/dev-util/ninja-ide/ChangeLog +++ b/dev-util/ninja-ide/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/ninja-ide # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ChangeLog,v 1.10 2013/03/12 18:37:21 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ChangeLog,v 1.11 2013/03/12 19:38:33 hasufell Exp $ + +*ninja-ide-2.1.1-r5 (12 Mar 2013) + + 12 Mar 2013; Julian Ospald <hasufell@gentoo.org> -ninja-ide-2.1.1-r4.ebuild, + +ninja-ide-2.1.1-r5.ebuild, files/ninja-ide-2.1.1-syntaxhighlighting.patch: + finally fix syntax highlighting 12 Mar 2013; Julian Ospald <hasufell@gentoo.org> ninja-ide-2.1.1-r4.ebuild: update deps diff --git a/dev-util/ninja-ide/Manifest b/dev-util/ninja-ide/Manifest index 0813276d5dc6..88eaab7fbdd1 100644 --- a/dev-util/ninja-ide/Manifest +++ b/dev-util/ninja-ide/Manifest @@ -2,20 +2,20 @@ Hash: SHA256 AUX ninja-ide-2.1.1-lang.patch 769 SHA256 0e35d5b10cb4d92633f8fa9ce46f08fd1a97c55abec5448d94729145f2e53b0e SHA512 d614061df4598878c6c9f802c0ca4b41b9ddb9b7cd6bb448030ba370dfcca4cb99b54a76d5c617298cdd8c35c05d7ac57927ba6b65409ce57676ee07c56e9f1c WHIRLPOOL a7cf5b1a7fd2fefe18b3e9440d8b2a14827daf5b1c7cbf0eee20a98feeb170f8316845ffd48548e8cfcfd6cf2cf1b5549890ce46621bcc25e42eb53ec9e3792c -AUX ninja-ide-2.1.1-syntaxhighlighting.patch 1012 SHA256 0a13ee766e777a8fb42ba7445ece3d60a7b1f8b4076b5d33417572867df22719 SHA512 437884f1896244beb862581322185d0b897e923deb9be8a6e9314f4dcf3bf235ecceee3a2aa4e332310a3c47c0e2b6bb0ecf841baad08a5a95e4ca7aaf4de367 WHIRLPOOL 27d983dab3370325162bbbc0ce57c29cd1bdc04d2239ebd18ebcc79bf34c19aa23a588a216df187653db0e9a422280646fa1ec71e57123163650f9ebf529a0ef +AUX ninja-ide-2.1.1-syntaxhighlighting.patch 1876 SHA256 12074533982cec33b6bbfa3f932e3458a6b2d6806886b6932cb16dc3dec2da09 SHA512 ace6867d2f0c51ba847dda495e5794ecc9e8a31a723105f7f0a7e94d519dae929596fe795e45ca630cb654db46f639c9d6d0f8e0dc8dd1d977b1f29abaf87757 WHIRLPOOL d2054fb45a1f4b46dd9f1e340e4a2c4d60a72cca48047b474fef1f8f0eaf7df4a47f4b4f2e8b779c14e1685182e922e62f6b192592f6ae6d39cced35640cffbf DIST ninja-ide-2.1.1.tar.gz 737456 SHA256 534a891dfdaa262fd6465d2d72672eb29e494401968ba31c483f9eab31f3d5a8 SHA512 4ecc9e09ce9e68fa3a883f326a59d6c5fc2c52e2b8e936da0d3c57974b76ce11d1c171bcbce29ab676818efedab10bf282d28e2d43eed4c00d1b9d1d1807e48c WHIRLPOOL 7b42097df4725b3747e6c774c1ff206dae0344f860ffea1ac8bc2212a2042cfb66b8f33a799c395ed58bbbd8348f5045e09720f549b0974b65ba80509980d1af EBUILD ninja-ide-2.1.1-r3.ebuild 1017 SHA256 8b3924c44298e6769334a6ae54fdd76a716cb5330279f297b083f1264c16ef41 SHA512 e759e7b7764a6cc1e7e19316aecfb025d32a688ab5a3576cefe80ef637c14173a66491833a99e8b6082f4fb9235417b2aea4c500f80212b8185928d6c735c8eb WHIRLPOOL e31365068e0609d1c81e71e8b6e94aebaf56901b76856bf7fe917ef675640921455b3bd2e3132bc984e911e259b436e1d8db8013eaf753c9f3e0bd00d8b20ec1 -EBUILD ninja-ide-2.1.1-r4.ebuild 1117 SHA256 7452a812fe23816550af39d1e740846b599987054f2ee1e6213d92480c0e42d9 SHA512 d1b989d362c46926649bc20b323e8de534177319394a12282528db447c456ad095a53bb104d581aceff1d27d256c593be3ed8ba484d3bc99c2a3c4dfa59db89f WHIRLPOOL 3530c16d206eb4be330690d63e2572094078336bd1ea5a5d3f2fadc30c397a95fbc052c29e13772d7b7a3bbb591a8a95ba3f5c3e5977ce507633f8ba00ea3334 -MISC ChangeLog 1710 SHA256 5d87cc41d6467450c76ef3efc440819bec6bb8cfe02c6592f983cb46412fdd3e SHA512 221c9fc0005922b65fb2f16633183722494ba79a20482ba72e59d65380e0f159934570bab856d2d8e9489452831bcbea9b15460f11fe2dbdebf539db57e65c34 WHIRLPOOL 8fb415c38b90564f0b54ba7f3e30890c2fbf15fc46a9961d8e598edf2928a96e8a8bc5a16c99a8971bd42073b99a95d1fbef4308c7f3daef24dee3a06759171c +EBUILD ninja-ide-2.1.1-r5.ebuild 1117 SHA256 772ba4b56c10119c6b4101b9cdb175b7a27fed7394991e490a49e05cc2e35155 SHA512 a6a4dc4a555b7803d0c7437e7c6c890daa3adb340ee9c798c7415b9437c3d3da3ef11061d30f23523109bdca8513dda7b6592531afcab237c1601e1f96384c97 WHIRLPOOL 4f9b70c74029ddbca4df77b34066a070bea1a39ff3162d03f0d0fcc62c2c873c353df51f4cbe0f5f83d47eeb9f5d883a4f9eeefce865c5229b4578cc6e627bfb +MISC ChangeLog 1937 SHA256 3ec48f9a4b14ee6bfb4eda5fdd4e0681befae8c8931990545f2ce388a0a8f84c SHA512 f5912267ef43690a28cf705c16e97d3f30c9d713fde55945919862ddf1ccc81157c74e1dae5c9f6a387d1914fa72c61e8d8756edec0db826a0c8bb4017e4b8ec WHIRLPOOL 49738dc9127bb3923cf7e98852ad7cf8adb098c6fb94749321be89ff6cecafe5466c9cdacdacdaf3852c97a7aec72c345ff7dfb9b3c143207a035614f050fefb MISC metadata.xml 1156 SHA256 103b713789d642faa1575649d615c9c521064471b28d643265d3669b6b9cb6bc SHA512 15c020963f8ef3896813fc3a0d2d56feb0246f1d63be138ccc1ae6e491bf6ca383c771bc83e7afee8be51bedfd3ad1f68d2b9afeb9f2b145fe90b9331da2af11 WHIRLPOOL 081d20f84f5f4e0d6e79e9078dd70f7f7e93c2a56fece08fdc4faab0739ac90afb8106b51daea523127f768634a73a982107b1896231cb1a8e6ef8b48417cf93 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRP3XiAAoJEFpvPKfnPDWzdQYH/id6V73wEPZfFg4Pb6JquH0s -14vw7g8FSyWlkOeHQsy9L1y18SoKEbiNg0XfDOQLNTwbw6tKcjhzCM35rSrWY8fv -T60VTpIMsr2jCpZQ0pyLGeKRsRSsPB3uSxHNR7iX/rDBGm9GoxNfmaABGnGYHNcH -9HNJzBLwD+FHWpwh+apABZe6d3piY0li9RN17d73AaBCLAr5T6DtK3MRlMWyTUxM -zpavKh9ck4mWLD1Ar4uQUHIOGE77nMDqIT7jcvRY3TigyakF6kBwFrjoLwctzitq -z19pn8Xc8w6qQnsmJs/jU9RwxWw0hBt6jVClNM99dPp/A+dPckFde7M5smsMDqw= -=3CaP +iQEcBAEBCAAGBQJRP4Q9AAoJEFpvPKfnPDWzxo4IAKZC06HZfOaZqp7qcyxeMTv8 +kbDbDFXcWf/l//Pe/6sQ3EgoDioDsGSaNzi2//vJwDe9ju+24IbOKlmOiyw0WOGK +UXF7z0jcpjUkhY1mpXPRkzZcCQIOeHjQhOAvihMVBo4fP9zVc6czW/sSk9xO0QUd +qdn5SBfq0b+Oc/NaQLFnPhIugkQ/hs163srs6Wm0zNdwdrQ/XEVccJfvdLIalyHV +yh5CGLbea/8f4PFfXawxQpOIOcUaemSdGhNRQtbolan6t6IVKbFQ4o+53QeSUTKN +LvCYrRX/30nWH0V+KOKTXqwH+vYNmV6EHLmudvrKBqt582Kk/lqgxL0FGNUV2m4= +=Z03S -----END PGP SIGNATURE----- diff --git a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch index cfeb8149d327..f3eb64bf315a 100644 --- a/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch +++ b/dev-util/ninja-ide/files/ninja-ide-2.1.1-syntaxhighlighting.patch @@ -1,7 +1,5 @@ -From c722e86c4e497efac56de674c47d5e094ea4c5c5 Mon Sep 17 00:00:00 2001 -From: Diego Sarmentero <diego.sarmentero@ninja-ide.org> -Date: Tue, 12 Mar 2013 14:04:56 -0300 -Subject: [PATCH] Fixed Issue #1106 +https://github.com/ninja-ide/ninja-ide/commit/f19cffa29646f1f9bc015597080b8ebc0ed83530.patch +https://github.com/ninja-ide/ninja-ide/commit/c722e86c4e497efac56de674c47d5e094ea4c5c5.patch backported by hasufell@gentoo.org for 2.1.1 @@ -25,3 +23,21 @@ backported by hasufell@gentoo.org for 2.1.1 user_data = SyntaxUserData(False) user_data.clear_data() block_number = block.blockNumber() +@@ -409,7 +409,7 @@ + block = self.document().begin() + while block.isValid(): + user_data = block.userData() +- if (user_data is not None) and (user_data.error == True): ++ if (user_data is not None) and isinstance(user_data, SyntaxUserData) and (user_data.error == True): + errors_lines.append(block.blockNumber()) + block = block.next() + return errors_lines +@@ -462,7 +462,7 @@ + ((st_fmt == STYLES['comment']) and + (self.previousBlockState() != 0))) and \ + (len(start_collides) == 0): +- if user_data is not None: ++ if user_data is not None and isinstance(user_data, SyntaxUserData): + style = highlight_errors(style, user_data) + self.setFormat(start, length, style) + else: diff --git a/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild b/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild index de18134c6f88..d346b07aaf0f 100644 --- a/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild +++ b/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ninja-ide-2.1.1-r4.ebuild,v 1.2 2013/03/12 18:37:21 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja-ide/ninja-ide-2.1.1-r5.ebuild,v 1.1 2013/03/12 19:38:33 hasufell Exp $ # XXX: tests |