Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit glibc
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 31 Aug 2007 18:41:42 +0200
  • Message-id: <20070831164142.567076781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package glibc
checked in at Fri Aug 31 18:41:42 CEST 2007.

--------
--- glibc/glibc.changes 2007-08-22 00:24:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/glibc/glibc.changes    2007-08-31 17:39:16.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 17:38:02 CEST 2007 - aj@xxxxxxx
+
+- Add /usr/share/locale-bundle/ as fallback directory for usage
+  with bundle-lang packages (see bug #302270).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.R13108/_old  2007-08-31 18:41:10.000000000 +0200
+++ /var/tmp/diff_new_pack.R13108/_new  2007-08-31 18:41:10.000000000 +0200
@@ -27,7 +27,7 @@
 Provides:       rtld(GNU_HASH)
 Autoreqprov:    on
 Version:        2.6.1
-Release:        8
+Release:        11
 %define snapshot_date 2007080316
 URL:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
@@ -894,6 +894,9 @@
 %{_libdir}/libdl_p.a
 
 %changelog
+* Fri Aug 31 2007 - aj@xxxxxxx
+- Add /usr/share/locale-bundle/ as fallback directory for usage
+  with bundle-lang packages (see bug #302270).
 * Tue Aug 21 2007 - pbaudis@xxxxxxx
 - Reintroduce errorneously omitted AMD64 optimizations
   (and fix them to compile again)




++++++ glibc-2.3.90-langpackdir.diff ++++++
--- /var/tmp/diff_new_pack.R13108/_old  2007-08-31 18:41:10.000000000 +0200
+++ /var/tmp/diff_new_pack.R13108/_new  2007-08-31 18:41:10.000000000 +0200
@@ -1,6 +1,11 @@
---- intl/loadmsgcat.c
-+++ intl/loadmsgcat.c  2006/02/06 14:18:51
-@@ -806,8 +806,31 @@
+Index: intl/loadmsgcat.c
+===================================================================
+RCS file: /cvs/glibc/libc/intl/loadmsgcat.c,v
+retrieving revision 1.57
+diff -u -p -r1.57 loadmsgcat.c
+--- intl/loadmsgcat.c  28 Jul 2007 20:34:43 -0000      1.57
++++ intl/loadmsgcat.c  31 Aug 2007 15:36:40 -0000
+@@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
    if (domain_file->filename == NULL)
      goto out;
  
@@ -9,21 +14,21 @@
 +  /* Replace /locale/ with /usr/share/locale-langpack/ */
 +  const char *langpackdir = "/usr/share/locale-langpack/";
 +  char *filename_langpack = malloc (strlen (domain_file->filename) +
-+                                  strlen (langpackdir));
++                                   strlen (langpackdir));
 +  if (filename_langpack != NULL)
 +    {
 +      char *p = strstr (domain_file->filename, "/locale/");
 +      if (p != NULL)
-+      {
-+        strcpy (filename_langpack, langpackdir);
-+        strcpy (&filename_langpack[strlen (langpackdir)],
-+                (p+8));
-+        if ((fd = open (filename_langpack, O_RDONLY)) == -1)
-+          fd = open (domain_file->filename, O_RDONLY);
-+      }
++       {
++         strcpy (filename_langpack, langpackdir);
++         strcpy (&filename_langpack[strlen (langpackdir)],
++                 (p+8));
++         if ((fd = open (filename_langpack, O_RDONLY)) == -1)
++           fd = open (domain_file->filename, O_RDONLY);
++       }
 +      else
-+      /* Try to open the addressed file.  */
-+      fd = open (domain_file->filename, O_RDONLY);
++       /* Try to open the addressed file.  */
++       fd = open (domain_file->filename, O_RDONLY);
 +
 +      free (filename_langpack);
 +    }
@@ -31,6 +36,27 @@
 +    /* Try to open the addressed file.  */
 +    fd = open (domain_file->filename, O_RDONLY);
 +
++  if (fd == -1)
++    {
++      /* Use the fallback directory.  */
++      const char *bundle_dir = "/usr/share/locale-bundle/";
++      char *filename_bundle = malloc (strlen (domain_file->filename) +
++                                    strlen (bundle_dir));
++      if (filename_bundle != NULL)
++      {
++        char *p = strstr (domain_file->filename, "/locale/");
++        if (p != NULL)
++          {
++            strcpy (filename_bundle, bundle_dir);
++            strcpy (&filename_bundle[strlen (bundle_dir)],
++                    (p+8));
++            fd = open (filename_bundle, O_RDONLY);
++          }
++
++        free (filename_bundle);
++      }
++    }
++
    if (fd == -1)
      goto out;
  







++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >