[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/03/02 14:23:48

Modified files:
        config         : configure.in 
        distrib        : ChangeLog Install.txt 

Log message:
        patch #6440

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.313&r2=1.314
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1360&r2=1.1361
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.16&r2=1.17

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- config/configure.in 29 Feb 2008 19:24:44 -0000      1.313
+++ config/configure.in 2 Mar 2008 14:23:48 -0000       1.314
@@ -1177,7 +1177,7 @@
         AC_MSG_CHECKING(for librsvg - version >= $REQUIRED_RSVG)
         if pkg-config --atleast-version $REQUIRED_RSVG $PKG_RSVG; then
           GTK_CONFIG="pkg-config $PKG_GTK $PKG_RSVG"
-          REQUIRED_LABLGTK=2.10.0
+          REQUIRED_LABLGTK=2.10.1
           LABLGTK_NAME=lablgtk2
           AC_MSG_RESULT(yes)
         else
@@ -1262,7 +1262,7 @@
          rm -rf lablgtk-"$REQUIRED_LABLGTK"
          if test ! -f lablgtk-"$REQUIRED_LABLGTK".tar.gz; then
            echo Downloading ...
-           $WGET 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-"$REQUIRED_LABLGTK".tar.gz
+           $WGET 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-"$REQUIRED_LABLGTK".tar.gz
          fi
          if test ! -f lablgtk-"$REQUIRED_LABLGTK".tar.gz; then exit 1; fi
 

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1360
retrieving revision 1.1361
diff -u -b -r1.1360 -r1.1361
--- distrib/ChangeLog   29 Feb 2008 19:24:44 -0000      1.1360
+++ distrib/ChangeLog   2 Mar 2008 14:23:48 -0000       1.1361
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2008/03/02
+6223: GTK2 GUI: Compile with lablgtk-2.10.1 by default
+- lablgtk-2.10.0 does not compile with Ocaml 3.10.2
+
 2008/02/29
 6439: Configure: Make Ocaml 3.10.2 the default compiler
 

Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- distrib/Install.txt 29 Feb 2008 19:24:45 -0000      1.16
+++ distrib/Install.txt 2 Mar 2008 14:23:48 -0000       1.17
@@ -76,9 +76,9 @@
     ~/tmp/ocaml-3.10.2> make install
 
  1.2.1) LablGTK 1.2.7 for GTK1
-      (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)
+      (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html)
 
-    ~/tmp> wget 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-1.2.7.tar.gz
+    ~/tmp> wget 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-1.2.7.tar.gz
     ~/tmp> tar zxf lablgtk-1.2.7.tar.gz
     ~/tmp> cd lablgtk-1.2.7
     ~/tmp/lablgtk-1.2.7> make configure
@@ -86,16 +86,15 @@
     ~/tmp/lablgtk-1.2.7> make opt
     ~/tmp/lablgtk-1.2.7> make install
 
- 1.2.2) LablGTK-2.10.0 for GTK2
-      (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)
+ 1.2.2) LablGTK-2.10.1 for GTK2
+      (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html)
 
-    ~/tmp> wget 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.10.0.tar.gz
-    ~/tmp> tar zxf lablgtk-2.10.0.tar.gz
-    ~/tmp> cd lablgtk-2.10.0
-    ~/tmp> patch -p0 -i ../mldonkey/patches/lablgtk-2.10.0.patch
-    ~/tmp/lablgtk-2.10.0> ./configure
-    ~/tmp/lablgtk-2.10.0> make world
-    ~/tmp/lablgtk-2.10.0> make install
+    ~/tmp> wget 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-2.10.1.tar.gz
+    ~/tmp> tar zxf lablgtk-2.10.1.tar.gz
+    ~/tmp> cd lablgtk-2.10.1
+    ~/tmp/lablgtk-2.10.1> ./configure
+    ~/tmp/lablgtk-2.10.1> make world
+    ~/tmp/lablgtk-2.10.1> make install
 
 2) Compiling mldonkey with GUI:
 
@@ -103,7 +102,7 @@
     To build GTK1 oldgui: ./configure --enable-gui=oldgui
       - note: oldgui does not compile with Ocaml >= 3.10
     To build GTK2 GUI:    ./configure --enable-gui[=newgui2]
-    lablgtk-1.2.7 and lablgtk-2.6.0 can both be installed at the same time.
+    lablgtk-1.2.7 and lablgtk-2.10.1 can both be installed at the same time.
 
     ~/tmp/mldonkey> make