patchmldonkey, a multi-networks file-sharing client - Patches: patch #4556, Fix linking mlnet to X and GTK...

 
 

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

patch #4556: Fix linking mlnet to X and GTK libs when using --enable-gui

Submitter:  spiralvoice <spiralvoice>
Submitted:  Wed 26 Oct 2005 07:02:46 PM UTC
   
 
Category:  Bug fixes Priority:  5 - Normal
Status:  Done Assigned to:  None
Open/Closed:  Closed

Jump to the original submission

Thu 27 Oct 2005 09:44:42 AM UTC, comment #6: 

Applied 2005/10/27

spiralvoice <spiralvoice>
Group administrator
Wed 26 Oct 2005 07:02:46 PM 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 #14856

Following are the information included in the original report:

[field #0]                  Item ID: 14856
[field #1]                 Group ID: 1409
[field #2]              Open/Closed: Open
[field #3]                 Severity: 4 - Important
[field #4]                  Privacy: Public
[field #6]                 Category: Core
[field #7]             Submitted by: spiralvoice
[field #8]              Assigned to: None
[field #9]             Submitted on: Di 25.10.2005 um 14:32
[field #10]                  Summary: mlnet is linked to X and GTK libs when using --enable-gui
[field #11]      Original Submission: topic says it all
[field #13]               Item Group: Compilation problem
[field #14]                   Status: None
[field #15]        Component Version: None
[field #16]         Platform Version: Linux
[field #17]          Reproducibility: None
[field #18]               Size (loc): None
[field #19]            Fixed Release: None
[field #20]          Planned Release: None
[field #21]                   Effort: 0.00
[field #25]                 Priority: 5 - Normal
[field #28]         Percent Complete: 0%
[field #30]                  Release: 2.6.6
[field #55]          Binaries Origin: CVS / Self compiled
[field #56]                 CPU type: Intel x86
[field #57]                      CPU: None
[field #58]     Custom Select Box #4: None
[field #59]     Custom Select Box #5: None
[field #60]     Custom Select Box #6: None
[field #61]     Custom Select Box #7: None
[field #62]     Custom Select Box #8: None
[field #63]     Custom Select Box #9: None
[field #64]    Custom Select Box #10: None

spiralvoice <spiralvoice>
Group administrator
Wed 26 Oct 2005 07:02:44 PM UTC, comment #4: 

Thanks, this patch works now, will be applied to CVS.

spiralvoice <spiralvoice>
Group administrator
Wed 26 Oct 2005 06:10:55 PM UTC, comment #3: 

my fault... the GTK C flags shall be in CFLAGS otherwise we can't find headers.
The patch attached should work.

su_blanc <su_blanc>
Group Member
Wed 26 Oct 2005 11:13:38 AM UTC, comment #2: 

Attached your patch, mlnet now links without X + GTK libs, thanks.
But now GTK2 GUI mlgui does not compile anymore:

/usr/local/bin/ocamlc.opt -verbose -ccopt "-I /byterun -o src/gtk2/gui/x11/eggtrayicon.o" -ccopt "-g -O2   -pthread" -ccopt " " -cclib "-lz  " -cclib -lbz2 -cclib -lz -cclib -lgd -cclib -lfreetype -cclib -lm -ccopt -W -ccopt -Wall -ccopt -Wno-unused -cclib -ljpeg -cclib -lpng -ccopt -DHAVE_JPEG -ccopt "-pthread" -c src/gtk2/gui/x11/eggtrayicon.c
+ gcc -fno-defer-pop -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -fPIC -c -I /byterun -o src/gtk2/gui/x11/eggtrayicon.o -g -O2   -pthread   -W -Wall -Wno-unused -DHAVE_JPEG -pthread  -I'/usr/local/lib/ocaml' 'src/gtk2/gui/x11/eggtrayicon.c'
src/gtk2/gui/x11/eggtrayicon.c:24:28: gtk/gtkversion.h: No such file or directory

This is the compile line for that file without the patch:

/usr/local/bin/ocamlc.opt -verbose -ccopt "-I /byterun -o src/gtk2/gui/x11/eggtrayicon.o" -ccopt "-g -O2   -pthread" -ccopt " " -cclib "-lz  " -ccopt "-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   " -cclib "-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  " -cclib -lbz2 -cclib -lz -cclib -lgd -cclib -lfreetype -cclib -lm -ccopt -W -ccopt -Wall -ccopt -Wno-unused -cclib -ljpeg -cclib -lpng -ccopt -DHAVE_JPEG -ccopt "-pthread" -c src/gtk2/gui/x11/eggtrayicon.c
+ gcc -fno-defer-pop -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -fPIC -c -I /byterun -o src/gtk2/gui/x11/eggtrayicon.o -g -O2   -pthread   -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include    -W -Wall -Wno-unused -DHAVE_JPEG -pthread  -I'/usr/local/lib/ocaml' 'src/gtk2/gui/x11/eggtrayicon.c'

spiralvoice <spiralvoice>
Group administrator
Tue 25 Oct 2005 01:56:03 PM UTC, comment #1: 

I think it's due to the tray icon...
The following points should do the trick to suppress the links

remove in Makefile.in (#line 140)

LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)"

and rip the GTK flags for newgui2 in (about line 800)

ifneq ("$(GUI)" , "no")
  ifeq ("$(GUI)", "newgui2")
    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2
    GTK_LIBS_byte=-ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
    GTK_LIBS_opt=-ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
    GTK_STATIC_LIBS_opt=-ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
  else
    SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) +lablgtk $(SRC_PROGRESS)
    GTK_LIBS_byte=-I +lablgtk $(LABLGL_CMA) lablgtk.cma
    GTK_LIBS_opt=-I +lablgtk  $(LABLGL_CMXA) lablgtk.cmxa
    GTK_STATIC_LIBS_opt=-I +lablgtk lablgtk.cmxa
  endif


su_blanc <su_blanc>
Group Member
Wed 26 Oct 2005 07:02:46 PM UTC, original submission:  

topic says it all

spiralvoice <spiralvoice>
Group administrator

 

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

Attached Files
file #7674:  gtkCFlag.patch added by su_blanc (2KiB - text/x-patch)
file #7671:  mlnet_no_xlibs.patch added by spiralvoice (2KiB - application/octet-stream)

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

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 5 latest changes.

Date Changed by Updated Field Previous Value => Replaced by
2005-10-27 spiralvoice StatusNone Done
    Open/ClosedOpen Closed
2005-10-26 spiralvoice CategoryNone Bug fixes
    SummaryReassigned item: mlnet is linked to X and GTK libs when using --enable-gui Fix linking mlnet to X and GTK libs when using --enable-gui
2005-10-26 spiralvoice Reassign itemFrom group mldonkey, a multi-networks file-sharing client, bugs tracker To group mldonkey, a multi-networks file-sharing client, patch tracker

Back to the top

Powered by Savane 3.13-4b48.
Corresponding source code