patchmldonkey, a multi-networks file-sharing client - Patches: patch #7287, Fix GTK1 oldgui compile with Ocaml...

 
 

You are not allowed to post comments on this tracker with your current authentication level.

patch #7287: Fix GTK1 oldgui compile with Ocaml 3.1*

Submitter:  spiralvoice <spiralvoice>
Submitted:  Mon 23 Aug 2010 04:26:49 AM UTC
   
 
Category:  None Priority:  5 - Normal
Status:  Done Assigned to:  None
Open/Closed:  Closed

Jump to the original submission

Sun 29 Aug 2010 08:12:40 PM UTC, comment #11: 

committed 2010/08/29

spiralvoice <spiralvoice>
Group administrator
Fri 27 Aug 2010 01:52:18 PM UTC, comment #10: 

Compiles ok with ocaml 3.11.2 on Debian i386 and x86_64

ygrek <ygrek>
Group Member
Tue 24 Aug 2010 08:36:34 PM UTC, comment #9: 

Posted patch version depending on patch #7289.
Using both patches I could compile GTK1 oldgui using Ocaml 3.10.1 and 3.12.0. Still have to test the versions between them but for now it looks good!

(file #21292)

spiralvoice <spiralvoice>
Group administrator
Tue 24 Aug 2010 08:12:49 PM UTC, comment #8: 

Created patch #7289 which raises minimum required Ocaml version to 3.10.1, please test as well.

This is the preferred way unless you keep several Ocaml versions installed on your system:

./configure --enable-ocamlver=3.10.1 --enable-force-ocaml --enable-batch


spiralvoice <spiralvoice>
Group administrator
Tue 24 Aug 2010 09:50:08 AM UTC, comment #7: 
ygrek <ygrek>
Group Member
Mon 23 Aug 2010 07:54:53 PM UTC, comment #6: 

Unfortunately the patch only works with Ocaml > 3.11 but fails with Ocaml 3.10.1 and 3.10.2:

# make depend
/root/mldonkey/mldonkey/patches/local/bin/ocamlc.opt -I tools/zoggy -I +camlp4 -pp "/root/mldonkey/mldonkey/patches/local/bin/camlp4of -loc loc" -a -o pa_zog.cma  tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
File "tools/zoggy/pa_zog.ml", line 873, characters 29-32:
The constructor EOI expects 0 argument(s),
but is here applied to 1 argument(s)

spiralvoice <spiralvoice>
Group administrator
Mon 23 Aug 2010 04:26:49 AM UTC, comment #5: 

This item has been reassigned from the project mldonkey, a multi-networks file-sharing client bugs tracker to your tracker.

The original report is still available at bugs #30830

Following are the information included in the original report:

[field #0]                  Item ID: 30830
[field #1]                 Group ID: 1409
[field #2]              Open/Closed: Open
[field #3]                 Severity: 4 - Important
[field #4]                  Privacy: Public
[field #9]                 Category: GUI GTK1 oldgui
[field #10]             Submitted by: spiralvoice
[field #11]              Assigned to: ygrek
[field #12]             Submitted on: Sa 21 Aug 2010 11:37:42 CEST
[field #13]                  Summary: GTK1 oldgui does not compile with Ocaml 3.1*
[field #14]      Original Submission: During "make depend", called by config/configure this happens:

/usr/local/bin/ocamlc.opt -I tools/zoggy -I +camlp4 -pp "/usr/local/bin/camlp4 pa_o.cmo pr_dump.cmo -loc loc" -a -o pa_zog.cma  tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
File "tools/zoggy/pa_zog.ml", line 659, characters 1-3:
Parse error: [expr level ;] expected after "in" (in [expr])
File "tools/zoggy/pa_zog.ml", line 1, characters 0-1:
Error: Preprocessor error
[field #16]               Item Group: Compilation problem
[field #17]                   Status: Ready For Test
[field #18]        Component Version: None
[field #19]         Operating System: None
[field #20]          Reproducibility: None
[field #21]               Size (loc): None
[field #22]            Fixed Release: None
[field #23]          Planned Release: None
[field #24]                   Effort: 0.00
[field #28]                 Priority: 5 - Normal
[field #31]         Percent Complete: 0%
[field #33]                  Release: 3.0.4
[field #58]          Binaries Origin: None
[field #59]                 CPU type: None
[field #60]                      CPU: None
[field #61]     Custom Select Box #4: None
[field #62]     Custom Select Box #5: None
[field #63]     Custom Select Box #6: None
[field #64]     Custom Select Box #7: None
[field #65]     Custom Select Box #8: None
[field #66]     Custom Select Box #9: None
[field #67]    Custom Select Box #10: None

spiralvoice <spiralvoice>
Group administrator
Mon 23 Aug 2010 04:26:48 AM UTC, comment #4: 

CouldnĀ“t wait much longer ;-) It works! Moved to patch tracker.

spiralvoice <spiralvoice>
Group administrator
Mon 23 Aug 2010 04:22:59 AM UTC, comment #3: 

Regarding gui_queries_base.ml there is an old, known problem with "make maintainerclean". The file exists in CVS

http://cvs.savannah.gnu.org/viewvc/mldonkey/src/gtk/gui/gui_queries_base.ml?root=mldonkey&view=markup

and is used during compile, but deleted by that make target.

I will test your patch later, thanks!

spiralvoice <spiralvoice>
Group administrator
Sun 22 Aug 2010 09:58:52 PM UTC, comment #2: 

Here is a dirty patch. After fixing pa_zog the build failed with missing gui_queries_base.ml
Looks like nobody ever tried to build it or what?
Anyway, I copied it from newgui and commented some labels to compile. Now oldgui compiles and starts. Please review, I will cleanup the patch later.

(file #21276)

ygrek <ygrek>
Group Member
Sat 21 Aug 2010 09:43:08 AM UTC, comment #1: 

To test GTK1 oldgui compilation with Ocaml 3.1* use this patch:

--- config/configure.in 2010-08-16 21:17:06.000000000 +0200
+++ config/configure.in 2010-08-21 11:35:21.000000000 +0200
@@ -650,10 +650,6 @@
 REBUILD_OCAML=no
 case "$OCAMLVERSION" in
     3.1*)
-      if test "$GUI" = "oldgui"; then
-        OLDGUI_NO_31=yes
-        GUI=no
-      fi
       ;;
     "$REQUIRED_OCAML"*|3.09.*|3.08.4*|3.08.3*) ;;
     *)

spiralvoice <spiralvoice>
Group administrator
Mon 23 Aug 2010 04:26:49 AM UTC, original submission:  

During "make depend", called by config/configure this happens:

/usr/local/bin/ocamlc.opt -I tools/zoggy -I +camlp4 -pp "/usr/local/bin/camlp4 pa_o.cmo pr_dump.cmo -loc loc" -a -o pa_zog.cma  tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
File "tools/zoggy/pa_zog.ml", line 659, characters 1-3:
Parse error: [expr level ;] expected after "in" (in [expr])
File "tools/zoggy/pa_zog.ml", line 1, characters 0-1:
Error: Preprocessor error

spiralvoice <spiralvoice>
Group administrator

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attached Files
file #21292:  7287.patch added by spiralvoice (20KiB - plain/text)
file #21289:  zoggy_camlp4_2.diff added by ygrek (26KiB - text/x-patch)
file #21276:  zoggy_camlp4.diff added by ygrek (25KiB - text/x-patch)

 

Carbon-Copy List
  • -email is unavailable- added by ygrek (Updated the item)
  • -email is unavailable- added by spiralvoice (Submitted the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

     

    Follow 9 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2010-08-29 spiralvoice StatusReady For Test Done
        Open/ClosedOpen Closed
    2010-08-24 spiralvoice Attached File- Added 7287.patch, #21292
    2010-08-24 spiralvoice Dependencies- patch #7144 is dependent
    2010-08-24 spiralvoice Dependencies- Depends on patch #7289
    2010-08-24 ygrek Attached File- Added zoggy_camlp4_2.diff, #21289
    2010-08-23 spiralvoice StatusNone Ready For Test
    2010-08-23 spiralvoice SummaryGTK1 oldgui does not compile with Ocaml 3.1* Fix GTK1 oldgui compile with Ocaml 3.1*
    2010-08-23 spiralvoice Reassign itemmldonkey, a multi-networks file-sharing client, bug #30830 mldonkey, a multi-networks file-sharing client, patch #7287

    Back to the top

    Powered by Savane 3.13-4b48.
    Corresponding source code