[mythtv] A disruptive MythContext change is coming

[Nigel Pearson]

Craig, applying the patch to latest SVN should
give you something that compiles. The patch
command will list errors, but if you go with
the defaults, it does the right thing:

% ls
mythtv

% svn update mythtv
...
U    programs/mythbackend/upnpcdsvideo.cpp
Updated to revision 15258.

% patch -p0 </tmp/ctxrestr.6.patch
patching file mythtv/libs/libmythtv/dbsettings.cpp
patching file mythtv/libs/libmythtv/libmythtv.pro
patching file mythtv/libs/libmythtv/backendselect.h
patching file mythtv/libs/libmythtv/mythcontextui.h
patching file mythtv/libs/libmythtv/dbsettings.h
patching file mythtv/libs/libmythtv/mythcontextui.cpp
patching file mythtv/libs/libmythtv/backendselect.cpp
patching file mythtv/libs/libmythui/mythmainwindow.cpp
patching file mythtv/libs/libmyth/mythdialogs.cpp
Hunk #5 succeeded at 890 (offset 16 lines).
Hunk #6 succeeded at 1708 (offset 20 lines).
Hunk #7 succeeded at 1770 (offset 20 lines).
Hunk #8 succeeded at 1990 (offset 20 lines).
Hunk #9 succeeded at 2254 (offset 20 lines).
Hunk #10 succeeded at 2370 (offset 20 lines).
patching file mythtv/libs/libmyth/dbsettings.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file mythtv/libs/libmyth/ 
dbsettings.cpp.rej
patching file mythtv/libs/libmyth/mythwidgets.cpp
patching file mythtv/libs/libmyth/xmlparse.cpp
patching file mythtv/libs/libmyth/uitypes.cpp
patching file mythtv/libs/libmyth/dbsettings.h
patching file mythtv/libs/libmyth/mythcontext.cpp
patching file mythtv/libs/libmyth/mythdbcon.cpp
patching file mythtv/libs/libmyth/mythwizard.cpp
patching file mythtv/libs/libmyth/mythcontext.h
patching file mythtv/libs/libmyth/mythconfigdialogs.cpp
patching file mythtv/libs/libmyth/libmyth.pro
patching file mythtv/libs/libmyth/backendselect.h
patching file mythtv/libs/libmyth/virtualkeyboard.cpp
patching file mythtv/libs/libmyth/backendselect.cpp
patching file mythtv/libs/libmythupnp/httpserver.cpp
patching file mythtv/libs/libmythupnp/upnp.cpp
patching file mythtv/libs/libmythupnp/libmythupnp.pro
patching file mythtv/libs/libmythupnp/upnp.h
patching file mythtv/programs/mythuitest/main.cpp
patching file mythtv/programs/programs-libs.pro
patching file mythtv/programs/mythfrontend/globalsettings.cpp
patching file mythtv/programs/mythfrontend/main.cpp
patching file mythtv/programs/mythjobqueue/main.cpp
patching file mythtv/programs/mythtranscode/main.cpp
patching file mythtv/programs/mythcommflag/main.cpp
patching file mythtv/programs/mythbackend/mythxml.cpp
Hunk #1 succeeded at 1371 (offset 21 lines).
patching file mythtv/programs/mythbackend/main.cpp
patching file mythtv/programs/mythtv-setup/main.cpp
patching file mythtv/programs/mythlcdserver/main.cpp
patching file mythtv/programs/mythtv/main.cpp
patching file mythtv/programs/mythwelcome/main.cpp
patching file mythtv/programs/mythfilldatabase/main.cpp
patching file mythtv/programs/mythshutdown/main.cpp
can't find file to patch at input line 5457
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: mythplugins/mytharchive/mytharchivehelper/main.cpp
|===================================================================
|--- mythplugins/mytharchive/mytharchivehelper/main.cpp (revision 15239)
|+++ mythplugins/mytharchive/mytharchivehelper/main.cpp (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 5490
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: mythplugins/mythvideo/mtd/mtd.pro
|===================================================================
|--- mythplugins/mythvideo/mtd/mtd.pro  (revision 15239)
|+++ mythplugins/mythvideo/mtd/mtd.pro  (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 5507
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: mythplugins/mythvideo/mtd/main.cpp
|===================================================================
|--- mythplugins/mythvideo/mtd/main.cpp (revision 15239)
|+++ mythplugins/mythvideo/mtd/main.cpp (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored

% cd mythtv

% svn status
?      libs/libmythtv/dbsettings.h
?      libs/libmythtv/dbsettings.cpp
?      libs/libmythtv/backendselect.h
?      libs/libmythtv/mythcontextui.h
?      libs/libmythtv/mythcontextui.cpp
?      libs/libmythtv/backendselect.cpp
M      libs/libmythtv/libmythtv.pro
M      libs/libmythui/mythmainwindow.cpp
?      libs/libmyth/mythdialogs.cpp.orig
M      libs/libmyth/mythdialogs.cpp
M      libs/libmyth/mythwidgets.cpp
M      libs/libmyth/xmlparse.cpp
M      libs/libmyth/uitypes.cpp
M      libs/libmyth/dbsettings.h
M      libs/libmyth/mythcontext.cpp
M      libs/libmyth/mythdbcon.cpp
M      libs/libmyth/mythwizard.cpp
M      libs/libmyth/mythcontext.h
M      libs/libmyth/mythconfigdialogs.cpp
M      libs/libmyth/libmyth.pro
M      libs/libmyth/backendselect.h
M      libs/libmyth/virtualkeyboard.cpp
M      libs/libmyth/backendselect.cpp
M      libs/libmythupnp/httpserver.cpp
M      libs/libmythupnp/upnp.cpp
M      libs/libmythupnp/libmythupnp.pro
M      libs/libmythupnp/upnp.h
M      programs/mythuitest/main.cpp
M      programs/programs-libs.pro
M      programs/mythjobqueue/main.cpp
M      programs/mythfrontend/globalsettings.cpp
M      programs/mythfrontend/main.cpp
M      programs/mythtranscode/main.cpp
M      programs/mythcommflag/main.cpp
M      programs/mythtv-setup/main.cpp
?      programs/mythbackend/mythxml.cpp.orig
M      programs/mythbackend/mythxml.cpp
M      programs/mythbackend/main.cpp
M      programs/mythtv/main.cpp
M      programs/mythlcdserver/main.cpp
M      programs/mythwelcome/main.cpp
M      programs/mythshutdown/main.cpp
M      programs/mythfilldatabase/main.cpp

% make
cd libs && make -f Makefile
make[1]: Entering directory `/home/nigel/mythtv/libs'
...
[several hours later]
make[1]: Entering directory `/home/nigel/mythtv/config'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/home/nigel/mythtv/config'

%


What did svn status report after you ran patch?

--
Nigel Pearson, nigel at ind.tansu.com.au|"Beware - I am a carrier
Telstra Net. Eng., Sydney, Australia |          of surrealism"
Office: 9202 3900    Fax:  9261 3912 |       D  A
Mobile: 0408 664435  Home: 9792 6998 |       L  I