Bug 190843 - [PATCH] games/odamex: update to 0.7.0
Summary: [PATCH] games/odamex: update to 0.7.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Kubilay Kocak
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-09 20:11 UTC by Carlos J Puga Medina
Modified: 2014-07-26 11:08 UTC (History)
2 users (show)

See Also:


Attachments
odamex-0.7.0.diff (1.42 KB, patch)
2014-06-09 20:11 UTC, Carlos J Puga Medina
no flags Details | Diff
patch-odalpapi-net_io.cpp (429 bytes, patch)
2014-06-16 15:40 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex.diff (2.34 KB, patch)
2014-06-20 19:27 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex-0.7.0.diff (3.15 KB, patch)
2014-07-14 11:30 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex-0.7.0.diff (3.17 KB, patch)
2014-07-14 14:30 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex-0.7.0.diff (3.17 KB, patch)
2014-07-16 10:09 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex-0.7.0.diff (6.80 KB, patch)
2014-07-19 21:35 UTC, Carlos J Puga Medina
no flags Details | Diff
odamex-0.7.0.diff (6.92 KB, patch)
2014-07-26 10:35 UTC, Carlos J Puga Medina
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Carlos J Puga Medina 2014-06-09 20:11:41 UTC
Created attachment 143578 [details]
odamex-0.7.0.diff

Update games/odamex to version 0.7.0

* Added LICENSE
* removed USE_BZIP2 variable
Comment 1 Carlos J Puga Medina 2014-06-10 11:14:36 UTC
odamex fails to build with LAUNCHER enabled on CURRENT, despite that <sys/time.h> header contains the definition of the 'struct timeval'

<snip>
Scanning dependencies of target odalaunch
[ 41%] Building CXX object odalaunch/CMakeFiles/odalaunch.dir/__/odalpapi/net_io.cpp.o
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalpapi/net_io.cpp:249:19: error: variable has incomplete type 'struct timeval'
        struct timeval   tv;
                         ^
/usr/include/unistd.h:487:8: note: forward declaration of 'odalpapi::timeval'
struct timeval;                         /* select(2) */
       ^
1 error generated.
*** [odalaunch/CMakeFiles/odalaunch.dir/__/odalpapi/net_io.cpp.o] Error code 1

make[4]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[4]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
*** [odalaunch/CMakeFiles/odalaunch.dir/all] Error code 2

make[3]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[3]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
*** [all] Error code 2

make[2]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[2]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
===> Compilation failed unexpectedly.
Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
the maintainer.
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/games/odamex
*** Error code 1

Stop.
make: stopped in /usr/ports/games/odamex
Comment 2 Carlos J Puga Medina 2014-06-16 15:40:21 UTC
Created attachment 143831 [details]
patch-odalpapi-net_io.cpp
Comment 3 Carlos J Puga Medina 2014-06-16 15:45:42 UTC
Ok, finally I could sort out this error, but now I have other build errors because wxgtk28-common is outdated [1]. At least is necessary to update to version 2.9.0 that added wxQueueEvent() to get it compiled.

Build errors:

[ 44%] Building CXX object odalaunch/CMakeFiles/odalaunch.dir/src/frm_odaget.cpp.o
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:83:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:360:39: warning: format specifies type 'unsigned long long' but the argument has type 'size_t' (aka 'unsigned int') [-Wformat]
                                      (size_t)event.GetInt());
                                      ^~~~~~~~~~~~~~~~~~~~~~
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:514:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:524:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:534:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:583:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:595:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:603:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:619:36: error: cannot pass non-POD object of type 'wxString' to variadic method; expected type from format string was 'char *' [-Wnon-pod-varargs]
    Command.Printf(wxT("SIZE %s"), m_File);
                             ~~    ^~~~~~
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:619:36: note: did you mean to call the c_str() method?
    Command.Printf(wxT("SIZE %s"), m_File);
                                   ^
                                         .c_str()
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:645:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:652:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:669:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:675:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:688:5: error: use of undeclared identifier 'wxQueueEvent'
    wxQueueEvent(m_EventHandler, Event.Clone());
    ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:713:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:723:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:733:13: error: use of undeclared identifier 'wxQueueEvent'
            wxQueueEvent(m_EventHandler, Event.Clone());
            ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:763:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:771:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
/usr/ports/games/odamex/work/odamex-src-0.7.0/odalaunch/src/frm_odaget.cpp:784:9: error: use of undeclared identifier 'wxQueueEvent'
        wxQueueEvent(m_EventHandler, Event.Clone());
        ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
1 warning and 20 errors generated.
*** [odalaunch/CMakeFiles/odalaunch.dir/src/frm_odaget.cpp.o] Error code 1

make[4]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[4]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
*** [odalaunch/CMakeFiles/odalaunch.dir/all] Error code 2

make[3]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[3]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
*** [all] Error code 2

make[2]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
1 error

make[2]: stopped in /usr/ports/games/odamex/work/odamex-src-0.7.0
===> Compilation failed unexpectedly.
Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
the maintainer.
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/games/odamex
*** Error code 1

Stop.

Yours sincerely

--CJPM

[1] http://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_3_0_0/docs/changes.txt
Comment 4 Carlos J Puga Medina 2014-06-20 19:27:51 UTC
Created attachment 143972 [details]
odamex.diff

In order to install LAUNCHER is necessary have installed wxWidgets-3.0.1. We don't have it ported yet, so despite  missing option, games/odamex works properly.
Comment 5 Carlos J Puga Medina 2014-07-14 11:30:46 UTC
Created attachment 144649 [details]
odamex-0.7.0.diff

I just fix odamex to build properly with LAUNCHER enabled. So the patch is ready to be committed. 

Also, if nobody is interested to maintain this port, I will.
Comment 6 Carlos J Puga Medina 2014-07-14 14:30:08 UTC
Created attachment 144655 [details]
odamex-0.7.0.diff

- Fix OPTIONS_DEFAULT
- Take maintainership
Comment 7 Carlos J Puga Medina 2014-07-15 17:54:54 UTC
Tested successfully in redports:

https://redports.org/buildarchive/20140714113400-20929/
Comment 8 Carlos J Puga Medina 2014-07-16 10:09:40 UTC
Created attachment 144720 [details]
odamex-0.7.0.diff
Comment 9 Carlos J Puga Medina 2014-07-19 21:35:43 UTC
Created attachment 144801 [details]
odamex-0.7.0.diff

New patch that fixes annoying asserts in odalaunch.

See this PR for more details: 

http://odamex.net/bugs/show_bug.cgi?id=1106
Comment 10 Kubilay Kocak freebsd_committer freebsd_triage 2014-07-26 09:54:48 UTC
Review:

* Improve COMMENT. Maybe "Client/server multiplayer engine for Doom"
* Add LICENSE_FILE

Also, what is the output of `portlint -AC` ?
Comment 11 Carlos J Puga Medina 2014-07-26 10:35:06 UTC
Created attachment 144997 [details]
odamex-0.7.0.diff

Here it is:

% cd /usr/ports/games/odamex && portlint -AC
WARN: Consider to set DEVELOPER=yes in /etc/make.conf
0 fatal errors and 1 warning found.
Comment 12 commit-hook freebsd_committer freebsd_triage 2014-07-26 11:05:09 UTC
A commit references this bug:

Author: koobs
Date: Sat Jul 26 11:04:35 UTC 2014
New revision: 362965
URL: http://svnweb.freebsd.org/changeset/ports/362965

Log:
  games/odamex: Update to 0.7.0, New MAINTAINER

  - Update to 0.7.0
  - Assign MAINTAINER
  - Update COMMENT
  - Add LICENSE & LICENSE_FILE
  - Sort OPTIONS
  - Convert USE_BZIP to USES= convention
  - Update wxWidgets dependency to 3+
  - Add patch to address assertions [1]

  [1] http://odamex.net/bugs/show_bug.cgi?id=1106

  PR:		190843
  Submitted by:	Carlos Medina <cjpugmed at gmail dot com>

Changes:
  head/games/odamex/Makefile
  head/games/odamex/distinfo
  head/games/odamex/files/patch-CMakeLists.txt
  head/games/odamex/files/patch-odalaunch-CMakeLists.txt
  head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp
  head/games/odamex/files/patch-odalpapi-net_io.cpp
Comment 13 Kubilay Kocak freebsd_committer freebsd_triage 2014-07-26 11:08:52 UTC
Great submission Carlos, thank you!

For future submissions, please include a proposed commit log (itemised changes with rationale if necessary) which makes it easier for committers to evaluate changes against your intentions.

Also, add any large amounts of text (like build output) as attachments rather than in comments :)