Add a patch initially from mandriva modified by me to handle tk up to 8.5

Package-Manager: portage-2.1.4.4

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index b8cc048a34287e927fef9370aeb7ac0652c871ac..37b3781efab33f57043e518ea0e2559c5cc817e9 100644 (file)
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.137 2008/02/29 16:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.138 2008/03/09 11:56:14 aballier Exp $
+
+  09 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ocaml-3.10.2-tk85.patch, ocaml-3.10.2.ebuild:
+  Add a patch initially from mandriva modified by me to handle tk up to 8.5
 
 *ocaml-3.10.2 (29 Feb 2008)
 

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 98c826051c77506127c0de7d8d5995acdd2f7079..4a4a2e6a089df4969d907425780c4e421a4c5007 100644 (file)
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -12,6 +12,7 @@ AUX ocaml-3.10.0-automagic.patch 1849 RMD160 6986c47d9d2d9bdaf246f3399ccc59a5751
 AUX ocaml-3.10.0-call-ld-with-proper-ldflags.patch 1497 RMD160 7eef667019e79f2877836f77a31466f9d301725b SHA1 36d95fb8b05e7bbff8e5f49a8f1faec5f11f0c78 SHA256 13d6cc7401c8374327e438517975fe9abf1b99030bb3243f2adb91d12570bc8d
 AUX ocaml-3.10.0-configure.patch 5644 RMD160 1a63847a6e632f59fef8ff448b96bc45da15eae5 SHA1 6a030e48dd5fc399b985dd99e21b6c0e6b95a12e SHA256 f42e11db2d184532aa561b0b117f7ce5850bb50981ea997d08eee34f826360ac
 AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e277c72bef5792 SHA1 15bc9692307f4781c3d01db7724869f7e9a401d7 SHA256 a260416a0fc1cf05ff3b2dceac83bd00043ee7ad6a8f2487934723f5b9f406da
+AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec SHA1 98c7a48c167500d3e7d8c34e79124dc0cedc315d SHA256 ba539578fbec539ff481b5fc786612d5e85b01cc2d6eee22a2f9ed340d2d0fd3
 AUX ocaml-rebuild.sh 1363 RMD160 8eda8892012f6600fb54be8ef3dd0594a649c81f SHA1 2790ddbed9cf897b7927264b7a86ad9f8f1b5965 SHA256 49e8ce024cdc2f665437c869d59931c136215971ec97d2c0b27d33668ebffa30
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
@@ -21,13 +22,13 @@ EBUILD ocaml-3.08.4.ebuild 2548 RMD160 b1f9ce0b2df4c8221e5c09e03ae8e7151100ad6c
 EBUILD ocaml-3.09.3-r1.ebuild 5527 RMD160 6f0f629b140dbe1b85f09e7a178ca73fee58fb4d SHA1 fd65f3e6048994cf76872cab7ee89b8b28a0251e SHA256 14e63cf0f62a5d916fc2ce3a04fa44fb1a98b8a806c3885f0c13d90ecb7eebc0
 EBUILD ocaml-3.09.3-r2.ebuild 5620 RMD160 0c851ed0b39423e36c8142620338dfc2a10fb05e SHA1 3667223a5f98109ba10d7b2429493964cb013d0f SHA256 fe645b9728880c28fdf5e61dd3043d12b3b1b015b01081c84929a32652db4969
 EBUILD ocaml-3.10.1.ebuild 4370 RMD160 60b6ed6e7ec9c159f788cdbcdf16bf6f52528c95 SHA1 b22152e4b429214446fc18827c412e2ea98fe86b SHA256 eebdb972fb7adb9db81399fe9dcdbc7603468d9b10eba7cb4cf5a24a60e502ff
