X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FPatches%2Fgettext-macosx.patch;h=214fb3d583e64898f56889e3b03d27b887ff66c4;hp=8c305dbaeddcd80fee308ecfaa6be78bf507be23;hb=c64913edec5e89ff57c60284ec3e0478a6368dcd;hpb=0b255a0a398a0aca2359980846986858fa877cbb diff --git a/extras/contrib/src/Patches/gettext-macosx.patch b/extras/contrib/src/Patches/gettext-macosx.patch index 8c305dbaed..214fb3d583 100644 --- a/extras/contrib/src/Patches/gettext-macosx.patch +++ b/extras/contrib/src/Patches/gettext-macosx.patch @@ -1,30 +1,11 @@ -diff -ruN gettext/gettext-runtime/m4/gettext.m4 gettext-0.14.5/gettext-runtime/m4/gettext.m4 ---- gettext/gettext-runtime/m4/gettext.m4 2005-04-07 13:37:04.000000000 +0200 -+++ gettext-0.14.5/gettext-runtime/m4/gettext.m4 2006-04-05 23:21:45.000000000 +0200 -@@ -445,7 +445,7 @@ - fi +--- 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 @@ - if test -n "$INTL_MACOSX_LIBS"; then -- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" -+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation" - fi + /* 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; - dnl intl/plural.c is generated from intl/plural.y. It requires bison, -@@ -489,7 +489,7 @@ - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" -+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include ], -@@ -505,7 +505,7 @@ - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" -+ CPPFLAGS="$CPPFLAGS -framework CoreFoundation" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + /* Long options. */