[55846] trunk/dports/x11/gtk2

[nox at macports.org]

Revision: 55846
          http://trac.macports.org/changeset/55846
Author:   nox at macports.org
Date:     2009-08-20 03:53:04 -0700 (Thu, 20 Aug 2009)
Log Message:
-----------
gtk2:
 * Update to 2.16.5.
 * Fix incompatibilities with Python 3 in gtk-builder-convert (closes #19717).

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-08-20 09:55:29 UTC (rev 55845)
+++ trunk/dports/x11/gtk2/Portfile	2009-08-20 10:53:04 UTC (rev 55846)
@@ -5,7 +5,7 @@
 PortGroup       muniversal 1.0
 
 name            gtk2
-version         2.16.4
+version         2.16.5
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer
@@ -61,9 +61,9 @@
     }
 }
 
-checksums       md5     d666f9f5a544e9d4d45804d88b1b5c4d \
-                sha1    e162f21fc587d9856b1560c461953bb9bcec2242 \
-                rmd160  4b402c6aa9afdf289c139c335e3b8d3eb8600d93
+checksums       md5     8d1ea0b9b0400224d25b0cc2750b438d \
+                sha1    4482e698730c8ea88239512a49306dc27a661145 \
+                rmd160  2e938a81a95b99275fd7738b1fc99f8f224d1e02
 
 patchfiles      patch-gtk-builder-convert.diff \
                 patch-modules-gail.diff \

Modified: trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff	2009-08-20 09:55:29 UTC (rev 55845)
+++ trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff	2009-08-20 10:53:04 UTC (rev 55846)
@@ -1,6 +1,31 @@
---- 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 @@
+--- gtk/gtk-builder-convert.orig	2009-08-20 12:22:55.000000000 +0200
++++ gtk/gtk-builder-convert	2009-08-20 12:51:31.000000000 +0200
+@@ -54,6 +54,24 @@
+ except ImportError:
+     subprocess = None
+ 
++# Sorted
++try:
++    sorted = sorted
++except NameError:
++    def sorted(iterable, cmp=None, key=None, reverse=False):
++        if key is None:
++            lst = list(iterable)
++        else:
++            lst = [(key(val), idx, val) for idx, val in enumerate(iterable)]
++        lst.sort()
++        if key is None:
++            if reverse:
++                return lst[::-1]
++            return lst
++        if reverse:
++            lst = reversed(lst)
++        return [i[-1] for i in lst]
++
+ def get_child_nodes(node):
+     assert node.tagName == 'object'
+     nodes = []
+@@ -258,7 +276,7 @@
          for node in objects:
              self._convert(node.getAttribute("class"), node)
              if self._get_object(node.getAttribute('id')) is not None:
@@ -9,7 +34,24 @@
              self.objects[node.getAttribute('id')] = node
  
          # Convert Gazpachos UI tag
-@@ -441,8 +441,8 @@
+@@ -269,15 +287,7 @@
+         for node in self._dom.getElementsByTagName("accessibility"):
+             self._convert_accessibility(node)
+ 
+-        # Output the newly created root objects and sort them
+-        # by attribute id
+-        # FIXME: Use sorted(self.root_objects,
+-        #                   key=lambda n: n.getAttribute('id'),
+-        #                   reverse=True):
+-        # when we can depend on python 2.4 or higher
+-        root_objects = self.root_objects[:]
+-        root_objects.sort(lambda a, b: cmp(b.getAttribute('id'),
+-                                           a.getAttribute('id')))
++        root_objects = sorted(self.root_objects, key=lambda n: n.getAttribute('id'), reverse=True)
+         for obj in root_objects:
+             self._interface.childNodes.insert(0, obj)
+ 
+@@ -441,8 +451,8 @@
              if signal_name in ['activate', 'toggled']:
                  action.appendChild(signal)
              else:
@@ -20,7 +62,7 @@
  
          if not uimgr.childNodes:
              child = self._dom.createElement('child')
-@@ -461,8 +461,8 @@
+@@ -461,8 +471,8 @@
          for accelerator in get_accelerator_nodes(node):
              signal_name = accelerator.getAttribute('signal')
              if signal_name != 'activate':
@@ -31,7 +73,7 @@
                  continue
              accelerator.removeAttribute('signal')
              child.appendChild(accelerator)
-@@ -527,12 +527,12 @@
+@@ -527,12 +537,12 @@
          if prop.childNodes:
              data = prop.childNodes[0].data
              value, lower, upper, step, page, page_size = data.split(' ')
@@ -50,7 +92,7 @@
          else:
              prop.appendChild(self._dom.createTextNode(""))
  
-@@ -711,7 +711,7 @@
+@@ -711,7 +721,7 @@
      return s.stdout.read()
  
  def usage():
@@ -59,9 +101,12 @@
  
  def main(args):
      try:
-@@ -745,10 +745,10 @@
+@@ -743,12 +753,12 @@
+                                root=root)
+     conv.parse_file(input_filename)
  
-     xml = _indent(conv.to_xml())
+-    xml = _indent(conv.to_xml())
++    xml = _indent(conv.to_xml()).decode()
      if output_filename == "-":
 -        print xml
 +        print(xml)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090820/ea7bfad5/attachment.html>