CVS commit: pkgsrc/x11/py-qwt-qt4

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Sep 16 01:51:42 UTC 2019

Modified Files:
        pkgsrc/x11/py-qwt-qt4: distinfo
        pkgsrc/x11/py-qwt-qt4/patches: patch-configure_configure.py
Added Files:
        pkgsrc/x11/py-qwt-qt4/patches: patch-sip_qwt5qt4_QwtTypes.sip

Log Message:
(x11/py-qwt-qt4): work around fix, build with py-sip 4.19.18

See https://mail-index.netbsd.org/pkgsrc-users/2019/09/09/msg029343.html


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-qwt-qt4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/py-qwt-qt4/patches/patch-sip_qwt5qt4_QwtTypes.sip

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

Modified files:

Index: pkgsrc/x11/py-qwt-qt4/distinfo
diff -u pkgsrc/x11/py-qwt-qt4/distinfo:1.3 pkgsrc/x11/py-qwt-qt4/distinfo:1.4
--- pkgsrc/x11/py-qwt-qt4/distinfo:1.3  Wed Nov  4 03:28:51 2015
+++ pkgsrc/x11/py-qwt-qt4/distinfo      Mon Sep 16 01:51:42 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:51 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/09/16 01:51:42 mef Exp $
 
 SHA1 (PyQwt-5.2.0.tar.gz) = 797f37c63dec660272f6a8ccfd16a017df0ad640
 RMD160 (PyQwt-5.2.0.tar.gz) = e4c8a63d623d974cd500e29fbc62255746ca7feb
 SHA512 (PyQwt-5.2.0.tar.gz) = 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265
 Size (PyQwt-5.2.0.tar.gz) = 2670893 bytes
-SHA1 (patch-configure_configure.py) = 4fbae449cd80b7cf8ed3893ba1333b6fbbca17fc
+SHA1 (patch-configure_configure.py) = 5336923286bf11e8ed65c74954d590432df848f2
+SHA1 (patch-sip_qwt5qt4_QwtTypes.sip) = 29a2a2e01a4d7332ec4a891b65634baaa9fbbe58

Index: pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py
diff -u pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py:1.1 pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py:1.2
--- pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py:1.1      Tue Jan 27 06:11:12 2015
+++ pkgsrc/x11/py-qwt-qt4/patches/patch-configure_configure.py  Mon Sep 16 01:51:42 2019
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure_configure.py,v 1.1 2015/01/27 06:11:12 dbj Exp $
+$NetBSD: patch-configure_configure.py,v 1.2 2019/09/16 01:51:42 mef Exp $
 
-On pkgsrc, python is installed more like generic unix and less like Mac OS.
+1. On pkgsrc, python is installed more like generic unix and less like Mac OS.
+2. build with py-sip 4.19.18
 
---- configure/configure.py.orig        2009-08-01 07:28:33.000000000 +0000
-+++ configure/configure.py
+--- configure/configure.py.orig        2009-08-01 16:28:33.000000000 +0900
++++ configure/configure.py     2019-09-16 08:03:52.221548278 +0900
 @@ -155,8 +155,6 @@ def make_and_run_qt_program(name, code, 
      if sys.platform == "win32":
          exe = os.path.join("release", name + ".exe")
@@ -13,3 +14,12 @@ On pkgsrc, python is installed more like
      else:
          exe = os.path.join(".", name)
  
+@@ -1075,7 +1073,7 @@ def main():
+     
+     options = check_sip(configuration, options)
+     options = check_os(configuration, options)
+-    options = check_compiler(configuration, options)
++#   options = check_compiler(configuration, options)
+     options = check_numarray(configuration, options, 'PyQwt')
+     options = check_numeric(configuration, options, 'PyQwt')
+     options = check_numpy(configuration, options, 'PyQwt')

Added files:

Index: pkgsrc/x11/py-qwt-qt4/patches/patch-sip_qwt5qt4_QwtTypes.sip
diff -u /dev/null pkgsrc/x11/py-qwt-qt4/patches/patch-sip_qwt5qt4_QwtTypes.sip:1.1
--- /dev/null   Mon Sep 16 01:51:42 2019
+++ pkgsrc/x11/py-qwt-qt4/patches/patch-sip_qwt5qt4_QwtTypes.sip        Mon Sep 16 01:51:42 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-sip_qwt5qt4_QwtTypes.sip,v 1.1 2019/09/16 01:51:42 mef Exp $
+
+build with py-sip 4.19.18, see the thread starting with
+  https://mail-index.netbsd.org/pkgsrc-users/2019/09/09/msg029343.html
+
+
+--- sip/qwt5qt4/QwtTypes.sip.orig      2008-09-01 19:52:30.000000000 +0900
++++ sip/qwt5qt4/QwtTypes.sip   2019-09-16 08:22:56.429324208 +0900
+@@ -1,7 +1,7 @@
+ // Automagically generated by configure.py
+ 
+ // Uncomment one of the following three lines
+-typedef unsigned int size_t;
++// typedef unsigned int size_t;
+ // typedef unsigned long size_t;
+ // typedef unsigned long long size_t;
+