[pkgsrc/trunk]: pkgsrc/devel/anjuta To deal with a newly introduced function ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83d4b150a97d
branches:  trunk
changeset: 533886:83d4b150a97d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 05 22:01:16 2007 +0000

description:
To deal with a newly introduced function in GTK 2.12.0 conflicting with
a function of the same name and functionality in Anjuta, add a patch to
use the new version and an API depend for that version. Don't bump
revision as an existing package is fine to use.

diffstat:

 devel/anjuta/Makefile         |   4 +++-
 devel/anjuta/distinfo         |   3 ++-
 devel/anjuta/patches/patch-aa |  31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diffs (67 lines):

diff -r 7ca08159460e -r 83d4b150a97d devel/anjuta/Makefile
--- a/devel/anjuta/Makefile     Fri Oct 05 21:55:26 2007 +0000
+++ b/devel/anjuta/Makefile     Fri Oct 05 22:01:16 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/09/21 13:03:33 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/10/05 22:01:16 joerg Exp $
 
 DISTNAME=      anjuta-2.0.2
 PKGREVISION=   7
@@ -39,6 +39,8 @@
 REPLACE_SH+=           scripts/anjuta_import.sh.in
 REPLACE_PERL+=         plugins/tools/scripts/*.pl
 
+BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
+
 .include "../../devel/devhelp/buildlink3.mk"
 .include "../../devel/gdl/buildlink3.mk"
 .include "../../devel/gnome-build/buildlink3.mk"
diff -r 7ca08159460e -r 83d4b150a97d devel/anjuta/distinfo
--- a/devel/anjuta/distinfo     Fri Oct 05 21:55:26 2007 +0000
+++ b/devel/anjuta/distinfo     Fri Oct 05 22:01:16 2007 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2007/02/02 17:05:58 joerg Exp $
+$NetBSD: distinfo,v 1.15 2007/10/05 22:01:16 joerg Exp $
 
 SHA1 (anjuta-2.0.2.tar.gz) = 5f11f6b642c310b8838237da5965272ebbd27426
 RMD160 (anjuta-2.0.2.tar.gz) = 9931311e2f65f66d149e64a02e1996b2b972b925
 Size (anjuta-2.0.2.tar.gz) = 6844511 bytes
+SHA1 (patch-aa) = bb2825744da8c70c1cddbe226bc3aec7e8ec4061
 SHA1 (patch-ba) = fc3a8036ff7886246fc21203b292be89585fa474
 SHA1 (patch-bb) = 9d4a6f63c9ba72d15c034bc3752320e5492c9cb2
 SHA1 (patch-bc) = 0e81a73de07cf24a20bcf7c7c35f8f5c280e2311
diff -r 7ca08159460e -r 83d4b150a97d devel/anjuta/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/anjuta/patches/patch-aa     Fri Oct 05 22:01:16 2007 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.6 2007/10/05 22:01:16 joerg Exp $
+
+--- plugins/sourceview/anjuta-languages-manager.c.orig 2007-10-05 20:50:12.000000000 +0000
++++ plugins/sourceview/anjuta-languages-manager.c
+@@ -110,15 +110,6 @@ get_gconf_key (GtkSourceLanguage *langua
+       return key;
+ }
+ 
+-static gchar * 
+-gdk_color_to_string (GdkColor color)
+-{
+-      return g_strdup_printf ("#%04x%04x%04x",
+-                              color.red, 
+-                              color.green,
+-                              color.blue);
+-}
+-
+ static gchar *
+ tag_style_to_string (const GtkSourceTagStyle *style)
+ {
+@@ -126,8 +117,8 @@ tag_style_to_string (const GtkSourceTagS
+       gchar *background;
+       gchar *foreground;
+ 
+-      background = gdk_color_to_string (style->background);
+-      foreground = gdk_color_to_string (style->foreground);
++      background = gdk_color_to_string (&style->background);
++      foreground = gdk_color_to_string (&style->foreground);
+ 
+       res = g_strdup_printf ("%d/%s/%s/%d/%d/%d/%d",
+                       style->mask,