[arch-commits] Commit in coreutils/trunk (PKGBUILD coreutils-i18n.patch)

[Allan McRae]

    Date: Wednesday, September 9, 2009 @ 01:24:28
  Author: allan
Revision: 51493

upgpkg: coreutils 7.5-2
    update i18n patch to fix human sorting (FS#15997)

Modified:
  coreutils/trunk/PKGBUILD
  coreutils/trunk/coreutils-i18n.patch

----------------------+
 PKGBUILD             |    4 ++--
 coreutils-i18n.patch |   14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-09 03:53:11 UTC (rev 51492)
+++ PKGBUILD	2009-09-09 05:24:28 UTC (rev 51493)
@@ -4,7 +4,7 @@
 
 pkgname=coreutils
 pkgver=7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -26,7 +26,7 @@
 	su)
 md5sums=('775351410b7d6879767c3e4563354dc6'
          '16d0091ce74e2b1f77c1562bed6f475a'
-         'a1ba529769e58ffede0e033736e04c77'
+         '06031a3521d90d75ab385e342910fc78'
          '18d3ba178e2691242287b59bd81aedb9'
          '2127eb34886396b8361c9ab39acfe01c'
          '01fd0ba2e88610d09313c3a4d0d46080'

Modified: coreutils-i18n.patch
===================================================================
--- coreutils-i18n.patch	2009-09-09 03:53:11 UTC (rev 51492)
+++ coreutils-i18n.patch	2009-09-09 05:24:28 UTC (rev 51493)
@@ -2204,7 +2204,7 @@
  {
    struct keyfield *key = keylist;
  
-@@ -1875,6 +2265,181 @@
+@@ -1875,6 +2265,179 @@
    return key->reverse ? -diff : diff;
  }
  
@@ -2232,7 +2232,7 @@
 +
 +  for (;;)
 +    {
-+      unsigned char *translate = (unsigned char *) key->translate;
++      char const *translate = key->translate;
 +      bool const *ignore = key->ignore;
 +
 +      /* Find the lengths. */
@@ -2242,16 +2242,14 @@
 +      /* Actually compare the fields. */
 +      if (key->random)
 +        diff = compare_random (texta, lena, textb, lenb);
-+      else if (key->numeric | key->general_numeric)
++      else if (key->numeric | key->general_numeric | key->human_numeric)
 +	{
 +	  char savea = *lima, saveb = *limb;
 +
 +	  *lima = *limb = '\0';
-+	  if (force_general_numcompare)
-+	    diff = general_numcompare (texta, textb);
-+	  else
-+	    diff = ((key->numeric ? numcompare : general_numcompare)
-+		(texta, textb));
++	  diff = (key->numeric ? numcompare (texta, textb)
++		  : key->general_numeric ? general_numcompare (texta, textb)
++		  : human_numcompare (texta, textb, key));
 +	  *lima = savea, *limb = saveb;
 +	}
 +      else if (key->version)