Mailinglist Archive: opensuse-commit (2125 mails)

< Previous Next >
commit ocaml
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Apr 2008 12:16:21 +0200
  • Message-id: <20080407101621.E913A678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package ocaml
checked in at Mon Apr 7 12:16:21 CEST 2008.

--------
--- ocaml/ocaml.changes 2008-03-10 14:47:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/ocaml/ocaml.changes 2008-04-07
11:54:17.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 7 11:54:06 CEST 2008 - anicka@xxxxxxx
+
+- fix build for tk 8.5
+
+-------------------------------------------------------------------

New:
----
ocaml-Tk8.5.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.zT7165/_old 2008-04-07 12:16:00.000000000 +0200
+++ /var/tmp/diff_new_pack.zT7165/_new 2008-04-07 12:16:00.000000000 +0200
@@ -17,7 +17,7 @@
Group: Development/Languages/Other
AutoReqProv: on
Version: 3.10.1
-Release: 1
+Release: 13
%define doc_version 3.10
Source0: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{version}.tar.bz2
Source1:
ftp://ftp.inria.fr/lang/caml-light/ocaml-%{doc_version}-refman.html.tar.bz2
@@ -33,6 +33,7 @@
Patch6: ocaml-3.08.3.patch
Patch7: ocaml-3.09-emacs_localcompile.patch
Patch8: ocaml-3.09-rpmoptflags.patch
+Patch9: ocaml-Tk8.5.diff
Url: http://caml.inria.fr/
Summary: The Objective Caml Compiler and Programming Environment
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,6 +54,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package devel
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Summary: The Objective Caml Compiler and Programming Environment
Group: Development/Languages/Other
Provides: libz:/usr/include/zlib.h
@@ -74,6 +76,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package -n labltk
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Summary: The Objective Caml Compiler and Programming Environment
Requires: ocaml = %{version}-%{release}
@@ -93,6 +96,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package -n camlp4
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Summary: The Objective Caml compiler and programming environment
Requires: ocaml = %{version}-%{release}
@@ -112,6 +116,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package ocamldoc
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Summary: The Objective Caml Compiler and Programming Environment
Requires: ocaml = %{version}-%{release}
@@ -131,6 +136,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package emacs
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Summary: The Objective Caml Compiler and Programming Environment
Requires: ocaml = %{version}-%{release}
@@ -151,6 +157,7 @@
Pierre Weis <Pierre.Weis@xxxxxxxx>

%package docs
+License: GPL v2 or later; THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Summary: The Objective Caml Compiler and Programming Environment
Requires: ocaml = %{version}-%{release}
@@ -183,6 +190,7 @@
%patch6
%patch7
%patch8
+%patch9
find -name ".cvsignore" | xargs -r rm -f

%build
@@ -289,6 +297,8 @@
%{_bindir}/ocamltags

%changelog
+* Mon Apr 07 2008 anicka@xxxxxxx
+- fix build for tk 8.5
* Mon Mar 10 2008 anicka@xxxxxxx
- update to 3.10.1
- made configure script work on PlayStation 3


++++++ ocaml-Tk8.5.diff ++++++
--- configure
+++ configure
@@ -1355,6 +1355,7 @@
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
--- otherlibs/labltk/support/cltkImg.c
+++ otherlibs/labltk/support/cltkImg.c
@@ -98,7 +98,11 @@
pib.offset[0] = 0;
pib.offset[1] = 1;
pib.offset[2] = 2;
- Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
+ Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+ NULL,
+#endif
+ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
, TK_PHOTO_COMPOSITE_SET
#endif
--- otherlibs/labltk/tkanim/tkAnimGIF.c
+++ otherlibs/labltk/tkanim/tkAnimGIF.c
@@ -334,7 +334,11 @@
goto error;
}
}
- Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
+ Tk_PhotoPutBlock(
+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
+ NULL,
+#endif
+photoHandle, &block, 0, 0, imageWidth, imageHeight
#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
, TK_PHOTO_COMPOSITE_SET
#endif


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread