cmake @2.8.4 +gui: patch fails

[dernic9@…]

Installing cmake with the +gui variant fails when MacPorts tries to apply a patch.

port -v configure cmake +gui +universal
--->  Computing dependencies for cmake.
--->  Fetching cmake
--->  Verifying checksum(s) for cmake
--->  Checksumming cmake-2.8.4.tar.gz
--->  Extracting cmake
--->  Extracting cmake-2.8.4.tar.gz
--->  Applying patches to cmake
--->  Applying /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
patching file Modules/CMakeFindFrameworks.cmake
--->  Applying /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
patching file Modules/FindQt4.cmake
Hunk #1 succeeded at 583 (offset 3 lines).
Hunk #2 succeeded at 608 (offset 3 lines).
Hunk #3 succeeded at 667 (offset 3 lines).
Hunk #4 succeeded at 716 (offset 3 lines).
Hunk #5 succeeded at 737 (offset 3 lines).
--->  Applying /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/cmake/files/patch-CMakeLists.txt.diff
patching file CMakeLists.txt
Hunk #1 succeeded at 547 (offset 166 lines).
Hunk #2 succeeded at 560 (offset 166 lines).
patching file Source/QtDialog/CMakeLists.txt
Hunk #1 succeeded at 59 (offset -7 lines).
Hunk #2 succeeded at 69 (offset -10 lines).
Hunk #3 succeeded at 90 (offset -11 lines).
Hunk #4 FAILED at 104.
1 out of 4 hunks FAILED -- saving rejects to file Source/QtDialog/CMakeLists.txt.rej
shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_cmake/work/cmake-2.8.4" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/cmake/files/patch-CMakeLists.txt.diff'" returned error 1
Error: Target org.macports.patch returned: shell command failed (see log for details)
Warning: the following items did not execute (for cmake): org.macports.configure org.macports.patch
Log for cmake is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_ports_devel_cmake/main.log
Error: Status 1 encountered during processing.
To report a bug, see <http://guide.macports.org/#project.tickets>

[jmroot (Joshua Root)]

Please remember to cc the maintainer.

[macports@…]

Cc Me!

[gamperl@…]

Cc Me!

[cssdev]

It's going to take me some time to get Qt built to test this out. I'll look into it.

[Ionic (Mihai Moldovan)]

Cc Me!

[raimue (Rainer Müller)]

Cc Me!

[moonpyk@…]

Cc Me!

[Ionic (Mihai Moldovan)]

Updated Modules file, no more fuzzy patching.

[Ionic (Mihai Moldovan)]

Updated GUI patch, fixes patch and compile failures.

[Ionic (Mihai Moldovan)]

Please check both files.

Builds and runs fine for me, i.e. WORKSFORME.

If everything looks OK, push it to the repo.

[moonpyk@…]

Cc Me!

[cssdev]

Tested and committed to r76552. Thanks for the updated patches!