Review Request 115017: Remove libdiff2 from kdevplatform and use the copy from kdesdk instead

[Kevin Funk]

> On Jan. 15, 2014, 7:55 a.m., Andreas Pakulat wrote:
> > IMO its still too early to do this, at least as a complete replacement. I'd keep the existing code as a fallback so people that have no access to KDE SC 4.12 are not blocked from contributing to KDevelop. KDevelop has always been relatively conservative on its KDE(libs) requirements so even people on slightly older Linux distro releases can use it.
> 
> Aleix Pol Gonzalez wrote:
>     Sure, or maybe it's something we can start adopting on the KF5 branch. Either way, something to be discussed in the sprint.
> 
> Milian Wolff wrote:
>     Yep I think this should go into the frameworks branch. Keeping libdiff for the KDE 4 version sounds fine to me.

@Jeremy, could rebase this on top of the frameworks branch? Then we can merge this.


- Kevin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/115017/#review47427
-----------------------------------------------------------


On Jan. 14, 2014, 11:48 p.m., Jeremy Whiting wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115017/
> -----------------------------------------------------------
> 
> (Updated Jan. 14, 2014, 11:48 p.m.)
> 
> 
> Review request for KDevelop.
> 
> 
> Repository: kdevplatform
> 
> 
> Description
> -------
> 
> This completes the unification of libdiff2 by using the libdiff2 from KDE SC 4.12 in kdevplatform.
> 
> 
> Diffs
> -----
> 
>   plugins/patchreview/CMakeLists.txt ba150dcf8f672d6dc4a788acc720b639dfeb78d2 
>   plugins/patchreview/libdiff2/CMakeLists.txt 88c05163602afabc81c663eb0fd0b3db882b2a3b 
>   plugins/patchreview/libdiff2/README e75c33e45e937c223b36cdfe22caf8604a7aff39 
>   plugins/patchreview/libdiff2/cvsdiffparser.h a642fbd383d6506ec2b159816f773e065eaaab57 
>   plugins/patchreview/libdiff2/cvsdiffparser.cpp 5b9c25d8a5f33abf16aafacd55b5b8107dadc8f2 
>   plugins/patchreview/libdiff2/diff2export.h 9d5ebf888601fe5a8ecb788d59c22b48843a13d1 
>   plugins/patchreview/libdiff2/difference.h af1f19c6e2535ecd1554675e5771052e85f66d41 
>   plugins/patchreview/libdiff2/difference.cpp db455e210ebc8408db98947c7989c14fa4ae1de1 
>   plugins/patchreview/libdiff2/differencestringpair.h 58fbf462e413dc53cf502ee792826528b0aadc8a 
>   plugins/patchreview/libdiff2/diffexport.h f4448d04169e14e06c2e9811b8b6c99d1d262fe7 
>   plugins/patchreview/libdiff2/diffhunk.h 53dad24a8eb791f24ce92c6c5a9fef8cf4f7e50d 
>   plugins/patchreview/libdiff2/diffhunk.cpp b76f3d3f603ce2eb82224fbdac82378b3e03cb26 
>   plugins/patchreview/libdiff2/diffmodel.h 201768ec41362ff56a1e9da18dec88ee62aaeb93 
>   plugins/patchreview/libdiff2/diffmodel.cpp a42e82dc5248ba4fe1f52cebde6ad8deb576b010 
>   plugins/patchreview/libdiff2/diffmodellist.h 6633456c860480bcfbe5849344ae82c17aa6434c 
>   plugins/patchreview/libdiff2/diffmodellist.cpp d76226f03ddcde34b35295027efa9063b38b777b 
>   plugins/patchreview/libdiff2/diffparser.h ae7dc84b16d6293fdf9729277d66f16a612de890 
>   plugins/patchreview/libdiff2/diffparser.cpp 1bd8be613dc62d022b24e0636a505a5dc8d8b466 
>   plugins/patchreview/libdiff2/kompare.h 6f55c43deb61336221d2bbaa43ae18d712732143 
>   plugins/patchreview/libdiff2/komparemodellist.h 090791618cdb140ba3b57647accfd208a2fabfca 
>   plugins/patchreview/libdiff2/komparemodellist.cpp 6512235d5c9932852b7b904cd9eca92f4b872bb2 
>   plugins/patchreview/libdiff2/kompareprocess.h 907d0f7667a16a97f34fd25650154217b2de93d8 
>   plugins/patchreview/libdiff2/kompareprocess.cpp 8f50925845a883a33691c95f5e125c12b94c1b7a 
>   plugins/patchreview/libdiff2/levenshteintable.h 135ce28138010bbf49660ddad3753c80b277a701 
>   plugins/patchreview/libdiff2/marker.h cd4ac62ea943b86243f2032cf8f3819459108170 
>   plugins/patchreview/libdiff2/parser.h 04630f9d5a0be6686cf340bc833d3654d8eb1cfb 
>   plugins/patchreview/libdiff2/parser.cpp 6e4327b150712bb13d2d88118a9d4ff7aace897f 
>   plugins/patchreview/libdiff2/parserbase.h 65097744453afa73b02952cea26e8d404e3a1af9 
>   plugins/patchreview/libdiff2/parserbase.cpp 9b04b85738e1e5ae7831c635cce5fe03435a5dc1 
>   plugins/patchreview/libdiff2/perforceparser.h ac78aa61fb391e18b942d5d8ed815caad0115535 
>   plugins/patchreview/libdiff2/perforceparser.cpp 60060332e96577557e73b98c3a1bb496a0b6ec29 
>   plugins/patchreview/libdiff2/stringlistpair.h bdbe2b2cb4198111d5dfb946fc2c21d4217c04ca 
>   plugins/patchreview/libdiff2/stringlistpair.cpp 3ef34d2476829dc871577c9b5702a2c280d96670 
>   plugins/patchreview/libdiff2/tests/CMakeLists.txt 61ea7ef83dd244031cad41d3f1ed0a6119f373f4 
>   plugins/patchreview/libdiff2/tests/interactivedifftest.h 800a8a7f07f5d46f17744c5a9a565bfa1d8344fc 
>   plugins/patchreview/libdiff2/tests/interactivedifftest.cpp bb0661c1691ff3c58511b82750804f435a5bcc7a 
>   plugins/patchreview/libdiff2/tests/levenshteintest.h b648fb702a276752ab5100fb1f9cfb5a6e33fc8b 
>   plugins/patchreview/libdiff2/tests/levenshteintest.cpp f58b9d36d1975fb49e99ea01ae80858d5d4038b2 
>   plugins/patchreview/patchhighlighter.cpp 2fe6690e988d4de9f313afaf28fcc1791e1ac515 
>   plugins/patchreview/patchreview.h b5b15fa1b241208c8f000e90ab91de9af5d665fb 
>   plugins/patchreview/patchreview.cpp 596ada5b54a4e3ec5a7f46f3b398ce9682c842f5 
>   plugins/patchreview/patchreviewtoolview.cpp 97b2d15cab4ddbd655bb03d92814a1d8893029ab 
>   plugins/patchreview/settings/diffsettings.h c88fa14561652015c6f4fdde1fa403ac8797b046 
>   plugins/patchreview/settings/diffsettings.cpp 081798d34aa6a4d951f1dfd77ad027b39aa8ba4f 
>   plugins/patchreview/settings/settingsbase.h 81c39d4384794c75cdbfa5dc99f43898e3ed7f4c 
>   plugins/patchreview/settings/settingsbase.cpp a68c3bb2de55063fa4984c573fb80e975aa066e4 
> 
> Diff: https://git.reviewboard.kde.org/r/115017/diff/
> 
> 
> Testing
> -------
> 
> It builds.
> 
> 
> Thanks,
> 
> Jeremy Whiting
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20140305/ad9bac5a/attachment.html>