[vlc-devel] commit: Fix macosx gettext (VideoLAN )

[git version control]

vlc | branch: master | VideoLAN <videolan at jones.via.ecp.fr> | Sun Mar 23 19:57:58 2008 +0100| [c64913edec5e89ff57c60284ec3e0478a6368dcd]

Fix macosx gettext

Default to no backup when updating po files

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c64913edec5e89ff57c60284ec3e0478a6368dcd
---

 extras/contrib/src/Makefile                     |    3 +++
 extras/contrib/src/Patches/gettext-macosx.patch |   11 +++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0a65285..6289900 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -366,6 +366,9 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
 ifdef HAVE_WIN32
 	patch -p0 < Patches/gettext-win32.patch
 endif
+ifdef HAVE_DARWIN_OS
+	patch -p0 < Patches/gettext-macosx.patch
+endif
 
 .intl: gettext .iconv
 ifdef HAVE_WIN32
diff --git a/extras/contrib/src/Patches/gettext-macosx.patch b/extras/contrib/src/Patches/gettext-macosx.patch
new file mode 100644
index 0000000..214fb3d
--- /dev/null
+++ b/extras/contrib/src/Patches/gettext-macosx.patch
@@ -0,0 +1,11 @@
+--- gettext/gettext-tools/src/msgmerge.c.orig	2007-10-21 03:25:52.000000000 +0200
++++ gettext/gettext-tools/src/msgmerge.c	2008-03-23 19:54:36.000000000 +0100
+@@ -96,7 +96,7 @@
+ 
+ /* Update mode.  */
+ static bool update_mode = false;
+-static const char *version_control_string;
++static const char *version_control_string = "none";
+ static const char *backup_suffix_string;
+ 
+ /* Long options.  */