packages: cups/cups.spec, cups/cups-locale.patch (NEW)=?UTF-8?Q?=20?=- fix empty output o...

[draenog]

Author: draenog                      Date: Thu Jun 21 12:30:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix empty output of lpstat if LANG=pl; part of 10321 in cups cvn

---- Files affected:
packages/cups:
   cups.spec (1.326 -> 1.327) , cups-locale.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.326 packages/cups/cups.spec:1.327
--- packages/cups/cups.spec:1.326	Tue Apr 17 19:10:50 2012
+++ packages/cups/cups.spec	Thu Jun 21 14:29:58 2012
@@ -18,7 +18,7 @@
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
 Version:	1.5.2
-Release:	4
+Release:	5
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:		Applications/Printing
@@ -47,6 +47,7 @@
 Patch13:	%{name}-systemd-socket.patch
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638521
 Patch14:	ipp-revert-1.4.patch
+Patch15:	%{name}-locale.patch
 # avahi patches from fedora
 Patch100:	%{name}-avahi-1-config.patch
 Patch101:	%{name}-avahi-2-backend.patch
@@ -328,6 +329,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p0
 
 %if %{with avahi}
 %patch100 -p1
@@ -782,6 +784,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.327  2012/06/21 12:29:58  draenog
+- fix empty output of lpstat if LANG=pl; part of 10321 in cups cvn
+
 Revision 1.326  2012/04/17 17:10:50  baggins
 - rel 4
 - better systemd deps

================================================================
Index: packages/cups/cups-locale.patch
diff -u /dev/null packages/cups/cups-locale.patch:1.1
--- /dev/null	Thu Jun 21 14:30:03 2012
+++ packages/cups/cups-locale.patch	Thu Jun 21 14:29:58 2012
@@ -0,0 +1,63 @@
+Index: cups/language.c
+===================================================================
+--- cups/language.c	(revision 10320)
++++ cups/language.c	(revision 10321)
+@@ -3,7 +3,7 @@
+  *
+  *   I18N/language support for CUPS.
+  *
+- *   Copyright 2007-2011 by Apple Inc.
++ *   Copyright 2007-2012 by Apple Inc.
+  *   Copyright 1997-2007 by Easy Software Products.
+  *
+  *   These coded instructions, statements, and computer programs are the
+@@ -979,8 +979,23 @@
+       */
+ 
+       if (m)
+-        cupsArrayAdd(a, m);
++      {
++        if (m->str[0])
++        {
++          cupsArrayAdd(a, m);
++        }
++        else
++        {
++         /*
++          * Translation is empty, don't add it... (STR #4033)
++          */
+ 
++          free(m->id);
++          free(m->str);
++          free(m);
++        }
++      }
++
+      /*
+       * Create a new message with the given msgid string...
+       */
+@@ -1057,8 +1072,23 @@
+   */
+ 
+   if (m)
+-    cupsArrayAdd(a, m);
++  {
++    if (m->str[0])
++    {
++      cupsArrayAdd(a, m);
++    }
++    else
++    {
++     /*
++      * Translation is empty, don't add it... (STR #4033)
++      */
+ 
++      free(m->id);
++      free(m->str);
++      free(m);
++    }
++  }
++
+  /*
+   * Close the message catalog file and return the new array...
+   */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/cups/cups.spec?r1=1.326&r2=1.327