[pkgsrc/trunk]: pkgsrc/devel/eel Has BROKEN_GETTEXT_DETECTION. Fix label at e...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/483c4ed5d9b4
branches:  trunk
changeset: 508249:483c4ed5d9b4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 16 19:29:41 2006 +0000

description:
Has BROKEN_GETTEXT_DETECTION. Fix label at end of compound for GCC 3.4+

diffstat:

 devel/eel/Makefile         |   3 ++-
 devel/eel/distinfo         |   4 +++-
 devel/eel/patches/patch-ab |  29 +++++++++++++++++++++++++++++
 devel/eel/patches/patch-ac |  20 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)

diffs (87 lines):

diff -r 775bf15322f2 -r 483c4ed5d9b4 devel/eel/Makefile
--- a/devel/eel/Makefile        Thu Feb 16 18:34:10 2006 +0000
+++ b/devel/eel/Makefile        Thu Feb 16 19:29:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/02/16 19:29:41 joerg Exp $
 
 DISTNAME=      eel-1.0.2
 PKGREVISION=   2
@@ -11,6 +11,7 @@
 COMMENT=       Eazel Extensions Library
 
 BUILD_USES_MSGFMT=     yes
+BROKEN_GETTEXT_DETECTION=      yes
 
 USE_TOOLS+=            gmake perl
 USE_LIBTOOL=           yes
diff -r 775bf15322f2 -r 483c4ed5d9b4 devel/eel/distinfo
--- a/devel/eel/distinfo        Thu Feb 16 18:34:10 2006 +0000
+++ b/devel/eel/distinfo        Thu Feb 16 19:29:41 2006 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:13 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/02/16 19:29:41 joerg Exp $
 
 SHA1 (eel-1.0.2.tar.bz2) = 5cc93ab75415dfcd2d15a60086e273af4cf33181
 RMD160 (eel-1.0.2.tar.bz2) = f0ff02461d0e8e76a0c329c75a34f5288ef263ed
 Size (eel-1.0.2.tar.bz2) = 793926 bytes
 SHA1 (patch-aa) = 6668ce77ed476ecdd3a96ea682a7e19b01ad745c
+SHA1 (patch-ab) = b99a5bcbd41c6fccdde9024b8006c451248aa767
+SHA1 (patch-ac) = 58b99398ebbb42b94bfe82ab2ceb0b5e6b516048
diff -r 775bf15322f2 -r 483c4ed5d9b4 devel/eel/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/eel/patches/patch-ab        Thu Feb 16 19:29:41 2006 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2006/02/16 19:29:41 joerg Exp $
+
+--- eel/eel-wrap-table.c.orig  2006-02-16 18:42:08.000000000 +0000
++++ eel/eel-wrap-table.c
+@@ -518,6 +518,7 @@ wrap_table_layout (EelWrapTable *wrap_ta
+                                       item_allocation.x += (max_child_dimensions.width - (int) item_allocation.width);
+                                       break;
+                               default:
++                                      break;
+                               }
+                               
+                               switch (wrap_table->details->y_justification) {
+@@ -528,6 +529,7 @@ wrap_table_layout (EelWrapTable *wrap_ta
+                                       item_allocation.y += (max_child_dimensions.height - (int) item_allocation.height);
+                                       break;
+                               default:
++                                      break;
+                               }
+                       }
+                       
+@@ -831,7 +833,7 @@ eel_wrap_table_find_child_at_event_point
+  */
+ void
+ eel_wrap_table_set_x_justification (EelWrapTable *wrap_table,
+-                                       EelJustification x_justification)
++                                       GtkJustification x_justification)
+ {
+       g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+       g_return_if_fail (x_justification >= EEL_JUSTIFICATION_BEGINNING);
diff -r 775bf15322f2 -r 483c4ed5d9b4 devel/eel/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/eel/patches/patch-ac        Thu Feb 16 19:29:41 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2006/02/16 19:29:41 joerg Exp $
+
+--- test/test-eel-gtk-style.c.orig     2006-02-16 18:55:17.000000000 +0000
++++ test/test-eel-gtk-style.c
+@@ -64,6 +64,7 @@ style_get_color (const GtkStyle *style,
+       case 5: return style->text[state]; break;
+       case 6: return style->base[state]; break;
+       default:
++              break;
+       }
+       g_assert_not_reached ();
+       return empty;
+@@ -89,6 +90,7 @@ style_get_gc (const GtkStyle *style,
+       case 5: return style->text_gc[state]; break;
+       case 6: return style->base_gc[state]; break;
+       default:
++              break;
+       }
+       g_assert_not_reached ();
+       return NULL;