[pkgsrc/trunk]: pkgsrc/devel/pango Give a name to a previously anonymous unio...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75b9cb80147f
branches:  trunk
changeset: 550575:75b9cb80147f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Nov 24 11:30:49 2008 +0000

description:
Give a name to a previously anonymous union member used during
initialisation of static data. Fixes build with Sun Studio 12.

diffstat:

 devel/pango/distinfo         |   3 ++-
 devel/pango/patches/patch-aa |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 10410b46ad24 -r 75b9cb80147f devel/pango/distinfo
--- a/devel/pango/distinfo      Mon Nov 24 10:42:43 2008 +0000
+++ b/devel/pango/distinfo      Mon Nov 24 11:30:49 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.66 2008/10/30 08:23:29 wiz Exp $
+$NetBSD: distinfo,v 1.67 2008/11/24 11:30:49 tnn Exp $
 
 SHA1 (pango-1.22.2.tar.bz2) = d1a3368ffdb29a239c41498bedbee6bac222d77a
 RMD160 (pango-1.22.2.tar.bz2) = 355a8743f8a98d6780c6464acdf9d2c4037ad601
 Size (pango-1.22.2.tar.bz2) = 1462487 bytes
+SHA1 (patch-aa) = de14d8b52aef9b448c170e0b3cca89fe93be3962
diff -r 10410b46ad24 -r 75b9cb80147f devel/pango/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pango/patches/patch-aa      Mon Nov 24 11:30:49 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.14 2008/11/24 11:30:49 tnn Exp $
+
+--- pango/pango-language.c.orig        2008-08-20 21:47:11.000000000 +0200
++++ pango/pango-language.c
+@@ -487,7 +487,7 @@ static const union _LangPool {
+ #define LANGUAGE(id, source, sample) char POOLSTRFIELD(__LINE__)[sizeof(sample)];
+ #include "pango-language-sample-table.h"
+ #undef LANGUAGE
+-  };
++  } lang_info;
+   const char str[1];
+ } lang_pool = { {
+     "",
+@@ -496,6 +496,8 @@ static const union _LangPool {
+ #undef LANGUAGE
+ } };
+ static const LangInfo lang_texts[] = {
++#undef POOLSTRFIELD1
++#define POOLSTRFIELD1(line) lang_info.str##line
+ #define LANGUAGE(id, source, sample) {G_STRINGIFY(id),        G_STRUCT_OFFSET(union _LangPool, POOLSTRFIELD(__LINE__))},
+ #include "pango-language-sample-table.h"
+ #undef LANGUAGE