#45421 closed defect (fixed)
qt4-mac patch for 10.10 Yosemite is broken
| Reported by: | nneonneo (Robert Xiao) | Owned by: | michaelld (Michael Dickens) |
|---|---|---|---|
| Priority: | Normal | Milestone: | |
| Component: | ports | Version: | 2.3.1 |
| Keywords: | yosemite | Cc: | elventear (Pepe Barbe) |
| Port: | qt4-mac |
Description (last modified by ryandesign (Ryan Carsten Schmidt))
The patch checked in on r126865 (browser:trunk/dports/aqua/qt4-mac/files/patch-10.10.diff?rev=126865) is broken: the entire patch is duplicated, causing "patch" to reject the entire second half of the patch file and subsequently fail.
Log message:
:debug:patch Executing command line: cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_sea.us.rsync.macports.org_release_tarballs_ports_aqua_qt4-mac/qt4-mac/work/qt-everywhere-opensource-src-4.8.6" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/sea.us.rsync.macports.org/release/tarballs/ports/aqua/qt4-mac/files/patch-10.10.diff' :info:patch patching file src/corelib/global/qglobal.cpp :info:patch patching file src/corelib/global/qglobal.h :info:patch patching file src/gui/dialogs/qcolordialog_mac.mm :info:patch patching file src/gui/dialogs/qfiledialog_mac.mm :info:patch patching file src/gui/dialogs/qfontdialog_mac.mm :info:patch patching file src/gui/kernel/qapplication_mac.mm :info:patch patching file src/gui/kernel/qcocoaapplication_mac.mm :info:patch patching file src/gui/kernel/qcocoaapplicationdelegate_mac.mm :info:patch patching file src/gui/kernel/qcocoaapplicationdelegate_mac_p.h :info:patch patching file src/gui/kernel/qcocoamenuloader_mac.mm :info:patch patching file src/gui/kernel/qcocoasharedwindowmethods_mac_p.h :info:patch patching file src/gui/kernel/qeventdispatcher_mac.mm :info:patch patching file src/gui/kernel/qt_cocoa_helpers_mac.mm :info:patch patching file src/gui/kernel/qt_mac_p.h :info:patch patching file src/gui/kernel/qwidget_mac.mm :info:patch patching file src/gui/styles/qmacstyle_mac.mm :info:patch patching file src/gui/util/qsystemtrayicon_mac.mm :info:patch patching file src/gui/widgets/qcocoamenu_mac.mm :info:patch patching file src/gui/widgets/qmenu_mac.mm :info:patch patching file src/corelib/global/qglobal.cpp :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 3 out of 3 hunks ignored -- saving rejects to file src/corelib/global/qglobal.cpp.rej :info:patch patching file src/corelib/global/qglobal.h :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 3 out of 3 hunks ignored -- saving rejects to file src/corelib/global/qglobal.h.rej :info:patch patching file src/gui/dialogs/qcolordialog_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 4 out of 4 hunks ignored -- saving rejects to file src/gui/dialogs/qcolordialog_mac.mm.rej :info:patch patching file src/gui/dialogs/qfiledialog_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 2 out of 2 hunks ignored -- saving rejects to file src/gui/dialogs/qfiledialog_mac.mm.rej :info:patch patching file src/gui/dialogs/qfontdialog_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 4 out of 4 hunks ignored -- saving rejects to file src/gui/dialogs/qfontdialog_mac.mm.rej :info:patch patching file src/gui/kernel/qapplication_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 7 out of 7 hunks ignored -- saving rejects to file src/gui/kernel/qapplication_mac.mm.rej :info:patch patching file src/gui/kernel/qcocoaapplication_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 5 out of 5 hunks ignored -- saving rejects to file src/gui/kernel/qcocoaapplication_mac.mm.rej :info:patch patching file src/gui/kernel/qcocoaapplicationdelegate_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 5 out of 5 hunks ignored -- saving rejects to file src/gui/kernel/qcocoaapplicationdelegate_mac.mm.rej :info:patch patching file src/gui/kernel/qcocoaapplicationdelegate_mac_p.h :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 2 out of 2 hunks ignored -- saving rejects to file src/gui/kernel/qcocoaapplicationdelegate_mac_p.h.rej :info:patch patching file src/gui/kernel/qcocoamenuloader_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 4 out of 4 hunks ignored -- saving rejects to file src/gui/kernel/qcocoamenuloader_mac.mm.rej :info:patch patching file src/gui/kernel/qcocoasharedwindowmethods_mac_p.h :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 3 out of 3 hunks ignored -- saving rejects to file src/gui/kernel/qcocoasharedwindowmethods_mac_p.h.rej :info:patch patching file src/gui/kernel/qeventdispatcher_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 17 out of 17 hunks ignored -- saving rejects to file src/gui/kernel/qeventdispatcher_mac.mm.rej :info:patch patching file src/gui/kernel/qt_cocoa_helpers_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 2 out of 2 hunks ignored -- saving rejects to file src/gui/kernel/qt_cocoa_helpers_mac.mm.rej :info:patch patching file src/gui/kernel/qt_mac_p.h :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 1 out of 1 hunk ignored -- saving rejects to file src/gui/kernel/qt_mac_p.h.rej :info:patch patching file src/gui/kernel/qwidget_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 6 out of 6 hunks ignored -- saving rejects to file src/gui/kernel/qwidget_mac.mm.rej :info:patch patching file src/gui/styles/qmacstyle_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 2 out of 2 hunks ignored -- saving rejects to file src/gui/styles/qmacstyle_mac.mm.rej :info:patch patching file src/gui/util/qsystemtrayicon_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 1 out of 1 hunk ignored -- saving rejects to file src/gui/util/qsystemtrayicon_mac.mm.rej :info:patch patching file src/gui/widgets/qcocoamenu_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 1 out of 1 hunk ignored -- saving rejects to file src/gui/widgets/qcocoamenu_mac.mm.rej :info:patch patching file src/gui/widgets/qmenu_mac.mm :info:patch Reversed (or previously applied) patch detected! Assume -R? [n] :info:patch Apply anyway? [n] :info:patch Skipping patch. :info:patch 5 out of 5 hunks ignored -- saving rejects to file src/gui/widgets/qmenu_mac.mm.rej :info:patch Command failed: cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_sea.us.rsync.macports.org_release_tarballs_ports_aqua_qt4-mac/qt4-mac/work/qt-everywhere-opensource-src-4.8.6" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/sea.us.rsync.macports.org/release/tarballs/ports/aqua/qt4-mac/files/patch-10.10.diff' :info:patch Exit code: 1 :error:patch org.macports.patch for port qt4-mac returned: command execution failed
The very simple fix is simply to delete the duplicated last half of patch-10.10.diff (I've checked and the two halves are identical).
Attachments (1)
Change History (5)
Changed 10 years ago by nneonneo (Robert Xiao)
| Attachment: | patch-10.10.diff added |
|---|
comment:1 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)
| Description: | modified (diff) |
|---|---|
| Keywords: | yosemite added; Yosemite removed |
| Owner: | changed from macports-tickets@… to michaelld@… |
comment:3 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)
| Resolution: | → fixed |
|---|---|
| Status: | new → closed |
Note: See
TracTickets for help on using
tickets.
Fixed patch file