[Pkg-ocaml-maint-commits] [lablgtk2] 02/07: New upstream version 2.18.5+dfsg

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository lablgtk2.

commit 5be31afead6cd96bc2d73fd0c34d786f1e1f63c8
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jul 17 22:01:22 2017 +0200

    New upstream version 2.18.5+dfsg
---
 CHANGES        | 10 ++++++++++
 README         |  4 ++--
 config.make.in |  2 +-
 configure      | 41 ++++++++++++++++++++++++++++++++++++++++-
 configure.in   | 19 +++++++++++++++++++
 src/ml_glib.c  |  1 +
 6 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 345bde6..3b90611 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,15 @@
 LablGTK changes log
 
+In Lablgtk-2.18.5:
+
+2016.08.10 [Jacques]
+  * update applications/browser for 4.04
+
+2016.08.02 [Jacques]
+  * add CAMLparam before CAMLlocal (report by Francois Bobot)
+  * add -fno-unwind-tables to GTKCFLAGS if the compiler allows it
+    (suggested by Bart Jacobs)
+
 In Lablgtk-2.18.4:
 
 2016.04.27 [Jacques]
diff --git a/README b/README
index a95f592..6fa44ff 100755
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 
-             LablGTK2 2.18.4 : an interface to the GIMP Tool Kit
+             LablGTK2 2.18.5 : an interface to the GIMP Tool Kit
 
 Needed:
-        ocaml-3.11 or more (4.03 is preferred)
+        ocaml-3.11 or more (4.04 is preferred)
         gtk+-2.x (gtk+-2.16.x for full functionality)
         findlib 1.2.1 or more (for default install)
         GNU make (there is no standard for conditionals)
diff --git a/config.make.in b/config.make.in
index 14d3cdd..feb27ad 100644
--- a/config.make.in
+++ b/config.make.in
@@ -68,7 +68,7 @@ FLINSTALLDIR=$(DESTDIR)$(FINDLIBDIR)/lablgtk2
 FILT = -Wl,--export-dynamic
 clean_libs = $(subst -pthread,-ldopt -pthread -ccopt -pthread,$(subst --rpath,-rpath,$(filter-out $(FILT),$(1))))
 
-GTKCFLAGS=@GTKALL_CFLAGS@
+GTKCFLAGS=@OCAML_CC_EXTRA_FLAGS@ @GTKALL_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GTKLIBS:=$(call clean_libs,$(GTK_LIBS))
 GTKGL_LIBS = @GTKGL_LIBS@
diff --git a/configure b/configure
index 0a28886..bc3d91f 100755
--- a/configure
+++ b/configure
@@ -590,6 +590,7 @@ HAVE_SVGZ
 LABLGLDIR
 OCAMLLDCONF
 FINDLIBDIR
+OCAML_CC_EXTRA_FLAGS
 HAS_NATIVE_DYNLINK
 HAS_DLL_SUPPORT
 THREADS_LIB
@@ -3620,6 +3621,44 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+OCAML_CC_EXTRA_FLAGS=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-unwind-tables" >&5
+$as_echo_n "checking whether C compiler accepts -fno-unwind-tables... " >&6; }
+if ${ax_cv_check_cflags___fno_unwind_tables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -fno-unwind-tables"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___fno_unwind_tables=yes
+else
+  ax_cv_check_cflags___fno_unwind_tables=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_unwind_tables" >&5
+$as_echo "$ax_cv_check_cflags___fno_unwind_tables" >&6; }
+if test "x$ax_cv_check_cflags___fno_unwind_tables" = xyes; then :
+  OCAML_CC_EXTRA_FLAGS=-fno-unwind-tables
+else
+  :
+fi
+
+
 # platform
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking platform" >&5
 $as_echo_n "checking platform... " >&6; }
@@ -3651,7 +3690,6 @@ rm test_dynlink.*
 # GTK 2 auto configuration
 
 GTKPKG=gtk+-2.0
-
 # Check whether --enable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;
@@ -5204,6 +5242,7 @@ fi
 
 
 
+
 # Finally create the config.make from config.make.in
 ac_config_files="$ac_config_files config.make"
 
diff --git a/configure.in b/configure.in
index 35fb04c..60e7ee2 100644
--- a/configure.in
+++ b/configure.in
@@ -219,6 +219,24 @@ if test -z "$CC" ; then
 fi
 AC_PROG_CC
 
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
+OCAML_CC_EXTRA_FLAGS=
+AX_CHECK_COMPILE_FLAG(-fno-unwind-tables,[OCAML_CC_EXTRA_FLAGS=-fno-unwind-tables])
+
 # platform
 AC_MSG_CHECKING(platform)
 echo "print_endline Sys.os_type ;;" > conftest.ml
@@ -360,6 +378,7 @@ AC_SUBST(OCAMLYACC)
 AC_SUBST(THREADS_LIB)
 AC_SUBST(HAS_DLL_SUPPORT)
 AC_SUBST(HAS_NATIVE_DYNLINK)
+AC_SUBST(OCAML_CC_EXTRA_FLAGS)
 
 AC_SUBST(CAMLC)
 AC_SUBST(CAMLOPT)
diff --git a/src/ml_glib.c b/src/ml_glib.c
index 0b56777..3204460 100644
--- a/src/ml_glib.c
+++ b/src/ml_glib.c
@@ -163,6 +163,7 @@ static value *lookup_exn_map (GQuark domain)
 static void ml_raise_gerror_exn(GError *, value *) Noreturn;
 static void ml_raise_gerror_exn(GError *err, value *exn)
 {
+  CAMLparam0();
   CAMLlocal2(b, msg);
   g_assert (err && exn);
   msg = copy_string(err->message);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git