Opened 2 years ago
Closed 2 years ago
#65822 closed defect (fixed)
qt58-qtconnectivity @5.8.0_0: patch fails to apply
Reported by: | chrstphrchvz (Christopher Chavez) | Owned by: | chrstphrchvz (Christopher Chavez) |
---|---|---|---|
Priority: | Normal | Milestone: | |
Component: | ports | Version: | |
Keywords: | Cc: | MarcusCalhoun-Lopez (Marcus Calhoun-Lopez) | |
Port: | qt58-qtconnectivity |
Description
The patch added in [1f4a153bf8c8/macports-ports] was bad:
---> Applying patch-qtconnectivity_qtbug_76847.diff Executing: cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_qt58/qt58-qtconnectivity/work/qtconnectivity-opensource-src-5.8.0" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/github.com/macports/macports-ports/aqua/qt58/files/patch-qtconnectivity_qtbug_76847.diff' patching file src/bluetooth/osx/osxbtledeviceinquiry.mm Hunk #1 succeeded at 139 (offset 22 lines). patching file src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm Hunk #1 succeeded at 181 (offset -16 lines). Hunk #2 FAILED at 199. Hunk #3 succeeded at 294 with fuzz 1 (offset 28 lines). Hunk #4 FAILED at 470. 2 out of 4 hunks FAILED -- saving rejects to file src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm.rej patching file src/bluetooth/qbluetoothlocaldevice_osx.mm Hunk #1 succeeded at 149 (offset 2 lines). patching file src/bluetooth/qbluetoothserver_osx.mm Hunk #1 succeeded at 120 (offset 6 lines). Hunk #2 succeeded at 142 (offset 6 lines). Hunk #3 succeeded at 154 (offset 6 lines). Hunk #4 FAILED at 291. 1 out of 4 hunks FAILED -- saving rejects to file src/bluetooth/qbluetoothserver_osx.mm.rej patching file src/bluetooth/qbluetoothserviceinfo_osx.mm Hunk #1 succeeded at 172 with fuzz 2 (offset -67 lines). patching file src/bluetooth/qbluetoothsocket_osx.mm Hunk #1 succeeded at 103 (offset 6 lines). Hunk #2 succeeded at 183 (offset 6 lines). Hunk #3 succeeded at 200 (offset 6 lines). Hunk #4 succeeded at 213 (offset 6 lines). Hunk #5 succeeded at 233 (offset 6 lines). Hunk #6 succeeded at 277 (offset 6 lines). Hunk #7 succeeded at 301 (offset 6 lines). patching file src/bluetooth/qbluetoothtransferreply_osx.mm Hunk #1 succeeded at 136 (offset 6 lines). Hunk #2 succeeded at 218 (offset 6 lines). Hunk #3 succeeded at 268 (offset 6 lines). Hunk #4 succeeded at 283 (offset 6 lines). patching file src/bluetooth/qlowenergycontroller_osx.mm Hunk #1 FAILED at 202. 1 out of 1 hunk FAILED -- saving rejects to file src/bluetooth/qlowenergycontroller_osx.mm.rej
I can likely investigate this and try again with a working patch soon.
Change History (2)
comment:1 Changed 2 years ago by chrstphrchvz (Christopher Chavez)
comment:2 Changed 2 years ago by chrstphrchvz (Christopher Chavez)
Owner: | set to chrstphrchvz |
---|---|
Resolution: | → fixed |
Status: | new → closed |
Note: See
TracTickets for help on using
tickets.
PR opened: https://github.com/macports/macports-ports/pull/16084