[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1899-gae13895

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ae1389512fbc594542fb5b57bacf64d49cfdeb6f (commit)
       via  3262b459bfd8a438f38b8eba3d275f34cdcf6185 (commit)
       via  104239fc142247382cbcaae32b90bd5146aadd3a (commit)
       via  b0d887a88c349440bd87f6d89be863fc40320dab (commit)
       via  c378be2a6801c4f1db8b9b6b60a7e035c22e993f (commit)
      from  6baec900752946441e493dfbe5638877fe3efbdd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ae1389512fbc594542fb5b57bacf64d49cfdeb6f


commit ae1389512fbc594542fb5b57bacf64d49cfdeb6f
Merge: 3262b45 6baec90
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 22:39:06 2014 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=3262b459bfd8a438f38b8eba3d275f34cdcf6185


commit 3262b459bfd8a438f38b8eba3d275f34cdcf6185
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 22:32:45 2014 +0200

    std:setlocale went cocobahia with intl and gettext. Only 'setlocale' worked 
though...

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 94ed3b0..d3a37ea 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -1,7 +1,7 @@
 // gnash.cpp:  Main routine for top-level SWF player, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-//   2011 Free Software Foundation, Inc
+//   2011, 2014 Free Software Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
 
     // Enable native language support, i.e. internationalization
 #ifdef ENABLE_NLS
-    std::setlocale (LC_ALL, "");
+    setlocale (LC_ALL, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);
 #endif

http://git.savannah.gnu.org/cgit//commit/?id=104239fc142247382cbcaae32b90bd5146aadd3a


commit 104239fc142247382cbcaae32b90bd5146aadd3a
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 22:16:15 2014 +0200

    Since we don't included <iostream> Apple GCC started to complain and bail 
out with errors.

diff --git a/libbase/IOChannel.h b/libbase/IOChannel.h
index 50a76cd..b12e62b 100644
--- a/libbase/IOChannel.h
+++ b/libbase/IOChannel.h
@@ -22,6 +22,7 @@
 #define GNASH_IOCHANNEL_H
 
 #include <string>
+#include <iostream> // for std::streamsize
 #include <boost/cstdint.hpp> // for boost int types
 
 #include "dsodefs.h" // DSOEXPORT

http://git.savannah.gnu.org/cgit//commit/?id=b0d887a88c349440bd87f6d89be863fc40320dab


commit b0d887a88c349440bd87f6d89be863fc40320dab
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 22:15:35 2014 +0200

    Updated copyright year.

diff --git a/configure.ac b/configure.ac
index 55836f8..75f12ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl  
-dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014
 dnl  Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify

http://git.savannah.gnu.org/cgit//commit/?id=c378be2a6801c4f1db8b9b6b60a7e035c22e993f


commit c378be2a6801c4f1db8b9b6b60a7e035c22e993f
Author: Markus Gothe <address@hidden>
Date:   Mon Apr 21 22:15:04 2014 +0200

    During all these years the include-search was fundamentally broken... Now 
we use the prefix-includedir instead of hard-coded /usr/include.

diff --git a/macros/gnashpkgtool.m4 b/macros/gnashpkgtool.m4
index 0840ef2..b460bea 100644
--- a/macros/gnashpkgtool.m4
+++ b/macros/gnashpkgtool.m4
@@ -1,6 +1,6 @@
 dnl  
 dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-dnl  2011 Free Software Foundation, Inc.
+dnl  2011, 2014 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ dnl   - always run AC_CHECK_HEADERS and AC_CHECK_LIB so that 
config.h end
 dnl     up with correct information about what's available and what not
 dnl     and every provided info is verified before acceptance.
 dnl
-dnl   - Document the interface of the macro !!
+dnl   - Document the interface of the macro!
 dnl
 
 AC_DEFUN([GNASH_PKG_INCLUDES],
@@ -94,9 +94,9 @@ AC_DEFUN([GNASH_PKG_INCLUDES],
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_$1_incl}" = x; then
     AC_CHECK_HEADER($2, [ac_cv_path_$1_incl=""; found_$1_incl="yes"], [
-      AC_CHECK_HEADER($1/$2, [ac_cv_path_$1_incl="-I/usr/include/$1"; 
found_$1_incl="yes"], [
-        AC_CHECK_HEADER($name/$2, [ac_cv_path_$1_incl="-I/usr/include/$name"; 
found_$1_incl="yes"], [
-          AC_CHECK_HEADER($2, [ac_cv_path_$1_incl="-I/usr/include/$2"; 
found_$1_incl="yes"], [
+      AC_CHECK_HEADER($1/$2, [eval ac_cv_path_$1_incl="-I${includedir}/$1"; 
found_$1_incl="yes"], [
+        AC_CHECK_HEADER($name/$2, [eval 
ac_cv_path_$1_incl="-I${includedir}/$name"; found_$1_incl="yes"], [
+          AC_CHECK_HEADER($2, [eval ac_cv_path_$1_incl="-I${includedir}/$2"; 
found_$1_incl="yes"], [
           if test x"${ac_cv_path_$1_incl}" = x; then
             for i in $incllist; do
               if test -f $i/$name; then

-----------------------------------------------------------------------

Summary of changes:
 configure.ac           |    2 +-
 gui/gnash.cpp          |    4 ++--
 libbase/IOChannel.h    |    1 +
 macros/gnashpkgtool.m4 |   10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash