[csw-devel] SF.net SVN: gar:[9711] csw/mgar/pkg/cpan/Locale-Gettext/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Apr 19 16:51:00 CEST 2010


Revision: 9711
          http://gar.svn.sourceforge.net/gar/?rev=9711&view=rev
Author:   dmichelsen
Date:     2010-04-19 14:50:59 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
cpan/Locale-Gettext: Add patch for Perl 5.10

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff

Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile	2010-04-19 14:11:51 UTC (rev 9710)
+++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile	2010-04-19 14:50:59 UTC (rev 9711)
@@ -10,11 +10,21 @@
   to internationalize software.
 endef
 
+DISTFILES = COPYING
+
+# Compatibility patches for Perl 5.10.1 from
+#   https://rt.cpan.org/Public/Bug/Display.html?id=35680
+PATCHFILES  = compatibility-with-POSIX-module.diff
+PATCHFILES += doc-update.diff
+
 PACKAGES = CSWpmlocalegettext
 CATALOGNAME = pm_localegettext
 
 RUNTIME_DEP_PKGS = CSWggettextrt
 
+# The Perl module really does not start with uppercase...
+CHECKPKG_OVERRIDES_CSWpmlocalegettext += pkginfo-description-not-starting-with-uppercase
+
 include gar/category.mk
 
 BUILD_ARGS += OTHERLDFLAGS="-lintl -R$(libdir)"

Modified: csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums	2010-04-19 14:11:51 UTC (rev 9710)
+++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/checksums	2010-04-19 14:50:59 UTC (rev 9711)
@@ -1,2 +1,4 @@
-8af338048eefc89879d1799aaeefc1e1  download/CSWpmlocalegettext.gspec
-f3d3f474a1458f37174c410dfef61a46  download/gettext-1.05.tar.gz
+40930028a14e3310e33dfdfe5fb9db37  COPYING
+6c1d3bcfd532e5ca5a5b3dcab8d49745  compatibility-with-POSIX-module.diff
+a6a34db43bbd5ed17a8565b9c7cc97c2  doc-update.diff
+f3d3f474a1458f37174c410dfef61a46  gettext-1.05.tar.gz

Added: csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff
===================================================================
--- csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff	                        (rev 0)
+++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/compatibility-with-POSIX-module.diff	2010-04-19 14:50:59 UTC (rev 9711)
@@ -0,0 +1,25 @@
+Locale::Gettext exports by default the various LC_* constants as does the
+POSIX perl module. Up to perl-5.10, their definition was strictly the same
+and didn't cause any harm. Now the POSIX module evolved slightly and the
+symbol redefinition are conflictual and
+generate warnings.
+
+Resolve this by making sure that Locale::Gettext reexports the constants
+coming from the POSIX module.
+
+Fixes Debian bug #479803.
+
+ -- Raphael Hertzog <hertzog at debian.org>
+
+Index: liblocale-gettext-perl-1.05/gettext.pm
+===================================================================
+--- liblocale-gettext-perl-1.05.orig/gettext.pm	2008-05-07 09:40:23.000000000 +0200
++++ liblocale-gettext-perl-1.05/gettext.pm	2008-05-07 09:41:04.000000000 +0200
+@@ -32,6 +32,7 @@
+ =cut
+ 
+ use Carp;
++use POSIX qw(:locale_h);
+ 
+ require Exporter;
+ require DynaLoader;

Added: csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff
===================================================================
--- csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff	                        (rev 0)
+++ csw/mgar/pkg/cpan/Locale-Gettext/trunk/files/doc-update.diff	2010-04-19 14:50:59 UTC (rev 9711)
@@ -0,0 +1,14 @@
+Fix documentation in manual page 
+Index: liblocale-gettext-perl/gettext.pm
+===================================================================
+--- liblocale-gettext-perl.orig/gettext.pm	2006-04-13 22:49:49.000000000 +0200
++++ liblocale-gettext-perl/gettext.pm	2008-02-03 19:53:01.000000000 +0100
+@@ -235,7 +235,7 @@
+ gettext(), dgettext(), and dcgettext() attempt to retrieve a string
+ matching their C<msgid> parameter within the context of the current
+ locale. dcgettext() takes the message's category and the text domain
+-as parameters while dcgettext() defaults to the LC_MESSAGES category
++as parameters while dgettext() defaults to the LC_MESSAGES category
+ and gettext() defaults to LC_MESSAGES and uses the current text domain.
+ If the string is not found in the database, then C<msgid> is returned.
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list