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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/10/04 00:05:57

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

Log message:
        patch #6223

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.305&r2=1.306
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1323&r2=1.1324
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.13&r2=1.14

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- config/configure.in 30 Sep 2007 11:03:42 -0000      1.305
+++ config/configure.in 4 Oct 2007 00:05:56 -0000       1.306
@@ -1176,7 +1176,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.6.0
+          REQUIRED_LABLGTK=2.10.0
           LABLGTK_NAME=lablgtk2
           AC_MSG_RESULT(yes)
         else
@@ -1270,6 +1270,10 @@
         echo Uncompressing ...
          gzip -cd $PATCH_DIR/lablgtk-"$REQUIRED_LABLGTK".tar.gz | tar xf -
          (cd lablgtk-"$REQUIRED_LABLGTK"
+          if test -f $PATCH_DIR/lablgtk-"$REQUIRED_LABLGTK".patch; then
+            echo Patching ...
+            patch -p0 < $PATCH_DIR/lablgtk-"$REQUIRED_LABLGTK".patch
+          fi
           PATH=$OCAML_PATH:$PATH
           export PATH
           echo $PATH

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1323
retrieving revision 1.1324
diff -u -b -r1.1323 -r1.1324
--- distrib/ChangeLog   30 Sep 2007 11:03:43 -0000      1.1323
+++ distrib/ChangeLog   4 Oct 2007 00:05:56 -0000       1.1324
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2007/10/04
+6223: GTK2 GUI: Compile with lablgtk-2.10.0 by default
+- this patch changes the lablgtk2 version used by ./configure
+- self-compiled lablgtk-2.10.0 must be patched with 
patches/lablgtk-2.10.0.patch
+
 2007/09/30
 6221: Configure: Remove unneeded checks
 6220: GTK2 GUI: Fix compile bug due to changed API in lablgtk-2.10.0

Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- distrib/Install.txt 26 Jun 2007 21:21:07 -0000      1.13
+++ distrib/Install.txt 4 Oct 2007 00:05:57 -0000       1.14
@@ -86,15 +86,16 @@
     ~/tmp/lablgtk-1.2.7> make opt
     ~/tmp/lablgtk-1.2.7> make install
 
- 1.2.2) LablGTK-2.6.0 for GTK2
+ 1.2.2) LablGTK-2.10.0 for GTK2
       (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html)
 
-    ~/tmp> wget 
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
-    ~/tmp> tar zxf lablgtk-2.6.0.tar.gz
-    ~/tmp> cd lablgtk-2.6.0
-    ~/tmp/lablgtk-2.6.0> ./configure
-    ~/tmp/lablgtk-2.6.0> make world
-    ~/tmp/lablgtk-2.6.0> make install
+    ~/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
 
 2) Compiling mldonkey with GUI: