Date: Sat, 8 Mar 2003 11:37:34 +0100 To: lablgtk at kaba.or.jp, garrigue at kurims.kyoto-u.ac.jp Subject: Please apply this small patch to next lablgtk2 snapshot. Message-ID: <20030308103734.GA6813 at iliana> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="WIyZ46R2i8wDzkSu" Content-Disposition: inline From: Sven Luther --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, ... I append here a small patch for lablgtk2, which : 1) Modifies the existing META file so that it supports the glade, init and mt predicates. This may already have been sent by Stefano though. 2) Adds a META.gtkgl file, which has to be installed into $(LIBDIR)/lablgtkgl2. There is no Makefile target to do this though. => I am not a findlib expert, but this is needed, since lablgtkgl2 has a dependency on lablgl which is not necessary for the other lablgtk2 libraries. 3) Adds support for DESTDIR installation. Please consider applying this to future lablgtk 1.2 and lablgl releases also, since installation is severly broken and has to be patched by the packagers if this is not present. 4) Some minor RSVG changes in the README file 5) Builds also lablgladecc, but then maybe there is a reason why its build was disabled in the first place. The patch is taken from my debian package's .diff.gz, i think most of the changes are ok, but _please_ apply at least the 3) part. Friendly, Sven Luther --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="upstream.diff" --- lablgtk2-0.alpha.20030221.orig/META +++ lablgtk2-0.alpha.20030221/META @@ -1,8 +1,29 @@ -requires="" version="1.3.0" +directory="+lablgtk2" +requires="" +linkopts="" + +# bytecode, no thread support archive(byte)="lablgtk.cma" archive(byte,init)="lablgtk.cma gtkInit.cmo" +archive(byte,glade)="lablgtk.cma lablglade.cma" +archive(byte,glade,init)="lablgtk.cma lablglade.cma gtkInit.cmo" + +# native code, no thread support archive(native)="lablgtk.cmxa" archive(native,init)="lablgtk.cmxa gtkInit.cmx" -linkopts="" -directory="+lablgtk2" +archive(native,glade)="lablgtk.cmxa lablglade.cmxa" +archive(native,glade,init)="lablgtk.cmxa lablglade.cmxa gtkInit.cmx" + +# bytecode, thread support +archive(byte,mt)="lablgtk.cma gtkThread.cmo" +archive(byte,init,mt)="lablgtk.cma gtkInit.cmo gtkThread.cmo" +archive(byte,glade,mt)="lablgtk.cma lablglade.cma gtkThread.cmo" +archive(byte,glade,init,mt)="lablgtk.cma lablglade.cma gtkInit.cmo gtkThread.cmo" + +# nativecode, thread support +archive(native,mt)="lablgtk.cmxa gtkThread.cmx" +archive(native,init,mt)="lablgtk.cmxa gtkInit.cmx gtkThread.cmx" +archive(native,glade,mt)="lablgtk.cmxa lablglade.cmxa gtkThread.cmx" +archive(native,glade,init,mt)="lablgtk.cmxa lablglade.cmxa gtkInit.cmx gtkThread.cmx" + --- lablgtk2-0.alpha.20030221.orig/META.gtkgl +++ lablgtk2-0.alpha.20030221/META.gtkgl @@ -0,0 +1,7 @@ +requires="lablgl lablgtk2" +version="1.3.0" +directory="+lablgtk2" + +archive(native)="lablgtkgl.cmxa" +archive(byte)="lablgtkgl.cma" + --- lablgtk2-0.alpha.20030221.orig/Makefile +++ lablgtk2-0.alpha.20030221/Makefile @@ -78,10 +78,11 @@ @echo DEBUG=$(DEBUG) >> config.make @echo CC=$(CC) >> config.make @echo RANLIB=$(RANLIB) >> config.make - @echo LIBDIR=$(LIBDIR) >> config.make - @echo BINDIR=$(BINDIR) >> config.make - @echo INSTALLDIR=$(INSTALLDIR) >> config.make - @echo DLLDIR=$(DLLDIR) >> config.make + @echo DESTDIR= >> config.make + @echo LIBDIR=$$\(DESTDIR\)$(LIBDIR) >> config.make + @echo BINDIR=$$\(DESTDIR\)$(BINDIR) >> config.make + @echo INSTALLDIR=$$\(DESTDIR\)$(INSTALLDIR) >> config.make + @echo DLLDIR=$$\(DESTDIR\)$(DLLDIR) >> config.make @echo GTKCFLAGS=$(GTKCFLAGS) >> config.make @echo GTKLIBS=$(GTKLIBS) >> config.make @echo GTKGLLIBS=$(GTKGLLIBS) >> config.make --- lablgtk2-0.alpha.20030221.orig/README +++ lablgtk2-0.alpha.20030221/README @@ -41,6 +41,7 @@ USE_CC=1 to use $(CC) rather than gcc USE_GL=1 to compile gtkglarea support USE_GLADE=1 to compile libglade support + USE_RSVG=1 to compile librsvg support The following variables will also be remembered if passed as options BINDIR INSTALLDIR DLLDIR DEBUG CC CAMLC CAMLOPT CAMLMKTOP CAMLMKLIB CAMLP40 --- lablgtk2-0.alpha.20030221.orig/src/Makefile +++ lablgtk2-0.alpha.20030221/src/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.97 2003/02/20 13:09:58 garrigue Exp $ # Makefile for lablgtk. -TARGETS = varcc lablgtktop lablgtktop_t lablgtk2 +TARGETS = varcc lablgtktop lablgtktop_t lablgtk2 lablgladecc all:: $(TARGETS) --WIyZ46R2i8wDzkSu--