[immodule-qt] immodule-qt patch and qt 3.3.7

[John B]

Are there any plans to update the immodule-qt patch, version 20060318,
so that it can be applied cleanly to qt-3.3.7? When I attempted to
apply the patch to the qt-3.3.7 source tree, most of the patches
applied cleanly or with some offset. However, two of the patches
didn't apply completely. The verbose output from the patch command for
just those files appears below:

Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN qt-x11-free-3.3.5.orig/src/widgets/qlineedit.cpp
qt-x11-free-3.3.5/src/widgets/qlineedit.cpp
|--- qt-x11-free-3.3.5.orig/src/widgets/qlineedit.cpp   2005-09-02
21:43:15.000000000 +0900
|+++ qt-x11-free-3.3.5/src/widgets/qlineedit.cpp        2006-03-12
19:57:46.000000000 +0900
--------------------------
Patching file src/widgets/qlineedit.cpp using Plan A...
Hunk #1 succeeded at 37.
Hunk #2 succeeded at 251.
Hunk #3 succeeded at 599.
Hunk #4 succeeded at 1428.
Hunk #5 succeeded at 1459.
Hunk #6 succeeded at 1489.
Hunk #7 succeeded at 1517.
Hunk #8 succeeded at 1788.
Hunk #9 FAILED at 1840.
Hunk #10 succeeded at 1884 (offset 1 line).
Hunk #11 succeeded at 1969.
Hunk #12 succeeded at 2018 (offset 1 line).
Hunk #13 succeeded at 2030.
Hunk #14 succeeded at 2068 (offset 2 lines).
Hunk #15 succeeded at 2185.
Hunk #16 succeeded at 2244 (offset 2 lines).
Hunk #17 succeeded at 2382.
Hunk #18 succeeded at 2393 (offset 2 lines).
Hunk #19 succeeded at 2418.
1 out of 19 hunks FAILED -- saving rejects to file src/widgets/qlineedit.cpp.rej

...

Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN qt-x11-free-3.3.5.orig/src/widgets/qtextedit.cpp
qt-x11-free-3.3.5/src/widgets/qtextedit.cpp
|--- qt-x11-free-3.3.5.orig/src/widgets/qtextedit.cpp   2005-09-02
21:43:14.000000000 +0900
|+++ qt-x11-free-3.3.5/src/widgets/qtextedit.cpp        2006-03-12
19:57:46.000000000 +0900
--------------------------
Patching file src/widgets/qtextedit.cpp using Plan A...
Hunk #1 succeeded at 39.
Hunk #2 succeeded at 113.
Hunk #3 succeeded at 1085.
Hunk #4 succeeded at 1564.
Hunk #5 succeeded at 1622 with fuzz 1.
Hunk #6 FAILED at 1644.
Hunk #7 succeeded at 1686 (offset 1 line).
Hunk #8 succeeded at 2181 (offset 1 line).
Hunk #9 succeeded at 2262 (offset 1 line).
Hunk #10 succeeded at 2370 (offset 1 line).
Hunk #11 succeeded at 2429 (offset 1 line).
Hunk #12 succeeded at 2440 (offset 1 line).
Hunk #13 succeeded at 2535 (offset 1 line).
Hunk #14 succeeded at 2566 (offset 1 line).
Hunk #15 succeeded at 2744 (offset 1 line).
Hunk #16 FAILED at 2902.
Hunk #17 succeeded at 3081 (offset 7 lines).
Hunk #18 succeeded at 3116 (offset 1 line).
Hunk #19 succeeded at 3147 (offset 7 lines).
Hunk #20 succeeded at 5655 (offset 28 lines).
2 out of 20 hunks FAILED -- saving rejects to file src/widgets/qtextedit.cpp.rej

The patch didn't get applied cleanly to either qlineedit.cpp or to
qtextedit.cpp.

Thanks for your input on this.

Regards,
John