[pkgsrc/trunk]: pkgsrc/www/trac Drop patch as superceded by upstream changes.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5a4f9cba9ef
branches:  trunk
changeset: 646429:b5a4f9cba9ef
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sun Feb 08 16:52:46 2015 +0000

description:
Drop patch as superceded by upstream changes.

Upstream says that this patch is no longer necessary because an
equivalent change was applied elsewhere in the code.  Until we're
sure, park the patch by dropping from distinfo and commenting out the
patch contents, leaving a note in the patchfile about why.

diffstat:

 www/trac/Makefile                                          |   3 +-
 www/trac/distinfo                                          |   3 +-
 www/trac/patches/patch-tracopt_versioncontrol_git_PyGIT.py |  58 +++++++------
 3 files changed, 35 insertions(+), 29 deletions(-)

diffs (95 lines):

diff -r 49bc079fcf4d -r b5a4f9cba9ef www/trac/Makefile
--- a/www/trac/Makefile Sun Feb 08 16:39:43 2015 +0000
+++ b/www/trac/Makefile Sun Feb 08 16:52:46 2015 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2015/02/08 14:27:23 gdt Exp $
+# $NetBSD: Makefile,v 1.69 2015/02/08 16:52:46 gdt Exp $
 
 DISTNAME=      Trac-1.0.4
 PKGNAME=       ${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    devel www
 MASTER_SITES=  http://ftp.edgewall.org/pub/trac/ \
                ftp://ftp.edgewall.org/pub/trac/
diff -r 49bc079fcf4d -r b5a4f9cba9ef www/trac/distinfo
--- a/www/trac/distinfo Sun Feb 08 16:39:43 2015 +0000
+++ b/www/trac/distinfo Sun Feb 08 16:52:46 2015 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.37 2015/02/08 14:27:23 gdt Exp $
+$NetBSD: distinfo,v 1.38 2015/02/08 16:52:46 gdt Exp $
 
 SHA1 (Trac-1.0.4.tar.gz) = 126698656e5d1709fb91985b28c3492c7a70e3b2
 RMD160 (Trac-1.0.4.tar.gz) = 50b7b4b9a2c7d087d89159b4bf6c8e617ef8aa81
 Size (Trac-1.0.4.tar.gz) = 3579886 bytes
-SHA1 (patch-tracopt_versioncontrol_git_PyGIT.py) = 71c82c57f4d47dee47beb5e270d7fb7c363d0cf6
diff -r 49bc079fcf4d -r b5a4f9cba9ef www/trac/patches/patch-tracopt_versioncontrol_git_PyGIT.py
--- a/www/trac/patches/patch-tracopt_versioncontrol_git_PyGIT.py        Sun Feb 08 16:39:43 2015 +0000
+++ b/www/trac/patches/patch-tracopt_versioncontrol_git_PyGIT.py        Sun Feb 08 16:52:46 2015 +0000
@@ -1,4 +1,10 @@
-$NetBSD: patch-tracopt_versioncontrol_git_PyGIT.py,v 1.2 2015/01/18 14:46:09 gdt Exp $
+$NetBSD: patch-tracopt_versioncontrol_git_PyGIT.py,v 1.3 2015/02/08 16:52:46 gdt Exp $
+
+2015-02-08: upstream says that this is unnecesary >= 1.0.2 because of
+http://trac.edgewall.org/changeset/11710
+which has since been refactored into a utils file.
+Hence it is not in distinfo, and parked here commented out until this is
+confirmed.
 
 The git browser can fail if the git log process has already exited when
 trac tries to terminate it (resulting in a python exception).
@@ -6,30 +12,30 @@
 This patch should be applied upstream; Reported to trac-devel@ on
 2014-03-11 and on 2015-01-18.
 
---- tracopt/versioncontrol/git/PyGIT.py.orig   2013-02-01 00:47:41.000000000 +0000
-+++ tracopt/versioncontrol/git/PyGIT.py
-@@ -913,7 +913,11 @@ class Storage(object):
-                         except ValueError:
-                             break
-             f.close()
--            terminate(p[0])
-+            # The process may or may not have finished.
-+            try:
-+                terminate(p[0])
-+            except:
-+                pass
-             p[0].wait()
-             p[:] = []
-             while True:
-@@ -930,7 +934,10 @@ class Storage(object):
+# --- tracopt/versioncontrol/git/PyGIT.py.orig 2013-02-01 00:47:41.000000000 +0000
+# +++ tracopt/versioncontrol/git/PyGIT.py
+# @@ -913,7 +913,11 @@ class Storage(object):
+#                          except ValueError:
+#                              break
+#              f.close()
+# -            terminate(p[0])
+# +            # The process may or may not have finished.
+# +            try:
+# +                terminate(p[0])
+# +            except:
+# +                pass
+#              p[0].wait()
+#              p[:] = []
+#              while True:
+# @@ -930,7 +934,10 @@ class Storage(object):
  
-         if p:
-             p[0].stdout.close()
--            terminate(p[0])
-+            try:
-+                terminate(p[0])
-+            except:
-+                pass
-             p[0].wait()
+#          if p:
+#              p[0].stdout.close()
+# -            terminate(p[0])
+# +            try:
+# +                terminate(p[0])
+# +            except:
+# +                pass
+#              p[0].wait()
  
-     def last_change(self, sha, path, historian=None):
+#      def last_change(self, sha, path, historian=None):