search

RJVB / macstrop

RJVB's repository of alternative macports, with ports missing from or overriding those in the standard collection, including a set of KF5 ports.
20 stars 9 forks source link

qt4-mac-devel: some patches fail to apply #102

Closed barracuda156 closed 4 months ago

barracuda156 commented 4 months ago 
--->  Applying patch-font-emojis.diff
Executing:  cd "/opt/local/var/macports/build/_opt_PPCSnowLeopardPorts_aqua_qt4-mac-devel/qt4-mac-devel/work/qt-everywhere-opensource-src-4.8.7" && /usr/bin/patch -p0 < '/opt/PPCSnowLeopardPorts/aqua/qt4-mac-devel/files/patch-font-emojis.diff'
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|index 6bf9399d23f460b5814ea17a645c61531feb89bf..41c1f4f8ae680de3ca02f92e4921db26e074dfa8 100644
|--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
8 out of 8 hunks ignored
can't find file to patch at input line 99
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
|index 75a67e87cc5d8643ebc3b54ebbd91f9343e308ca..8897448faa2559ca1f3db17c1a0fcd9925f96421 100644
|--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
|+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 154
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
|index 78f899cc94571854c44a12a5860e58f9e47d2096..e6ce1c4ff925c7494524518874b415912be7067a 100644
|--- a/src/gui/painting/qpaintengine_raster.cpp
|+++ b/src/gui/painting/qpaintengine_raster.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 180
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
|index 883433a216addaba28e5ab7d6a774e2bb18c98e7..533ad8e3be59e394e73fec8bad19294741554c4b 100644
|--- a/src/gui/painting/qtextureglyphcache.cpp
|+++ b/src/gui/painting/qtextureglyphcache.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 221
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
|index 602927cbb00760e471f90638fa45c5ac50ff5271..c8dc64b29fad3ad3d5c2561011bd676818dcc56e 100644
|--- a/src/gui/text/qfontengineglyphcache_p.h
|+++ b/src/gui/text/qfontengineglyphcache_p.h
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 234
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
|index 67b8798da1d09c435579d1419ae47add0695fa0c..73feaa3978793da160c26c8717429a2504db93ce 100644
|--- a/src/gui/text/qfontengine.cpp
|+++ b/src/gui/text/qfontengine.cpp
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 252
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
|index f29ac47eef8f27c88afb8645f04e00fa82da0056..938f2cad2d30ca28dad4c0698e0cdcd4ca6f1db9 100644
|--- a/src/gui/text/qfontengine_p.h
|+++ b/src/gui/text/qfontengine_p.h
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 283
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h
|index 5a46c988ed1d112ebd0f7faf8a88b48188bc28ad..a8b01b8dbfeaf7f68fcd99cd68c06c9ce06a635e 100644
|--- a/src/gui/text/qfontengine_coretext_p.h
|+++ b/src/gui/text/qfontengine_coretext_p.h
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 295
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm
|index 204d6855c1273f1bd982c810af8f25fd7e070da7..8c3938a650d9cf58daadb31298977f00d10b9422 100644
|--- a/src/gui/text/qfontengine_coretext.mm
|+++ b/src/gui/text/qfontengine_coretext.mm
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
6 out of 6 hunks ignored
Command failed:  cd "/opt/local/var/macports/build/_opt_PPCSnowLeopardPorts_aqua_qt4-mac-devel/qt4-mac-devel/work/qt-everywhere-opensource-src-4.8.7" && /usr/bin/patch -p0 < '/opt/PPCSnowLeopardPorts/aqua/qt4-mac-devel/files/patch-font-emojis.diff'
Exit code: 1

(Should not use en extra initial prefix.)

--->  Applying patch-invalid-fnt-table-handling.diff
Executing:  cd "/opt/local/var/macports/build/_opt_PPCSnowLeopardPorts_aqua_qt4-mac-devel/qt4-mac-devel/work/qt-everywhere-opensource-src-4.8.7" && /usr/bin/patch -p0 < '/opt/PPCSnowLeopardPorts/aqua/qt4-mac-devel/files/patch-invalid-fnt-table-handling.diff'
patching file src/gui/text/qfontengine.cpp
Hunk #2 succeeded at 825 (offset 7 lines).
Hunk #3 succeeded at 865 (offset 7 lines).
Hunk #4 succeeded at 878 (offset 7 lines).
Hunk #5 succeeded at 917 (offset 7 lines).
Hunk #6 succeeded at 956 (offset 7 lines).
Hunk #7 succeeded at 1017 (offset 7 lines).
Hunk #8 succeeded at 1055 (offset 7 lines).
Hunk #9 succeeded at 1065 (offset 7 lines).
Hunk #10 succeeded at 1083 (offset 7 lines).
Hunk #11 succeeded at 1102 (offset 7 lines).
Hunk #12 succeeded at 1154 (offset 7 lines).
Hunk #13 succeeded at 1175 (offset 7 lines).
Hunk #14 succeeded at 1190 (offset 7 lines).
patching file src/gui/text/qfontengine_mac.mm
patching file src/gui/text/qfontengine_mac_p.h
patching file src/gui/text/qfontengine_p.h
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file src/gui/text/qfontengine_p.h.rej
patching file src/gui/text/qfontengine_qpa.cpp
patching file src/gui/text/qfontengine_qpf.cpp
patching file src/gui/text/qfontengine_s60.cpp
patching file src/gui/text/qfontengine_s60_p.h
patching file src/gui/text/qfontengine_win.cpp
patching file src/gui/text/qfontengine_win_p.h

(Perhaps a duplicate.)

--->  Applying patch-support-openssl11.diff
Executing:  cd "/opt/local/var/macports/build/_opt_PPCSnowLeopardPorts_aqua_qt4-mac-devel/qt4-mac-devel/work/qt-everywhere-opensource-src-4.8.7" && /usr/bin/patch -p0 < '/opt/PPCSnowLeopardPorts/aqua/qt4-mac-devel/files/patch-support-openssl11.diff'
patching file src/network/ssl/qsslcertificate.cpp
patching file src/network/ssl/qsslkey.cpp
patching file src/network/ssl/qsslsocket_openssl.cpp
Hunk #4 FAILED at 273.
Hunk #5 succeeded at 377 (offset 4 lines).
Hunk #6 succeeded at 514 (offset 4 lines).
Hunk #7 succeeded at 538 (offset 4 lines).
Hunk #8 succeeded at 587 (offset 4 lines).
Hunk #9 succeeded at 681 (offset 4 lines).
1 out of 9 hunks FAILED -- saving rejects to file src/network/ssl/qsslsocket_openssl.cpp.rej
patching file src/network/ssl/qsslsocket_openssl_symbols.cpp
Hunk #2 FAILED at 237.
Hunk #3 succeeded at 303 (offset 4 lines).
Hunk #4 succeeded at 830 (offset 4 lines).
Hunk #5 FAILED at 853.
2 out of 5 hunks FAILED -- saving rejects to file src/network/ssl/qsslsocket_openssl_symbols.cpp.rej
patching file src/network/ssl/qsslsocket_openssl_symbols_p.h
Command failed:  cd "/opt/local/var/macports/build/_opt_PPCSnowLeopardPorts_aqua_qt4-mac-devel/qt4-mac-devel/work/qt-everywhere-opensource-src-4.8.7" && /usr/bin/patch -p0 < '/opt/PPCSnowLeopardPorts/aqua/qt4-mac-devel/files/patch-support-openssl11.diff'
Exit code: 1