pkgsrc-WIP-changes archive

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

py-qwt-qt5: patch-mk__distinfo.py: skip checksum for directory



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 07:05:25 2020 +0200
Changeset:	4bbaf07137df93b3cf51c1e3ad3f0c66d0ecec02

Modified Files:
	py-qwt-qt5/distinfo
	py-qwt-qt5/patches/patch-mk__distinfo.py

Log Message:
py-qwt-qt5: patch-mk__distinfo.py: skip checksum for directory

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

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

diffstat:
 py-qwt-qt5/distinfo                      | 2 +-
 py-qwt-qt5/patches/patch-mk__distinfo.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs:
diff --git a/py-qwt-qt5/distinfo b/py-qwt-qt5/distinfo
index 51daa59a9b..2c9df1b6e4 100644
--- a/py-qwt-qt5/distinfo
+++ b/py-qwt-qt5/distinfo
@@ -4,5 +4,5 @@ SHA1 (pyqt-qwt-1.02.00.tar.gz) = d1c113c5c8ae504bfc479dafdad94a2e459ecf09
 RMD160 (pyqt-qwt-1.02.00.tar.gz) = a25d19cd71baf264b03c02ecd2c86dd4fb3b560c
 SHA512 (pyqt-qwt-1.02.00.tar.gz) = f2b54bd4097b726bcf4df897b910d49489efd2bc9d06d239037b0ecb7ed1420c76499e65b84a49efe2e8ba2313857ece92d8d50d157ccc38fda0cc0dac5ab178
 Size (pyqt-qwt-1.02.00.tar.gz) = 103588 bytes
-SHA1 (patch-mk__distinfo.py) = 0de0a5d946d5c9a97744a0cd26bf69e3bbf73b86
+SHA1 (patch-mk__distinfo.py) = c1f863f827720d0b0f04f592a88901b4ffc15ca6
 SHA1 (patch-sip_qwt.sip) = f2491af157af22410ac78f1fb8bf05b332feb58e
diff --git a/py-qwt-qt5/patches/patch-mk__distinfo.py b/py-qwt-qt5/patches/patch-mk__distinfo.py
index 965146a2c0..4ef403f4af 100644
--- a/py-qwt-qt5/patches/patch-mk__distinfo.py
+++ b/py-qwt-qt5/patches/patch-mk__distinfo.py
@@ -4,12 +4,14 @@ Work around DESTDIR installation issue
 
 --- mk_distinfo.py.orig	2019-02-23 12:55:34.000000000 +0000
 +++ mk_distinfo.py
-@@ -98,6 +98,9 @@ for name in installed:
+@@ -98,6 +98,11 @@ for name in installed:
          else:
              fn_name = fn
  
 +        if (fn.startswith(sys.prefix)):
 +            fn = os.environ.get("DESTDIR") + fn
++        if (os.path.isdir(fn)):
++            continue
 +
          fn_f = open(fn, 'rb')
          data = fn_f.read()


Home | Main Index | Thread Index | Old Index