[50885] trunk/dports/x11/gtk2

[nox at macports.org]

Revision: 50885
          http://trac.macports.org/changeset/50885
Author:   nox at macports.org
Date:     2009-05-12 01:12:40 -0700 (Tue, 12 May 2009)
Log Message:
-----------
gtk2: Fixed incompatibility of gtk-builder-convert with Python 2.3 (closes #19593).

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile
    trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-05-12 07:00:11 UTC (rev 50884)
+++ trunk/dports/x11/gtk2/Portfile	2009-05-12 08:12:40 UTC (rev 50885)
@@ -6,7 +6,7 @@
 
 name            gtk2
 version         2.16.1
-revision        3
+revision        4
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer

Modified: trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff	2009-05-12 07:00:11 UTC (rev 50884)
+++ trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff	2009-05-12 08:12:40 UTC (rev 50885)
@@ -1,5 +1,5 @@
---- gtk/gtk-builder-convert.orig	2009-04-27 14:02:41.000000000 +0300
-+++ gtk/gtk-builder-convert	2009-04-27 13:58:26.000000000 +0300
+--- gtk/gtk-builder-convert.orig	2009-05-12 09:56:55.000000000 +0200
++++ gtk/gtk-builder-convert	2009-05-12 09:58:02.000000000 +0200
 @@ -258,7 +258,7 @@
          for node in objects:
              self._convert(node.getAttribute("class"), node)
@@ -31,6 +31,25 @@
                  continue
              accelerator.removeAttribute('signal')
              child.appendChild(accelerator)
+@@ -527,12 +527,12 @@
+         if prop.childNodes:
+             data = prop.childNodes[0].data
+             value, lower, upper, step, page, page_size = data.split(' ')
+-            properties.update(value=value,
+-                              lower=lower,
+-                              upper=upper,
+-                              step_increment=step,
+-                              page_increment=page,
+-                              page_size=page_size)
++            properties.update(dict(value=value,
++                                   lower=lower,
++                                   upper=upper,
++                                   step_increment=step,
++                                   page_increment=page,
++                                   page_size=page_size))
+         else:
+             prop.appendChild(self._dom.createTextNode(""))
+ 
 @@ -711,7 +711,7 @@
      return s.stdout.read()
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090512/c4167a53/attachment.html>