Asking to re-introduce 1.6 lobby as an optional choice

[Blarumyrran]

@ancestral, the 1.8 server will simply not let you join with non-rc 1.7.x versions (I think?); maybe they are compatible, I don't know that, but it doesn't matter.

[michaelmax]

Don't forget; the whole point of open source is that you have the possibility to do it yourself. It's about a 15-minute work (I tested it), longer if your computer is slower than my laptop:

* grab the 1.8 source repository,
* revert revisions 40127, 40126, 40125, 40120, 40111, 40110, 39491,
* compile and install.

You then get a Wesnoth executable whose lobby is the 1.6 one yet which works just fine on the 1.8 server (it's the one I'm using).

In fact, I may just as well attach the corresponding patch, just in case I messed when copying the commit numbers.

Thx silene, you were really kind (even if I'm not able to compile wesnoth on windows, Nobun will explain me )
Thx to Noy for the fast answers and the disponibility too

[chains]

I uninstalled my SVN installed wesnoth using scons -c install. Then I ran gunzip old-lobby.patch.gz. Then I ran patch -p1 < old-lobby.patch.
It seems there was a problem. I'm trying to install Wesnoth again to see what happens, but that's gunna be all night before it finishes on my old clunker.

Any thoughts?

Here was my output:

patching file changelog
Hunk #1 succeeded at 328 (offset 1 line).
patching file players_changelog
patching file src/CMakeLists.txt
Hunk #1 succeeded at 401 (offset 55 lines).
patching file src/Makefile.am
patching file src/SConscript
patching file src/lobby_preferences.cpp
patching file src/lobby_preferences.hpp
patching file src/multiplayer.cpp
Hunk #2 FAILED at 538.
1 out of 2 hunks FAILED -- saving rejects to file src/multiplayer.cpp.rej
patching file src/multiplayer_lobby.cpp
patching file src/multiplayer_lobby.hpp
patching file src/multiplayer_ui.cpp
patching file src/multiplayer_ui.hpp
patching file src/widgets/textbox.cpp
patching file src/widgets/textbox.hpp

[silene]

Any thoughts?

Which revision/branch is your SVN repository at? My patch is against the 1.8 release. Applying it to 1.8.1 or 1.9 will fail with the error you obtained. Either solve the conflict by hand (open multiplayer.cpp, search for ==== and look around, the fix should be obvious) or revert commit 42017 before applying the patch. (For 1.8.1, it's 42018.)

[chains]

Ok, I broke out my geek translator for that one *Lol*

My version of wesnoth is 1.8.0+svn (42038M)

I followed the compile directions provided for Ubuntu and checked out wesnoth svn branch 1.8.

From what your saying, I need to re-download wesnoth and ask for a different version? Do you have the SVN command I would type to accomplish this checkout? Or is there another command I can type to revert from 42038 to 42018?

How do I specify that I want version 42017 instead of 42038?

[silene]

Or is there another command I can type to revert from 42038 to 42018?
How do I specify that I want version 42017 instead of 42038?

No, you don't want to go to version 42017, you want to avoid changes that were introduced by 42017; that is, you want everything before 42017 and everything after 42018. I haven't used subversion for several years, so I may be a bit rusty, but I think the following commands will work for you (assuming your repository is still on the 1.8 branch).

Code: Select all

svn merge -c -42018
patch -p1 < old-lobby.patch

[chains]

svn merge -c -42018
svn: Merge source required

I've only used SVN for basic check out and commit.

[silene]

svn merge -c -42018
svn: Merge source required

What about

Code: Select all

svn merge -c -42018 .

?

[grrr]

svn merge -c -42018
svn: Merge source required

I've only used SVN for basic check out and commit.

Use the patch against the official 1.8 tarball release, that's what it was meant for. Don't try to be clever with SVN.

[chains]

I wasn't attempting to be clever.

I was following the directions posted on the Wesnoth page for compiling on Ubuntu: http://wiki.wesnoth.org/CompilingWesnoth. It lists two options for downloading the files and doesn't say there is any difference between the two or even provide any comment at all. In other open source projects like wine or ndiswrapper, SVN has always been the more successful download. So, I assumed the same would be true for Wesnoth.

Thanks for the feedback grrr I'll download the tar file instead. Perhaps the instructions page could make a note of the difference and encourage users to download the tar?

[Loremoth]

Ehm... can be putted as an RPM?

[chains]

I'm working on it.

Well, Working on 3 things at the moment:

1. Getting this to work on My ubuntu machine (BIG Thanks for the help on that one guys, patched version is building now)
2. Creating a .deb package
3. Creating a Windows .exe

RPM will be a tough one because I haven't seen a Redhat desktop in a decade, but I'll see what I can do.

[Loremoth]

Thanks. As I know, it shouldn't be so difficult...