SourceMage Grimoire Bug List

[bugzilla-daemon AT bugs.sourcemage.org]

http://bugs.sourcemage.org/show_bug.cgi?id=15165

           Summary: qt-x11 3.3.8 fails to patch from
                    Qt-3.3.8-UTF-8-fix.diff but continues
           Product: Codex
           Version: stable grimoire
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: major
          Priority: P3
         Component: x11-toolkits
        AssignedTo: sm-grimoire-bugs AT lists.ibiblio.org
        ReportedBy: sandalle AT sourcemage.org


# cast qt-x11
...
qt-x11 conflicts with qt-x11. Dispel qt-x11? [y]
Dispelled spell: qt-x11
Found source file /var/spool/sorcery/qt-x11-free-3.3.8.tar.gz for spell qt-x11
in /var/spool/sorcery
Waiting for any Solo casts to complete...
Waiting for any other casts of qt-x11 to complete... done.
staging enabled
castfs: checking sanity of <mnt-dir> and <stage-dir>
castfs: stagedir is okay!
Building qt-x11
hash checking source file qt-x11-free-3.3.8.tar.gz...
Algorithm used: sha512
Allowing new hash sha512
Checking spell level WORKS_FOR_ME
Spell level is a new allowed level
hash verification succeeded
Unpacking source file qt-x11-free-3.3.8.tar.gz for spell qt-x11.
patching file src/codecs/qutfcodec.cpp
Hunk #1 FAILED at 154.
Hunk #2 FAILED at 168.
Hunk #3 FAILED at 184.
Hunk #4 FAILED at 194.
Hunk #5 FAILED at 205.
5 out of 5 hunks FAILED -- saving rejects to file src/codecs/qutfcodec.cpp.rej
patching file src/tools/qstring.cpp
Hunk #1 FAILED at 5805.
Hunk #2 FAILED at 5823.
Hunk #3 FAILED at 5851.
3 out of 3 hunks FAILED -- saving rejects to file src/tools/qstring.cpp.rej

And because of how PRE_BUILD is setup, it skips the rest of the patches but
continues to cast:
# apply patches
patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
patch -p4 < $SPELL_DIRECTORY/170529.diff &&
patch -p0 < $SPELL_DIRECTORY/175791_3.diff &&
...
# speed up up build process by removing unnecessary examples
rm -r examples
rm -r extensions/nsplugin/examples

Patch 170529.diff seems to still apply fine (manually), but 175791_3.diff also
fails (probably because 175791_3.diff requires Qt-3.3.8-UTF-8-fix.diff):
patch -p0 < /var/lib/sorcery/codex/test/x11-toolkits/qt-x11/175791_3.diff
patching file src/codecs/qutfcodec.cpp
Hunk #1 FAILED at 165.
1 out of 1 hunk FAILED -- saving rejects to file src/codecs/qutfcodec.cpp.rej

qt-x11 then proceeds to successfully cast, so are these even needed?

-- 
Configure bugmail: http://bugs.sourcemage.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.