[30149] trunk/dports/gnome/gnome-doc-utils

[source_changes at macosforge.org]

Revision: 30149
          http://trac.macosforge.org/projects/macports/changeset/30149
Author:   rhwood at macports.org
Date:     2007-10-21 11:15:29 -0700 (Sun, 21 Oct 2007)

Log Message:
-----------
Add a patch to xml2po that, against all reason, seems to work.
Bump the revision number so everyone gets it.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-doc-utils/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-doc-utils/files/
    trunk/dports/gnome/gnome-doc-utils/files/diff-xml2po_xml2po.py.patch

Modified: trunk/dports/gnome/gnome-doc-utils/Portfile
===================================================================
--- trunk/dports/gnome/gnome-doc-utils/Portfile	2007-10-21 17:33:37 UTC (rev 30148)
+++ trunk/dports/gnome/gnome-doc-utils/Portfile	2007-10-21 18:15:29 UTC (rev 30149)
@@ -5,7 +5,7 @@
 name		gnome-doc-utils
 version		0.12.0
 set branch  [join [lrange [split ${version} .] 0 1] .]
-revision	1
+revision	2
 description	GNOME document utils.
 long_description \
 	gnome-doc-utils is a collection of documentation utilities \
@@ -25,6 +25,9 @@
 
 use_bzip2 	yes
 
+patchfiles	\
+	diff-xml2po_xml2po.py.patch
+
 depends_build	\
     port:pkgconfig \
     port:perl5.8 \

Added: trunk/dports/gnome/gnome-doc-utils/files/diff-xml2po_xml2po.py.patch
===================================================================
--- trunk/dports/gnome/gnome-doc-utils/files/diff-xml2po_xml2po.py.patch	                        (rev 0)
+++ trunk/dports/gnome/gnome-doc-utils/files/diff-xml2po_xml2po.py.patch	2007-10-21 18:15:29 UTC (rev 30149)
@@ -0,0 +1,49 @@
+--- xml2po/xml2po.py~	2007-10-21 13:35:23.000000000 -0400
++++ xml2po/xml2po.py	2007-10-21 13:06:00.000000000 -0400
+@@ -669,20 +669,19 @@
+     #import imp
+     #found = imp.find_module(modename, submodes_path)
+     #module = imp.load_module(modename, found[0], found[1], found[2])
+-    try:
+-        sys.path.append(submodes_path)
+-        module = __import__(modename)
+-        modeModule = '%sXmlMode' % modename
+-        return getattr(module, modeModule)
+-    except:
+-        return None
++    #try:
++    sys.path.append(submodes_path)
++    module = __import__(modename)
++    modeModule = '%sXmlMode' % modename
++    return getattr(module, modeModule)
++    #except:
++    #    return None
+ 
+ def xml_error_handler(arg, ctxt):
+     pass
+ 
+ libxml2.registerErrorHandler(xml_error_handler, None)
+ 
+-
+ # Main program start
+ if __name__ != '__main__': raise NotImplementedError
+ 
+@@ -799,12 +798,12 @@
+     print  >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
+     sys.exit(2)
+ 
+-try:
+-    CurrentXmlMode = load_mode(default_mode)()
+-except:
+-    CurrentXmlMode = None
+-    print >> sys.stderr, "Warning: cannot load module '%s', using automatic detection (-a)." % (default_mode)
+-    automatic = 1
++#try:
++CurrentXmlMode = load_mode(default_mode)()
++#except:
++#    CurrentXmlMode = None
++#    print >> sys.stderr, "Warning: cannot load module '%s', using automatic detection (-a)." % (default_mode)
++#    automatic = 1
+ 
+ if mode=='merge' and mofile=='':
+     print >> sys.stderr, "Error: You must specify MO file when merging translations."

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071021/8aeb4dd0/attachment.html