pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hgsubversion: Add patch from upstream to fix build.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat May 7 00:36:44 2016 +0200
Changeset:	921a4af08bf4216ef506fef159348efa3a816d86

Modified Files:
	hgsubversion/distinfo
Added Files:
	hgsubversion/patches/patch-hgsubversion_____init____.py
	hgsubversion/patches/patch-hgsubversion_svncommands.py

Log Message:
hgsubversion: Add patch from upstream to fix build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=921a4af08bf4216ef506fef159348efa3a816d86

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hgsubversion/distinfo                                   |  2 ++
 hgsubversion/patches/patch-hgsubversion_____init____.py | 16 ++++++++++++++++
 hgsubversion/patches/patch-hgsubversion_svncommands.py  | 16 ++++++++++++++++
 3 files changed, 34 insertions(+)

diffs:
diff --git a/hgsubversion/distinfo b/hgsubversion/distinfo
index 2b0198b..24c8742 100644
--- a/hgsubversion/distinfo
+++ b/hgsubversion/distinfo
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.2 2015/06/09 08:19:23 thomasklausner Exp $
 SHA1 (hgsubversion/1.8.1.tar.gz) = 9e4220ddbd77e1c95260a5ba31a4be6e4d74d44d
 RMD160 (hgsubversion/1.8.1.tar.gz) = 655049a23dfaf836b486af370350c9385d1622b9
 Size (hgsubversion/1.8.1.tar.gz) = 285463 bytes
+SHA1 (patch-hgsubversion_____init____.py) = 24883a8290fd4de61ece1230883412ba596c669f
+SHA1 (patch-hgsubversion_svncommands.py) = 9cf0f17c5b7877f81cce025424eeab2d59e77d68
diff --git a/hgsubversion/patches/patch-hgsubversion_____init____.py b/hgsubversion/patches/patch-hgsubversion_____init____.py
new file mode 100644
index 0000000..e9dd6b1
--- /dev/null
+++ b/hgsubversion/patches/patch-hgsubversion_____init____.py
@@ -0,0 +1,16 @@
+$NetBSD$
+
+https://bitbucket.org/durin42/hgsubversion/commits/2ae4fb5bfab90f93ebf074e382798a7d2e67137a
+
+--- hgsubversion/__init__.py.orig	2015-05-07 08:46:09.000000000 +0000
++++ hgsubversion/__init__.py
+@@ -191,7 +191,8 @@ hg.schemes.update({ 'file': _lookup, 'ht
+                     'svn': svnrepo, 'svn+ssh': svnrepo, 'svn+http': svnrepo,
+                     'svn+https': svnrepo})
+ 
+-commands.optionalrepo += ' svn'
++if hgutil.safehasattr(commands, 'optionalrepo'):
++    commands.optionalrepo += ' svn'
+ 
+ cmdtable = {
+     "svn":
diff --git a/hgsubversion/patches/patch-hgsubversion_svncommands.py b/hgsubversion/patches/patch-hgsubversion_svncommands.py
new file mode 100644
index 0000000..13f2715
--- /dev/null
+++ b/hgsubversion/patches/patch-hgsubversion_svncommands.py
@@ -0,0 +1,16 @@
+$NetBSD$
+
+https://bitbucket.org/durin42/hgsubversion/commits/2ae4fb5bfab90f93ebf074e382798a7d2e67137a
+
+--- hgsubversion/svncommands.py.orig	2015-05-07 08:46:09.000000000 +0000
++++ hgsubversion/svncommands.py
+@@ -490,6 +490,9 @@ def svn(ui, repo, subcommand, *args, **o
+         else:
+             raise
+ 
++svn.optionalrepo = True
++svn.norepo = False
++
+ table = {
+     'genignore': genignore,
+     'info': info,


Home | Main Index | Thread Index | Old Index