-EBUILD ocaml-3.10.2.ebuild 4371 RMD160 d22c32fb8da36a6f013eaa0c376257de1becaf7a SHA1 f62042ae1cdbfa097972ab4f42b6a692c4bcc910 SHA256 1ba48a12632dd0c3cf2c6a07c5d007c6fe8c503c807adf0c04002e958061d416
-MISC ChangeLog 21726 RMD160 42a66e6f225549928194b47b16acf26ad0b1f1e1 SHA1 bca167bd53c031de8e558e5df0896de656da8fdf SHA256 724555bb3712f69d51578e4b7139b678606d528ff23fb4e1cb9a8be60bb1eba7
+EBUILD ocaml-3.10.2.ebuild 4465 RMD160 8333ed26a1cf5441c417d0037db238b0cbac7f30 SHA1 a125b1eddb2c7ccb67718799b506a52cd79cdb96 SHA256 4a620ac885b67637f7a7fba1d4ce2afbfbd1e4f6e79be02c7dcf157c9366f41a
+MISC ChangeLog 21910 RMD160 78cb360f739f1710a6fedc5a7530c19d459769cd SHA1 edc145aaaa55b9cb6c2fc55a75c9ff23fa85c135 SHA256 4811885e8adb0ed6481c24cf9655ac47387cb5fba49c385f0835b48e96bc4518
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHyDbsvFcC4BYPU0oRAnp9AKCpjxQDogEpuUbvlolaQCL7Rtir/wCgwDpA
-7XQgWuGqP3r6OWYYNWFZoeQ=
-=uWpS
+iD8DBQFH09BmvFcC4BYPU0oRAjgnAKDEwUJiKP7wgFeyUZ4cvv4KXm+KoQCdGjXp
+EKJ0wjcaQK6rZTpaSC4kwws=
+=8S/e
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch b/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch
new file mode 100644 (file)
index 0000000..b612ef8
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch
@@ -0,0 +1,53 @@
+Index: ocaml-3.10.2/configure
+===================================================================
+--- ocaml-3.10.2.orig/configure
++++ ocaml-3.10.2/configure
+@@ -1339,6 +1339,8 @@ if test $has_tk = true; then
+   tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
+   for tk_incs in \
+     "-I/usr/local/include" \
++    "-I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5" \
++    "-I/usr/include/tcl8.5 -I/usr/include/tk8.5" \
+     "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \
+     "-I/usr/include/tcl8.4 -I/usr/include/tk8.4" \
+     "-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" \
+@@ -1361,6 +1363,7 @@ if test $has_tk = true; then
+     8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
+     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
+     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
++    8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
+     *) echo "This version is not known."; has_tk=false ;;
+     esac
+   else
+Index: ocaml-3.10.2/otherlibs/labltk/support/cltkImg.c
+===================================================================
+--- ocaml-3.10.2.orig/otherlibs/labltk/support/cltkImg.c
++++ ocaml-3.10.2/otherlibs/labltk/support/cltkImg.c
+@@ -98,7 +98,11 @@ camltk_setimgdata_native (value imgname,
+   pib.offset[0] = 0;
+   pib.offset[1] = 1;
+   pib.offset[2] = 2;
++#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
++  Tk_PhotoPutBlock(cltclinterp,ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
++#else
+   Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
++#endif
+ #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
+                    , TK_PHOTO_COMPOSITE_SET
+ #endif
+Index: ocaml-3.10.2/otherlibs/labltk/tkanim/tkAnimGIF.c
+===================================================================
+--- ocaml-3.10.2.orig/otherlibs/labltk/tkanim/tkAnimGIF.c
++++ ocaml-3.10.2/otherlibs/labltk/tkanim/tkAnimGIF.c
+@@ -334,7 +334,11 @@ FileReadGIF(interp, f, fileName, formatS
+                 goto error;
+             }
+         }
++#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
++        Tk_PhotoPutBlock(interp, photoHandle, &block, 0, 0, imageWidth, imageHeight
++#else
+         Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
++#endif
+ #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
+                    , TK_PHOTO_COMPOSITE_SET
+ #endif

diff --git a/dev-lang/ocaml/ocaml-3.10.2.ebuild b/dev-lang/ocaml/ocaml-3.10.2.ebuild
index e0f03ad6fc28cce298710c391a3fa31e1a84ef20..58888fd7ccb24028b5cf5a27cf2da901368707b0 100644 (file)
--- a/dev-lang/ocaml/ocaml-3.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.1 2008/02/29 16:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.2 2008/03/09 11:56:14 aballier Exp $
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
@@ -57,6 +57,8 @@ src_unpack() {
        # See comment in the patch
        epatch "${FILESDIR}/${PN}-3.10.0-call-ld-with-proper-ldflags.patch"
 
+       # Adapted from mandriva to get labltk built with tk8.5
+       epatch "${FILESDIR}/${P}-tk85.patch"
 }
 
 src_compile() {