Opened 10 years ago

Closed 10 years ago

#28520 closed defect (fixed)

cmake @2.8.4 +gui: patch fails

Reported by: dernic9@… Owned by: cssdev
Priority: Normal Milestone:
Component: ports Version: 1.9.2
Keywords: Cc: macports@…, gamperl@…, Ionic (Mihai Moldovan), raimue (Rainer Müller)
Port: cmake

Description

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>

Attachments (2)

patch-Modules-FindQt4.cmake-NEW.diff (2.3 KB) - added by Ionic (Mihai Moldovan) 10 years ago.
Updated Modules file, no more fuzzy patching.
patch-CMakeLists.txt-NEW.diff (3.2 KB) - added by Ionic (Mihai Moldovan) 10 years ago.
Updated GUI patch, fixes patch and compile failures.

Download all attachments as: .zip

Change History (12)

comment:1 Changed 10 years ago by jmroot (Joshua Root)

Owner: changed from macports-tickets@… to css@…
Port: 2.8.4 removed

Please remember to cc the maintainer.

comment:2 Changed 10 years ago by macports@…

Cc: macports@… added

Cc Me!

comment:3 Changed 10 years ago by gamperl@…

Cc: gamperl@… added

Cc Me!

comment:4 Changed 10 years ago by cssdev

Status: newassigned

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

comment:5 Changed 10 years ago by Ionic (Mihai Moldovan)

Cc: ionic@… added

Cc Me!

comment:6 Changed 10 years ago by raimue (Rainer Müller)

Cc: raimue@… added

Cc Me!

comment:7 Changed 10 years ago by moonpyk@…

Cc: moonpyk@… added

Cc Me!

Changed 10 years ago by Ionic (Mihai Moldovan)

Updated Modules file, no more fuzzy patching.

Changed 10 years ago by Ionic (Mihai Moldovan)

Updated GUI patch, fixes patch and compile failures.

comment:8 Changed 10 years ago by 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.

comment:9 Changed 10 years ago by moonpyk@…

Cc: moonpyk@… removed

Cc Me!

comment:10 Changed 10 years ago by cssdev

Resolution: fixed
Status: assignedclosed

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

Note: See TracTickets for help on using tickets.