Opened 9 years ago
Closed 9 years ago
#1306 closed defect (fixed)
QGIS: GdalTools patch no longer works
|Reported by:||hamish||Owned by:|
related to #1208. seen in nightly build logs for r11165.
there's a patch called fix_gdaltools_version.patch which is applied at the end of install_qgis.sh. It no longer works.
The patch can be found in gisvm/app-conf/qgis/.
... Setting up sphinx-common (1.1.3+dfsg-2ubuntu2.1) ... Setting up python-sphinx (1.1.3+dfsg-2ubuntu2.1) ... make: *** No rule to make target `html'. Stop. cp: cannot stat `_build/html': No such file or directory (Stripping trailing CRs from patch.) patching file python/plugins/GdalTools/GdalTools.py Hunk #1 FAILED at 97. Hunk #2 FAILED at 141. Hunk #3 FAILED at 170. Hunk #4 FAILED at 185. Hunk #5 FAILED at 226. 5 out of 5 hunks FAILED -- saving rejects to file python/plugins/GdalTools/GdalTools.py.rej (Stripping trailing CRs from patch.) patching file python/plugins/GdalTools/tools/GdalTools_utils.py Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] ... [many more failures] ... Hunk #1 FAILED at 30. 1 out of 1 hunk FAILED -- saving rejects to file python/plugins/GdalTools/tools/doTranslate.py.rej (Stripping trailing CRs from patch.) patching file python/plugins/GdalTools/tools/doWarp.py Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file python/plugins/GdalTools/tools/doWarp.py.rej =============================================================== Finished "install_qgis.sh"
also I note the seemingly unrelated sphinx error there, but not sure what it's about.
Change history (1)
comment:1 by , 9 years ago
|Status:||new → closed|
Note: See TracTickets for help on using tickets.
the GdalTools.py patch was applied upstream, no longer needed. dropped in r11215.
sphinx error remains, but hopefully harmless & not specific to us.