[gentoo-commits] gentoo-x86 commit in dev-util/intltool/files: intltool-0.50.2-localedir-fix.patch intltool-0.50.2-absolute-paths.patch

[Pacho Ramos (pacho)]

pacho       13/05/26 07:26:43

  Added:                intltool-0.50.2-localedir-fix.patch
                        intltool-0.50.2-absolute-paths.patch
  Log:
  Use plain localedir to install mo files to rather than trying to guess one (#432848#c11), fix handling absolute paths in single file key output (#470040).
  
  (Portage version: 2.1.12.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch?rev=1.1&content-type=text/plain

Index: intltool-0.50.2-localedir-fix.patch
===================================================================
=== modified file 'Makefile.in.in'
--- Makefile.in.in	2013-05-12 18:38:08 +0000
+++ Makefile.in.in	2013-05-22 13:43:26 +0000
@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -108,7 +107,7 @@
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot

=== modified file 'intltool.m4'
--- intltool.m4	2012-02-20 14:50:33 +0000
+++ intltool.m4	2013-05-12 17:08:09 +0000
@@ -155,31 +155,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
 IT_PO_SUBDIR([po])
 
 ])




1.1                  dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/intltool/files/intltool-0.50.2-absolute-paths.patch?rev=1.1&content-type=text/plain

Index: intltool-0.50.2-absolute-paths.patch
===================================================================
From c262cb09fa9f4dad056ba5b25a8627408bcf909a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
Date: Sun, 14 Apr 2013 20:41:41 +0200
Subject: [PATCH] Fix handling absolute paths in single file key output.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@g.o>
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=464954
---
 intltool-merge.in | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/intltool-merge.in b/intltool-merge.in
index 1afa2a4..47dbbdf 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -1108,13 +1108,20 @@ sub keys_merge_translation
 {
     my ($lang) = @_;
 
-    if ( ! -d $lang && $MULTIPLE_OUTPUT)
+    my $outpath = "$OUTFILE";
+
+    if ($MULTIPLE_OUTPUT)
     {
-        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+        $outpath = "$lang/$outpath";
+
+        if ( ! -d $lang )
+        {
+            mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+        }
     }
 
     open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
-    open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+    open OUTPUT, ">$outpath" or die "Cannot open $outpath: $!\n";
     binmode (OUTPUT) if $^O eq 'MSWin32';
 
     while (<INPUT>)
@@ -1159,7 +1166,7 @@ sub keys_merge_translation
     close OUTPUT;
     close INPUT;
 
-    print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+    print "CREATED $outpath\n" unless $QUIET_ARG;
 }
 
 sub keys_merge_translations
@@ -1174,7 +1181,7 @@ sub keys_merge_translations
     }
     else
     {
-        keys_merge_translation (".");
+        keys_merge_translation ();
     }
 }
 
-- 
1.8.1.5